ias 签约黄牌，初始话黄牌限制更改

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

@@ -95,11 +95,6 @@ public class OrderInitManager extends AbstractOrderManager<OrderInitRequest> {
         if (!tryLock) {
             throw newBusinessException("该车牌重复下单！");
         }
-        //黄牌 单位不可办理，因为微信签约 黄牌证件类型只支持身份证
-        if (UserType.UNIT_USER.getCode() == request.getUserType() &&
-                request.getVehiclePlateColor() == PlateColorType.YELLOW.getCode()){
-            throw newBusinessException("单位用户不可办理黄牌");
-        }
         //校验渠道网点是否禁用
         QtkServiceHall qtkServiceHall = checkChannelandAgency(request);
         // 渠道订单校验坐标

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

@@ -5,6 +5,7 @@ import cn.com.taiji.core.entity.basic.QtkVehicleInfo;
 import cn.com.taiji.core.entity.comm.CommonWxSignConfig;
 import cn.com.taiji.core.entity.dict.basic.PlateColorType;
 import cn.com.taiji.core.entity.dict.basic.SourceType;
+import cn.com.taiji.core.entity.dict.basic.UserType;
 import cn.com.taiji.core.entity.dict.issue.IssueOrderStep;
 import cn.com.taiji.core.entity.dict.issue.ShippingStatus;
 import cn.com.taiji.core.entity.issue.IssueOrderinfo;
@@ -128,6 +129,7 @@ public class SignQueryManager extends AbstractOrderManager<SignQueryRequest> {
         resultRequest.setOpenId(request.getSubOpenId());
         resultRequest.setPlateNumber(order.getVehiclePlate());
         resultRequest.setMchid(signConfig.getMchId());
+        resultRequest.setSubMchId(signConfig.getSubMchId());
         resultRequest.setApiV3Key(signConfig.getSignKey());
         resultRequest.setPrivateKey(signConfig.getPrivateKey());
         resultRequest.setPublicKeyId(signConfig.getWxPublicKeyId());
@@ -155,6 +157,8 @@ public class SignQueryManager extends AbstractOrderManager<SignQueryRequest> {
             AtsVehicleSignV3Request v3Request = new AtsVehicleSignV3Request();
             v3Request.setAppId(signConfig.getAppId());
             v3Request.setMchid(signConfig.getMchId());
+            v3Request.setSubMchid(signConfig.getSubMchId());
+            v3Request.setSubAppId(signConfig.getSubAppId());
             v3Request.setApiV3Key(signConfig.getSignKey());
             v3Request.setPrivateKey(signConfig.getPrivateKey());
             v3Request.setPublicKeyId(signConfig.getWxPublicKeyId());
@@ -163,8 +167,14 @@ public class SignQueryManager extends AbstractOrderManager<SignQueryRequest> {
             v3Request.setPlanId(signConfig.getPlanId());
             v3Request.setOpenId(request.getSubOpenId());
             v3Request.setPlateNumber(order.getVehiclePlate());
-            v3Request.setUserName(order.getCustomerName());
-            v3Request.setIdNum(order.getCustomerIdNum());
+            //单位订单使用经办人的身份证信息
+            if (UserType.PERSONAL_USER.equals(order.getUserType())) {
+                v3Request.setUserName(order.getCustomerName());
+                v3Request.setIdNum(order.getCustomerIdNum());
+            }else {
+                v3Request.setUserName(order.getAgentName());
+                v3Request.setIdNum(order.getAgentIdNum());
+            }
             AtsVehicleSignV3Response response = jsonPostRepeat(v3Request);
             SignQueryResponse signRes = copyProperties(response, new SignQueryResponse());
             signRes.setUserState("UNAUTHORIZED");