功能完善，修改杜魏的接口，完成公用

common/fire-dto/src/main/java/com/fire/dto/AdditionalPayment.java

@@ -0,0 +1,91 @@
+package com.fire.dto;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Builder;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+
+/**
+ * @author: liuliu
+ * @ClassName: AdditionalPayment
+ * @Description: TODO 客户和供应商加款实体
+ * @date: 2021-06-03 11:04
+ */
+@Data
+@Builder
+@TableName("additional_payment")
+public class AdditionalPayment {
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    @ApiModelProperty(value = "主键")
+    private Integer id;
+    /**
+     * 银行卡
+     */
+    @ApiModelProperty(value = "银行卡")
+    String cardNo;
+    /**
+     * 开户行
+     */
+    private String bankDeposit;
+    /**
+     * 账户
+     */
+    @ApiModelProperty(value = "开户行")
+    private BigInteger account;
+
+    /**
+     * 加款人
+     */
+    @ApiModelProperty(value = "加款人")
+    private String payer;
+
+    /**
+     * 加款金额
+     */
+    @ApiModelProperty(value = "加款金额")
+    private BigDecimal amount;
+
+    /**
+     * 凭证
+     */
+    @ApiModelProperty(value = "凭证")
+    private String certificate;
+
+    /**
+     * 加款时间
+     */
+    @ApiModelProperty(value = "加款时间")
+    private String time;
+    /**
+     * 出款账户
+     */
+    @ApiModelProperty(value = "出款账户")
+    private String paymentAccount;
+    /**
+     * 供应商或者客户的关联关系
+     */
+    @ApiModelProperty(value = "供应商或者客户的关联关系")
+    private String relationId;
+    /**
+     * 区分是供应商还是客户 1-供应商 2-客户
+     */
+    @ApiModelProperty(value = " 区分是供应商还是客户 1-供应商 2-客户")
+    private Integer distinguish;
+
+    /**
+     * 撤销
+     */
+    @ApiModelProperty(value = "撤销")
+    private Integer undo;
+
+
+}

modules/admin/src/main/java/com/fire/admin/dto/AdditionalPaymentDto.java

@@ -0,0 +1,80 @@
+package com.fire.admin.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+
+/**
+ * @author: liuliu
+ * @ClassName: AdditionalPayment
+ * @Description: TODO 加款记录 dto
+ * @date: 2021-06-03 14:25
+ */
+@Data
+public class AdditionalPaymentDto {
+
+    @ApiModelProperty(value = "主键")
+    private Integer id;
+    /**
+     * 银行卡
+     */
+    @ApiModelProperty(value = "银行卡")
+    String cardNo;
+    /**
+     * 开户行
+     */
+    private String bankDeposit;
+    /**
+     * 账户
+     */
+    @ApiModelProperty(value = "开户行")
+    private BigInteger account;
+
+    /**
+     * 加款人
+     */
+    @ApiModelProperty(value = "加款人")
+    private String payer;
+
+    /**
+     * 加款金额
+     */
+    @ApiModelProperty(value = "加款金额")
+    private BigDecimal amount;
+
+    /**
+     * 凭证
+     */
+    @ApiModelProperty(value = "凭证")
+    private String certificate;
+
+    /**
+     * 加款时间
+     */
+    @ApiModelProperty(value = "加款时间")
+    private String time;
+    /**
+     * 出款账户
+     */
+    @ApiModelProperty(value = "出款账户")
+    private String paymentAccount;
+    /**
+     * 供应商或者客户的关联关系
+     */
+    @ApiModelProperty(value = "供应商或者客户的关联关系")
+    private String relationId;
+    /**
+     * 区分是供应商还是客户 1-供应商 2-客户
+     */
+    @ApiModelProperty(value = " 区分是供应商还是客户 1-供应商 2-客户")
+    private Integer distinguish;
+
+    /**
+     * 撤销
+     */
+    @ApiModelProperty(value = "撤销")
+    private Integer undo;
+
+}

modules/admin/src/main/java/com/fire/admin/dto/CustomerDto.java

@@ -1,11 +1,14 @@
 package com.fire.admin.dto;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fire.dto.BankCard;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.util.Date;
+import java.util.List;
 
 /**
  * @author: liuliu
@@ -81,5 +84,9 @@ public class CustomerDto {
     private Integer priceCheck;
 
 
+    @ApiModelProperty("银行卡列表")
+    @TableField(exist = false)
+    private List<BankCard> bankCards;
+
 
 }

modules/admin/src/main/java/com/fire/admin/mapper/AdditionalPaymentMapper.java

@@ -0,0 +1,17 @@
+package com.fire.admin.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.fire.dto.AdditionalPayment;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @author: liuliu
+ * @ClassName: AdditionalPaymentMapper
+ * @Description: TODO 供应商或客户加款记录
+ * @date: 2021-06-03 14:22
+ */
+@Repository
+public interface AdditionalPaymentMapper  extends BaseMapper<AdditionalPayment> {
+
+
+}

modules/admin/src/main/java/com/fire/admin/mapper/FireProductMapper.java

@@ -38,6 +38,6 @@ public interface FireProductMapper extends BaseMapper<FireProductInfo> {
     * @Author: liuliu
     * @Date: 2021/5/28 17:43
     */
-    List<FireProductInfoVo> selectProductAll(Integer operator);
+    List<FireProductInfoVo> selectProductAll();
     
 }

modules/admin/src/main/java/com/fire/admin/rest/BankCardRest.java

@@ -56,4 +56,7 @@ public class BankCardRest {
         bankCardService.deleteBankCards(bankId);
         return new BaseResponse();
     }
+
+
+
 }

modules/admin/src/main/java/com/fire/admin/rest/FireProductController.java

@@ -101,9 +101,9 @@ public class FireProductController {
      * @Date: 2021/5/28 17:51
      */
     @ApiOperation(value = "获取所有产品，用于通道和客户产品的添加")
-    @GetMapping("/all/{operator}/{customerId}")
-    public BaseRestResponse makeProductAll( @PathVariable("operator") Integer operator,@PathVariable("customerId") Integer customerId ) {
-        return new BaseRestResponse<>(fireProductService.getProductAll(operator,customerId));
+    @GetMapping("/all/{customerId}")
+    public BaseRestResponse makeProductAll( @PathVariable("customerId") Integer customerId ) {
+        return new BaseRestResponse<>(fireProductService.getProductAll(customerId));
     }
 
 

modules/admin/src/main/java/com/fire/admin/service/BankCardService.java

@@ -14,7 +14,14 @@ import java.util.List;
  */
 public interface BankCardService extends IService<BankCard> {
 
-    List<BankCard> getBankCardList(Integer supplierId);
+    /**
+    * @Description:  TODO  获取银行卡列表， distinguish  1-供应商 2-客户
+    * @Param: [supplierId, distinguish]
+    * @return: java.util.List<com.fire.dto.BankCard>
+    * @Author: liuliu
+    * @Date: 2021/6/3 15:00
+    */
+    List<BankCard> getBankCardList(Integer relation_id, Integer distinguish);
 
     void saveBankCards(@RequestBody List<BankCard> bankCards);
 

modules/admin/src/main/java/com/fire/admin/service/CustomerProductInfoService.java

@@ -62,6 +62,6 @@ public interface CustomerProductInfoService extends IService<CustomerProduct> {
     * @Author: liuliu
     * @Date: 2021/6/1 14:57
     */
-    List<String> getCuProByCustomerId(Integer customerId,String packageId);
+    List<String> getCuProByCustomerId(Integer customerId);
 
 }

modules/admin/src/main/java/com/fire/admin/service/FireProductService.java

@@ -63,7 +63,7 @@ public interface FireProductService extends IService<FireProductInfo> {
     * @Author: liuliu
     * @Date: 2021/5/28 17:48
     */
-    List<FireProductInfoVo> getProductAll(Integer operator,Integer customerId);
+    List<FireProductInfoVo> getProductAll(Integer customerId);
     
     /**
     * @Description:  TODO 逻辑删除产品

modules/admin/src/main/java/com/fire/admin/service/impl/BankCardServiceImpl.java

@@ -22,8 +22,10 @@ import java.util.List;
 public class BankCardServiceImpl extends ServiceImpl<BankCardMapper, BankCard> implements BankCardService {
 
     @Override
-    public List<BankCard> getBankCardList(Integer supplierId) {
-        List<BankCard> bankCardList = new LambdaQueryChainWrapper<>(baseMapper).eq(supplierId != null, BankCard::getSupplierId, supplierId).list();
+    public List<BankCard> getBankCardList(Integer supplierId, Integer distinguish) {
+        List<BankCard> bankCardList = new LambdaQueryChainWrapper<>(baseMapper)
+                .eq(BankCard::getDistinguish,distinguish)
+                .eq(supplierId != null, BankCard::getSupplierId, supplierId).list();
         if (bankCardList != null) {
             return bankCardList;
         } else {

modules/admin/src/main/java/com/fire/admin/service/impl/CustomerProductInfoServiceImpl.java

@@ -104,12 +104,11 @@ public class CustomerProductInfoServiceImpl extends ServiceImpl<CustomerProductI
     }
 
     @Override
-    public List<String> getCuProByCustomerId(Integer customerId,String packageId) {
+    public List<String> getCuProByCustomerId(Integer customerId) {
 
         LambdaQueryWrapper<CustomerProduct> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.select(CustomerProduct::getCustomerProductId,CustomerProduct::getPackageId)
-                .eq(CustomerProduct::getCustomerId,customerId)
-                .like(CustomerProduct::getPackageId,packageId);
+                .eq(CustomerProduct::getCustomerId,customerId);
         List<CustomerProduct> productList = baseMapper.selectList(queryWrapper);
         return productList.stream().map(CustomerProduct::getPackageId).collect(Collectors.toList());
     }

modules/admin/src/main/java/com/fire/admin/service/impl/CustomerServiceImpl.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fire.admin.dto.CustomerDto;
 import com.fire.admin.mapper.CustomerMapper;
 import com.fire.admin.mapper.FlowAppMapper;
+import com.fire.admin.service.BankCardService;
 import com.fire.admin.service.CustomerService;
 import com.fire.admin.util.SecurityUtil;
 import com.fire.admin.vo.CustomerInfoVo;
@@ -21,6 +22,8 @@ import redis.clients.jedis.JedisCluster;
 
 import javax.annotation.Resource;
 import java.time.LocalDateTime;
+import java.util.List;
+import java.util.stream.Collectors;
 
 import static com.fire.dto.enums.RedisKey.CUSTOMER_AMOUNT;
 
@@ -40,6 +43,9 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, CustomerInf
     @Autowired
     private FlowAppMapper flowAppMapper;
 
+    @Autowired
+    private BankCardService bankCardService;
+
     /**
      * @Description: TODO 分页获取客户信息
      * @Param: 查询条件，根据客户名称模糊查询
@@ -49,7 +55,11 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, CustomerInf
      */
     @Override
     public IPage<CustomerInfoVo> getCustomerInfoPage(Page page, CustomerDto customerDto) {
-        return baseMapper.queryCustomerInfoPage(page, customerDto);
+        IPage<CustomerInfoVo> customerInfoVoIPage = baseMapper.queryCustomerInfoPage(page, customerDto);
+        List<Long> customerIds = customerInfoVoIPage.getRecords().stream().map(CustomerInfoVo::getCustomerId).collect(Collectors.toList());
+
+
+        return customerInfoVoIPage;
     }
 
 
@@ -135,6 +145,11 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, CustomerInf
                 .priceCheck(customerDto.getPriceCheck()).build();
 
         int count = baseMapper.updateById(customerInfo);
+
+        if (!customerDto.getBankCards().isEmpty()){
+            bankCardService.saveBankCards(customerDto.getBankCards());
+        }
+
         if(count>0){
             log.info("------------------------- 客户修改成功，发送消息到相应的topic --------------------------------");
         }

modules/admin/src/main/java/com/fire/admin/service/impl/FireProductServiceImpl.java

@@ -181,14 +181,14 @@ public class FireProductServiceImpl extends ServiceImpl<FireProductMapper, FireP
      * @Date: 2021/5/28 17:49
      */
     @Override
-    public List<FireProductInfoVo> getProductAll(Integer operator, Integer customerId) {
+    public List<FireProductInfoVo> getProductAll( Integer customerId) {
 
         // TODO  构建返回的对象
         List<FireProductInfoVo> ProductVolist = Lists.newArrayList();
         // TODO 首先获取所有的产品
-        List<FireProductInfoVo> fireProductInfoVos = baseMapper.selectProductAll(operator);
+        List<FireProductInfoVo> fireProductInfoVos = baseMapper.selectProductAll();
         log.info("所有产品的个数：【{}】", fireProductInfoVos.size());
-        List<String> packageList = customerProductInfoService.getCuProByCustomerId(customerId, this.getOpertor(operator));
+        List<String> packageList = customerProductInfoService.getCuProByCustomerId(customerId);
         log.info("客户已经有的产品个数：【{}】", packageList.size());
         if (!ObjectUtil.hasEmpty(packageList)) {
             List<FireProductInfoVo> list = fireProductInfoVos.stream().filter((FireProductInfoVo pro) -> packageList.contains(pro.getPackageId()) == false).collect(Collectors.toList());
@@ -201,27 +201,6 @@ public class FireProductServiceImpl extends ServiceImpl<FireProductMapper, FireP
     }
 
 
-    /**
-     * @Description: TODO 根据运营商编号获取构建 packageId 前缀
-     * @Param: [operator]
-     * @return: java.lang.String
-     * @Author: liuliu
-     * @Date: 2021/6/1 15:57
-     */
-    public String getOpertor(int operator) {
-        switch (operator) {
-            case 1:
-                return "YDHF";
-            case 2:
-                return "DXHF";
-            case 3:
-                return "LTHF";
-            default:
-                throw new BaseException(Status.PACKAGEERROR.status(), Status.PACKAGEERROR.message());
-        }
-
-    }
-
     /**
      * @Description: TODO 逻辑删除产品
      * @Param: [productId]

modules/admin/src/main/java/com/fire/admin/service/impl/SupplierServiceImpl.java

@@ -43,7 +43,8 @@ public class SupplierServiceImpl extends ServiceImpl<ChannelSupplierMapper, Chan
 
         if (supplierList != null) {
             for (ChannelSupplier supplier : supplierList.getRecords()) {
-                supplier.setBankCards(bankCardService.getBankCardList(supplier.getSupplierId()));
+                // TODO 这里是获取供应商的银行卡，所以值写死  【六六补充】
+                supplier.setBankCards(bankCardService.getBankCardList(supplier.getSupplierId(), 1));
             }
             return supplierList;
         } else {

modules/admin/src/main/java/com/fire/admin/util/AliyunOSSUtil.java

@@ -31,7 +31,6 @@ public class AliyunOSSUtil {
     private ConstantProperties constantProperties;
 
 
-
     /**
      * @Description: TODO  阿里云oss 文件上传
      * @Param: [file]
@@ -45,7 +44,6 @@ public class AliyunOSSUtil {
         String accessKeySecret = constantProperties.getKeysecret();
         String bucketName = constantProperties.getBucketname();
         String fileHost = constantProperties.getFilehost();
-        log.info("oss 配置信息为：【{}】", constantProperties.toString());
         OSS ossClient = new OSSClientBuilder().build(endpoint, accessKeyId, accessKeySecret);
         try {
             // TODO 假如容器不存在，就创建
@@ -55,8 +53,7 @@ public class AliyunOSSUtil {
                 createBucketRequest.setCannedACL(CannedAccessControlList.PublicRead);
                 ossClient.createBucket(createBucketRequest);
             }
-            log.info("======= getOriginalFilename : {} ======",multipartFile.getOriginalFilename());
-            String fileUrl = fileHost.concat("/".concat(RandomUtil.randomString(16)).concat(multipartFile.getOriginalFilename()));
+            String fileUrl = fileHost.concat("/".concat(multipartFile.getOriginalFilename()));
 
             if (multipartFile.getSize() != 0 && ObjectUtil.isNotEmpty(multipartFile.getName())) {
                 //上传文件
@@ -86,7 +83,4 @@ public class AliyunOSSUtil {
     }
 
 
-
-
-
 }

modules/admin/src/main/java/com/fire/admin/vo/CustomerInfoVo.java

@@ -1,8 +1,10 @@
 package com.fire.admin.vo;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fire.admin.dto.CustomerProductDto;
+import com.fire.dto.BankCard;
 import com.fire.dto.FlowAppInfo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -118,4 +120,7 @@ public class CustomerInfoVo {
     private Integer priceCheck;
 
 
+    @ApiModelProperty("银行卡列表")
+    private List<BankCard> bankCards;
+
 }

modules/admin/src/main/resources/bootstrap.yml

@@ -33,7 +33,7 @@ oos:
   keyid: LTAI4FyxwFmsGEESaa7tiB6z # 填写刚刚生成的AccessKey
   keysecret: dG701ohwFU28pT84ZpEmIn7EcLOzzu  # 填写刚刚生成的Accesssecret
   bucketname: bluefire # bucket名称
-  filehost: bluefire    #bucket下文件夹的路径
+  filehost: fmp    #bucket下文件夹的路径
   finalUrl: https://bluefire.oss-cn-chengdu.aliyuncs.com/
 
 ---
@@ -61,9 +61,11 @@ spring:
         service: admin
 
 
+
 oos:
   endpoint: http://oss-cn-chengdu.aliyuncs.com
   keyid: LTAI4FyxwFmsGEESaa7tiB6z # 填写刚刚生成的AccessKey
   keysecret: dG701ohwFU28pT84ZpEmIn7EcLOzzu  # 填写刚刚生成的Accesssecret
   bucketname: bluefire # bucket名称
-  filehost: bluefire    #bucket下文件夹的路径
+  filehost: fmp    #bucket下文件夹的路径
+  finalUrl: https://bluefire.oss-cn-chengdu.aliyuncs.com/

modules/admin/src/main/resources/mapper/AdditionalPaymentMapper.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fire.admin.mapper.AdditionalPaymentMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.fire.dto.AdditionalPayment">
+        <id column="id" property="id"/>
+        <result column="card_no" property="cardNo"/>
+        <result column="bank_deposit" property="bankDeposit"/>
+        <result column="account" property="account"/>
+        <result column="payer" property="payer"/>
+        <result column="amount" property="amount"/>
+        <result column="certificate" property="certificate"/>
+        <result column="time" property="time"/>
+        <result column="payment_account" property="paymentAccount"/>
+        <result column="relation_id" property="relationId"/>
+        <result column="distinguish" property="distinguish"/>
+        <result column="undo" property="undo"/>
+    </resultMap>
+
+
+
+
+
+</mapper>

modules/admin/src/main/resources/mapper/FireProductMapper.xml

@@ -82,12 +82,8 @@
         product_price
         FROM
         flow_product_info
-        <where>
-            <if test="operator != null and operator != '' or operator ==0">
-                and operator =#{query.operator}
-            </if>
-        </where>
-      and   is_delete=0
+        WHERE
+         is_delete=0
     </select>