|
|
@ -159,7 +159,11 @@ public class OrderPayController { |
|
|
|
} else if (order.getProductType().equals(OrderProductType.PRODUCT_TYPE5.getNumber())) { |
|
|
|
} else if (order.getProductType().equals(OrderProductType.PRODUCT_TYPE5.getNumber())) { |
|
|
|
HighCoupon coupon = couponService.getCouponById(order.getHighChildOrderList().get(0).getGoodsId()); |
|
|
|
HighCoupon coupon = couponService.getCouponById(order.getHighChildOrderList().get(0).getGoodsId()); |
|
|
|
if (coupon.getCouponSource() != null && coupon.getCouponSource().equals(4)) { |
|
|
|
if (coupon.getCouponSource() != null && coupon.getCouponSource().equals(4)) { |
|
|
|
weChatPayReqInfo.setSub_mch_id(WxOrderConfig.MCH_ID_1634835264); |
|
|
|
if (order.getMemDiscountId() != null) { |
|
|
|
|
|
|
|
weChatPayReqInfo.setSub_mch_id(WxOrderConfig.MCH_ID_1614670195); |
|
|
|
|
|
|
|
} else { |
|
|
|
|
|
|
|
weChatPayReqInfo.setSub_mch_id(WxOrderConfig.MCH_ID_1634835264); |
|
|
|
|
|
|
|
} |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
weChatPayReqInfo.setSub_mch_id(WxOrderConfig.MCH_ID_1614670195); |
|
|
|
weChatPayReqInfo.setSub_mch_id(WxOrderConfig.MCH_ID_1614670195); |
|
|
|
} |
|
|
|
} |
|
|
|