修改bug

commons/src/main/java/com/jzg/commons/entity/po/SysUserJzgInfo.java

@@ -70,18 +70,6 @@ public class SysUserJzgInfo extends BaseModel implements Serializable {
     @Schema(description = "审批意见")
     private String approvalOpinion;
 
-    @TableField(value = "identity")
-    @Schema(description = "身份证号")
-    private String identity;
-
-    @TableField(value = "identity_time_start")
-    @Schema(description = "身份证有效期起期")
-    private String identityTimeStart;
-
-    @TableField(value = "identity_time_end")
-    @Schema(description = "身份证有效期止期")
-    private String identityTimeEnd;
-
     @TableField(value = "logout_time")
     @Schema(description = "离职时间")
     private String logoutTime;

commons/src/main/java/com/jzg/commons/entity/po/SysUserJzgInfoFile.java

@@ -20,8 +20,8 @@ public class SysUserJzgInfoFile {
     @TableField(value = "file_id")
     private String fileId;
 
-    @TableField(value = "user_jzg_info_id")
-    private String userJzgInfoId;
+    @TableField(value = "user_id")
+    private String userId;
 
     @TableField(value = "file_name")
     private String fileName;
@@ -32,10 +32,10 @@ public class SysUserJzgInfoFile {
     @TableField(value = "file_type")
     private String fileType;
 
-    public SysUserJzgInfoFile(String fileId, String userJzgInfoId, String fileName) {
+    public SysUserJzgInfoFile(String fileId, String userId, String fileName) {
         this.id = IdGenerate.nextId();
         this.fileId = fileId;
-        this.userJzgInfoId = userJzgInfoId;
+        this.userId = userId;
         this.fileName = fileName;
     }
 

commons/src/main/java/com/jzg/commons/entity/quote/vo/orders/InsOrdersVo.java

@@ -83,4 +83,7 @@ public class InsOrdersVo extends QuoteVo {
     @Schema(description = "保单号信息")
     private InsOrdersPolicy insOrdersPolicy;
 
+    @Schema(description = "订单其他信息")
+    private InsOrdersOther insOrdersOther;
+
 }

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/controller/InsOrdersController.java

@@ -103,7 +103,7 @@ public class InsOrdersController {
         return HttpResult.ok(insOrdersService.getHistoryQuote());
     }
 
-    @Operation(summary = "根据订单存在的保险公司获取 保司列表")
+    @Operation(summary = "根据订单存在的保险公司获取保司列表")
     @GetMapping("/getExistCompany")
     public HttpResult getExistCompany(){
         return HttpResult.ok(insOrdersService.getExistCompany());

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/impl/InsOrdersServiceImpl.java

@@ -529,17 +529,18 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
             insOrdersCostsService.saveOrUpdate(ordersCosts);
 
             //更新评分
-            InsOrdersOther ordersOther = insOrdersOtherService.getOne(new LambdaQueryWrapper<InsOrdersOther>().eq(InsOrdersOther::getOrderNo, ordersNo));
-            if (Objects.isNull(ordersOther)) {
+            InsOrdersOther ordersOther = insOrdersOtherService.getOne(new LambdaQueryWrapper<InsOrdersOther>()
+                    .eq(InsOrdersOther::getOrderNo, ordersNo));
+            if (Objects.nonNull(ordersOther)) {
                 ordersOther = new InsOrdersOther();
                 ordersOther.setOrderNo(ordersNo);
                 ordersOther.setScore(quoteResponse.getScoreVo().getScore());
                 ordersOther.setJqScore(quoteResponse.getScoreVo().getJqScore());
                 ordersOther.setSyScore(quoteResponse.getScoreVo().getSyScore());
                 ordersOther.setLossRation(new BigDecimal(quoteResponse.getScoreVo().getLossRation()));
-                ordersOther.setJqLossRation(new BigDecimal(quoteResponse.getScoreVo().getJqLossRation()));
-                ordersOther.setSyLossRation(new BigDecimal(quoteResponse.getScoreVo().getSyLossRation()));
-                ordersOther.setTpColorScore(quoteResponse.getScoreVo().getTpColorScore());
+                ordersOther.setJqLossRation(new BigDecimal(quoteResponse.getScoreVo().getJqLossRation() != null ? quoteResponse.getScoreVo().getJqLossRation() : "0"));
+                ordersOther.setSyLossRation(new BigDecimal(quoteResponse.getScoreVo().getSyLossRation() != null ? quoteResponse.getScoreVo().getSyLossRation() : "0"));
+                ordersOther.setTpColorScore(quoteResponse.getScoreVo().getTpColorScore() != null ? quoteResponse.getScoreVo().getTpColorScore() : "");
             }
             insOrdersOtherService.saveOrUpdate(ordersOther);
 
@@ -775,7 +776,7 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
         List<InsOrders> insOrders = insOrdersMapper.selectList(new LambdaQueryWrapper<InsOrders>()
                 .select(InsOrders::getCompanyId)
                 .groupBy(InsOrders::getCompanyId));
-        List<String> companyIds = insOrders.stream().map(x -> x.getCompanyId()).collect(Collectors.toList());
+        List<String> companyIds = insOrders.stream().map(InsOrders::getCompanyId).collect(Collectors.toList());
         String joined = String.join(",", companyIds);
         HttpResult<List<EsmInsCompany>> companyByIds = platformClient.getCompanyByIds(joined,baseController.getToken());
         return companyByIds.getData();

tenant/insurance/quotation-summary/src/main/resources/application-dev.yaml

@@ -42,8 +42,8 @@ image:
 
 # 支付码相关配置
 qrcode:
-  genAddress: https://192.168.0.106:8001/order/qrCode/index
-  imageSrc: https://192.168.0.106:8001/template/
+  genAddress: https://192.168.0.250:8001/order/qrCode/index
+  imageSrc: https://192.168.0.250:8001/template/
 
 
 yc:

tenant/insurance/quotation-summary/src/main/resources/mapper/InsOrdersMapper.xml

@@ -465,7 +465,8 @@
             suji.name as salesmanInfo,
             suji.type_attr as salesmanType,
             pa.agreement_name as agreementName,
-            sd.name as deptName
+            sd.name as deptName,
+            io.pay_link as paymentLink
         FROM
             ins_orders io
                 LEFT JOIN ins_orders_car_info ioci ON ioci.order_no = io.id

tenant/insurance/quotation-yangguang/src/main/java/com/jzg/quotation/yangguang/api/service/impl/YangGuangApiRequestImpl.java

@@ -198,6 +198,7 @@ public class YangGuangApiRequestImpl implements YangGuangApiRequest {
                 paymentLinkVo.setInsOrdersCosts(underwritingVo.getInsOrdersCosts());
                 PaymentLinkResultsVo payLink = getPaymentLink(paymentLinkVo);
                 underwritingResultsVo.setPaymentLink(payLink.getPaymentLink());
+                underwritingResultsVo.setCompanyOrderNo(yangGuangApiOrder.getInfotransNo());
             }
 
         } else {

tenant/organization/src/main/java/com/jzg/organization/service/impl/SysUserServiceImpl.java

@@ -570,7 +570,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
 
         List<SysUserJzgInfoFile> sysUserJzgInfoFile = sysUserJzgInfoFileService.list
-                (new LambdaQueryWrapper<SysUserJzgInfoFile>().eq(SysUserJzgInfoFile::getUserJzgInfoId,sysUserJzgInfo.getId()));
+                (new LambdaQueryWrapper<SysUserJzgInfoFile>().eq(SysUserJzgInfoFile::getUserId,sysUserJzgInfo.getId()));
         sysUserJzgInfo.setFileList(sysUserJzgInfoFile);
         List<SysUserJzgInfoBankCardDto> sysUserJzgInfoBankCardDto = sysUserJzgInfoBankCardService.getBankCardByUserId(sysUserJzgInfo.getId());
         sysUserJzgInfo.setBankCardList(sysUserJzgInfoBankCardDto);
@@ -641,7 +641,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
     public boolean uploadFile(String fileId,String fileType,String userId){
         List<SysUserJzgInfoFile> sysUserJzgInfoFiles = sysUserJzgInfoFileService.list(
-                (new LambdaQueryWrapper<SysUserJzgInfoFile>().eq(SysUserJzgInfoFile::getUserJzgInfoId, userId)
+                (new LambdaQueryWrapper<SysUserJzgInfoFile>().eq(SysUserJzgInfoFile::getUserId, userId)
                         .eq(SysUserJzgInfoFile::getFileType, fileType)));
         if(sysUserJzgInfoFiles.size()>0) {
             sysUserJzgInfoFileService.removeBatchByIds(sysUserJzgInfoFiles);
@@ -681,7 +681,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
     public void verifyFile(SysUserVo sysUserVo,String userId){
         List<SysUserJzgInfoFile> fileList = sysUserJzgInfoFileService.list(new LambdaQueryWrapper<SysUserJzgInfoFile>()
-                .eq(SysUserJzgInfoFile::getUserJzgInfoId, userId));
+                .eq(SysUserJzgInfoFile::getUserId, userId));
         if(checkFileModify(fileList,"sfz1",sysUserVo.getSfz1())){
             uploadFile(sysUserVo.getSfz1(),"sfz1",userId);
         }