wks il y a 2 ans
Parent
commit
bb55569549

+ 2 - 0
src/main/java/com/ydtech/modules/order/entity/api/huatai/constants/HuaTaiTransCode.java

@@ -11,6 +11,7 @@ public class HuaTaiTransCode {
 
     //车型查询
     public static final String MODELS_QUERY = "ModelsQuery";
+
     //实际价值
     public static final String ACTUAL_VALUE = "ActualValue";
 
@@ -25,6 +26,7 @@ public class HuaTaiTransCode {
 
     //见费出单结果查询接口
     public static final String ORDER_CONFIRM = "OrderConfirm";
+
     public static final String UPLOAD_IMAGE = "UploadImage";
 
     //非电子投保单缴费申请接口

+ 7 - 1
src/main/java/com/ydtech/modules/order/service/impl/InsOrdersServiceImpl.java

@@ -113,6 +113,7 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
         if (InsOrderStatusEnum.TO_BACK.getCode().equals(orderStatus)) {
             return;
         }
+
         LambdaQueryWrapper<InsAreaCompany> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(InsAreaCompany::getOrderno, orderNo)
                 .orderByDesc(InsAreaCompany::getOrderstatus)
@@ -122,6 +123,9 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
         InsAreaCompany insAreaCompany = insAreaCompanyService.getOne(wrapper);
         if (!ObjectUtils.isEmpty(insAreaCompany)) {
             InsOrders insOrders = getById(orderNo);
+            if(InsOrderStatusEnum.ACCEPT_INSURANCE.getCode().equals(insOrders.getOrderstatus())){
+                return;
+            }
 
             // 承保设置保险公司
             if (InsOrderStatusEnum.ACCEPT_INSURANCE.getCode().equals(orderStatus)) {
@@ -130,7 +134,9 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
             }
 
             insOrders.setOrderstatus(insAreaCompany.getOrderstatus());
-            updateById(insOrders);
+            LambdaQueryWrapper<InsOrders> insOrdersLambdaQueryWrapper = new LambdaQueryWrapper<>();
+            insOrdersLambdaQueryWrapper.ne(InsOrders::getOrderstatus, InsOrderStatusEnum.ACCEPT_INSURANCE.getCode());
+            update(insOrders, insOrdersLambdaQueryWrapper);
         }
     }
 

+ 9 - 9
src/main/java/com/ydtech/modules/order/service/impl/ZijinOrderApiServiceImpl.java

@@ -144,7 +144,7 @@ public class ZijinOrderApiServiceImpl implements ZijinOrderApiService {
                 queryActualValueResponse.getActualValue(), quoteVo.getAccidentalDrivingVo(), zjConfigureParameters,
                 modelQueryResponse);
         boolean isEnergy = false;
-        if("D6,D8,D12,".contains(vehicleModelInfosDTO.getPowerTypeCode()+",")) {//纯电动 燃料电池 插电式混合动力 归属为新能源产品
+        if ("D6,D8,D12,".contains(vehicleModelInfosDTO.getPowerTypeCode() + ",")) {//纯电动 燃料电池 插电式混合动力 归属为新能源产品
             isEnergy = true;
         }
         String message = "";
@@ -153,14 +153,14 @@ public class ZijinOrderApiServiceImpl implements ZijinOrderApiService {
                         message, queryActualValueRequest, true);
         // 警告信息
         QuoteRespVo quoteRespVo = getQuoteRespVo(calculatePremiumResponse, quoteInfoVo,
-                quoteVo.getAccidentalDrivingVo(),isEnergy);
+                quoteVo.getAccidentalDrivingVo(), isEnergy);
         if (!StringUtils.isEmpty(message)) {
             ArrayList<String> objects = new ArrayList<>();
             objects.add(message);
             quoteRespVo.setWarnMessageList(objects);
         }
         return responseOrder(calculatePremiumResponse, quoteRespVo, ptlAgreementAttribution,
-                calculatePremiumRequest.getOrderId(), calculatePremiumRequest.getOrderNo(),quoteInfoVo);
+                calculatePremiumRequest.getOrderId(), calculatePremiumRequest.getOrderNo(), quoteInfoVo);
     }
 
     @Override
@@ -406,7 +406,7 @@ public class ZijinOrderApiServiceImpl implements ZijinOrderApiService {
     }
 
     public QuoteRespVo getQuoteRespVo(CalculatePremiumResponse calculatePremiumResponse,
-                                      BaseQuoteInfoVo yaQuoteInfoVo, List<ZjQuoteAccidentVo> accidentalDrivingVo,boolean isEnergy) {
+                                      BaseQuoteInfoVo yaQuoteInfoVo, List<ZjQuoteAccidentVo> accidentalDrivingVo, boolean isEnergy) {
         double jqPremium = 0;
         double syPremium = 0;
         double sumPayTax = 0;
@@ -452,12 +452,12 @@ public class ZijinOrderApiServiceImpl implements ZijinOrderApiService {
             kind.setKindCode(kindInfoVo.getKindCode());
             kind.setKindName(kindInfoVo.getKindName());
             int i = ArrayUtil.indexOf(InsuranceTypeCorrespondence.getJinZhangGuiType(), kindInfoVo.getKindCode());
-            CalculatePremiumResponse.ItemKindListDTO itemKindListDTO ;
-            if(isEnergy){
+            CalculatePremiumResponse.ItemKindListDTO itemKindListDTO;
+            if (isEnergy) {
                 itemKindListDTO = itemKindList.stream()
                         .filter(a -> a.getKindCode().equals(InsuranceTypeCorrespondence.getZjConnectInsuranceTypeNewEnergy()[i]))
                         .collect(Collectors.toList()).get(0);
-            }else{
+            } else {
                 itemKindListDTO = itemKindList.stream()
                         .filter(a -> a.getKindCode().equals(InsuranceTypeCorrespondence.getZjConnectInsuranceType()[i]))
                         .collect(Collectors.toList()).get(0);
@@ -504,7 +504,7 @@ public class ZijinOrderApiServiceImpl implements ZijinOrderApiService {
     public HttpResult<QuoteRespVo> responseOrder(CalculatePremiumResponse calculatePremiumResponse,
                                                  QuoteRespVo quoteRespVo,
                                                  PtlAgreementAttribution ptlAgreementAttribution, String orderId,
-                                                 String orderNo,BaseQuoteInfoVo quoteInfoVo) {
+                                                 String orderNo, BaseQuoteInfoVo quoteInfoVo) {
         // 保存订单信息
         InsAreaCompany insAreaCompany = new InsAreaCompany(quoteRespVo, ptlAgreementAttribution);
         // 协议id
@@ -521,7 +521,7 @@ public class ZijinOrderApiServiceImpl implements ZijinOrderApiService {
         insAreaCompanyService.insertCompanyAndOrders(insAreaCompany);
         quoteRespVo.setCompanyId(orderNo);
         //添加调用费用匹配功能
-        feeRuleSchemeService.dealFeeOrderInfo(quoteInfoVo, quoteRespVo, ptlAgreementAttribution.getId(),insAreaCompany.getId());
+        feeRuleSchemeService.dealFeeOrderInfo(quoteInfoVo, quoteRespVo, ptlAgreementAttribution.getId(), insAreaCompany.getId());
         return HttpResult.ok("报价成功", quoteRespVo);
     }