任务提交 通道列表及删除

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

@@ -0,0 +1,66 @@
+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-20 10:46
+ * @Modified By:
+ */
+@ApiModel("通道实体")
+@Data
+@NoArgsConstructor
+@TableName("access_channel_info")
+public class ChannelInfo {
+
+    @TableId("channel_id")
+    @ApiModelProperty("通道id")
+    private Long channelId;
+
+    @ApiModelProperty("供应商id")
+    private Integer supplierId;
+
+    @ApiModelProperty("通道名称")
+    private String channelName;
+
+    @ApiModelProperty("对应运营商产品ID YD:移动　LT:联通　DX:电信")
+    private String operatorCode;
+
+    @ApiModelProperty("是否有效 0:无效 1:有效")
+    private Integer isValid;
+
+    @ApiModelProperty("备注")
+    private String remark;
+
+    @ApiModelProperty("创建者")
+    private String creator;
+
+    @ApiModelProperty("创建时间")
+    private Date createTime;
+
+    @ApiModelProperty("修改者")
+    private String updator;
+
+    @ApiModelProperty("修改时间")
+    private Date updateTime;
+
+    @ApiModelProperty("创建者IP")
+    private String ip;
+
+    @ApiModelProperty("折扣")
+    private Double discount;
+
+    @ApiModelProperty("通道类别 1:运营商 2:第三方")
+    private Integer channelType;
+
+    @ApiModelProperty("删除标记 0:未删除 1:已删除")
+    private Integer isDelete;
+}

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

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

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

@@ -18,5 +18,5 @@ public interface BankCardMapper extends BaseMapper<BankCard> {
 
     IPage<BankCard> getBankCardList(Page page, @Param("supplierId") Integer supplierId);
 
-    void saveBankCards(@Param("bankCards") List<BankCard> bankCards);
+    int saveBankCards(@Param("bankCards") List<BankCard> bankCards);
 }

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

@@ -0,0 +1,21 @@
+package com.fire.admin.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.fire.admin.request.ChannelPageParam;
+import com.fire.dto.ChannelInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * @author: admin
+ * @Description:
+ * @date: 2021-05-20 11:33
+ * @Modified By:
+ */
+public interface ChannelInfoMapper extends BaseMapper<ChannelInfo> {
+
+    IPage<ChannelInfo> selectChannelInfoList(@Param("selectList") ChannelPageParam channelPageParam);
+
+    int delChannelById(Integer channelId);
+
+}

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

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

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

@@ -0,0 +1,28 @@
+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-20 11:42
+ * @Modified By:
+ */
+@ApiModel("通道分页请求参数")
+@Getter
+@Setter
+public class ChannelPageParam extends Page {
+
+    @ApiModelProperty("通道id")
+    private Long channelId;
+
+    @ApiModelProperty("供应商id")
+    private Integer supplierId;
+
+    @ApiModelProperty("通道名称")
+    private String channelName;
+}

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

@@ -34,6 +34,7 @@ public class BankCardRest {
     }
 
     @RequestMapping("/list")
+    @ApiOperation(value = "银行卡列表",notes = "bankcard_list.py")
     public BaseRestResponse getBankCardList(BankCardPageParam bankCardPageParam) {
         return new BaseRestResponse(bankCardService.getBankCardList(bankCardPageParam,bankCardPageParam.getSupplierId()));
     }

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

@@ -0,0 +1,45 @@
+package com.fire.admin.rest;
+
+import com.fire.admin.request.ChannelPageParam;
+import com.fire.admin.service.ChannelInfoService;
+import com.fire.dto.response.BaseResponse;
+import com.fire.dto.response.BaseRestResponse;
+import io.swagger.annotations.Api;
+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;
+
+/**
+ * @author: admin
+ * @Description:
+ * @date: 2021-05-20 11:16
+ * @Modified By:
+ */
+@Api(tags = "通道相关接口")
+@RestController
+@RequestMapping("channel")
+public class ChannelInfoRest {
+
+    private ChannelInfoService channelInfoService;
+
+    @Autowired
+    public ChannelInfoRest(ChannelInfoService channelInfoService) {
+        this.channelInfoService = channelInfoService;
+    }
+
+    @PostMapping("list")
+    @ApiOperation(value = "通道列表",notes = "channel_list.py")
+    public BaseRestResponse channelInfoList(ChannelPageParam channelPageParam) {
+        return new BaseRestResponse(channelInfoService.getChannelList(channelPageParam));
+    }
+
+    @PutMapping("/delete")
+    @ApiOperation(value = "通道逻辑删除",notes = "channel_delete.py")
+    public BaseResponse deleteChannelById(Integer ChannelId) {
+        channelInfoService.deleteChannelById(ChannelId);
+        return new BaseResponse();
+    }
+}

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

@@ -45,15 +45,15 @@ public class ChannelSupplierRest {
 
     @PutMapping("/update")
     @ApiOperation(value = "修改供应商", notes = "supplier_update.py")
-    public BaseResponse updateSupplierBySupplierCode(@RequestBody ChannelSupplier channelSupplier) {
+    public BaseResponse updateSupplierBySupplierId(@RequestBody ChannelSupplier channelSupplier) {
         supplierService.updateSupplierBySupplierId(channelSupplier);
         return new BaseResponse();
     }
 
-    @DeleteMapping("/delete")
+    @PutMapping("/delete")
     @ApiOperation(value = "删除供应商", notes = "supplier_delete.py")
-    public BaseResponse deleteSupplierBySupplierCode(@RequestParam String supplierCode) {
-        supplierService.deleteSupplierBySupplierId(supplierCode);
+    public BaseResponse deleteSupplierBySupplierId(Integer supplierId) {
+        supplierService.deleteSupplierBySupplierId(supplierId);
         return new BaseResponse();
     }
 }

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

@@ -0,0 +1,20 @@
+package com.fire.admin.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.fire.admin.request.ChannelPageParam;
+import com.fire.dto.ChannelInfo;
+
+/**
+ * @author: admin
+ * @Description:
+ * @date: 2021-05-20 11:17
+ * @Modified By:
+ */
+public interface ChannelInfoService extends IService<ChannelInfo> {
+
+    IPage<ChannelInfo> getChannelList(ChannelPageParam channelPageParam);
+
+    void deleteChannelById(Integer channelId);
+
+}

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

@@ -19,6 +19,6 @@ public interface SupplierService extends IService<ChannelSupplier> {
 
     void saveSupplier(ChannelSupplier channelSupplier);
 
-    void deleteSupplierBySupplierId(String supplierId);
+    void deleteSupplierBySupplierId(Integer supplierId);
 
 }

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

@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fire.admin.mapper.BankCardMapper;
 import com.fire.admin.service.BankCardService;
 import com.fire.dto.BankCard;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -20,17 +19,16 @@ import java.util.List;
 @Service
 public class BankCardServiceImpl extends ServiceImpl<BankCardMapper, BankCard> implements BankCardService {
 
-    @Autowired
-    private BankCardMapper bankCardMapper;
-
     @Override
     public IPage<BankCard> getBankCardList(Page page, Integer supplierId) {
-        return bankCardMapper.getBankCardList(page, supplierId);
+        return baseMapper.getBankCardList(page, supplierId);
     }
 
     @Override
     public void saveBankCards(List<BankCard> bankCards) {
-//        baseMapper.saveBankCards(bankCards);
-
+        int result = baseMapper.saveBankCards(bankCards);
+        if (result>0) {
+            // TODO: 2021/5/20 向MQ推送消息
+        }
     }
 }

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

@@ -0,0 +1,32 @@
+package com.fire.admin.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fire.admin.mapper.ChannelInfoMapper;
+import com.fire.admin.request.ChannelPageParam;
+import com.fire.admin.service.ChannelInfoService;
+import com.fire.dto.ChannelInfo;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author: admin
+ * @Description:
+ * @date: 2021-05-20 11:32
+ * @Modified By:
+ */
+@Service
+public class ChannelInfoServiceImpl extends ServiceImpl<ChannelInfoMapper, ChannelInfo> implements ChannelInfoService {
+
+    @Override
+    public IPage<ChannelInfo> getChannelList(ChannelPageParam channelPageParam) {
+        return baseMapper.selectChannelInfoList(channelPageParam);
+    }
+
+    @Override
+    public void deleteChannelById(Integer channelId) {
+        int result = baseMapper.delChannelById(channelId);
+        if (result>0) {
+            // TODO: 2021/5/20 向MQ推送消息
+        }
+    }
+}

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

@@ -10,8 +10,7 @@ import com.fire.dto.ChannelSupplier;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
-import java.util.HashMap;
-import java.util.Map;
+import java.util.Date;
 
 /**
  * @author: admin
@@ -30,6 +29,7 @@ public class SupplierServiceImpl extends ServiceImpl<ChannelSupplierMapper,Chann
 
     @Override
     public void updateSupplierBySupplierId(ChannelSupplier channelSupplier) {
+        channelSupplier.setUpdateTime(new Date());
         UpdateWrapper<ChannelSupplier> updateWrapper = new UpdateWrapper<>();
         updateWrapper.eq("supplier_id", channelSupplier.getSupplierId());
         int result = baseMapper.update(channelSupplier, updateWrapper);
@@ -40,6 +40,7 @@ public class SupplierServiceImpl extends ServiceImpl<ChannelSupplierMapper,Chann
 
     @Override
     public void saveSupplier(ChannelSupplier channelSupplier) {
+        channelSupplier.setCreateTime(new Date());
         int result = baseMapper.insert(channelSupplier);
         if (result > 0) {
             // TODO:2021/5/18 向MQ推送消息
@@ -47,10 +48,8 @@ public class SupplierServiceImpl extends ServiceImpl<ChannelSupplierMapper,Chann
     }
 
     @Override
-    public void deleteSupplierBySupplierId(String supplierId) {
-        Map<String, Object> map = new HashMap<>();
-        map.put("supplier_id", supplierId);
-        int result = baseMapper.deleteByMap(map);
+    public void deleteSupplierBySupplierId(Integer supplierId) {
+        int result = baseMapper.deleteSupplierById(supplierId);
         if (result > 0) {
             // TODO:2021/5/18 向MQ推送消息
         }

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

@@ -0,0 +1,68 @@
+<?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.ChannelInfoMapper">
+
+    <resultMap id="channelInfoResultMap" type="com.fire.dto.ChannelInfo">
+        <id column="channel_id" property="channelId"/>
+        <result column="supplier_id" property="supplierId"/>
+        <result column="channel_name" property="channelName"/>
+        <result column="operator_code" property="operatorCode"/>
+        <result column="is_valid" property="isValid"/>
+        <result column="remark" property="remark"/>
+        <result column="creator" property="creator"/>
+        <result column="create_time" property="createTime"/>
+        <result column="updator" property="updator"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="ip" property="ip"/>
+        <result column="discount" property="discount"/>
+        <result column="channel_type" property="channelType"/>
+        <result column="is_delete" property="isDelete"/>
+    </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
+    </sql>
+
+    <select id="selectChannelInfoList" resultMap="channelInfoResultMap">
+        SELECT <include refid="common_field"/>
+        FROM access_channel_info
+        <where>
+            <if test="channelId !=null">
+                AND channel_id = #{selectList.channelId}
+            </if>
+            <if test="supplierId !=null">
+                AND supplier_id = #{selectList.supplierId}
+            </if>
+            <if test="supplierName !=null and supplierName.trim()!=''">
+                AND supplier_name = #{selectList.supplierName}
+            </if>
+        </where>
+    </select>
+
+    <!--<insert id="">
+        INSERT INTO access_channel_info
+        (, , , , , ,,,)
+        VALUES
+
+    </insert>-->
+
+    <update id="delChannelById">
+        UPDATE access_channel_info
+        SET is_delete = 1
+        WHERE channel_id = #{channelId}
+    </update>
+
+</mapper>

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

@@ -77,12 +77,6 @@
         ORDER BY balance DESC
     </select>
 
-   <!-- <insert id="saveSupplier">
-        INSERT INTO channel_supplier
-            (supplier_code, supplier_name, balance, ratio, is_valid, create_time)
-        VALUES (#{supplierCode}, #{supplierName}, #{balance}, #{ratio}, #{isValid}, #{createTime});
-    </insert>-->
-
     <!--<update id="updateSupplierBySupplierCode">
         UPDATE channel_supplier
         <set>
@@ -106,16 +100,12 @@
             </if>
         </set>
         WHERE supplier_code = #{supplierCode}
-    </update>
+    </update>-->
 
-    <delete id="deleteSupplierBySupplierCode">
+    <update id="deleteSupplierById">
         UPDATE channel_supplier
-            <set>
-                <if test="isDelete==0 or isDelete==1">
-                    is_delete = #{isDelete}
-                </if>
-            </set>
-        WHERE supplier_code = #{supplierCode}
-    </delete>-->
+        SET is_delete = 1
+        WHERE supplier_id = #{supplierId}
+    </update>
 
 </mapper>