任务提交 供应商删除/银行卡列表完成

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

@@ -0,0 +1,52 @@
+package com.fire.dto;
+
+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;
+
+import java.util.Date;
+
+/**
+ * @author: admin
+ * @Description:
+ * @date: 2021-05-19 13:41
+ * @Modified By:
+ */
+@ApiModel("银行卡实体")
+@Data
+@NoArgsConstructor
+@TableName("bank_card")
+public class BankCard {
+
+    @TableId(value = "card_no")
+    @ApiModelProperty("银行卡号")
+    private String cardNo;
+
+    @ApiModelProperty("开户行")
+    private String bankDeposit;
+
+    @ApiModelProperty("账户 1-供应商 2-客户")
+    private Integer account;
+
+    @ApiModelProperty("供应商id")
+    private Integer supplierId;
+
+    @ApiModelProperty("创建者")
+    private String creator;
+
+    @ApiModelProperty("创建时间")
+    private Date createTime;
+
+    @ApiModelProperty("修改者")
+    private String updator;
+
+    @ApiModelProperty("修改时间")
+    private Date updateTime;
+
+    @ApiModelProperty("区分是供应商还是客户 1-供应商 2-客户")
+    private Integer distinguish;
+
+}

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

@@ -22,9 +22,9 @@ import java.util.Date;
 @TableName("channel_supplier")
 public class ChannelSupplier {
 
-    @TableId(value = "supplier_code",type = IdType.AUTO)
-    @ApiModelProperty("供应商编码")
-    private String supplierCode;
+    @TableId(value = "supplier_id",type = IdType.AUTO)
+    @ApiModelProperty("供应商id")
+    private Integer supplierId;
 
     @ApiModelProperty("供应商名称")
     private String supplierName;
@@ -112,4 +112,5 @@ public class ChannelSupplier {
 
     @ApiModelProperty("删除标记 0-未删除,1-已删除")
     private Integer isDelete;
+
 }

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

@@ -0,0 +1,22 @@
+package com.fire.admin.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fire.dto.BankCard;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @author: admin
+ * @Description:
+ * @date: 2021-05-19 14:03
+ * @Modified By:
+ */
+public interface BankCardMapper extends BaseMapper<BankCard> {
+
+    IPage<BankCard> getBankCardList(Page page, @Param("supplierId") Integer supplierId);
+
+    void saveBankCards(@Param("bankCards") List<BankCard> bankCards);
+}

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

@@ -18,7 +18,7 @@ public interface ChannelSupplierMapper extends BaseMapper<ChannelSupplier> {
 
 //    void updateSupplier(ChannelSupplier channelSupplier);
 
-//    void saveSupplier(ChannelSupplier channelSupplier);
+    void saveSupplier(ChannelSupplier channelSupplier);
 
 //    void deleteSupplierById(Integer id);
 }

modules/admin/src/main/java/com/fire/admin/request/BankCardPageParam.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-19 16:19
+ * @Modified By:
+ */
+@ApiModel("银行卡分页请求参数")
+@Getter
+@Setter
+public class BankCardPageParam extends Page {
+
+    @ApiModelProperty("供应商id")
+    private Integer supplierId;
+}

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

@@ -32,8 +32,8 @@ public class ChannelSupplierRest {
 
     @PostMapping("/list")
     @ApiOperation(value = "供应商列表", notes = "supplier_list.py")
-    public BaseRestResponse supplierList(@RequestBody SupplierPageParam page) {
-        return new BaseRestResponse<>(supplierService.getSupplierList(page, page.getSupplierName()));
+    public BaseRestResponse supplierList(@RequestBody SupplierPageParam supplierPageParam) {
+        return new BaseRestResponse<>(supplierService.getSupplierList(supplierPageParam, supplierPageParam.getSupplierName()));
     }
 
     @PostMapping("/add")
@@ -46,14 +46,14 @@ public class ChannelSupplierRest {
     @PutMapping("/update")
     @ApiOperation(value = "修改供应商", notes = "supplier_update.py")
     public BaseResponse updateSupplierBySupplierCode(@RequestBody ChannelSupplier channelSupplier) {
-        supplierService.updateSupplierBySupplierCode(channelSupplier);
+        supplierService.updateSupplierBySupplierId(channelSupplier);
         return new BaseResponse();
     }
 
     @DeleteMapping("/delete")
     @ApiOperation(value = "删除供应商", notes = "supplier_delete.py")
     public BaseResponse deleteSupplierBySupplierCode(@RequestParam String supplierCode) {
-        supplierService.deleteSupplierBySupplierCode(supplierCode);
+        supplierService.deleteSupplierBySupplierId(supplierCode);
         return new BaseResponse();
     }
 }

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

@@ -15,10 +15,10 @@ public interface SupplierService extends IService<ChannelSupplier> {
 
     IPage<ChannelSupplier> getSupplierList(Page page, String supplierName);
 
-    void updateSupplierBySupplierCode(ChannelSupplier channelSupplier);
+    void updateSupplierBySupplierId(ChannelSupplier channelSupplier);
 
     void saveSupplier(ChannelSupplier channelSupplier);
 
-    void deleteSupplierBySupplierCode(String supplierCode);
+    void deleteSupplierBySupplierId(String supplierId);
 
 }

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

@@ -29,11 +29,11 @@ public class SupplierServiceImpl extends ServiceImpl<ChannelSupplierMapper,Chann
     }
 
     @Override
-    public void updateSupplierBySupplierCode(ChannelSupplier channelSupplier) {
+    public void updateSupplierBySupplierId(ChannelSupplier channelSupplier) {
         UpdateWrapper<ChannelSupplier> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("supplier_code",channelSupplier.getSupplierCode());
+        updateWrapper.eq("supplier_id", channelSupplier.getSupplierId());
         int result = baseMapper.update(channelSupplier, updateWrapper);
-        if (result>0) {
+        if (result > 0) {
             // TODO: 2021/5/18 向MQ推送消息
         }
     }
@@ -41,20 +41,19 @@ public class SupplierServiceImpl extends ServiceImpl<ChannelSupplierMapper,Chann
     @Override
     public void saveSupplier(ChannelSupplier channelSupplier) {
         int result = baseMapper.insert(channelSupplier);
-        if (result>0) {
+        if (result > 0) {
             // TODO:2021/5/18 向MQ推送消息
         }
     }
 
     @Override
-    public void deleteSupplierBySupplierCode(String supplierCode) {
+    public void deleteSupplierBySupplierId(String supplierId) {
         Map<String, Object> map = new HashMap<>();
-        map.put("supplier_code",supplierCode);
+        map.put("supplier_id", supplierId);
         int result = baseMapper.deleteByMap(map);
-        if (result>0) {
+        if (result > 0) {
             // TODO:2021/5/18 向MQ推送消息
         }
     }
 
-
-}
+}

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

@@ -4,7 +4,7 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="supplierResultMap" type="com.fire.dto.ChannelSupplier">
-        <id column="supplier_code" property="supplierCode"/>
+        <id column="supplier_id" property="supplierId"/>
         <result column="supplier_name" property="supplierName"/>
         <result column="link_name" property="linkName"/>
         <result column="mobile" property="mobile"/>
@@ -36,7 +36,7 @@
     </resultMap>
 
     <sql id="common_field">
-       supplier_code,
+       supplier_id,
        supplier_name,
        link_name,
        mobile,