Merge remote-tracking branch 'origin/master'

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ias/brz/BrzVehicleCheckRequest.java

@@ -11,7 +11,7 @@ import javax.validation.constraints.NotNull;
 @Getter
 @Setter
 @Accessors(chain = true)
-public class BrzVehicleCheckRequest extends AbstractIasRequest<BrzVehicleCheckResponse> {
+public class BrzVehicleCheckRequest extends AbstractBrzRequest<BrzVehicleCheckResponse> {
     public BrzVehicleCheckRequest() {
         super(BrzServiceCmd.VEHICLECHECK);
     }

zhywpt-dps-iasq/src/main/java/cn/com/taiji/iasq/manager/quartz/brz/BrzDataSendManagerImpl.java

@@ -117,7 +117,7 @@ public class BrzDataSendManagerImpl extends AbstractCommManager implements BrzDa
             if (response == null) {
                 return data.setOfflineSendResult("返回值为空").setSuccess(false);
             }
-            if (hasText(response.getInfo()) && response.getInfo().contains("成功")) {
+            if (response.isSuccess()) {
                 data.setOfflineToken(response.getAccessToken());
                 data.setOfflineTokenTime(LocalDateTime.now());
                 data.setOfflineSendTime(LocalDateTime.now());
@@ -147,7 +147,7 @@ public class BrzDataSendManagerImpl extends AbstractCommManager implements BrzDa
             if (response == null) {
                 return data.setOfflineSendResult("返回值为空").setSuccess(false);
             }
-            if (hasText(response.getInfo()) && response.getInfo().contains("成功")) {
+            if (response.isSuccess()) {
                 data.setOfflineToken(response.getAccessToken());
                 data.setOfflineTokenTime(LocalDateTime.now());
                 data.setOfflineSendTime(LocalDateTime.now());
@@ -186,7 +186,7 @@ public class BrzDataSendManagerImpl extends AbstractCommManager implements BrzDa
             if (response == null) {
                 return data.setOfflineSendResult("返回值为空").setSuccess(false);
             }
-            if (hasText(response.getInfo()) && response.getInfo().contains("成功")) {
+            if (response.isSuccess()) {
                 data.setCurrentSendStatus(1);
                 return data.setOfflineSendResult(response.getInfo()).setSuccess(true);
             } else {
@@ -214,7 +214,7 @@ public class BrzDataSendManagerImpl extends AbstractCommManager implements BrzDa
             if (response == null) {
                 return data.setOfflineSendResult("返回值为空").setSuccess(false);
             }
-            if (hasText(response.getInfo()) && response.getInfo().contains("成功")) {
+            if (response.isSuccess()) {
                 data.setCurrentSendStatus(1);
                 return data.setOfflineSendResult(response.getInfo()).setSuccess(true);
             } else {
@@ -242,7 +242,7 @@ public class BrzDataSendManagerImpl extends AbstractCommManager implements BrzDa
             if (response == null) {
                 return data.setOfflineSendResult("返回值为空").setSuccess(false);
             }
-            if (hasText(response.getInfo()) && response.getInfo().contains("成功")) {
+            if (response.isSuccess()) {
                 data.setCurrentSendStatus(1);
                 return data.setOfflineSendResult(response.getInfo()).setSuccess(true);
             } else {
@@ -262,7 +262,7 @@ public class BrzDataSendManagerImpl extends AbstractCommManager implements BrzDa
             request.setOpenId(data.getOfflineOpenId());
             BrzUserAccountResponse response = jsonPostRepeat(request);
             if (response == null) return null;
-            if (hasText(response.getInfo()) && response.getInfo().contains("成功")) {
+            if (response.isSuccess()) {
                 BrzUserAccountModel model = response.getModelList().get(0);
                 return model.getAccountId();
             } else {
@@ -282,7 +282,8 @@ public class BrzDataSendManagerImpl extends AbstractCommManager implements BrzDa
             request.setAccessToken(data.getOfflineToken());
             request.setOpenId(data.getOfflineOpenId());
             BrzTouchTokenResponse response = jsonPostRepeat(request);
-            if (response != null && hasText(response.getInfo()) && response.getInfo().contains("成功")) {
+            if (response == null) return null;
+            if (response.isSuccess()) {
                 return response.getAccessToken();
             }
             return null;

zhywpt-service-ats/src/main/java/cn/com/taiji/ats/manager/weixin/GetWeChatOpenIdManager.java

@@ -52,7 +52,11 @@ public class GetWeChatOpenIdManager extends AbstractManager {
             res = JsonTools.json2Object(string, AtsGetWeChatOpenIdResponse.class);
         } catch (IOException e) {
             logger.error("微信登录获取openId异常：{}", e.toString());
-            throw GlyServiceError.SYSTEM_ERROR.toHandleException(e.getMessage());
+            throw GlyServiceError.BUSINESS_VALIDATE_ERR.toHandleException(e.getMessage());
+        }
+        if (hasText(res.getErrCode())) {
+            logger.error("微信登录获取openId正常响应异常：code{},msg{}",res.getErrCode(), res.getErrMsg());
+            throw GlyServiceError.BUSINESS_VALIDATE_ERR.toHandleException(res.getErrMsg());
         }
         return res;
     }

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

@@ -6,8 +6,11 @@ import cn.com.taiji.core.entity.basic.QtkVehicleInfo;
 import cn.com.taiji.core.entity.dict.basic.VehicleUseCharacter;
 import cn.com.taiji.core.entity.log.IasInterfaceLog;
 import cn.com.taiji.core.manager.comm.LogManager;
+import cn.com.taiji.core.model.comm.protocol.ias.brz.BrzVehicleCheckRequest;
+import cn.com.taiji.core.model.comm.protocol.ias.brz.BrzVehicleCheckResponse;
 import cn.com.taiji.core.model.comm.protocol.ias.brz.BrzVehicleInfoRequest;
 import cn.com.taiji.core.model.comm.protocol.ias.brz.BrzVehicleInfoResponse;
+import cn.com.taiji.core.model.comm.protocol.valid.GlyServiceError;
 import cn.com.taiji.core.repo.jpa.log.IasInterfaceLogRepo;
 import cn.com.taiji.ias.manager.tools.AESTools;
 import cn.com.taiji.sdk2.comm.BspClientHelper;
@@ -24,10 +27,22 @@ public class BrzVehicleInfoManager extends AbstractManager implements LogManager
 
     @Autowired
     private IasInterfaceLogRepo logRepo;
+    @Autowired
+    private BrzVehicleCheckManager brzVehicleCheckManager;
 
     public BrzVehicleInfoResponse serviceHandle(BrzVehicleInfoRequest request) throws ServiceHandleException {
         long begin = System.currentTimeMillis();
         try {
+            BrzVehicleCheckRequest checkRequest = new BrzVehicleCheckRequest();
+            checkRequest.setAccessToken(request.getAccessToken());
+            checkRequest.setOpenId(request.getOpenId());
+            checkRequest.setPlateNum(request.getVehicleInfo().getVehiclePlate());
+            checkRequest.setPlateColor(request.getVehicleInfo().getVehiclePlateColor());
+            checkRequest.setAccountId(request.getAccountId());
+            BrzVehicleCheckResponse checkResponse = brzVehicleCheckManager.serviceHandle(checkRequest);
+            if (!checkResponse.isSuccess())
+                throw GlyServiceError.BUSINESS_VALIDATE_ERR.toHandleException(checkResponse.getInfo());
+            logger.info(checkResponse.toJson());
             QtkVehicleInfo vehicleInfo = request.getVehicleInfo();
             VloflRequest vloflRequest = new VloflRequest();
             VloflModel vloflModel = new VloflModel();

zhywpt-service-inss/src/main/java/cn/com/taiji/inss/manager/inst/InstOnlineActiveMananger.java

@@ -491,6 +491,8 @@ public class InstOnlineActiveMananger extends AbstractCallBackManager {
             obuInfo.setObuEnableTime(vo.getObuEnableTime());
             obuInfo.setObuExpireTime(vo.getObuExpireTime());
         }
+        IssueProduct product = productRepo.findByReleaseId(orderInfo.getProductId());
+        obuInfo.setWarrantyDate(vo.getObuEnableTime().plusYears(product.getWarrantyPeriod()));//质保期
         obuInfoRepo.persist(obuInfo);
         //通知渠道
         if (orderInfo.getOrderSource() == SourceType.CHANNEL) {