ias

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/MyCommHandleManager.java

@@ -3,10 +3,7 @@ package cn.com.taiji.ias.manager;
 import cn.com.taiji.core.manager.comm.AbstractCommHandleManager;
 import cn.com.taiji.core.model.comm.protocol.ias.IasServiceSystem;
 import cn.com.taiji.core.model.comm.protocol.ias.IasServiceType;
-import cn.com.taiji.ias.manager.handler.BillServiceHandler;
-import cn.com.taiji.ias.manager.handler.ChannelSendHandler;
-import cn.com.taiji.ias.manager.handler.PortalServiceHandler;
-import cn.com.taiji.ias.manager.handler.ProvinceHandler;
+import cn.com.taiji.ias.manager.handler.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -29,6 +26,8 @@ public class MyCommHandleManager extends AbstractCommHandleManager {
     private ProvinceHandler provinceHandler;
     @Autowired
     private ChannelSendHandler channelSendHandler;
+    @Autowired
+    private OrderServiceHandler orderServiceHandler;
 
     public MyCommHandleManager() {
         super(IasServiceSystem.ISSUES);
@@ -41,6 +40,7 @@ public class MyCommHandleManager extends AbstractCommHandleManager {
         registerJsonService(portalServiceHandler);
         registerJsonService(provinceHandler);
         registerJsonService(channelSendHandler);
+        registerJsonService(orderServiceHandler);
     }
 
     @Override

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/order/OrderPayApplyManager.java

@@ -62,7 +62,7 @@ public class OrderPayApplyManager extends AbstractOrderManager<OrderPayApplyRequ
             throw newBusinessException("当前订单不能支付，订单状态" + order.getOrderStatus().getStatus());
         }
         if (!IssueOrderStep.VEHICLE_UPLOAD.equals(order.getOrderStep())) {
-            throw newBusinessException("当前订单不能支付，订单状态" + order.getOrderStep().getStep());
+            throw newBusinessException("当前订单步骤不能支付，订单步骤" + order.getOrderStep().getStep());
         }
         // 查询支付单
         IssueOrderPay orderPay = orderPayRepo.findById(request.getOrderPayId()).orElse(null);
@@ -135,13 +135,7 @@ public class OrderPayApplyManager extends AbstractOrderManager<OrderPayApplyRequ
     private OrderPayApplyResponse applyV3(OrderPayApplyRequest req, IssueOrderPay orderPay,
                                                CommonPayConfig payConfig, OrderPayApplyResponse res) throws ServiceHandleException {
         AtsCreatPayOrderV3Request v3Request = new AtsCreatPayOrderV3Request();
-        v3Request.setCreateType(payConfig.getWxServiceType());
-        v3Request.setTradeType(TradeType.valueOf(payConfig.getPayProductType()));
-        v3Request.setAppid(payConfig.getWxAppId());
-        v3Request.setPublicKeyId(payConfig.getWxPublicKeyId());
-        v3Request.setPublicKey(payConfig.getWxPublicKey());
-//        v3Request.setSubAppid();
-        v3Request.setSubMchId(payConfig.getWxSubMchId());
+
         v3Request.setDescription(orderPay.getPayType().getValue());
         v3Request.setOutTradeNo(orderPay.getPayOrderNo());
         v3Request.setNotifyUrl("https://skx.mynatapp.cc/qtucpaymgt/wxv3/notify/");
@@ -149,6 +143,14 @@ public class OrderPayApplyManager extends AbstractOrderManager<OrderPayApplyRequ
         v3Request.setSpOpenid(req.getSubOpenId());
         v3Request.setSubOpenid(req.getSubOpenId());
         v3Request.setOpenid(req.getSubOpenId());
+        v3Request.setPayerClientIp(req.getSpbillCreateIp());
+        v3Request.setType(req.getH5Type());
+        v3Request.setCreateType(payConfig.getWxServiceType());
+        v3Request.setTradeType(TradeType.valueOf(payConfig.getPayProductType()));
+        v3Request.setAppid(payConfig.getWxAppId());
+        v3Request.setPublicKeyId(payConfig.getWxPublicKeyId());
+        v3Request.setPublicKey(payConfig.getWxPublicKey());
+        v3Request.setSubMchId(payConfig.getWxSubMchId());
         v3Request.setMchid(payConfig.getWxMchId());
         v3Request.setApiV3Key(payConfig.getWxApiv3key());
         v3Request.setPrivateKey(payConfig.getWxPrivatekey());

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/order/OrderPayQueryManager.java

@@ -92,7 +92,11 @@ public class OrderPayQueryManager extends AbstractOrderManager<OrderPayQueryRequ
             res.setPaymentStatus(payStatus.contains(OrderPayStatus.SUCCESS) && payStatus.size()==1 ? 1:0);
             res.setSumFee(order.getAmount());
             List<OrderPayQueryModel> collect =
-                    orderPays.stream().map(p -> copyProperties(p, new OrderPayQueryModel())).collect(Collectors.toList());
+                    orderPays.stream().map(p -> {
+                        OrderPayQueryModel model = copyProperties(p, new OrderPayQueryModel());
+                        model.setOrderPayId(p.getId());
+                        return model;
+                    }).collect(Collectors.toList());
             res.setDatas(collect);
         } else {
             res.setSumFee(0L);