Merge remote-tracking branch 'origin/master'

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

@@ -140,7 +140,7 @@ public class VerificationRuleManagerImpl extends AbstractCommManager implements
                     builder.append("车辆识别代码【" + model.getVin() + "】与系统识别结果【" + res.getVin() + "】不一致；");
                 }
                 if (!model.getVehicleModel().equals(res.getModel())) {
-                    builder.append("品牌型号【" + model.getVin() + "】与系统识别结果【" + res.getVin() + "】不一致；");
+                    builder.append("品牌型号【" + model.getVehicleModel() + "】与系统识别结果【" + res.getModel() + "】不一致；");
                 }
             } catch (IOException e) {
                 builder.append("行驶证主页照片识别结果异常；");

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

@@ -2,6 +2,7 @@ package cn.com.taiji.ias.manager.order;
 
 import cn.com.taiji.common.manager.net.http.ServiceHandleException;
 import cn.com.taiji.common.pub.StringTools;
+import cn.com.taiji.common.pub.TimeTools;
 import cn.com.taiji.core.entity.basic.QtkCustomerInfo;
 import cn.com.taiji.core.entity.basic.QtkServiceHall;
 import cn.com.taiji.core.entity.basic.QtkServicehallLocation;
@@ -11,6 +12,8 @@ import cn.com.taiji.core.entity.dict.issue.OrderPayStatus;
 import cn.com.taiji.core.entity.dict.issue.OrderType;
 import cn.com.taiji.core.entity.dict.issue.TransactionBizType;
 import cn.com.taiji.core.entity.dict.pay.PayChannelType;
+import cn.com.taiji.core.entity.dict.pay.TradeState;
+import cn.com.taiji.core.entity.dict.pay.TradeType;
 import cn.com.taiji.core.entity.issue.*;
 import cn.com.taiji.core.entity.user.AccountInfo;
 import cn.com.taiji.core.manager.tools.MyTimeTools;
@@ -305,16 +308,16 @@ public abstract class AbstractOrderManager<T extends AbstractSignTypeRequest<?>>
         AtsQueryPayResultV3Request v3Request = new AtsQueryPayResultV3Request();
         v3Request.setCreateType(payConfig.getWxServiceType());
         v3Request.setExternalOrderNo(pay.getExternalOrderNo());
-//        v3Request.setTradeType(TradeType.valueOf(payConfig.getPayProductType()));
+        v3Request.setTradeType(TradeType.valueOf(payConfig.getPayProductType()));
         v3Request.setMchid(payConfig.getWxMchId());
         v3Request.setApiV3Key(payConfig.getWxApiv3key());
         v3Request.setPrivateKey(payConfig.getWxPrivatekey());
         v3Request.setSerialNo(payConfig.getWxSerialNo());
-//        v2Request.setSubMchId(payConfig.get);
+        v3Request.setSubMchid(payConfig.getWxSubMchId());
         AtsQueryPayResultV3Response res = jsonPostRepeat(v3Request);
-        if (OrderPayStatus.SUCCESS.equals(res.getTradeState())) {
+        if (TradeState.SUCCESS.equals(res.getTradeState())) {
             pay.setPayStatus(OrderPayStatus.SUCCESS);
-            pay.setPayTime(MyTimeTools.strToTime(res.getSuccessTime(), DateTimeFormatter.ofPattern("yyyy-MM-ddTHH:mm:ss")));
+            pay.setPayTime(MyTimeTools.strToTime(res.getSuccessTime(),TimeTools.ISO_LOCAL_DATE_TIME));
             pay.setUpdateTime(LocalDateTime.now());
             pay.setExternalOrderNo(res.getTransactionId());
             pay.setPayResult(res.toJson());
@@ -328,12 +331,12 @@ public abstract class AbstractOrderManager<T extends AbstractSignTypeRequest<?>>
         v2Request.setOutTradeNo(pay.getExternalOrderNo());
         v2Request.setAppId(payConfig.getWxAppId());
         v2Request.setMchId(payConfig.getWxMchId());
-//        v2Request.setSubAppId(payConfig.gets);
-//        v2Request.setSubMchId(payConfig.get);
+        v2Request.setSubMchId(payConfig.getWxSubMchId());
+        v2Request.setMchKey(payConfig.getWxKey());
         AtsQueryPayResultV2Response res = jsonPostRepeat(v2Request);
-        if (OrderPayStatus.SUCCESS.equals(res.getTradeState())) {
+        if (TradeState.SUCCESS.equals(res.getTradeState())) {
             pay.setPayStatus(OrderPayStatus.SUCCESS);
-            pay.setPayTime(MyTimeTools.strToTime(res.getTimeEnd(), DateTimeFormatter.ofPattern("yyyyMMddHHmmss")));
+            pay.setPayTime(MyTimeTools.strToTime(res.getTimeEnd(),TimeTools.yyyyMMddHHmmss));
             pay.setUpdateTime(LocalDateTime.now());
             pay.setExternalOrderNo(res.getTransactionId());
             pay.setPayResult(res.toJson());