同步svn代码

sailun-allsteel-app-rest/src/main/java/io/platform/app/web/controller/AppAgentController.java

@@ -0,0 +1,183 @@
+package io.platform.app.web.controller;
+
+import cn.hutool.http.HttpUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import io.platform.app.web.query.AgentLongQuery;
+import io.platform.app.web.query.QueryAgentStock;
+import io.platform.app.web.query.QueryAppAgentStock;
+import io.platform.base.common.annotation.CountUse;
+import io.platform.base.common.annotation.SysLog;
+import io.platform.base.common.utils.R;
+import io.platform.base.common.utils.StringUtils;
+import io.platform.store.dto.BizBasicMsgDto;
+import io.platform.store.dto.BizStoreAgentDto;
+import io.platform.store.dto.QueryAgentStockDto;
+import io.platform.store.dto.StoreAgentBrandLvDto;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+@RestController
+@RequestMapping("/app/appAgent")
+public class AppAgentController {
+    private Logger logger = LoggerFactory.getLogger(getClass());
+
+    @Value("${QueryAgentStock}")
+    private String QueryAgentStock;
+    @Value("${clientBasicMsg}")
+    private String clientBasicMsg;
+
+    @Autowired
+    AppAgentServiceRemote appAgentServiceRemote;
+
+//    /**
+//     * 通商APP-首页轮播图接口
+//     */
+//    @CountUse(fundesc = "通商APP-首页轮播图",username = "username")
+//    @RequestMapping("/getAgentBanner")
+//    @ResponseBody
+//    public R getAgentBanner(@RequestBody Map<String,Object> map){
+//        if (map.get("KUNNR") == null){
+//            return R.error("没有接收到参数");
+//        }
+//        return R.ok().put("agentBanner",appAgentServiceRemote.selectAgentBanner(map));
+//    }
+
+//    /**
+//     * 通商APP-首页跑马灯连接
+//     */
+//    @CountUse(fundesc = "通商APP-首页跑马灯连接",username = "username")
+//    @RequestMapping("/getAgentMessage")
+//    @ResponseBody
+//    public R getAgentMessage(@RequestParam Integer contentType){
+//        if (contentType == null){
+//            return R.error("没有接收到参数");
+//        }
+//        return R.ok().put("agentBanner",appAgentServiceRemote.selectAgentMessage(contentType));
+//    }
+
+    @CountUse(fundesc = "通商APP首页-经销商信息",username = "username")
+    @SysLog("通商APP首页-获取经销商信息")
+    @RequestMapping("/getClientBasicMsg")
+    @ResponseBody
+    public R getClientBasicMsg(@RequestBody AgentLongQuery agentLongQuery) {
+        String postResposts = "";
+        BizBasicMsgDto bizBasicMsgDto = new BizBasicMsgDto();
+        Map map = new HashMap();
+        map.put("token", agentLongQuery.getToken());
+        try {
+            long startDate = System.currentTimeMillis();
+            logger.info("开始调用B2B获取经销商信息接口" + startDate);
+            postResposts = HttpUtil.post(clientBasicMsg, map);
+            bizBasicMsgDto = JSON.parseObject(postResposts, BizBasicMsgDto.class);
+            logger.info("调用B2B获取经销商信息接口结束耗时为" + (System.currentTimeMillis() - startDate));
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        if (bizBasicMsgDto.getCode()==1){
+            return R.ok().put("data", bizBasicMsgDto);
+        }else {
+            return R.error().put("data","查询经销商信息有误");
+        }
+    }
+
+    @CountUse(fundesc = "通商APP首页-经销商查询旗下门店进货量",username = "username")
+    @SysLog("通商APP首页-经销商查询旗下门店进货量")
+    @RequestMapping("/agentSelectStoreRecord")
+    @ResponseBody
+    public Map<String, Object> agentSelectStoreRecord(@RequestBody BizStoreAgentDto bizStoreAgentDto) {
+        Map selectStoreRecord = appAgentServiceRemote.agentSelectStoreRecord(bizStoreAgentDto);
+        return selectStoreRecord;
+    }
+
+    @SysLog("通商APP-经销商库存")
+    @PostMapping("/getAgentStock")
+    @ResponseBody
+    public R getAgentStock(@RequestBody QueryAppAgentStock queryAppAgentStock){
+        QueryAgentStockDto.Data queryAgentStockData = new QueryAgentStockDto.Data();
+        List<String> brands = new ArrayList<>();
+        List<String> patterns = new ArrayList<>();
+        List<String> specs = new ArrayList<>();
+        List<Integer> stocks = new ArrayList<>();
+        List<QueryAgentStockDto.Data.stockList> stockLists = new ArrayList<>();
+        String s = JSONObject.toJSONString(queryAppAgentStock);
+        try {
+            String postman =  HttpUtil.post(QueryAgentStock,s);
+            QueryAgentStockDto queryAgentStockDto = JSON.parseObject(postman,QueryAgentStockDto.class);
+            patterns.addAll(queryAgentStockDto.getData().getPatternList());
+            specs.addAll(queryAgentStockDto.getData().getSpecList());
+            stockLists.addAll(queryAgentStockDto.getData().getList());
+            stocks.add(queryAgentStockDto.getData().getStock());
+            return R.ok().put("data",queryAgentStockDto);
+        }catch (Exception e){
+            return R.error(e.getMessage());
+        }
+    }
+
+    @SysLog("门店APP-门店查经销商库存")
+    @PostMapping("/getStoreAgentStock")
+    @ResponseBody
+    public R getStoreAgentStock(@RequestBody QueryAgentStock queryAgentStock){
+        List<Long> agentIdList = new ArrayList<>();
+//        List<QueryAgentStockDto> queryAgentStockDtos = new ArrayList<>();
+        QueryAgentStockDto.Data queryAgentStockData = new QueryAgentStockDto.Data();
+        String postman = "";
+        QueryAgentStockDto queryAgentStockDto = new QueryAgentStockDto();
+        List<String> brands = new ArrayList<>();
+        List<String> patterns = new ArrayList<>();
+        List<String> specs = new ArrayList<>();
+        List<Integer> stocks = new ArrayList<>();
+        List<QueryAgentStockDto.Data.stockList> stockLists = new ArrayList<>();
+        try {
+        List<StoreAgentBrandLvDto> bizStoreAgentDtoList = appAgentServiceRemote.selectAgency(queryAgentStock.getStoreId());
+        if (bizStoreAgentDtoList!=null && bizStoreAgentDtoList.size()>0){
+            for(StoreAgentBrandLvDto item : bizStoreAgentDtoList){
+                agentIdList.add(item.getAgentId());
+            }
+            agentIdList = agentIdList.stream().distinct().collect(Collectors.toList());
+            for(Long itemAgent : agentIdList){
+                List<StoreAgentBrandLvDto> storeBrands = appAgentServiceRemote.selectStoreBrand(queryAgentStock.getStoreId(),itemAgent);
+                if(storeBrands!=null && storeBrands.size()>0){
+                    storeBrands = storeBrands.stream().distinct().collect(Collectors.toList());
+
+                    for(StoreAgentBrandLvDto itemBrand : storeBrands){
+                        if(StringUtils.isNotEmpty(itemBrand.getBrand())){
+                            String a = "000";
+                            queryAgentStock.setKunnr(a+itemAgent.toString());
+                            queryAgentStock.setBrand(itemBrand.getBrandCode());
+                            String s = JSONObject.toJSONString(queryAgentStock);
+                            postman =  HttpUtil.post(QueryAgentStock,s);
+                            brands.add(itemBrand.getBrandCode());
+
+                            queryAgentStockDto = JSON.parseObject(postman,QueryAgentStockDto.class);
+                            patterns.addAll(queryAgentStockDto.getData().getPatternList());
+                            specs.addAll(queryAgentStockDto.getData().getSpecList());
+                            stockLists.addAll(queryAgentStockDto.getData().getList());
+                            stocks.add(queryAgentStockDto.getData().getStock());
+//                            queryAgentStockDtos.add(queryAgentStockDto);
+                        }
+                    }
+                }
+            }
+            Integer sum = 0;
+            for(Integer item : stocks){
+                sum+=item;
+            }
+            queryAgentStockData.setBrandList(brands);
+            queryAgentStockData.setPatternList(patterns);
+            queryAgentStockData.setSpecList(specs);
+            queryAgentStockData.setList(stockLists);
+            queryAgentStockData.setStock(sum);
+        }
+            return R.ok().put("data",queryAgentStockData);
+        }catch (Exception e){
+            return R.error(e.getMessage());
+        }
+    }
+}

sailun-allsteel-app-rest/src/main/java/io/platform/app/web/controller/AppAgentServiceRemote.java

@@ -0,0 +1,171 @@
+package io.platform.app.web.controller;
+
+import com.alibaba.dubbo.config.annotation.Reference;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import io.platform.base.common.utils.PageUtil;
+import io.platform.homepage.dto.ConfigBannerDto;
+import io.platform.homepage.service.client.api.ConfigBannerServiceClient;
+import io.platform.store.dto.BizStoreAgentDto;
+import io.platform.store.dto.StoreAgentBrandLvDto;
+import io.platform.store.dto.StoreBasicInfoDto;
+import io.platform.store.dto.Zkotg901Dto;
+import io.platform.store.service.client.api.StoreAgentBrandLvServiceClient;
+import io.platform.store.service.client.api.StoreBasicInfoServiceClient;
+import io.platform.store.service.client.api.Zkotg901ServiceClient;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
+
+@Service("appAgentServiceRemote")
+public class AppAgentServiceRemote {
+
+    @Reference(check = false)
+    private StoreAgentBrandLvServiceClient storeAgentBrandLvServiceClient;
+    @Reference(check = false)
+    private StoreBasicInfoServiceClient storeBasicInfoServiceClient;
+    @Reference(check = false)
+    private Zkotg901ServiceClient zkotg901ServiceClient;
+    @Reference(check = false)
+    private ConfigBannerServiceClient configBannerServiceClient;
+
+    /**
+     * 通商APP-首页轮播图接口
+     */
+    public List<ConfigBannerDto> selectAgentBanner(Map<String,Object> map) {
+        //从JYB2B_NEW.ZKOTG901表获取经销商的品牌名称
+        map.put("IF_FLAG","1");
+        map.put("VKORG","8100");
+        map.put("SPART","40");
+        map.put("VTWEG","10");
+        List<Zkotg901Dto> zkotg901Dtos = zkotg901ServiceClient.queryList(map);
+        if(zkotg901Dtos!=null &&zkotg901Dtos.size()>0){
+            return configBannerServiceClient.selectAgentBanner(zkotg901Dtos);
+        }
+        return null;
+    }
+
+    /**
+     * 通商APP-首页跑马灯链接
+     */
+    public List<ConfigBannerDto> selectAgentMessage(Integer contentType) {
+        return configBannerServiceClient.selectAgentMessage(contentType);
+    }
+
+    /**
+     * 根据门店查经销商
+     * @return
+     */
+    public List<StoreAgentBrandLvDto> selectAgency(Long storeId){
+        Map map = new HashMap();
+        map.put("STORE_ID", storeId);
+        map.put("AGENT_STATUS", "1");
+        return storeAgentBrandLvServiceClient.queryList(map);
+    }
+
+    public List<StoreAgentBrandLvDto> selectBrand(Long agentId){
+        Map map = new HashMap();
+        map.put("AGENT_ID",agentId);
+        map.put("AGENT_STATUS", "1");
+        return storeAgentBrandLvServiceClient.queryList(map);
+    }
+
+    public List<StoreAgentBrandLvDto> selectStoreBrand(Long storeId,Long agentId){
+        Map map = new HashMap();
+        map.put("STORE_ID",storeId);
+        map.put("AGENT_ID",agentId);
+        map.put("AGENT_STATUS", "1");
+        return storeAgentBrandLvServiceClient.queryList(map);
+    }
+
+    /**
+     * 根据经销商编号查门店ID -> 门店ID获取门店名 -> 门店ID获取门店经营品牌 -> 门店ID获取订单量
+     */
+    public Map agentSelectStoreRecord(BizStoreAgentDto bizStoreAgentDto) {
+        Map map = new HashMap(1);
+        map.put("KUNNR", bizStoreAgentDto.getKunnr());
+
+        List<StoreAgentBrandLvDto> storeAgentBrandLvDtoList = storeAgentBrandLvServiceClient.queryList(map);
+        List list = new ArrayList();
+        int total = 0;
+        for (StoreAgentBrandLvDto storeAgentDto : storeAgentBrandLvDtoList) {
+            Map map4 = new HashMap();
+            // 门店名 手机号
+            Map map1 = new HashMap(1);
+            map1.put("MAIN_ID", storeAgentDto.getStoreId());
+            List<StoreBasicInfoDto> storeBasicInfoDtoList = storeBasicInfoServiceClient.queryList(map1);
+            if (CollectionUtils.isNotEmpty(storeBasicInfoDtoList)) {
+                for (StoreBasicInfoDto bizStoreBasicInfoDto : storeBasicInfoDtoList) {
+                    map4.put("storeName", bizStoreBasicInfoDto.getStoreName());
+                    map4.put("storePhone", bizStoreBasicInfoDto.getStorePhone());
+                    map4.put("storeImageUrl", bizStoreBasicInfoDto.getStoreImageUrl());
+                }
+            }
+            // 品牌名
+            Map map2 = new HashMap(1);
+            map2.put("KUNNR", bizStoreAgentDto.getKunnr());
+            map2.put("RETAILER_ID", storeAgentDto.getStoreId());
+            List<StoreAgentBrandLvDto> storeBrandList = storeBasicInfoServiceClient.queryList(map2);
+            if (CollectionUtils.isNotEmpty(storeBrandList)) {
+                for (StoreAgentBrandLvDto bizStoreBrandDto : storeBrandList) {
+                    map4.put("brandName", bizStoreBrandDto.getBrand());
+                }
+            }
+//            // 订单
+//            int count = 0;
+//            List<BizOrderDto> bizOrderDtoList = bizOrderServiceClient.getAmount(storeAgentDto.getStoreId());
+//            if (CollectionUtils.isNotEmpty(bizOrderDtoList)) {
+//                for (BizOrderDto bizOrderDto : bizOrderDtoList) {
+//                    count = count + bizOrderDto.getAmount();
+//                    total = total + bizOrderDto.getAmount();
+//                    map4.put("createTime", bizOrderDto.getCreateTime());
+//                }
+//            }
+//            map4.put("count", count);
+//
+//            Map map5 = new HashMap();
+//            map5.put("RETARILER_ID", storeAgentDto.getStoreId());
+//            List<BizOrderInfoDto> bizOrderInfoDtoList = bizOrderInfoServiceClient.queryList(map5);
+//            if (CollectionUtils.isNotEmpty(bizOrderInfoDtoList)) {
+//                for (BizOrderInfoDto bizOrderInfoDto : bizOrderInfoDtoList) {
+//                    map4.put("materialId", bizOrderInfoDto.getMaterialId());
+//                    map4.put("maktx", bizOrderInfoDto.getMaktx());
+//                }
+//            }
+//            list.add(map4);
+        }
+
+        Map map1 = new HashMap();
+
+        Integer count = list.size();
+        if (list != null && list.size() > 1) {
+            Collections.sort(list, new Comparator<Map<String, Object>>() {
+                @Override
+                public int compare(Map<String, Object> o1, Map<String, Object> o2) {
+                    Integer o1Value = Integer.valueOf(o1.get("count").toString());
+                    Integer o2Value = Integer.valueOf(o2.get("count").toString());
+                    return o2Value.compareTo(o1Value);
+                }
+            });
+        }
+
+        if (bizStoreAgentDto.getSize() == null && bizStoreAgentDto.getPageSize() == null) {
+            bizStoreAgentDto.setSize(1);
+            bizStoreAgentDto.setPageSize(10);
+        }
+        Integer pageCount = 0;
+        if (count % bizStoreAgentDto.getPageSize() == 0) {
+            pageCount = count / bizStoreAgentDto.getPageSize();
+        } else {
+            pageCount = count / bizStoreAgentDto.getPageSize() + 1;
+        }
+        map1.put("pageCount", pageCount);
+        List list1 = PageUtil.startPage(list, bizStoreAgentDto.getSize(), bizStoreAgentDto.getPageSize());
+        map1.put("Data", list1);
+
+
+        map1.put("code:", "0");
+        map1.put("msg:", "success");
+        map1.put("count", total);
+        return map1;
+    }
+}

sailun-allsteel-app-rest/src/main/java/io/platform/app/web/query/AgentLongQuery.java

@@ -0,0 +1,54 @@
+package io.platform.app.web.query;
+
+import lombok.Data;
+
+@Data
+public class AgentLongQuery {
+    /**
+     * 封装了调用远程接口的参数
+     */
+    //客户编号
+    private String clientId;
+    //密码
+    private String password;
+    //验证码
+    private String authCode;
+    //登录后的用户信息
+    private String token;
+    //销售组织
+    private String vkorg;
+    //分销渠道
+    private String vtweg;
+    //产品组
+    private String spart;
+    //查询时间范围    0、三个月以内，1、一个月以内 2、一周以内，空着就是所有
+    private String dateinterval;
+    //订单状态：0、订单处理，1、订单确认，2、装运安排，3、货物运输，4、客户签收
+    private String orderstatus;
+    //订单编号
+    private String ordernumber;
+    //交货单号
+    private String deliverynumber;
+    //提交开始时间
+    private String startdate;
+    //提交结束时间
+    private String enddate;
+    //送货地址
+    private String destination;
+    //开始页数
+    private String page;
+    //每页数量
+    private String pagesize;
+    //装运凭证
+    private String shippingdoc;
+    //装运日期
+    private String shipdate;
+    //使用0。0、不需要更新信贷；1、需要更新信贷
+    private String type;
+    //品牌
+    private String brands;
+    //花纹
+    private String pattern;
+    //规格
+    private String specification;
+}

sailun-allsteel-app-rest/src/main/java/io/platform/app/web/query/CommonQuery.java

@@ -0,0 +1,16 @@
+package io.platform.app.web.query;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+
+@Data
+public class CommonQuery {
+
+    /**
+     * 门店Id
+     */
+    private Long storeId;
+}

sailun-allsteel-app-rest/src/main/java/io/platform/app/web/query/QueryAgentStock.java

@@ -0,0 +1,18 @@
+package io.platform.app.web.query;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class QueryAgentStock {
+    private String kunnr;
+    private String brand;
+    private String spec;
+    private String pattern;
+    private String starttime;
+    private String endtime;
+    private Long storeId;
+    private int page=1;
+    private int pagesize=5;
+}

sailun-allsteel-app-rest/src/main/java/io/platform/app/web/query/QueryAppAgentStock.java

@@ -0,0 +1,18 @@
+package io.platform.app.web.query;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class QueryAppAgentStock {
+    private String kunnr;
+    private String brand;
+    private String spec;
+    private String pattern;
+    private String starttime;
+    private String endtime;
+    private Long storeId;
+    private int page=1;
+    private int pagesize=5;
+}

sailun-allsteel-app-rest/src/main/java/io/platform/app/web/query/RewardQuery.java

@@ -0,0 +1,43 @@
+package io.platform.app.web.query;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+
+@Data
+public class RewardQuery {
+    /**
+     * 门店Id
+     */
+    private Long storeId;
+    /**
+     * 品牌cade
+     */
+    private String brandCode;
+
+    /**
+     * 开始日期
+     */
+    private String beginDate;
+
+    /**
+     * 结束日期
+     */
+    private String endDate;
+
+
+    /**
+     * 搜索条件
+     */
+    private String content;
+    /**
+     * 当前页
+     */
+    private Long current;
+    /**
+     * 页数
+     */
+    private Long size;
+
+}

sailun-allsteel-app-rest/src/main/java/io/platform/app/web/query/ScanRecordQuery.java

@@ -0,0 +1,46 @@
+package io.platform.app.web.query;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+
+@Data
+public class ScanRecordQuery {
+
+    /**
+     * 门店Id
+     */
+    private Long storeId;
+    /**
+     * 品牌cade
+     */
+    private String brandCode;
+
+    /**
+     * 开始日期
+     */
+    private String beginDate;
+    /**
+     * 结束日期
+     */
+    private String endDate;
+
+    /**
+     * 搜索条件
+     */
+    private String content;
+
+    /**
+     * 1入库2出库
+     */
+    private Integer scanType;
+    /**
+     * 当前页
+     */
+    private Long current;
+    /**
+     * 页数
+     */
+    private Long size;
+}

sailun-allsteel-app-rest/src/main/resources/application-dev.yml

@@ -25,4 +25,13 @@ spring:
 
 
 #门店扫码获取相应的物料信息
-storeScanGetTyreMsgUrl: http://b2bcnapi.sailuntire.com/api/test/b2bapi/action/api/scanCode.xhtml
+storeScanGetTyreMsgUrl: http://b2bcnapi.sailuntire.com/api/test/b2bapi/action/api/scanCode.xhtml
+##门店查询经销商库存
+#QueryAgentStock :  http://b2bcnapi.sailuntire.com/api/b2bapi/action/api/queryAgentStock.xhtml
+##获取经销商信息接口
+#clientBasicMsg: http://b2bcnapi.sailuntire.com/api/b2bapi/action/api/clientBasicMsg.xhtml
+#门店查询经销商库存
+QueryAgentStock :  http://b2bcnapi.sailuntire.com/api/test/b2bapi/action/api/queryAgentStockTBR.xhtml
+#获取经销商信息接口
+clientBasicMsg: http://b2bcnapi.sailuntire.com/api/test/b2bapi/action/api/clientBasicMsg.xhtml
+

sailun-allsteel-bus-provider/saillun-allsteel-bus-api/src/main/java/io/platform/homepage/dto/ConfigBannerDto.java

@@ -1,5 +1,6 @@
 package io.platform.homepage.dto;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 
 @Data
@@ -7,66 +8,80 @@ public class ConfigBannerDto  implements java.io.Serializable{
 private static final long serialVersionUID = 5454155825314635342L;
 
 
+/**
+ * mainId       db_column: MAIN_ID
+ */
+private Long mainId;
+/**
+ * banner名称描述       db_column: BANNER_NAME
+ */
+private String bannerName;
+/**
+ * 可见品牌       db_column: BRAND
+ */
+private String brand;
+/**
+ * 链接       db_column: PATH
+ */
+private String path;
+/**
+ * banner图片       db_column: IMG_PATH
+ */
+private String imgPath;
+/**
+ * 类型0静态图片，1活动，2新闻       db_column: TYPE
+ */
+private Long type;
+/**
+ * 排序       db_column: ORDER_INDEX
+ */
+private Long orderIndex;
+/**
+ * 备注       db_column: REMARK
+ */
+private String remark;
+/**
+ * 删除标记 0有效，1删除       db_column: FLAG_DEL
+ */
+private Long flagDel;
+/**
+ * 宽度       db_column: WIDTH
+ */
+private Long width;
+/**
+ * 高度       db_column: HEIGHT
+ */
+private Long height;
+/**
+ * 展示位置0门店       db_column: SHOW_POSITION
+ */
+private Long showPosition;
+/**
+ * 创建时间       db_column: CREATE_TIME
+ */
+private java.util.Date createTime;
+/**
+ * 修改时间       db_column: UPDATE_TIME
+ */
+private java.util.Date updateTime;
+/**
+ * 创建人       db_column: CREATE_BY
+ */
+private String createBy;
     /**
-     * mainId       db_column: MAIN_ID
+     * 区分APP:0门店APP1小程序2通商APP
      */
-    private Long mainId;
+    private int appType;
     /**
-     * banner名称描述       db_column: BANNER_NAME
+     * 标题
      */
-    private String bannerName;
+    private String msgTitle;
     /**
-     * 可见品牌       db_column: BRAND
+     * 0系统消息1门店消息2经销商消息3车主消息
      */
-    private String brandCode;
+    private int contentType;
     /**
-     * 链接       db_column: PATH
+     * 区分滚动图和跑马灯:0滚动图1跑马灯
      */
-    private String path;
-    /**
-     * banner图片       db_column: IMG_PATH
-     */
-    private String imgPath;
-    /**
-     * 类型0静态图片，1活动，2新闻       db_column: TYPE
-     */
-    private Long imgType;
-    /**
-     * 排序       db_column: ORDER_INDEX
-     */
-    private Long orderIndex;
-    /**
-     * 备注       db_column: REMARK
-     */
-    private String remark;
-    /**
-     * 删除标记 0有效，1删除       db_column: FLAG_DEL
-     */
-    private Long flagDel;
-    /**
-     * 宽度       db_column: WIDTH
-     */
-    private Long width;
-    /**
-     * 高度       db_column: HEIGHT
-     */
-    private Long height;
-    /**
-     * 展示位置0门店       db_column: SHOW_POSITION
-     */
-    private Long showPosition;
-    /**
-     * 创建时间       db_column: CREATE_TIME
-     */
-    private java.util.Date createTime;
-    /**
-     * 修改时间       db_column: UPDATE_TIME
-     */
-    private java.util.Date updateTime;
-    /**
-     * 创建人       db_column: CREATE_BY
-     */
-    private String createBy;
-    //columns END
-
+    private int modelType;
 }

sailun-allsteel-bus-provider/saillun-allsteel-bus-api/src/main/java/io/platform/homepage/service/client/api/ConfigBannerServiceClient.java

@@ -8,6 +8,7 @@ import io.platform.homepage.dto.ConfigBannerDto;
 import java.util.List;
 import java.util.Map;
 import io.platform.base.common.utils.ExecuteResult;
+import io.platform.store.dto.Zkotg901Dto;
 
 
 public interface ConfigBannerServiceClient{
@@ -51,9 +52,11 @@ public interface ConfigBannerServiceClient{
         List<ConfigBannerDto> getStoreBannerList(StoreBannerDTO storeBannerDTO);
 
         /**
-         * 获取品牌列表
-         * @return
+         * 通商APP-首页轮播图接口
          */
-        List<ConfigBannerDto> getBrandList();
-
+        List<ConfigBannerDto> selectAgentBanner(List<Zkotg901Dto> list);
+        /**
+         * 通商APP-首页跑马灯链接
+         */
+        List<ConfigBannerDto> selectAgentMessage(Integer contentType);
 }

sailun-allsteel-bus-provider/sailun-allsteel-bus-service/src/main/java/io/platform/homepage/biz/entity/ConfigBanner.java

@@ -109,6 +109,29 @@ public class ConfigBanner extends Model<ConfigBanner>  implements Serializable{
      */
     @TableField("CREATE_BY")
     private String createBy;
-//columns END
+
+    /**
+     * 区分APP:0门店APP1小程序2通商APP
+     */
+    @TableField("APP_TYPE")
+    private int appType;
+
+    /**
+     * 标题
+     */
+    @TableField("MSG_TITLE")
+    private String msgTitle;
+
+    /**
+     * 0系统消息1门店消息2经销商消息3车主消息
+     */
+    @TableField("CONTENT_TYPE")
+    private int contentType;
+
+    /**
+     * 区分滚动图和跑马灯:0滚动图1跑马灯
+     */
+    @TableField("MODEL_TYPE")
+    private int modelType;
 
 }

sailun-allsteel-bus-provider/sailun-allsteel-bus-service/src/main/java/io/platform/homepage/service/client/impl/ConfigBannerServiceClientImpl.java

@@ -8,23 +8,26 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.platform.base.common.BaseServiceClient;
 import io.platform.base.common.utils.ExecuteResult;
 
+import io.platform.base.common.utils.Query;
 import io.platform.base.dto.StoreBannerDTO;
 import io.platform.homepage.biz.entity.ConfigBanner;
+import io.platform.homepage.biz.mapper.ConfigBannerMapper;
 import io.platform.homepage.biz.service.ConfigBannerService;
 import io.platform.homepage.dto.ConfigBannerDto;
 import io.platform.homepage.service.client.api.ConfigBannerServiceClient;
 
+import io.platform.store.dto.Zkotg901Dto;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import org.springframework.beans.BeanUtils;
-import org.springframework.data.convert.EntityWriter;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
 import java.rmi.MarshalledObject;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -38,6 +41,8 @@ public class ConfigBannerServiceClientImpl extends BaseServiceClient<ConfigBanne
 
     @Resource
     private ConfigBannerService configBannerService;
+    @Resource
+    private ConfigBannerMapper configBannerMapper;
 
     @Override
     public ConfigBannerDto queryObject(Long id) {
@@ -165,6 +170,20 @@ public class ConfigBannerServiceClientImpl extends BaseServiceClient<ConfigBanne
         List<ConfigBannerDto> bannerDtoList = this.queryList(queryMap);
         return bannerDtoList;
     }
+    public List<ConfigBannerDto> selectAgentBanner(List<Zkotg901Dto> list) {
+        List<ConfigBanner> agentBannerList = new ArrayList<>();
+        for (Zkotg901Dto zkotg901Dto : list) {
+            List<ConfigBanner> bizBannerList =  configBannerService.list(new QueryWrapper<ConfigBanner>().eq("brand", zkotg901Dto.getEan11().toString()).eq("SHOW_POSITION", 2).eq("APP_TYPE",2).eq("MODEL_TYPE",0));
+            agentBannerList.addAll(bizBannerList);
+        }
+        return convertList(agentBannerList,ConfigBannerDto.class);
+    }
 
+    public List<ConfigBannerDto> selectAgentMessage(Integer contentType) {
+        QueryWrapper<ConfigBanner> condition = new QueryWrapper<>();
+        condition.eq("APP_TYPE",2).eq("CONTENT_TYPE",contentType).eq("MODEL_TYPE",1);
+        List<ConfigBanner> agentBannerList = configBannerMapper.selectList(condition);
+        return convertList(agentBannerList,ConfigBannerDto.class);
+    }
 
 }