Merge remote-tracking branch 'origin/test' into test

README.md

@@ -232,6 +232,17 @@
 
 
 
+**《掌柜鼎PC平台》临时更新公告**
+
+* 版本号：v0.0.4.3
+* 访问地址：http://sxzgkj.baoxianzhanggui.com/
+* 需求bug收集表：https://kdocs.cn/l/cloAn4eaINVw
+* 更新日期：2023-10-11
+* 更新时间：09：30  ~  10：00
+* 更新内容：
+  1. 解决永诚突然出现二维码无法生成问题。
+  2. 解决部分保单无法下载问题。
+
 
 
 

src/main/java/com/ydtech/modules/ins/controller/InsAlltrustApiController.java

@@ -4,6 +4,7 @@ package com.ydtech.modules.ins.controller;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 //import com.ydtech.aop.request.MethodLogAnnotation;
 import com.ydtech.aop.request.RequestSingleParam;
+import com.ydtech.constants.enums.dict.InsOrderStatusEnum;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.exception.SystemException;
 import com.ydtech.modules.esm.dao.EsmInsAttachInsureDetailsMapper;
@@ -15,7 +16,9 @@ import com.ydtech.modules.ins.model.ya.CarModel_Req;
 import com.ydtech.modules.ins.model.yc.CallBackRequest;
 import com.ydtech.modules.ins.service.InsAlltrustApiService;
 import com.ydtech.modules.order.components.InsOrdersComponents;
+import com.ydtech.modules.order.entity.InsAreaCompany;
 import com.ydtech.modules.order.entity.vo.*;
+import com.ydtech.modules.order.service.InsAreaCompanyService;
 import com.ydtech.utils.Base64Utils;
 import com.ydtech.utils.StringUtils;
 import io.swagger.annotations.*;
@@ -24,6 +27,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.time.LocalDate;
 import java.util.*;
 
 import javax.servlet.http.HttpServletRequest;
@@ -54,6 +58,8 @@ public class InsAlltrustApiController {
     EsmInsAttachInsureMapper esmInsAttachInsureMapper;
     @Autowired
     EsmInsAttachInsureDetailsMapper esmInsAttachInsureDetailsMapper;
+    @Autowired
+    InsAreaCompanyService insAreaCompanyService;
 
 
     @ApiResponses({
@@ -202,5 +208,25 @@ public class InsAlltrustApiController {
     }
 
 
+    @GetMapping(value = "/updatePay/{suborderId}")
+    @ApiOperation(value = "永诚API方式 - 刷新支付链接 通过子订单ID")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "suborderId", value = "子订单ID", required = true, dataType = "String")
+    })
+    public HttpResult updatePay(@PathVariable String suborderId) {
+
+        LambdaQueryWrapper<InsAreaCompany> lqw = new LambdaQueryWrapper<>();
+        lqw.eq(InsAreaCompany::getOrderstatus, InsOrderStatusEnum.WAIT_PAY.getCode());
+        lqw.gt(InsAreaCompany::getAudittime, LocalDate.now().minusDays(1));
+        List<InsAreaCompany> list = insAreaCompanyService.list(lqw);
+
+        list.stream().forEach(a ->{
+            insYongchengApiService.getPayUrlApi(a);
+        });
+
+        return HttpResult.ok("更新成功");
+    }
+
+
 
 }

src/main/java/com/ydtech/modules/ins/model/yc/ruote/Tax.java

@@ -148,6 +148,8 @@ public class Tax {
         tax.setConruty("156");
         tax.setTel(policyHolderInfo.getMobile());
         tax.setExhaust(carInfo.getEnginedesc());
+
+
         return tax;
     }
 

src/main/java/com/ydtech/modules/ins/model/yc/ruote/Vhl.java

@@ -413,7 +413,7 @@ public class Vhl {
         //核定载客数   取的座位数
         vhl.setNSeatNum(carInfo.getSeatCount());
 
-        vhl.setCVhlTyp(StringUtils.toInt(vhl.getNSeatNum()) < 7 ? "337001" : "337002");
+        vhl.setCVhlTyp(StringUtils.toInt(vhl.getNSeatNum()) < 6 ? "337001" : "337002");
 //        //新旧车标志  0 新车,1 旧车
         vhl.setCNewMrk("1");
 

src/main/java/com/ydtech/modules/ins/service/impl/InsAlltrustApiServiceImpl.java

@@ -236,19 +236,22 @@ public class InsAlltrustApiServiceImpl implements InsAlltrustApiService {
 
         //匹配的车辆信息数据  为空
         if (CollUtil.isEmpty(vehicleInfoList)) {
-            carInfo.setModelCode(rd.getVehicleInfoList().get(0).getVehicleId());
-//                        carInfo.setCiModelCode(a.getModelCode());
-            carInfo.setCiCarName(rd.getVehicleInfoList().get(0).getVehicleName());
-            carInfo.setModelcname(rd.getVehicleInfoList().get(0).getVehicleName());
+
+            buildCarInfo(carInfo,rd.getVehicleInfoList().get(0));
+//            carInfo.setModelCode(rd.getVehicleInfoList().get(0).getVehicleId());
+////                        carInfo.setCiModelCode(a.getModelCode());
+//            carInfo.setCiCarName(rd.getVehicleInfoList().get(0).getVehicleName());
+//            carInfo.setModelcname(rd.getVehicleInfoList().get(0).getVehicleName());
             return;
         }
 
         //匹配的车辆信息数据
         ModelsQueryResponse.VehicleInfo matchVehicleInfo = vehicleInfoList.stream().filter(a -> a.getVehiclePrice().equals(carInfo.getPurchasePrice())).findFirst().orElse(null);
         if (null != matchVehicleInfo) {
-            carInfo.setModelCode(matchVehicleInfo.getVehicleId());
-            carInfo.setCiCarName(matchVehicleInfo.getVehicleName());
-            carInfo.setModelcname(matchVehicleInfo.getVehicleName());
+            buildCarInfo(carInfo,matchVehicleInfo);
+//            carInfo.setModelCode(matchVehicleInfo.getVehicleId());
+//            carInfo.setCiCarName(matchVehicleInfo.getVehicleName());
+//            carInfo.setModelcname(matchVehicleInfo.getVehicleName());
             return;
         }
 
@@ -259,9 +262,10 @@ public class InsAlltrustApiServiceImpl implements InsAlltrustApiService {
                 .collect(Collectors.toList());
 
 
-        carInfo.setModelCode(vehicleInfoList.get(0).getVehicleId());
-        carInfo.setCiCarName(vehicleInfoList.get(0).getVehicleName());
-        carInfo.setModelcname(vehicleInfoList.get(0).getVehicleName());
+        buildCarInfo(carInfo,vehicleInfoList.get(0));
+//        carInfo.setModelCode(vehicleInfoList.get(0).getVehicleId());
+//        carInfo.setCiCarName(vehicleInfoList.get(0).getVehicleName());
+//        carInfo.setModelcname(vehicleInfoList.get(0).getVehicleName());
 
 
     }
@@ -596,6 +600,8 @@ public class InsAlltrustApiServiceImpl implements InsAlltrustApiService {
                         sb.append(String.format("   商业险提示信息：s%",rd.getCiResponseMessagedate().getCMessage()));
                     }
                     iac.setAuditopinion(sb.toString());
+                } else if(statusJq.equals("9") || statusSy.equals("9")){
+                    iac.setOrderstatus(InsOrderStatusEnum.WAIT_PAY.getCode());
                 }
 
                 //构造订单状态
@@ -1672,6 +1678,11 @@ public class InsAlltrustApiServiceImpl implements InsAlltrustApiService {
             return rMap;
         }
 
+        if(address.contains("邢台县")){
+            address.replaceAll("邢台县","信都区");
+
+        }
+
 
         Map<String, String> m = IDCardUtils.addressResolution(address);
         if (null == m) return null;
@@ -2031,5 +2042,14 @@ public class InsAlltrustApiServiceImpl implements InsAlltrustApiService {
     }
 
 
+    private void buildCarInfo(CarInfoVo carInfo,ModelsQueryResponse.VehicleInfo vehicleInfo){
+        carInfo.setModelCode(vehicleInfo.getVehicleId());
+        carInfo.setCiCarName(vehicleInfo.getVehicleName());
+        carInfo.setModelcname(vehicleInfo.getVehicleName());
+//        carInfo.setSeatCount(vehicleInfo.getVehicleSeat());
+
+    }
+
+
 
 }

src/main/java/com/ydtech/utils/IDCardUtils.java

@@ -374,7 +374,8 @@ public class IDCardUtils {
     public static void main(String[] args) throws ParseException {
 
 
-        Map m = addressResolution("山西省忻州市忻府区合索乡沙洼村22-040");
+        Map m = addressResolution("河北省邢台市邢台县西黄村镇徘徊村310号");
+//        Map m = addressResolution("山西省忻州市忻府区合索乡沙洼村22-040");
 //        Map m = addressResolution("安徽省池州市贵池区长江中路39号采石队宿舍9号");
 //        Map m = addressResolution("山西省汾西县坪乡细坪村055号");
 //        Map m = addressResolution("山西省兴县魏家滩镇高家洼村091");