Merge remote-tracking branch 'origin/master'

gly-base-core/src/main/java/cn/com/taiji/core/manager/tools/issue/QdCallUtil.java

                 .setCardId(order.getCardId())
                 .setObuId(order.getObuId())
                 .setPlateNum(order.getVehiclePlate())
-                .setPlateColor(order.getVehiclePlateColor());
+                .setPlateColor(order.getVehiclePlateColor())
+                .setProtocol(order.getProtocol())
+                .setOpenId(order.getUserId());
         if (order.getActivationTime() != null){
             callbackModel.setActiveTime(order.getActivationTime().format(TimeTools.ISO_LOCAL_DATE_TIME));
         }

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ats/model/CallbackModel.java

     @NotNull
     private Integer plateColor;//车牌颜色
 
+    private String protocol;//用户协议签署状态
+
+    private String openId;//用户标识
+
     public SignJsonRequest getJsonReq(String appId,String key,String singKey){
         String reqId = appId + "_" + LocalDateTime.now().format(TimeTools.yyyyMMddHHmmssSSS) + "_"
             + RandomStringUtils.randomNumeric(5);

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

 
 import cn.com.taiji.common.manager.net.http.ServiceHandleException;
 import cn.com.taiji.common.pub.TimeTools;
+import cn.com.taiji.core.entity.ass.AssAgencyConfig;
 import cn.com.taiji.core.entity.basic.QtkAgency;
 import cn.com.taiji.core.entity.basic.QtkCardInfo;
 import cn.com.taiji.core.entity.basic.QtkServiceHall;
 import cn.com.taiji.core.model.comm.protocol.ods.oqs.issue.OqsIssueOrderQueryRequest;
 import cn.com.taiji.core.model.comm.protocol.ods.oqs.issue.OqsIssueOrderQueryResponse;
 import cn.com.taiji.core.model.comm.protocol.valid.ErrorMsgBuilder;
+import cn.com.taiji.core.repo.jpa.ass.AssAgencyConfigRepo;
 import cn.com.taiji.core.repo.jpa.basic.QtkAgencyRepo;
 import cn.com.taiji.core.repo.jpa.issue.IssueProductPayRepo;
 import cn.com.taiji.core.repo.jpa.issue.IssueProductPromotionRepo;
 
     @Autowired
     private QtkAgencyRepo qtkAgencyRepo;
+    @Autowired
+    private AssAgencyConfigRepo assAgencyConfigRepo;
 
     public OrderInitManager() {
         super(DataType.ORDER_INIT);
     protected void businessValidateInternal(ErrorMsgBuilder builder, OrderInitRequest request, ServiceLogEvent event,
                                             Map<String, Object> dataStream) throws ServiceHandleException {
         //黄牌车暂不办理
-//        if (PlateColorType.YELLOW.getCode() == request.getVehiclePlateColor()){
-//            throw newBusinessException("黄牌车辆暂不可办理，敬请期待");
-//        }
+        if (PlateColorType.YELLOW.getCode() == request.getVehiclePlateColor()){
+            AssAgencyConfig agencyConfig = assAgencyConfigRepo.findByAgencyId(request.getAgentId());
+            if (agencyConfig != null && agencyConfig.getQtSign()) {
+                throw newBusinessException("黄牌车辆暂不可办理，敬请期待");
+            }
+        }
 
         String lockKey = MyFinals.VEHICLE_LOCK_KEY + request.getVehiclePlate();
         lock = redissonClient.getLock(lockKey);