任务提交 通道产品

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

@@ -1,5 +1,6 @@
 package com.fire.dto;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
@@ -49,4 +50,7 @@ public class BankCard {
     @ApiModelProperty("区分是供应商还是客户 1-供应商 2-客户")
     private Integer distinguish;
 
+    @ApiModelProperty("对应供应商")
+    @TableField(exist = false)
+    private ChannelSupplier channelSupplier;
 }

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

@@ -1,5 +1,6 @@
 package com.fire.dto;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
@@ -8,6 +9,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * @author: admin
@@ -63,4 +65,8 @@ public class ChannelInfo {
 
     @ApiModelProperty("删除标记 0:未删除 1:已删除")
     private Integer isDelete;
+
+    @TableField(exist = false)
+    @ApiModelProperty("通道产品")
+    private List<ChannelProductInfo> channelProductInfos;
 }

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

@@ -0,0 +1,50 @@
+package com.fire.dto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author: admin
+ * @Description:
+ * @date: 2021-05-21 16:00
+ * @Modified By:
+ */
+@ApiModel("通道产品实体")
+@Data
+@NoArgsConstructor
+@TableName("channel_product_info")
+public class ChannelProductInfo {
+
+    @TableId("channel_product_id")
+    @ApiModelProperty("主键")
+    private Long channelProductId;
+
+    @ApiModelProperty("通道id")
+    private Long channelId;
+
+    @ApiModelProperty("产品id")
+    private String productId;
+
+    @ApiModelProperty("通道产品名称")
+    private String channelProductName;
+
+    @ApiModelProperty("流量包id")
+    private String packageId;
+
+    @ApiModelProperty("结算价格")
+    private Integer price;
+
+    @ApiModelProperty("备注")
+    private String remark;
+
+    @ApiModelProperty("产品是否有效(默认Y)")
+    private String channelProductStatus;
+
+    @TableField(exist = false)
+    private ChannelInfo channelInfo;
+}

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

@@ -1,6 +1,7 @@
 package com.fire.dto;
 
 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 io.swagger.annotations.ApiModel;
@@ -9,6 +10,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * @author: admin
@@ -113,4 +115,8 @@ public class ChannelSupplier {
     @ApiModelProperty("删除标记 0-未删除,1-已删除")
     private Integer isDelete;
 
+    @ApiModelProperty("银行卡列表")
+    @TableField(exist = false)
+    private List<BankCard> bankCards;
+
 }

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

@@ -0,0 +1,14 @@
+package com.fire.admin.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.fire.dto.ChannelProductInfo;
+
+/**
+ * @author: admin
+ * @Description:
+ * @date: 2021-05-24 16:44
+ * @Modified By:
+ */
+public interface ChannelProductMapper extends BaseMapper<ChannelProductInfo> {
+
+}

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

@@ -0,0 +1,22 @@
+package com.fire.admin.request;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @author: admin
+ * @Description:
+ * @date: 2021-05-24 17:28
+ * @Modified By:
+ */
+@ApiModel("通道产品分页请求参数")
+@Getter
+@Setter
+public class ChannelProductPageParam extends Page {
+
+    @ApiModelProperty("通道id")
+    private Long channelId;
+}

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

@@ -7,7 +7,6 @@ package com.fire.admin.rest;
  * @Modified By:
  */
 
-import com.fire.admin.request.BankCardPageParam;
 import com.fire.admin.service.BankCardService;
 import com.fire.dto.BankCard;
 import com.fire.dto.response.BaseResponse;
@@ -35,15 +34,20 @@ public class BankCardRest {
     }
 
     @PostMapping("/list")
-    @ApiOperation(value = "银行卡列表",notes = "bankcard_list.py")
-    public BaseRestResponse getBankCardList(BankCardPageParam bankCardPageParam) {
-        return new BaseRestResponse(bankCardService.getBankCardList(bankCardPageParam,bankCardPageParam.getSupplierId()));
+    @ApiOperation(value = "银行卡列表", notes = "bankcard_list.py")
+    public BaseRestResponse getBankCardList(Integer supplierId) {
+        List<BankCard> bankCardList = bankCardService.getBankCardList(supplierId);
+        if (bankCardList != null) {
+            return new BaseRestResponse(bankCardList);
+        } else {
+            return new BaseRestResponse(null);
+        }
     }
 
     @PostMapping("/add")
-    @ApiOperation(value = "批量添加银行卡",notes = "add_bankcards.py")
+    @ApiOperation(value = "批量添加银行卡", notes = "add_bankcards.py")
     public BaseResponse addBankCard(@RequestBody List<BankCard> bankCards) {
-        bankCardService.saveOrUpdateBatch(bankCards);
+        bankCardService.saveBankCards(bankCards);
         return new BaseResponse();
     }
 }

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

@@ -1,16 +1,16 @@
 package com.fire.admin.rest;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.fire.admin.request.ChannelPageParam;
 import com.fire.admin.service.ChannelInfoService;
+import com.fire.dto.ChannelInfo;
 import com.fire.dto.response.BaseResponse;
 import com.fire.dto.response.BaseRestResponse;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * @author: admin
@@ -31,13 +31,33 @@ public class ChannelInfoRest {
     }
 
     @PostMapping("list")
-    @ApiOperation(value = "通道列表",notes = "channel_list.py")
-    public BaseRestResponse channelInfoList(ChannelPageParam channelPageParam) {
-        return new BaseRestResponse(channelInfoService.getChannelList(channelPageParam));
+    @ApiOperation(value = "通道列表", notes = "channel_list.py")
+    public BaseRestResponse channelInfoList(@RequestBody ChannelPageParam channelPageParam) {
+        IPage<ChannelInfo> channelList = channelInfoService.getChannelList(channelPageParam);
+        if (channelList != null) {
+            return new BaseRestResponse(channelList);
+        } else {
+            return new BaseRestResponse(null);
+        }
+    }
+
+    @PostMapping("/add")
+    @ApiOperation(value = "添加通道", notes = "add_channelInfo.py")
+    public BaseResponse addChannelInfo(@RequestBody ChannelInfo channelInfo) {
+        channelInfoService.insertChannelInfo(channelInfo);
+        return new BaseResponse();
+    }
+
+    @PutMapping("/update")
+    @ApiModelProperty(value = "修改通道", notes = "update_channelInfo.py")
+    public BaseResponse updateChannelInfo(@RequestBody ChannelInfo channelInfo) {
+        channelInfoService.updateChannelInfoById(channelInfo);
+        return new BaseResponse();
     }
 
     @PutMapping("/delete")
-    @ApiOperation(value = "通道逻辑删除",notes = "channel_delete.py")
+    @ApiOperation(value = "通道逻辑删除", notes = "delete_channelInfo.py")
+
     public BaseResponse deleteChannelById(Integer ChannelId) {
         channelInfoService.deleteChannelById(ChannelId);
         return new BaseResponse();

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

@@ -0,0 +1,47 @@
+package com.fire.admin.rest;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.fire.admin.request.ChannelProductPageParam;
+import com.fire.admin.service.ChannelProductService;
+import com.fire.dto.ChannelProductInfo;
+import com.fire.dto.response.BaseRestResponse;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author: admin
+ * @Description:
+ * @date: 2021-05-24 16:38
+ * @Modified By:
+ */
+@Api(tags = "通道产品相关接口")
+@RestController
+@RequestMapping("/channelProduct")
+public class ChannelProductInfoRest {
+
+    private ChannelProductService channelProductService;
+
+    @Autowired
+    public ChannelProductInfoRest(ChannelProductService channelProductService) {
+        this.channelProductService = channelProductService;
+    }
+
+    @PostMapping("/list")
+    @ApiModelProperty(value = "通道产品列表", notes = "channelProduct_list.py")
+    public BaseRestResponse channelProductList(@RequestBody ChannelProductPageParam channelProductPageParam) {
+        IPage<ChannelProductInfo> channelProductList = channelProductService.getChannelProductList(channelProductPageParam);
+        if (channelProductList != null) {
+            return new BaseRestResponse(channelProductList);
+        } else {
+            return new BaseRestResponse(null);
+        }
+    }
+
+
+
+}

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

@@ -1,7 +1,9 @@
 package com.fire.admin.rest;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.fire.admin.request.SupplierPageParam;
 import com.fire.admin.service.SupplierService;
+import com.fire.dto.BankCard;
 import com.fire.dto.ChannelSupplier;
 import com.fire.dto.response.BaseResponse;
 import com.fire.dto.response.BaseRestResponse;
@@ -11,6 +13,8 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  * @author: admin
  * @Description:
@@ -33,7 +37,12 @@ public class ChannelSupplierRest {
     @PostMapping("/list")
     @ApiOperation(value = "供应商列表", notes = "supplier_list.py")
     public BaseRestResponse supplierList(@RequestBody SupplierPageParam supplierPageParam) {
-        return new BaseRestResponse<>(supplierService.getSupplierList(supplierPageParam, supplierPageParam.getSupplierName()));
+        IPage<ChannelSupplier> supplierList = supplierService.getSupplierList(supplierPageParam, supplierPageParam.getSupplierName());
+        if (supplierList != null) {
+            return new BaseRestResponse(supplierList);
+        } else {
+            return new BaseRestResponse(null);
+        }
     }
 
     @PostMapping("/add")
@@ -43,11 +52,15 @@ public class ChannelSupplierRest {
         return new BaseResponse();
     }
 
-    @PutMapping("/update")
+    @PostMapping("/update")
     @ApiOperation(value = "修改供应商", notes = "supplier_update.py")
-    public BaseResponse updateSupplierBySupplierId(@RequestBody ChannelSupplier channelSupplier) {
-        supplierService.updateSupplierBySupplierId(channelSupplier);
-        return new BaseResponse();
+    public BaseRestResponse updateSupplierBySupplierId(@RequestBody ChannelSupplier channelSupplier) {
+        List<BankCard> bankCardList = supplierService.updateSupplierBySupplierId(channelSupplier);
+        if (bankCardList != null) {
+            return new BaseRestResponse(bankCardList);
+        } else {
+            return new BaseRestResponse(null);
+        }
     }
 
     @PutMapping("/delete")

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

@@ -1,9 +1,10 @@
 package com.fire.admin.service;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.fire.dto.BankCard;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
 
 /**
  * @author: admin
@@ -13,9 +14,9 @@ import com.fire.dto.BankCard;
  */
 public interface BankCardService extends IService<BankCard> {
 
-    IPage<BankCard> getBankCardList(Page page, Integer supplierId);
+    List<BankCard> getBankCardList(Integer supplierId);
 
-//    void saveBankCards(List<BankCard> bankCards);
+    void saveBankCards(@RequestBody List<BankCard> bankCards);
 
 
 

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

@@ -15,6 +15,10 @@ public interface ChannelInfoService extends IService<ChannelInfo> {
 
     IPage<ChannelInfo> getChannelList(ChannelPageParam channelPageParam);
 
+    void updateChannelInfoById(ChannelInfo channelInfo);
+
+    void insertChannelInfo(ChannelInfo channelInfo);
+
     void deleteChannelById(Integer channelId);
 
 }

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

@@ -0,0 +1,18 @@
+package com.fire.admin.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.fire.admin.request.ChannelProductPageParam;
+import com.fire.dto.ChannelProductInfo;
+
+/**
+ * @author: admin
+ * @Description:
+ * @date: 2021-05-24 16:40
+ * @Modified By:
+ */
+public interface ChannelProductService extends IService<ChannelProductInfo> {
+
+    IPage<ChannelProductInfo> getChannelProductList(ChannelProductPageParam channelProductPageParam);
+
+}

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

@@ -3,8 +3,11 @@ package com.fire.admin.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.fire.dto.BankCard;
 import com.fire.dto.ChannelSupplier;
 
+import java.util.List;
+
 /**
  * @author: admin
  * @Description:
@@ -15,7 +18,7 @@ public interface SupplierService extends IService<ChannelSupplier> {
 
     IPage<ChannelSupplier> getSupplierList(Page page, String supplierName);
 
-    void updateSupplierBySupplierId(ChannelSupplier channelSupplier);
+    List<BankCard> updateSupplierBySupplierId(ChannelSupplier channelSupplier);
 
     void saveSupplier(ChannelSupplier channelSupplier);
 

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

@@ -1,12 +1,16 @@
 package com.fire.admin.service.impl;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fire.admin.mapper.BankCardMapper;
 import com.fire.admin.service.BankCardService;
+import com.fire.admin.util.SecurityUtil;
 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;
 
 /**
  * @author: admin
@@ -18,15 +22,28 @@ import org.springframework.stereotype.Service;
 public class BankCardServiceImpl extends ServiceImpl<BankCardMapper, BankCard> implements BankCardService {
 
     @Override
-    public IPage<BankCard> getBankCardList(Page page, Integer supplierId) {
-        return baseMapper.getBankCardList(page, supplierId);
+    public List<BankCard> getBankCardList(Integer supplierId) {
+        List<BankCard> bankCardList = new LambdaQueryChainWrapper<>(baseMapper).eq(supplierId != null, BankCard::getSupplierId, supplierId).list();
+        if (bankCardList != null) {
+            return bankCardList;
+        } else {
+            return null;
+        }
     }
 
-    /*@Override
-    public void saveBankCards(List<BankCard> bankCards) {
-        int result = baseMapper.saveBankCards(bankCards);
-        if (result>0) {
-            // TODO: 2021/5/20 向MQ推送消息
+    @Override
+    public void saveBankCards(@RequestBody List<BankCard> bankCards) {
+        for (BankCard bankCard : bankCards) {
+            bankCard.setCreator(SecurityUtil.getUser().getUsername());
+            bankCard.setCreateTime(new Date());
+            bankCard.setUpdator(SecurityUtil.getUser().getUsername());
+            bankCard.setUpdateTime(new Date());
         }
-    }*/
+        if (bankCards != null) {
+            boolean result = this.saveOrUpdateBatch(bankCards);
+            if (result) {
+                // TODO: 2021/5/20 向MQ推送消息
+            }
+        }
+    }
 }

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

@@ -1,5 +1,6 @@
 package com.fire.admin.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fire.admin.mapper.ChannelInfoMapper;
@@ -19,13 +20,39 @@ public class ChannelInfoServiceImpl extends ServiceImpl<ChannelInfoMapper, Chann
 
     @Override
     public IPage<ChannelInfo> getChannelList(ChannelPageParam channelPageParam) {
-        return baseMapper.selectChannelInfoList(channelPageParam);
+        LambdaQueryWrapper<ChannelInfo> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(channelPageParam.getChannelId() != null, ChannelInfo::getChannelId, channelPageParam.getSupplierId())
+                .eq(channelPageParam.getSupplierId() != null, ChannelInfo::getSupplierId, channelPageParam.getSupplierId())
+                .eq(channelPageParam.getChannelName() != null, ChannelInfo::getChannelName, channelPageParam.getChannelName())
+                .eq(ChannelInfo::getIsDelete, 0);
+        IPage<ChannelInfo> channelInfoList = baseMapper.selectPage(channelPageParam, lambdaQueryWrapper);
+        if (channelInfoList != null) {
+            return channelInfoList;
+        } else {
+            return null;
+        }
+    }
+
+    @Override
+    public void updateChannelInfoById(ChannelInfo channelInfo) {
+        int result = baseMapper.updateById(channelInfo);
+        if (result > 0) {
+            // TODO: 2021/5/24 向MQ推送消息
+        }
+    }
+
+    @Override
+    public void insertChannelInfo(ChannelInfo channelInfo) {
+        int result = baseMapper.insert(channelInfo);
+        if (result > 0) {
+            // TODO: 2021/5/24 向MQ推送消息
+        }
     }
 
     @Override
     public void deleteChannelById(Integer channelId) {
         int result = baseMapper.delChannelById(channelId);
-        if (result>0) {
+        if (result > 0) {
             // TODO: 2021/5/20 向MQ推送消息
         }
     }

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

@@ -0,0 +1,32 @@
+package com.fire.admin.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fire.admin.mapper.ChannelProductMapper;
+import com.fire.admin.request.ChannelProductPageParam;
+import com.fire.admin.service.ChannelProductService;
+import com.fire.dto.ChannelProductInfo;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author: admin
+ * @Description:
+ * @date: 2021-05-24 16:42
+ * @Modified By:
+ */
+@Service
+public class ChannelProductServiceImpl extends ServiceImpl<ChannelProductMapper, ChannelProductInfo> implements ChannelProductService {
+
+    @Override
+    public IPage<ChannelProductInfo> getChannelProductList(ChannelProductPageParam channelProductPageParam) {
+        QueryWrapper<ChannelProductInfo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq(channelProductPageParam.getChannelId() != null, "channel_id", channelProductPageParam.getChannelId());
+        IPage<ChannelProductInfo> channelProductInfoIPage = baseMapper.selectPage(channelProductPageParam, queryWrapper);
+        if (channelProductInfoIPage != null) {
+            return channelProductInfoIPage;
+        } else {
+            return null;
+        }
+    }
+}

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

@@ -1,16 +1,21 @@
 package com.fire.admin.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+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.fire.admin.mapper.ChannelSupplierMapper;
+import com.fire.admin.service.BankCardService;
 import com.fire.admin.service.SupplierService;
+import com.fire.dto.BankCard;
 import com.fire.dto.ChannelSupplier;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * @author: admin
@@ -20,26 +25,48 @@ import java.util.Date;
  */
 @Service
 @Slf4j
-public class SupplierServiceImpl extends ServiceImpl<ChannelSupplierMapper,ChannelSupplier> implements SupplierService {
+public class SupplierServiceImpl extends ServiceImpl<ChannelSupplierMapper, ChannelSupplier> implements SupplierService {
+
+    @Autowired
+    private BankCardService bankCardService;
 
     @Override
     public IPage<ChannelSupplier> getSupplierList(Page page, String supplierName) {
-        return baseMapper.getSupplierList(page, supplierName);
+        LambdaQueryWrapper<ChannelSupplier> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(supplierName != null, ChannelSupplier::getSupplierName, supplierName)
+                .eq(ChannelSupplier::getIsDelete, 0);
+        IPage<ChannelSupplier> supplierList = baseMapper.selectPage(page, lambdaQueryWrapper);
+        if (supplierList != null) {
+            return supplierList;
+        } else {
+            return null;
+        }
     }
 
     @Override
-    public void updateSupplierBySupplierId(ChannelSupplier channelSupplier) {
+    public List<BankCard> updateSupplierBySupplierId(ChannelSupplier channelSupplier) {
+        channelSupplier.setUpdator("admin");
         channelSupplier.setUpdateTime(new Date());
-        UpdateWrapper<ChannelSupplier> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("supplier_id", channelSupplier.getSupplierId());
-        int result = baseMapper.update(channelSupplier, updateWrapper);
+        LambdaUpdateWrapper<ChannelSupplier> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
+        lambdaUpdateWrapper.eq(channelSupplier.getSupplierId() != null, ChannelSupplier::getSupplierId, channelSupplier.getSupplierId());
+        int result = baseMapper.update(channelSupplier, lambdaUpdateWrapper);
+        List<BankCard> bankCardList = bankCardService.getBankCardList(channelSupplier.getSupplierId());
+        if (channelSupplier.getBankCards() != null) {
+            bankCardService.saveBankCards(channelSupplier.getBankCards());
+        }
         if (result > 0) {
             // TODO: 2021/5/18 向MQ推送消息
         }
+        if (bankCardList != null) {
+            return bankCardList;
+        } else {
+            return null;
+        }
     }
 
     @Override
     public void saveSupplier(ChannelSupplier channelSupplier) {
+        channelSupplier.setCreator("admin");
         channelSupplier.setCreateTime(new Date());
         int result = baseMapper.insert(channelSupplier);
         if (result > 0) {

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

@@ -10,18 +10,18 @@ spring:
   cloud:
     nacos:
       config:
-        server-addr: 192.168.101.104:8848
+        server-addr: 192.168.2.114:8848
         file-extension: yaml
         namespace: fire
       discovery:
-        server-addr: 192.168.101.104:8848
+        server-addr: 192.168.2.114:8848
         namespace: fire
         service: admin
   datasource:
     username: root
     password: 123456
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://192.168.101.21:4000/fmp?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://192.168.2.118:4000/fmp?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
     hikari:
       minimum-idle: 5
       maximum-pool-size: 15
@@ -31,7 +31,7 @@ spring:
       pool-name: DatebookHikariCP
   redis:
     cluster:
-      nodes: 192.168.101.101:7001,192.168.101.101:7002,192.168.101.101:7003
+      nodes: 192.168.2.110:7001,192.168.2.110:7002,192.168.2.110:7003,192.168.2.110:7004,192.168.2.110:7005,192.168.2.110:7006
 #    host: 192.168.101.100
 #    port: 11670
 jwt: