|
|
@@ -286,6 +286,7 @@ public class StoreOrderScrmController extends AppBaseController {
|
|
|
//@Synchronized
|
|
|
public R pay(HttpServletRequest request, @Validated @RequestBody FsStoreOrderPayParam param)
|
|
|
{
|
|
|
+ logger.info("支付开始{}",param);
|
|
|
FsStoreOrderScrm order=orderService.selectFsStoreOrderById(param.getOrderId());
|
|
|
if(order==null){
|
|
|
return R.error("订单不存在");
|
|
|
@@ -410,6 +411,7 @@ public class StoreOrderScrmController extends AppBaseController {
|
|
|
}
|
|
|
}
|
|
|
}else if(order.getPayType().equals("1") && order.getPayMoney().compareTo(BigDecimal.ZERO) ==0 ){// 判断0金额订单
|
|
|
+ logger.info("订单支付金额0,{}", order.getId());
|
|
|
FsStorePaymentScrm storePayment=new FsStorePaymentScrm();
|
|
|
storePayment.setCompanyId(order.getCompanyId());
|
|
|
storePayment.setCompanyUserId(order.getCompanyUserId());
|
|
|
@@ -485,6 +487,7 @@ public class StoreOrderScrmController extends AppBaseController {
|
|
|
com.fs.hisStore.config.StoreConfig config = JSONUtil.toBean(json, com.fs.hisStore.config.StoreConfig.class);
|
|
|
return config.getAuditSwitch() == 1;
|
|
|
} catch (Exception e) {
|
|
|
+ logger.error("获取订单审核配置失败",e);
|
|
|
return false;
|
|
|
}
|
|
|
}
|