提交代码

hai-order/src/main/java/com/web/controller/OrderPayController.java

@@ -83,6 +83,9 @@ public class OrderPayController {
     @Resource
     private HighGasService gasService;
 
+    @Resource
+    private HighCouponService couponService;
+
     @Resource
     private HighGasChannelConfigService gasChannelConfigService;
 
@@ -141,7 +144,13 @@ public class OrderPayController {
                 orderTitle = productType.getName();
             }
 
-            if (order.getProductType().equals(OrderProductType.PRODUCT_TYPE6.getNumber())) {
+            if (order.getProductType().equals(OrderProductType.PRODUCT_TYPE5.getNumber())) {
+                HighCoupon coupon = couponService.getCouponById(order.getHighChildOrderList().get(0).getGoodsId());
+                if (coupon.getCouponSource() != null && coupon.getCouponSource().equals(4)) {
+                    weChatPayReqInfo.setSub_mch_id(WxOrderConfig.MCH_ID_1634835264);
+                }
+
+            } else if (order.getProductType().equals(OrderProductType.PRODUCT_TYPE6.getNumber())) {
                 // 查询油站
                 HighMerchantStoreModel store = merchantStoreService.getMerchantStoreById(order.getHighChildOrderList().get(0).getGoodsId());
                 if (store == null) {