Qchen 1 год назад
Родитель
Сommit
c26a03ad95

+ 4 - 1
commons/src/main/java/com/jzg/commons/entity/dto/SysUserJzgInfoBankCardDto.java

@@ -1,5 +1,6 @@
 package com.jzg.commons.entity.dto;
 
+import com.jzg.commons.core.base.PageRequest;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -13,7 +14,7 @@ import java.io.Serializable;
 public class SysUserJzgInfoBankCardDto implements Serializable {
     private String id;
 
-    private String userInfoId;
+    private String userId;
 
     private String name;
 
@@ -26,4 +27,6 @@ public class SysUserJzgInfoBankCardDto implements Serializable {
     private String auditStatus;
 
     private String cardFile;
+
+    private String systemCode;
 }

+ 1 - 0
tenant/insurance/quotation-zhongmei/src/main/java/com/jzg/quotation/zhongmei/api/service/impl/ZhongMeiApiRequestImpl.java

@@ -92,6 +92,7 @@ public class ZhongMeiApiRequestImpl implements ZhongMeiApiRequest {
         }
         // 存储信息
         ZmApiOrder zmApiOrder = new ZmApiOrder();
+        zmApiOrder.setId(order.getOrdersNo());
         zmApiOrder.setOrdersNo(order.getOrdersNo());
         zmApiOrder.setBussinessNo(quotedPriceResponse.getBusinessNo());
         zmApiOrder.setPolicyHolderInfo(quoteVo.getPolicyHolderInfo());

+ 1 - 1
tenant/organization/src/main/java/com/jzg/organization/mapper/SysUserJzgInfoBankCardMapper.java

@@ -9,6 +9,6 @@ import java.util.List;
 
 @Mapper
 public interface SysUserJzgInfoBankCardMapper extends BaseMapper<SysUserJzgInfoBankCard> {
-    List<SysUserJzgInfoBankCardDto> getBankCardByUserId(String userInfoId);
+    List<SysUserJzgInfoBankCardDto> getBankCardByUserId(String userInfoId , String systemCode);
 
 }

+ 1 - 1
tenant/organization/src/main/java/com/jzg/organization/service/SysUserJzgInfoBankCardService.java

@@ -10,5 +10,5 @@ import java.util.List;
 
 public interface SysUserJzgInfoBankCardService extends IService<SysUserJzgInfoBankCard> {
 
-    List<SysUserJzgInfoBankCardDto> getBankCardByUserId(String userInfoId);
+    List<SysUserJzgInfoBankCardDto> getBankCardByUserId(String userInfoId, String systemCode);
 }

+ 2 - 2
tenant/organization/src/main/java/com/jzg/organization/service/impl/SysUserJzgInfoBankCardServiceImpl.java

@@ -20,7 +20,7 @@ public class SysUserJzgInfoBankCardServiceImpl extends ServiceImpl<SysUserJzgInf
     private SysUserJzgInfoBankCardMapper sysUserJzgInfoBankCardMapper;
 
     @Override
-    public List<SysUserJzgInfoBankCardDto> getBankCardByUserId(String userInfoId) {
-        return sysUserJzgInfoBankCardMapper.getBankCardByUserId(userInfoId);
+    public List<SysUserJzgInfoBankCardDto> getBankCardByUserId(String userInfoId, String systemCode) {
+        return sysUserJzgInfoBankCardMapper.getBankCardByUserId(userInfoId,systemCode);
     }
 }

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

@@ -583,7 +583,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         List<SysUserJzgInfoFile> sysUserJzgInfoFile = sysUserJzgInfoFileService.list
                 (new LambdaQueryWrapper<SysUserJzgInfoFile>().eq(SysUserJzgInfoFile::getUserId,sysUserJzgInfo.getId()));
         sysUserJzgInfo.setFileList(sysUserJzgInfoFile);
-        List<SysUserJzgInfoBankCardDto> sysUserJzgInfoBankCardDto = sysUserJzgInfoBankCardService.getBankCardByUserId(sysUserJzgInfo.getId());
+        List<SysUserJzgInfoBankCardDto> sysUserJzgInfoBankCardDto = sysUserJzgInfoBankCardService.getBankCardByUserId(sysUserJzgInfo.getId(),baseController.getUserSystemCode());
         sysUserJzgInfo.setBankCardList(sysUserJzgInfoBankCardDto);
         if (!sysUserJzgInfoBankCardDto.isEmpty()) {
             sysUserJzgInfo.setBankCardNumber(sysUserJzgInfoBankCardDto.get(0).getBankCardNumber());

+ 4 - 2
tenant/organization/src/main/resources/mapper/SysUserJzgInfoBankCardMapper.xml

@@ -3,13 +3,14 @@
 <mapper namespace="com.jzg.organization.mapper.SysUserJzgInfoBankCardMapper">
     <resultMap id="BaseResultMap" type="com.jzg.commons.entity.dto.SysUserJzgInfoBankCardDto">
         <id column="id" jdbcType="VARCHAR" property="id"/>
-        <result column="userInfoId" jdbcType="VARCHAR" property="userInfoId"/>
+        <result column="userId" jdbcType="VARCHAR" property="userId"/>
         <result column="name" jdbcType="VARCHAR" property="name"/>
         <result column="bankName" jdbcType="VARCHAR" property="bankName"/>
         <result column="bankAddress" jdbcType="VARCHAR" property="bankAddress"/>
         <result column="bankCardNumber" jdbcType="VARCHAR" property="bankCardNumber"/>
         <result column="auditStatus" jdbcType="VARCHAR" property="auditStatus"/>
         <result column="cardFile" jdbcType="VARCHAR" property="cardFile"/>
+        <result column="systemCode" jdbcType="VARCHAR" property="systemCode"/>
     </resultMap>
 
     <select id="getBankCardByUserId" resultMap="BaseResultMap">
@@ -24,7 +25,8 @@
             sujif.file_url as cardFile
         from
             sys_user_jzg_info_bank_card sujibc
-        left join sys_user_jzg_info suji on suji.id = sujibc.user_jzg_info_id
+        left join sys_user su on su.id = sujibc.user_id
+        left join sys_user_jzg_info suji on suji.user_id = su.id and suji.system_code = #{systemCode}
         left join sys_user_jzg_info_file sujif on sujif.id = sujibc.file_id
         where
             1=1