修改bug

commons/src/main/java/com/jzg/commons/entity/orders/po/InsOrdersTax.java

@@ -1,5 +1,6 @@
 package com.jzg.commons.entity.orders.po;
 
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -12,6 +13,7 @@ import java.time.LocalDateTime;
 public class InsOrdersTax {
 
     @Schema(description = "订单号")
+    @TableId(value = "order_no")
     private String orderNo;
 
     @Schema(description = "减免税凭证号（减免税时必传）")

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

@@ -19,9 +19,9 @@ public class SysUserJzgInfoBankCard {
     @Schema(description = "主键")
     private String id;
 
-    @TableField(value = "user_jzg_info_id")
+    @TableField(value = "user_id")
     @Schema(description = "info表id")
-    private String userJzgInfoId;
+    private String userId;
 
     @TableField(value = "bank_card_number")
     @Schema(description = "银行卡号")
@@ -37,7 +37,7 @@ public class SysUserJzgInfoBankCard {
 
     @TableField(value = "is_default")
     @Schema(description = "是否默认 1：是  0：否")
-    private Integer isDefault;
+    private boolean isDefault;
 
     @TableField(value = "audit_status")
     @Schema(description = "审核状态  0：未审核 1：审核通过 2：审核驳回")
@@ -51,18 +51,22 @@ public class SysUserJzgInfoBankCard {
     @Schema(description = "附件id")
     private String fileId;
 
+    @TableField(value = "system_code")
+    @Schema(description = "租户id")
+    private String systemCode;
+
 
     public SysUserJzgInfoBankCard(){
 
     }
 
-    public SysUserJzgInfoBankCard(String userJzgInfoId,String bankCardNumber,String bankName){
+    public SysUserJzgInfoBankCard(String userId,String bankCardNumber,String bankName,String systemCode){
         this.id = IdGenerate.nextId();
-        this.userJzgInfoId = userJzgInfoId;
+        this.userId = userId;
         this.bankCardNumber = bankCardNumber;
         this.bankName = bankName;
-        this.isDefault = 0;
+        this.isDefault = false;
         this.auditStatus = 0;
-
+        this.systemCode = systemCode;
     }
 }

commons/src/main/java/com/jzg/commons/entity/vo/ImagesVo.java

@@ -27,6 +27,6 @@ public class ImagesVo {
     private String bucketName;
 
     @Schema(description = "预览地址")
-    private String previewUrl;
+    private String downloadUrl;
 
 }

commons/src/main/java/com/jzg/commons/entity/vo/SysUserJzgInfoBankCardVo.java

@@ -11,6 +11,9 @@ import lombok.Data;
 @Data
 public class SysUserJzgInfoBankCardVo {
 
+    @Schema(description = "user表id")
+    private String userId;
+
     @Schema(description = "业务员id")
     private String userJzgInfoId;
 
@@ -26,4 +29,7 @@ public class SysUserJzgInfoBankCardVo {
     @Schema(description = "附件")
     private String attachment;
 
+    @Schema(description = "是否默认卡 1是 0否")
+    private boolean isDefault;
+
 }

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

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jzg.commons.constants.CompanyConstants;
 import com.jzg.commons.constants.InsuranceRisk;
 import com.jzg.commons.constants.dict.InsOrderStatusEnum;
 import com.jzg.commons.core.base.BaseController;
@@ -124,10 +125,14 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
             InsOrders insOrders = ordersAdd.getInsOrders();
             insOrders.setQuoteNo(SnowFlakeUtil.getSnowFlakeId());
             insOrders.setCompanyId(ordersAdd.getInsOrdersOtherInfo().getCompanyId());
-            insOrders.setCompanyName(ordersAdd.getInsOrdersOtherInfo().getCompanyName());
+            HttpResult<EsmInsCompany> esmInsCompanyHttpResult = platformClient.findById(ordersAdd.getInsOrdersOtherInfo().getCompanyId(), baseController.getToken());
+            String companyName = CompanyConstants.getCompanyNameByCode(esmInsCompanyHttpResult.getData().getCompanyCode());
+            insOrders.setCompanyName(companyName);
             insOrders.setSigningTime(ordersAdd.getInsOrdersOtherInfo().getSigningTime());
             insOrders.setIsTemporarily(ordersAdd.getIsTemporarily());
+            insOrders.setProductName(ProductsType.getProductNameByCode(ordersAdd.getProductId()));
             insOrders.setOrderStatus(InsOrderStatusEnum.UNDERWRITED.getCode());
+            insOrders.setRealQuoteUserId(baseController.getUserName());
             // 插入订单信息，如果插入失败，则返回错误信息
             int insertResult = insOrdersMapper.insert(insOrders);
             if (insertResult <= 0) {
@@ -343,7 +348,7 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
         if (ObjectUtil.isNotEmpty(imagesAdds)){
             imagesAdds.getImages().forEach(image -> {
                 if (StringUtils.isNotEmpty(image.getBucketName()) && StringUtils.isNotEmpty(image.getFileName())){
-                    image.setPreviewUrl(MinioUtils.getPresignedObjectUrl(image.getBucketName(), image.getFileName()));
+                    image.setDownloadUrl(MinioUtils.getPresignedObjectUrl(image.getBucketName(), image.getFileName()));
                 }
             });
         }
@@ -778,7 +783,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(InsOrders::getCompanyId).collect(Collectors.toList());
+        List<String> companyIds = insOrders.stream().map(InsOrders::getCompanyId).filter(Objects::nonNull).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/java/com/jzg/quotation/summary/service/impl/InsTaskImagesServiceImpl.java

@@ -46,7 +46,7 @@ public class  InsTaskImagesServiceImpl extends ServiceImpl<InsTaskImagesMapper,
        try {
            InsTaskImagesVo taskImagesVo = baseMapper.selectByQuoteNo(quoteNo);
            for (ImagesVo insTaskImagesVo : taskImagesVo.getImages()) {
-               insTaskImagesVo.setPreviewUrl(MinioUtils.getPresignedObjectUrl(insTaskImagesVo.getBucketName(), insTaskImagesVo.getFileName()));
+               insTaskImagesVo.setDownloadUrl(MinioUtils.getPresignedObjectUrl(insTaskImagesVo.getBucketName(), insTaskImagesVo.getFileName()));
            }
            return taskImagesVo;
        }catch (Exception e){

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

@@ -221,7 +221,7 @@
             <result property="fileName" column="file_name" jdbcType="VARCHAR"/>
             <result property="fileType" column="file_type" jdbcType="VARCHAR"/>
             <result property="bucketName" column="bucket_name" jdbcType="VARCHAR"/>
-            <result property="previewUrl" column="preview_url" jdbcType="VARCHAR"/>
+            <result property="downloadUrl" column="download_url" jdbcType="VARCHAR"/>
         </collection>
     </resultMap>
 <!--费用-->

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

@@ -321,7 +321,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         //如果表单输入的银行卡号和银行名不为空，则保存银行卡信息
         if (sysUserVo.getBankCardId() != null && sysUserVo.getBankName() != null) {
             SysUserJzgInfoBankCard sysUserJzgInfoBankCard =
-                    new SysUserJzgInfoBankCard(sysUserJzgInfoId, sysUserVo.getBankCardId(), sysUserVo.getBankName());
+                    new SysUserJzgInfoBankCard(sysUserId, sysUserVo.getBankCardId(), sysUserVo.getBankName(),sysUserJzgInfo.getSystemCode());
             sysUserJzgInfoBankCardService.save(sysUserJzgInfoBankCard);
         }
         //如果角色存在的话则存储角色
@@ -450,6 +450,17 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         SysUserJzgInfoBankCard sysUserJzgInfoBankCard = new SysUserJzgInfoBankCard();
         BeanUtils.copyProperties(sysUserJzgInfoBankCardVo, sysUserJzgInfoBankCard);
         sysUserJzgInfoBankCard.setFileId(fileId);
+        sysUserJzgInfoBankCard.setUserId(sysUserJzgInfo.getUserId());
+        sysUserJzgInfoBankCard.setSystemCode(sysUserJzgInfo.getSystemCode());
+        if (sysUserJzgInfoBankCardVo.isDefault()) {
+            List<SysUserJzgInfoBankCard> sysUserJzgInfoBankCardList = sysUserJzgInfoBankCardService
+                    .list(new LambdaQueryWrapper<SysUserJzgInfoBankCard>().eq(SysUserJzgInfoBankCard::getUserId, sysUserJzgInfo.getUserId()));
+            for (SysUserJzgInfoBankCard sysUserJzgInfoBankCard1 : sysUserJzgInfoBankCardList) {
+                sysUserJzgInfoBankCard1.setDefault(false);
+                sysUserJzgInfoBankCardService.updateById(sysUserJzgInfoBankCard1);
+            }
+            sysUserJzgInfoBankCard.setDefault(true);
+        }
         sysUserJzgInfoBankCardService.save(sysUserJzgInfoBankCard);
 
         return HttpResult.ok("添加银行卡成功");