but test

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

@@ -83,4 +83,8 @@ public class ChannelInfo {
     @ApiModelProperty(value = "通道产品 根据通道id分第一层 根据区域分第二次 根据面额分第三层", hidden = true)
     @JsonIgnoreProperties
     Map<String, Map<Long, List<ChannelProductInfo>>> productListMap;
+
+    @ApiModelProperty("供应商名称")
+    @TableField(exist = false)
+    private String supplierName;
 }

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

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -33,7 +32,6 @@ public class ChannelProductInfo {
     private String productId;
 
     @ApiModelProperty("通道产品名称")
-//    @JsonProperty(value = "productName")
     private String productName;
 
     @ApiModelProperty("流量包id")

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

@@ -21,7 +21,7 @@ import java.util.List;
 @TableName("channel_supplier")
 public class ChannelSupplier {
 
-    @TableId(value = "relation_id", type = IdType.AUTO)
+    @TableId(value = "supplier_id", type = IdType.AUTO)
     @ApiModelProperty("供应商id")
     private Integer supplierId;
 

modules/admin/src/main/java/com/fire/admin/request/ChannelPageParam.java

@@ -20,8 +20,8 @@ public class ChannelPageParam extends Page {
     @ApiModelProperty("通道id")
     private Long channelId;
 
-    @ApiModelProperty("客户或者供应商的关联id")
-    private Integer relationId;
+    @ApiModelProperty("供应商id")
+    private Integer supplierId;
 
     @ApiModelProperty("通道名称")
     private String channelName;

modules/admin/src/main/java/com/fire/admin/request/SupplierPageParam.java

@@ -19,4 +19,7 @@ public class SupplierPageParam extends Page {
 
     @ApiModelProperty("供应商名称")
     private String supplierName;
+
+    @ApiModelProperty("区分是供应商还是客户 1-供应商 2-客户")
+    private Integer distinguish;
 }

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

@@ -34,8 +34,8 @@ public class BankCardRest {
 
     @PostMapping("/list")
     @ApiOperation(value = "银行卡列表", notes = "bankcard_list.py")
-    public BaseRestResponse getBankCardList(Integer supplierId) {
-        List<BankCard> bankCardList = bankCardService.getBankCardList(supplierId);
+    public BaseRestResponse getBankCardList(Integer relationId, Integer distinguish) {
+        List<BankCard> bankCardList = bankCardService.getBankCardList(relationId, distinguish);
         if (bankCardList != null) {
             return new BaseRestResponse(bankCardList);
         } else {
@@ -58,5 +58,4 @@ public class BankCardRest {
     }
 
 
-
 }

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

@@ -2,7 +2,6 @@ package com.fire.admin.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.fire.dto.BankCard;
-import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
 
@@ -15,15 +14,15 @@ import java.util.List;
 public interface BankCardService extends IService<BankCard> {
 
     /**
-    * @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);
+     * @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 relationId, Integer distinguish);
 
-    void saveBankCards(@RequestBody List<BankCard> bankCards);
+    void saveBankCards(List<BankCard> bankCards);
 
     void deleteBankCards(Integer id);
 

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

@@ -7,7 +7,6 @@ import com.fire.admin.mapper.BankCardMapper;
 import com.fire.admin.service.BankCardService;
 import com.fire.dto.BankCard;
 import org.springframework.stereotype.Service;
-import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.Date;
 import java.util.List;
@@ -22,10 +21,10 @@ import java.util.List;
 public class BankCardServiceImpl extends ServiceImpl<BankCardMapper, BankCard> implements BankCardService {
 
     @Override
-    public List<BankCard> getBankCardList(Integer supplierId, Integer distinguish) {
+    public List<BankCard> getBankCardList(Integer relationId, Integer distinguish) {
         List<BankCard> bankCardList = new LambdaQueryChainWrapper<>(baseMapper)
-                .eq(BankCard::getDistinguish,distinguish)
-                .eq(supplierId != null, BankCard::getRelationId, supplierId).list();
+                .eq(BankCard::getDistinguish, distinguish)
+                .eq(relationId != null, BankCard::getRelationId, relationId).list();
         if (bankCardList != null) {
             return bankCardList;
         } else {
@@ -34,7 +33,7 @@ public class BankCardServiceImpl extends ServiceImpl<BankCardMapper, BankCard> i
     }
 
     @Override
-    public void saveBankCards(@RequestBody List<BankCard> bankCards) {
+    public void saveBankCards(List<BankCard> bankCards) {
         for (BankCard bankCard : bankCards) {
             if (bankCard.getId() == null) {
                 bankCard.setCreator("admin");

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

@@ -1,7 +1,6 @@
 package com.fire.admin.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -41,12 +40,7 @@ public class ChannelInfoServiceImpl extends ServiceImpl<ChannelInfoMapper, Chann
 
     @Override
     public IPage<ChannelInfo> getChannelList(ChannelPageParam channelPageParam) {
-        LambdaQueryWrapper<ChannelInfo> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-        lambdaQueryWrapper.eq(channelPageParam.getChannelId() != null, ChannelInfo::getChannelId, channelPageParam.getChannelId())
-                .eq(channelPageParam.getRelationId() != null, ChannelInfo::getSupplierId, channelPageParam.getRelationId())
-                .like(channelPageParam.getChannelName() != null, ChannelInfo::getChannelName, channelPageParam.getChannelName())
-                .eq(ChannelInfo::getIsDelete, 0);
-        IPage<ChannelInfo> channelInfoList = baseMapper.selectPage(channelPageParam, lambdaQueryWrapper);
+        IPage<ChannelInfo> channelInfoList = baseMapper.selectChannelInfoList(channelPageParam);
         if (channelInfoList != null) {
             for (ChannelInfo info : channelInfoList.getRecords()) {
                 info.setChannelProductInfos(channelProductService.getChannelProductList(info.getChannelId()));
@@ -90,12 +84,10 @@ public class ChannelInfoServiceImpl extends ServiceImpl<ChannelInfoMapper, Chann
     public void insertChannelInfo(ChannelInfo channelInfo) {
         channelInfo.setCreator("admin");
         channelInfo.setCreateTime(new Date());
-
         int result = baseMapper.insert(channelInfo);
         if (result > 0) {
             // TODO: 2021/5/24 向MQ推送消息
         }
-
     }
 
     @Override

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

@@ -2,7 +2,6 @@ package com.fire.admin.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -44,7 +43,7 @@ public class SupplierServiceImpl extends ServiceImpl<ChannelSupplierMapper, Chan
 
         if (supplierList != null) {
             for (ChannelSupplier supplier : supplierList.getRecords()) {
-                supplier.setBankCards(bankCardService.getBankCardList(supplier.getSupplierId()));
+                supplier.setBankCards(bankCardService.getBankCardList(supplier.getSupplierId(), supplierPageParam.getDistinguish()));
             }
             return supplierList;
         } else {
@@ -54,9 +53,9 @@ public class SupplierServiceImpl extends ServiceImpl<ChannelSupplierMapper, Chan
 
     @Override
     public List<ChannelSupplier> getSupplierInfo() {
-        QueryWrapper<ChannelSupplier> queryWrapper = new QueryWrapper<>();
-        queryWrapper.select("relation_id", "supplier_name");
-        return baseMapper.selectList(queryWrapper);
+        LambdaQueryWrapper<ChannelSupplier> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.select(ChannelSupplier::getSupplierId, ChannelSupplier::getSupplierName);
+        return this.list(queryWrapper);
     }
 
     @Override

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

@@ -5,8 +5,9 @@
     <resultMap id="channelInfoResultMap" type="com.fire.dto.ChannelInfo">
         <id column="channel_id" property="channelId"/>
         <result column="supplier_id" property="supplierId"/>
+        <result column="supplier_name" property="supplierName"/>
         <result column="channel_name" property="channelName"/>
-        <result column="operator_code" property="operatorCode"/>
+        <result column="operator" property="operator"/>
         <result column="is_valid" property="isValid"/>
         <result column="remark" property="remark"/>
         <result column="creator" property="creator"/>
@@ -20,46 +21,45 @@
     </resultMap>
 
     <sql id="common_field">
-        channel_id,
-        supplier_id,
-        channel_name,
-        operator_code,
-        is_valid,
-        remark,
-        creator,
-        create_time,
-        updator,
-        update_time,
-        ip,
-        discount,
-        channel_type,
-        is_delete
+        aci
+        .
+        channel_id
+        ,
+        aci.supplier_id,
+        cs.supplier_name,
+        aci.channel_name,
+        aci.operator,
+        aci.is_valid,
+        aci.remark,
+        aci.creator,
+        aci.create_time,
+        aci.updator,
+        aci.update_time,
+        aci.ip,
+        aci.discount,
+        aci.channel_type,
+        aci.is_delete
     </sql>
 
     <select id="selectChannelInfoList" resultMap="channelInfoResultMap">
-        SELECT <include refid="common_field"/>
-        FROM access_channel_info
+        SELECT
+        <include refid="common_field"/>
+        FROM access_channel_info AS aci LEFT JOIN channel_supplier AS cs
+        ON aci.supplier_id = cs.supplier_id
         <where>
             <if test="channelId !=null">
-                AND channel_id = #{channelId}
+                AND aci.channel_id = #{channelId}
             </if>
             <if test="supplierId !=null">
-                AND supplier_id = #{supplierId}
+                AND aci.supplier_id = #{supplierId}
             </if>
             <if test="channelName !=null and channelName.trim()!=''">
-                AND channel_name = #{channelName}
+                AND aci.channel_name = #{channelName}
             </if>
-            AND is_delete = 0
+            AND aci.is_delete = 0
         </where>
     </select>
 
-    <!--<insert id="">
-        INSERT INTO access_channel_info
-        (, , , , , ,,,)
-        VALUES
-
-    </insert>-->
-
     <update id="delChannelById">
         UPDATE access_channel_info
         SET is_delete = 1

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

@@ -28,8 +28,11 @@
         <result column="discount" property="disCount"/>
     </resultMap>
 
-    <sql id="selectCustomerProductByCustomerId" >
-        cp.customer_product_id,
+    <sql id="selectCustomerProductByCustomerId">
+        cp
+        .
+        customer_product_id
+        ,
         cp.customer_id,
         p.package_id,
         p.product_name,