提交代码

hai-cweb/src/main/java/com/cweb/controller/pay/UnionPayController.java

@@ -122,6 +122,9 @@ public class UnionPayController {
     @Resource
     private ShellGroupService shellGroupService;
 
+    @Resource
+    private JinZhuJiaYouService jinZhuJiaYouService;
+
     @RequestMapping(value = "/notify", method = RequestMethod.POST)
     @ApiOperation(value = "银联支付 -> 异步回调")
     public void notify(@RequestBody String params,HttpServletRequest request, HttpServletResponse response) {
@@ -359,6 +362,9 @@ public class UnionPayController {
                                             order.getDeductionPrice()
                                     );
 
+                                } else if (store.getSourceType().equals(MerchantStoreSourceType.type4.getNumber())) {
+                                    // 推送金猪加油
+                                    jinZhuJiaYouService.payOrder(order.getOrderNo(), highChildOrder.getGasPriceChannelPay());
                                 }
                             }
                             if (highChildOrder.getGoodsType() == 4 || highChildOrder.getGoodsType() == 9) {

hai-service/src/main/java/com/hai/service/impl/HighOrderServiceImpl.java

@@ -575,12 +575,7 @@ public class HighOrderServiceImpl implements HighOrderService {
 
                 } else if (store.getSourceType().equals(MerchantStoreSourceType.type4.getNumber())) {
                     // 推送金猪加油
-                    JSONObject jzOrderObject = jinZhuJiaYouService.payOrder(highOrder.getOrderNo(), highChildOrder.getGasPriceChannelPay());
+                    jinZhuJiaYouService.payOrder(highOrder.getOrderNo(), highChildOrder.getGasPriceChannelPay());
-                    if (jzOrderObject == null
-                            || !jzOrderObject.getString("type").equals("OK")
-                            || !jzOrderObject.getInteger("status").equals(200)) {
-                        throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, jzOrderObject.getString("title"));
-                    }
                 }
             }
 
@@ -859,6 +854,9 @@ public class HighOrderServiceImpl implements HighOrderService {
                             order.getPayablePrice(),
                             order.getDeductionPrice()
                     );
+                } else if (store.getSourceType().equals(MerchantStoreSourceType.type4.getNumber())) {
+                    // 推送金猪加油
+                    jinZhuJiaYouService.payOrder(order.getOrderNo(), highChildOrder.getGasPriceChannelPay());
                 }
             }
 
@@ -1175,6 +1173,9 @@ public class HighOrderServiceImpl implements HighOrderService {
                             order.getPayablePrice(),
                             order.getDeductionPrice()
                     );
+                } else if (store.getSourceType().equals(MerchantStoreSourceType.type4.getNumber())) {
+                    // 推送金猪加油
+                    jinZhuJiaYouService.payOrder(order.getOrderNo(), highChildOrder.getGasPriceChannelPay());
                 }
             }
 

hai-service/src/main/java/com/hai/service/pay/impl/GoodsOrderServiceImpl.java

@@ -131,6 +131,9 @@ public class GoodsOrderServiceImpl implements PayService {
     @Resource
     private ShellGroupService shellGroupService;
 
+    @Resource
+    private JinZhuJiaYouService jinZhuJiaYouService;
+
     @Override
     @Transactional(propagation= Propagation.REQUIRES_NEW)
     public void paySuccess(Map<String, String> map, String payType) throws Exception {
@@ -353,6 +356,9 @@ public class GoodsOrderServiceImpl implements PayService {
                                     order.getPayablePrice(),
                                     order.getDeductionPrice()
                             );
+                        } else if (store.getSourceType().equals(MerchantStoreSourceType.type4.getNumber())) {
+                            // 推送金猪加油
+                            jinZhuJiaYouService.payOrder(order.getOrderNo(), highChildOrder.getGasPriceChannelPay());
                         }
                     }