|
@@ -93,6 +93,9 @@ public class PosOrderController extends BaseController {
|
|
|
private IInfoUserService infoUserService;
|
|
private IInfoUserService infoUserService;
|
|
|
@Autowired
|
|
@Autowired
|
|
|
private IPosStoreService posStoreService;
|
|
private IPosStoreService posStoreService;
|
|
|
|
|
+ /** 支付方式闸门(031):商家建单与用户下单共用同一判定入口。 */
|
|
|
|
|
+ @Autowired
|
|
|
|
|
+ private com.ruoyi.system.service.PaymentMethodGateService paymentMethodGateService;
|
|
|
@Autowired
|
|
@Autowired
|
|
|
private IInfoAddressService infoAddressService;
|
|
private IInfoAddressService infoAddressService;
|
|
|
@Autowired
|
|
@Autowired
|
|
@@ -1223,6 +1226,13 @@ public class PosOrderController extends BaseController {
|
|
|
}
|
|
}
|
|
|
//设置支付类型为货到付款
|
|
//设置支付类型为货到付款
|
|
|
if ("1".equals(posOrder.getCollectPayment())) {
|
|
if ("1".equals(posOrder.getCollectPayment())) {
|
|
|
|
|
+ // 031 闸门对称校验:平台关闭到付时商家建单同样被拒,与用户下单同口径(spec FR-004)。
|
|
|
|
|
+ com.ruoyi.system.domain.PosStore payStore = posStoreService.getById(posOrder.getMdId());
|
|
|
|
|
+ if (payStore != null) {
|
|
|
|
|
+ paymentMethodGateService.assertUsable("1",
|
|
|
|
|
+ com.ruoyi.system.service.PaymentMethodGateService.GateScope.MERCHANT,
|
|
|
|
|
+ payStore.getId().longValue(), payStore.getUserId());
|
|
|
|
|
+ }
|
|
|
posOrder.setPayType("1");
|
|
posOrder.setPayType("1");
|
|
|
}
|
|
}
|
|
|
Boolean org = posOrderService.saveOrUpdate(posOrder);
|
|
Boolean org = posOrderService.saveOrUpdate(posOrder);
|