Merge branch 'master' of http://120.78.198.155:10080/zhangjunqiang/fire

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

@@ -33,8 +33,8 @@ public class BankCard {
     @ApiModelProperty("开户行")
     private String bankDeposit;
 
-    @ApiModelProperty("账户 1-供应商 2-客户")
-    private Integer account;
+    @ApiModelProperty("账户全称")
+    private String account;
 
     @ApiModelProperty("供应商id")
     private Integer supplierId;

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

@@ -1,8 +1,8 @@
 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.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -10,7 +10,6 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.util.Date;
-import java.util.List;
 
 /**
  * @author: admin
@@ -44,8 +43,6 @@ public class ChannelGroup {
     private Date updateTime;
 
     @ApiModelProperty("删除标记 0-未删除,1-删除")
+    @TableLogic
     private Integer isDelete;
-
-    @TableField(exist = false)
-    private List<DistributeGroup> distributeGroups;
 }

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

@@ -1,9 +1,6 @@
 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 com.baomidou.mybatisplus.annotation.*;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -24,7 +21,7 @@ import java.util.List;
 @TableName("access_channel_info")
 public class ChannelInfo {
 
-    @TableId(value = "channel_id",type = IdType.AUTO)
+    @TableId(value = "channel_id", type = IdType.AUTO)
     @ApiModelProperty("通道id")
     private Long channelId;
 
@@ -65,6 +62,7 @@ public class ChannelInfo {
     private Integer channelType;
 
     @ApiModelProperty("删除标记 0:未删除 1:已删除")
+    @TableLogic
     private Integer isDelete;
 
     @TableField(exist = false)

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

@@ -39,7 +39,7 @@ public class ChannelProductInfo {
     private String packageId;
 
     @ApiModelProperty("标准价格")
-    private Integer standardPrice;
+    private Long standardPrice;
 
     @ApiModelProperty("结算价格")
     private Integer price;

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

@@ -1,9 +1,6 @@
 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 com.baomidou.mybatisplus.annotation.*;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -113,6 +110,7 @@ public class ChannelSupplier {
     private String ext3;
 
     @ApiModelProperty("删除标记 0-未删除,1-已删除")
+    @TableLogic
     private Integer isDelete;
 
     @ApiModelProperty("银行卡列表")

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

@@ -1,9 +1,6 @@
 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 com.baomidou.mybatisplus.annotation.*;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -61,6 +58,7 @@ public class DistributeGroup {
     private Integer isValid;
 
     @ApiModelProperty("删除标记 0-未删除 1-删除")
+    @TableLogic
     private Integer isDelete;
 
     @TableField(exist = false)

modules/admin/pom.xml

@@ -47,6 +47,11 @@
             <artifactId>hutool-all</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi-ooxml</artifactId>
+        </dependency>
+
        <dependency>
             <groupId>javax.xml.bind</groupId>
             <artifactId>jaxb-api</artifactId>

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

@@ -15,10 +15,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 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;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
@@ -52,4 +49,11 @@ public class BankCardRest {
         bankCardService.saveBankCards(bankCards);
         return new BaseResponse();
     }
+
+    @DeleteMapping("/delete/{bankId}")
+    @ApiOperation(value = "删除银行卡", notes = "delete_bank_card.py")
+    public BaseResponse delete(@PathVariable("bankId") Integer bankId) {
+        bankCardService.deleteBankCards(bankId);
+        return new BaseResponse();
+    }
 }

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

@@ -4,8 +4,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.fire.admin.request.ChannelGroupPageParam;
 import com.fire.admin.service.ChannelGroupService;
 import com.fire.dto.ChannelGroup;
+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;
@@ -41,5 +43,13 @@ public class ChannelGroupRest {
         }
     }
 
+    @PostMapping("/add")
+    @ApiModelProperty(value = "添加通道组", notes = "add_channel_group.py")
+    public BaseResponse saveChannelGroup(ChannelGroup channelGroup) {
+        channelGroupService.addChannelGroup(channelGroup);
+        return new BaseResponse();
+    }
+
+
 
 }

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

@@ -71,11 +71,11 @@ public class ChannelInfoRest {
         return new BaseResponse();
     }
 
-    @DeleteMapping("/delete")
+    @DeleteMapping("/delete/{channelId}")
     @ApiOperation(value = "通道逻辑删除", notes = "delete_channelInfo.py")
-    public BaseResponse deleteChannelById(Long id) {
+    public BaseResponse deleteChannelById(@PathVariable("channelId") Long channelId) {
         try {
-            channelInfoService.deleteChannelById(id);
+            channelInfoService.deleteChannelById(channelId);
         } catch (Exception e) {
             e.printStackTrace();
             log.error("参数异常!");

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

@@ -2,13 +2,12 @@ package com.fire.admin.rest;
 
 import com.fire.admin.service.ChannelProductService;
 import com.fire.dto.ChannelProductInfo;
+import com.fire.dto.response.BaseResponse;
 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.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
@@ -41,5 +40,10 @@ public class ChannelProductInfoRest {
         }
     }
 
+    @DeleteMapping("/delete/{channelProductId}")
+    public BaseResponse deleteChannelProduct(@PathVariable("channelProductId") Long channelProductId) {
+        channelProductService.deleteChannelProductById(channelProductId);
+        return new BaseResponse();
+    }
 
 }

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

@@ -56,15 +56,16 @@ public class ChannelSupplierRest {
         return new BaseResponse();
     }
 
-    @DeleteMapping("/delete")
+    @DeleteMapping("/delete/{supplierId}")
     @ApiOperation(value = "删除供应商", notes = "supplier_delete.py")
-    public BaseResponse deleteSupplierBySupplierId(Integer id) {
+    public BaseResponse deleteSupplierBySupplierId(@PathVariable("supplierId") Integer supplierId) {
         try {
-            supplierService.deleteSupplierBySupplierId(id);
+            supplierService.deleteSupplierById(supplierId);
         } catch (Exception e) {
             e.printStackTrace();
             log.error("参数异常!");
         }
         return new BaseResponse();
     }
+
 }

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

@@ -1,9 +1,13 @@
 package com.fire.admin.rest;
 
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.poi.excel.ExcelUtil;
+import cn.hutool.poi.excel.ExcelWriter;
 import com.fire.admin.request.DispatchSearchPram;
 import com.fire.admin.request.OrderSearchPram;
 import com.fire.admin.service.OrderManagementService;
 import com.fire.dto.response.BaseRestResponse;
+import com.fire.es.OrderEsDto;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -12,6 +16,14 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.net.URLEncoder;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
 import java.util.Map;
 
 
@@ -49,8 +61,30 @@ public class OrderRest {
         return new BaseRestResponse<>(orderManagementService.dispatchSearch(dispatchSearchPram));
     }
 
+    @PostMapping("/getOrderExcel")
+    @ApiOperation(value = "导出订单数据")
+    public void getOrderExcel(@RequestBody OrderSearchPram orderSearchPram, HttpServletResponse response) {
+        String fileName = "Order-" + new SimpleDateFormat("yyyy-MM-dd").format(new Date());
+        ServletOutputStream out = null;
+        try {
+            ArrayList<OrderEsDto> orderList = orderManagementService.getOrderList(orderSearchPram);
+            out = response.getOutputStream();
+            response.setContentType("multipart/form-data");
+            response.setCharacterEncoding("utf-8");
+            response.setHeader("Content-disposition", "attachment;filename=" + URLEncoder.encode(fileName, "UTF-8") + ".xlsx");
+            ExcelWriter excelWriter = ExcelUtil.getWriter(true);
+            excelWriter.write(orderList);
+            excelWriter.flush(response.getOutputStream());
+            excelWriter.close();
+            out.flush();
+    } catch (Exception e) {
+        e.printStackTrace();
+    }
+
 
 
+    }
+
 
 
 }

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

@@ -18,6 +18,6 @@ public interface BankCardService extends IService<BankCard> {
 
     void saveBankCards(@RequestBody List<BankCard> bankCards);
 
-    void deleteBankCards(List<Integer> ids);
+    void deleteBankCards(Integer id);
 
 }

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

@@ -15,4 +15,6 @@ public interface ChannelGroupService extends IService<ChannelGroup> {
 
     IPage<ChannelGroup> getChannelGroupList(ChannelGroupPageParam pageParam);
 
+    void addChannelGroup(ChannelGroup channelGroup);
+
 }

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

@@ -18,4 +18,6 @@ public interface ChannelProductService extends IService<ChannelProductInfo> {
 
     void saveChannelProducts(@RequestBody List<ChannelProductInfo> channelProductInfos);
 
+    void deleteChannelProductById(Long channelProductId);
+
 }

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

@@ -10,6 +10,4 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface DistributeGroupService extends IService<DistributeGroupService> {
 
-
-
 }

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

@@ -1,5 +1,7 @@
 package com.fire.admin.service;
 
+import cn.hutool.poi.excel.BigExcelWriter;
+import cn.hutool.poi.excel.ExcelUtil;
 import com.fire.admin.request.DispatchSearchPram;
 import com.fire.admin.request.OrderSearchPram;
 import com.fire.es.DispatchDto;
@@ -13,6 +15,9 @@ import org.elasticsearch.search.aggregations.AggregationBuilders;
 import org.elasticsearch.search.aggregations.Aggregations;
 import org.elasticsearch.search.aggregations.metrics.ParsedSum;
 import org.elasticsearch.search.aggregations.metrics.SumAggregationBuilder;
+import org.elasticsearch.search.sort.FieldSortBuilder;
+import org.elasticsearch.search.sort.SortBuilders;
+import org.elasticsearch.search.sort.SortOrder;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
@@ -411,6 +416,123 @@ public class OrderManagementService {
         }
         return pageMap;
     }
+
+    public ArrayList<OrderEsDto> getOrderList(OrderSearchPram orderSearchPram) {
+        HashMap<String, Object> pageMap = new HashMap<>();
+        ArrayList<OrderEsDto> resultsList = new ArrayList<>();
+        //查询时间范围
+        Date applyDateStart = orderSearchPram.getApplyDateStart();
+        Date applyDateEnd = orderSearchPram.getApplyDateEnd();
+        //以创建时间倒序排列
+        FieldSortBuilder timeSort = SortBuilders.fieldSort("applyDate").order(SortOrder.DESC);
+
+        BoolQueryBuilder boolQuery = QueryBuilders.boolQuery();
+        RangeQueryBuilder rangeQueryBuilder = null;
+        //判断回调时间参数是否为空 不为空以回调时间来查询 否则用创建时间来查询
+        if (null != orderSearchPram.getCallbackTimeStart()) {
+            rangeQueryBuilder = QueryBuilders.rangeQuery("callbackTime")
+                    .gte(orderSearchPram.getCallbackTimeStart().getTime())
+                    .lte(orderSearchPram.getCallbackTimeEnd().getTime());
+            boolQuery.must(rangeQueryBuilder);
+            boolQuery.must(QueryBuilders.existsQuery("callbackTime"));
+        }
+        rangeQueryBuilder = QueryBuilders.rangeQuery("applyDate")
+                .gte(applyDateStart.getTime())
+                .lte(applyDateEnd.getTime());
+        boolQuery.must(rangeQueryBuilder);
+
+        //筛选条件
+        //订单号
+        if (Strings.isNotBlank(orderSearchPram.getOrderId())) {
+            boolQuery.must(QueryBuilders.termQuery("orderId", orderSearchPram.getOrderId()));
+        }
+        //客户订单号
+        if (Strings.isNotBlank(orderSearchPram.getExtorderId())) {
+            boolQuery.must(QueryBuilders.termQuery("extorderId", orderSearchPram.getExtorderId()));
+        }
+
+        //商户订单号
+        if (Strings.isNotBlank(orderSearchPram.getGwSeqNo())) {
+            boolQuery.must(QueryBuilders.termQuery("gwSeqNo", orderSearchPram.getGwSeqNo()));
+            boolQuery.must(QueryBuilders.existsQuery("gwSeqNo"));
+        }
+
+        //回调状态
+        if (Strings.isNotBlank(orderSearchPram.getCallbackStatus())) {
+            boolQuery.must(QueryBuilders.termQuery("callbackStatus", orderSearchPram.getCallbackStatus()));
+            boolQuery.must(QueryBuilders.existsQuery("callbackStatus"));
+        }
+
+        //电话号码
+        if (Strings.isNotBlank(orderSearchPram.getPhoneNo())) {
+            String usedMobiles = orderSearchPram.getPhoneNo();
+            if (usedMobiles.contains(",")) {
+                String[] usedMobileList = usedMobiles.split(",");
+                BoolQueryBuilder temp = QueryBuilders.boolQuery();
+                for (String usedMobile : usedMobileList) {
+                    temp.should(QueryBuilders.termQuery("phoneNo", usedMobile));
+                }
+                boolQuery.must(temp);
+            } else {
+                boolQuery.must(QueryBuilders.termQuery("phoneNo", usedMobiles));
+            }
+        }
+        //客户名称
+        if (Strings.isNotBlank(orderSearchPram.getCustomerName())) {
+            boolQuery.must(QueryBuilders.wildcardQuery("customerName.keyword", "*" + orderSearchPram.getCustomerName() + "*"));
+        }
+        //通道名称
+        if (Strings.isNotBlank(orderSearchPram.getChannelName())) {
+            boolQuery.must(QueryBuilders.wildcardQuery("channelName.keyword", "*" + orderSearchPram.getChannelName() + "*" ));
+            boolQuery.must(QueryBuilders.existsQuery("channelName"));
+        }
+        //订单状态
+        if (Strings.isNotBlank(orderSearchPram.getStatus())) {
+            boolQuery.must(QueryBuilders.termQuery("status", orderSearchPram.getStatus()));
+        }
+        //运营商
+        if (Strings.isNotBlank(orderSearchPram.getPhoneOperator())) {
+            boolQuery.must(QueryBuilders.termQuery("phoneOperator", orderSearchPram.getPhoneOperator()));
+        }
+        //面额
+        if (Strings.isNotBlank(orderSearchPram.getFlowAmount())) {
+            String flowAmount = orderSearchPram.getFlowAmount();
+            if (flowAmount.contains("-")) {
+                String[] flowAmountSplit = flowAmount.split("-");
+                rangeQueryBuilder = QueryBuilders.rangeQuery("flowAmount")
+                        .gte(flowAmountSplit[0])
+                        .lte(flowAmountSplit[1]);
+                boolQuery.must(rangeQueryBuilder);
+            }
+        }
+        //归属地
+        if (Strings.isNotBlank(orderSearchPram.getPhoneHome())) {
+            boolQuery.must(QueryBuilders.wildcardQuery("phoneHome.keyword", "*" + orderSearchPram.getPhoneHome() + "*"));
+        }
+
+        NativeSearchQuery query = new NativeSearchQueryBuilder()
+                .withSort(timeSort)
+                .withQuery(boolQuery)
+                .build();
+        //查询数据
+        try {
+            SearchHits<OrderEsDto> hits = restTemplate.search(query, OrderEsDto.class);
+            long total = hits.getTotalHits();
+            List<SearchHit<OrderEsDto>> searchHits = hits.getSearchHits();
+            System.out.println("一共" + total + "个");
+            for (SearchHit<OrderEsDto> searchHit : searchHits) {
+                OrderEsDto orderEsDto = searchHit.getContent();
+                resultsList.add(orderEsDto);
+            }
+            //写出到EXCEL
+//            BigExcelWriter writer= ExcelUtil.getBigWriter("e:/xxx.xlsx");
+//            writer.write(resultsList);
+//            writer.close();
+            } catch (Exception e) {
+                log.error(String.valueOf(e));
+            }
+        return resultsList;
+    }
 }
 
 

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

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.fire.admin.request.SupplierPageParam;
 import com.fire.dto.ChannelSupplier;
 
+import java.util.List;
+
 /**
  * @author: admin
  * @Description:
@@ -15,10 +17,14 @@ public interface SupplierService extends IService<ChannelSupplier> {
 
     IPage<ChannelSupplier> getSupplierList(SupplierPageParam supplierPageParam);
 
+    List<ChannelSupplier> getSupplierInfo();
+
     void updateSupplierBySupplierId(ChannelSupplier channelSupplier);
 
     void saveSupplier(ChannelSupplier channelSupplier);
 
-    void deleteSupplierBySupplierId(Integer id);
+    void deleteSupplierById(Integer id);
+
+    void deleteBankCardById(Integer bankId);
 
 }

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

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapp
 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;
@@ -36,10 +35,10 @@ public class BankCardServiceImpl extends ServiceImpl<BankCardMapper, BankCard> i
     public void saveBankCards(@RequestBody List<BankCard> bankCards) {
         for (BankCard bankCard : bankCards) {
             if (bankCard.getId() == null) {
-                bankCard.setCreator(SecurityUtil.getUser().getUsername());
+                bankCard.setCreator("admin");
                 bankCard.setCreateTime(new Date());
             } else {
-                bankCard.setUpdator(SecurityUtil.getUser().getUsername());
+                bankCard.setUpdator("admin");
                 bankCard.setUpdateTime(new Date());
             }
         }
@@ -52,11 +51,10 @@ public class BankCardServiceImpl extends ServiceImpl<BankCardMapper, BankCard> i
     }
 
     @Override
-    public void deleteBankCards(List<Integer> ids) {
-        if (ids != null) {
-            this.removeByIds(ids);
+    public void deleteBankCards(Integer bankId) {
+        if (bankId != null) {
+            this.baseMapper.deleteById(bankId);
         }
     }
 
-
 }

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

@@ -21,15 +21,19 @@ public class ChannelGroupServiceImpl extends ServiceImpl<ChannelGroupMapper, Cha
     @Override
     public IPage<ChannelGroup> getChannelGroupList(ChannelGroupPageParam pageParam) {
         LambdaQueryWrapper<ChannelGroup> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-        lambdaQueryWrapper.like(pageParam.getChannelGroupName()!=null,ChannelGroup::getGroupName,pageParam.getChannelGroupName());
+        lambdaQueryWrapper.like(pageParam.getChannelGroupName() != null, ChannelGroup::getGroupName, pageParam.getChannelGroupName());
         IPage<ChannelGroup> channelGroupList = baseMapper.selectPage(pageParam, lambdaQueryWrapper);
         if (channelGroupList != null) {
-            for (ChannelGroup channelGroup : channelGroupList.getRecords()) {
-                channelGroup.setDistributeGroups(channelGroup.getDistributeGroups());
-            }
             return channelGroupList;
         } else {
             return null;
         }
     }
+
+    @Override
+    public void addChannelGroup(ChannelGroup channelGroup) {
+        if (channelGroup != null) {
+            baseMapper.insert(channelGroup);
+        }
+    }
 }

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

@@ -1,5 +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;
@@ -9,7 +10,7 @@ import com.fire.admin.mapper.FireProductMapper;
 import com.fire.admin.request.ChannelPageParam;
 import com.fire.admin.service.ChannelInfoService;
 import com.fire.admin.service.ChannelProductService;
-import com.fire.admin.util.SecurityUtil;
+import com.fire.admin.service.SupplierService;
 import com.fire.common.exception.BaseException;
 import com.fire.dto.ChannelInfo;
 import com.fire.dto.FireProductInfo;
@@ -28,6 +29,9 @@ import java.util.List;
 @Service
 public class ChannelInfoServiceImpl extends ServiceImpl<ChannelInfoMapper, ChannelInfo> implements ChannelInfoService {
 
+    @Autowired
+    private SupplierService supplierService;
+
     @Autowired
     private ChannelProductService channelProductService;
 
@@ -54,7 +58,7 @@ public class ChannelInfoServiceImpl extends ServiceImpl<ChannelInfoMapper, Chann
 
     @Override
     public List<FireProductInfo> getChannelProduct(Integer operator) {
-        List<FireProductInfo> fireProductInfos = new LambdaQueryChainWrapper<>(fireProductMapper).eq(operator!= null, FireProductInfo::getOperator, operator).list();
+        List<FireProductInfo> fireProductInfos = new LambdaQueryChainWrapper<>(fireProductMapper).eq(operator != null, FireProductInfo::getOperator, operator).list();
         if (fireProductInfos != null) {
             return fireProductInfos;
         } else {
@@ -64,13 +68,13 @@ public class ChannelInfoServiceImpl extends ServiceImpl<ChannelInfoMapper, Chann
 
     @Override
     public void updateChannelInfoById(ChannelInfo channelInfo) {
-        channelInfo.setUpdator(SecurityUtil.getUser().getUsername());
+        channelInfo.setUpdator("admin");
         channelInfo.setUpdateTime(new Date());
         int result = baseMapper.updateById(channelInfo);
         if (result > 0) {
             // TODO: 2021/5/24 向MQ推送消息
         }
-        if (channelInfo.getChannelProductInfos() != null) {
+        if (ObjectUtil.isNotEmpty(channelInfo.getChannelProductInfos())) {
             channelProductService.saveChannelProducts(channelInfo.getChannelProductInfos());
         }
 
@@ -78,7 +82,7 @@ public class ChannelInfoServiceImpl extends ServiceImpl<ChannelInfoMapper, Chann
 
     @Override
     public void insertChannelInfo(ChannelInfo channelInfo) {
-        channelInfo.setCreator(SecurityUtil.getUser().getUsername());
+        channelInfo.setCreator("admin");
         channelInfo.setCreateTime(new Date());
 
         int result = baseMapper.insert(channelInfo);

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

@@ -40,4 +40,9 @@ public class ChannelProductServiceImpl extends ServiceImpl<ChannelProductMapper,
             }
         }
     }
+
+    @Override
+    public void deleteChannelProductById(Long channelProductId) {
+        baseMapper.deleteById(channelProductId);
+    }
 }

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

@@ -1,5 +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.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -8,7 +9,6 @@ import com.fire.admin.mapper.ChannelSupplierMapper;
 import com.fire.admin.request.SupplierPageParam;
 import com.fire.admin.service.BankCardService;
 import com.fire.admin.service.SupplierService;
-import com.fire.admin.util.SecurityUtil;
 import com.fire.common.exception.BaseException;
 import com.fire.dto.ChannelSupplier;
 import lombok.extern.slf4j.Slf4j;
@@ -16,6 +16,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @author: admin
@@ -39,20 +42,23 @@ public class SupplierServiceImpl extends ServiceImpl<ChannelSupplierMapper, Chan
         IPage<ChannelSupplier> supplierList = baseMapper.selectPage(supplierPageParam, lambdaQueryWrapper);
 
         if (supplierList != null) {
-
             for (ChannelSupplier supplier : supplierList.getRecords()) {
                 supplier.setBankCards(bankCardService.getBankCardList(supplier.getSupplierId()));
             }
-
             return supplierList;
         } else {
             return null;
         }
     }
 
+    @Override
+    public List<ChannelSupplier> getSupplierInfo() {
+        return baseMapper.selectList(null);
+    }
+
     @Override
     public void updateSupplierBySupplierId(ChannelSupplier channelSupplier) {
-        channelSupplier.setUpdator(SecurityUtil.getUser().getUsername());
+        channelSupplier.setUpdator("admin");
         channelSupplier.setUpdateTime(new Date());
         LambdaUpdateWrapper<ChannelSupplier> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
         lambdaUpdateWrapper.eq(channelSupplier.getSupplierId() != null, ChannelSupplier::getSupplierId, channelSupplier.getSupplierId());
@@ -60,7 +66,7 @@ public class SupplierServiceImpl extends ServiceImpl<ChannelSupplierMapper, Chan
         if (result > 0) {
             // TODO: 2021/5/18 向MQ推送消息
         }
-        if (channelSupplier.getBankCards() != null) {
+        if (ObjectUtil.isNotEmpty(channelSupplier.getBankCards())) {
             bankCardService.saveBankCards(channelSupplier.getBankCards());
         }
 
@@ -68,7 +74,7 @@ public class SupplierServiceImpl extends ServiceImpl<ChannelSupplierMapper, Chan
 
     @Override
     public void saveSupplier(ChannelSupplier channelSupplier) {
-        channelSupplier.setCreator(SecurityUtil.getUser().getUsername());
+        channelSupplier.setCreator("admin");
         channelSupplier.setCreateTime(new Date());
         int result = baseMapper.insert(channelSupplier);
         if (result > 0) {
@@ -77,7 +83,7 @@ public class SupplierServiceImpl extends ServiceImpl<ChannelSupplierMapper, Chan
     }
 
     @Override
-    public void deleteSupplierBySupplierId(Integer id) {
+    public void deleteSupplierById(Integer id) {
         if (id != null) {
             int result = baseMapper.deleteById(id);
             if (result > 0) {
@@ -88,4 +94,18 @@ public class SupplierServiceImpl extends ServiceImpl<ChannelSupplierMapper, Chan
         }
     }
 
+    @Override
+    public void deleteBankCardById(Integer bankId) {
+        if (bankId != null) {
+            Map<String, Object> map = new HashMap<>();
+            map.put("id", bankId);
+            int result = baseMapper.deleteByMap(map);
+            if (result > 0) {
+                // TODO:2021/5/18 向MQ推送消息
+            }
+        } else {
+            throw new BaseException("非法参数！");
+        }
+    }
+
 }

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

@@ -9,20 +9,6 @@
         <result column="create_time" property="createTime"/>
         <result column="updator" property="updator"/>
         <result column="update_time" property="updateTime"/>
-        <collection property="distributeGroups" ofType="com.fire.dto.DistributeGroup">
-            <id column="id" property="id"/>
-            <result column="name" property="name"/>
-            <result column="channel_group_id" property="channelGroupId"/>
-            <result column="policy" property="policy"/>
-            <result column="operator" property="operator"/>
-            <result column="weight" property="weight"/>
-            <result column="creator" property="creator"/>
-            <result column="create_time" property="createTime"/>
-            <result column="updator" property="updator"/>
-            <result column="update_time" property="updateTime"/>
-            <result column="is_valid" property="isValid"/>
-            <result column="is_delete" property="isDelete"/>
-        </collection>
     </resultMap>
 
     <select id="channelGroupList" resultMap="channelGroupResultMap">

modules/save-data/src/main/java/com/fire/savedata/consumer/OrderTidbConsumer.java

@@ -12,7 +12,6 @@ import org.apache.rocketmq.common.message.MessageExt;
 import org.apache.rocketmq.spring.annotation.ConsumeMode;
 import org.apache.rocketmq.spring.annotation.RocketMQMessageListener;
 import org.apache.rocketmq.spring.core.RocketMQListener;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;

pom.xml

@@ -90,6 +90,11 @@
                 <artifactId>hutool-all</artifactId>
                 <version>5.2.0</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.poi</groupId>
+                <artifactId>poi-ooxml</artifactId>
+                <version>5.0.0</version>
+            </dependency>
 
             <dependency>
                 <groupId>io.jsonwebtoken</groupId>