商户功能开发

jeeplus-modules/jeeplus-test/src/main/java/com/jeeplus/test/wdt/merchantCompany/controller/MerchantCompanyController.java

@@ -9,9 +9,13 @@ import com.jeeplus.core.excel.EasyExcelUtils;
 import com.jeeplus.core.excel.ExcelOptions;
 import com.jeeplus.core.excel.annotation.ExportMode;
 import com.jeeplus.core.query.QueryWrapperGenerator;
+import com.jeeplus.sys.service.dto.UserDTO;
+import com.jeeplus.sys.utils.UserUtils;
 import com.jeeplus.test.utils.excel.MerchantCompanyEasyExcel;
 import com.jeeplus.test.wdt.merchantCompany.service.MerchantCompanyService;
 import com.jeeplus.test.wdt.merchantCompany.service.dto.MerchantCompanyDTO;
+import com.jeeplus.test.wdt.merchantCompany.service.dto.MerchantCompanyExportDTO;
+import com.jeeplus.test.wdt.merchantCompany.service.dto.SettledPlatformDTO;
 import com.jeeplus.test.wdt.merchantCompany.service.mapstuct.MerchantCompanyWrapper;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -71,7 +75,7 @@ public class MerchantCompanyController {
 
 
     /**
-     * 保存请假表单
+     * 保存商家基本信息
      */
     @ApiLog("保存商家基本信息")
     @ApiOperation(value = "保存商家基本信息")
@@ -122,6 +126,23 @@ public class MerchantCompanyController {
     public void importFileTemplate(HttpServletResponse response) throws IOException {
         String fileName = "入驻商家数据导入模板.xlsx";
         List<MerchantCompanyDTO> list = Lists.newArrayList();
+        MerchantCompanyDTO info = new MerchantCompanyDTO();
+        info.setCompanyName("测试公司名称");
+        info.setLinkmanName("测试联系人名称");
+        info.setLinkmanPhone("138xxxx8888");
+        info.setPractitionerCount(15);
+        info.setAnnualSales("100000");
+        info.setOnlineRetailSales("200000");
+        info.setSettledPlatformStr("淘宝,抖音(使用英文','隔开)");
+        SettledPlatformDTO settledPlatformDTO = new SettledPlatformDTO();
+        settledPlatformDTO.setName("抖音");
+        SettledPlatformDTO settledPlatformDTO1 = new SettledPlatformDTO();
+        settledPlatformDTO1.setName("淘宝");
+        List<SettledPlatformDTO> settledPlatformDTOList = Lists.newArrayList();
+        settledPlatformDTOList.add(settledPlatformDTO);
+        settledPlatformDTOList.add(settledPlatformDTO1);
+        info.setSettledPlatformDTOList(settledPlatformDTOList);
+        list.add (info);
         EasyExcelUtils.newInstance ( merchantCompanyService, merchantCompanyWrapper ).exportExcel ( list,  "入驻商家数据", MerchantCompanyDTO.class, fileName, null, response );
     }
 
@@ -152,7 +173,19 @@ public class MerchantCompanyController {
             page.setCurrent(0);
             result = merchantCompanyService.findPage(page, merchantCompanyDTO).getRecords();
         }
-        EasyExcelUtils.newInstance ( merchantCompanyService, merchantCompanyWrapper ).exportExcel ( result,  options.getSheetName ( ), MerchantCompanyDTO.class, fileName,options.getExportFields (), response );
+        EasyExcelUtils.newInstance ( merchantCompanyService, merchantCompanyWrapper ).exportExcel ( result,  options.getSheetName ( ), MerchantCompanyExportDTO.class, fileName,options.getExportFields (), response );
+    }
+
+
+    /**
+     * 入驻商家列表数据(大屏数据)
+     */
+    @ApiLog("查询入驻商家列表数据(大屏数据)")
+    @ApiOperation(value = "查询入驻商家列表数据(大屏数据)")
+    @GetMapping("getListJson")
+    public List<MerchantCompanyDTO> getListJson(MerchantCompanyDTO merchantCompanyDTO) throws Exception {
+        List<MerchantCompanyDTO> result = merchantCompanyService.getListJson (merchantCompanyDTO);
+        return result;
     }
 
 }

jeeplus-modules/jeeplus-test/src/main/java/com/jeeplus/test/wdt/merchantCompany/controller/MerchantDetailsController.java

@@ -0,0 +1,88 @@
+package com.jeeplus.test.wdt.merchantCompany.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.google.common.collect.Lists;
+import com.jeeplus.aop.logging.annotation.ApiLog;
+import com.jeeplus.core.excel.EasyExcelUtils;
+import com.jeeplus.core.excel.ExcelOptions;
+import com.jeeplus.core.excel.annotation.ExportMode;
+import com.jeeplus.core.query.QueryWrapperGenerator;
+import com.jeeplus.test.utils.excel.MerchantCompanyEasyExcel;
+import com.jeeplus.test.wdt.merchantCompany.service.MerchantCompanyService;
+import com.jeeplus.test.wdt.merchantCompany.service.MerchantDetailsService;
+import com.jeeplus.test.wdt.merchantCompany.service.dto.MerchantCompanyDTO;
+import com.jeeplus.test.wdt.merchantCompany.service.dto.MerchantCompanyExportDTO;
+import com.jeeplus.test.wdt.merchantCompany.service.dto.MerchantDetailsDTO;
+import com.jeeplus.test.wdt.merchantCompany.service.dto.SettledPlatformDTO;
+import com.jeeplus.test.wdt.merchantCompany.service.mapstuct.MerchantCompanyWrapper;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
+import java.util.stream.Collectors;
+
+
+/**
+ * 入驻详情controller
+ * @author: 徐滕
+ * @version: 2024-01-04 10:40
+ */
+
+@Api("入驻详情管理")
+@RestController
+@RequestMapping(value = "/wdt/merchantDetails")
+public class MerchantDetailsController {
+    @Autowired
+    private MerchantDetailsService merchantDetailsService;
+
+
+    /**
+     * 根据Id获取商家基本信息
+     */
+    @ApiLog("获取入驻详情信息")
+    @ApiOperation(value = "获取入驻详情信息")
+    @GetMapping("getLimit1")
+    public ResponseEntity<MerchantDetailsDTO> getLimit1() {
+        MerchantDetailsDTO byId = merchantDetailsService.getLimit1();
+        return ResponseEntity.ok ( byId);
+    }
+
+
+
+    /**
+     * 保存入驻详情信息
+     */
+    @ApiLog("保存入驻详情信息")
+    @ApiOperation(value = "保存入驻详情信息")
+    @PostMapping("save")
+    public  ResponseEntity <String> save(@Valid @RequestBody MerchantDetailsDTO merchantDetailsDTO) {
+        //新增或编辑表单保存
+        merchantDetailsService.saveOrUpdate (merchantDetailsDTO);
+        return ResponseEntity.ok ( "保存入驻详情信息成功" );
+    }
+
+    /**
+     * 保存入驻详情信息获取方式
+     */
+    @ApiLog("保存入驻详情信息获取方式")
+    @ApiOperation(value = "保存入驻详情信息获取方式")
+    @PostMapping("saveDataSources")
+    public  ResponseEntity <String> saveDataSources(String dataSources) {
+        //新增或编辑表单保存
+        merchantDetailsService.saveDataSources (dataSources);
+        return ResponseEntity.ok ( "保存入驻详情信息获取方式成功" );
+    }
+
+
+
+}

jeeplus-modules/jeeplus-test/src/main/java/com/jeeplus/test/wdt/merchantCompany/domain/MerchantDetails.java

@@ -0,0 +1,44 @@
+package com.jeeplus.test.wdt.merchantCompany.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.jeeplus.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+
+/**
+ * 入驻商家表
+ * @author: 徐滕
+ * @version: 2024-01-04 10:41
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("merchant_details_info")
+public class MerchantDetails extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 入驻企业数
+     */
+    private Integer settledEnterpriseNumber;
+
+    /**
+     * 电商从业人员
+     */
+    private Integer practitionerCount;
+
+    /**
+     * 年销售额
+     */
+    private String annualSales;
+
+    /**
+     * 网络零售额
+     */
+    private String onlineRetailSales;
+
+    /**
+     * 抖音入驻商家数
+     */
+    private String enterNumber;
+}

jeeplus-modules/jeeplus-test/src/main/java/com/jeeplus/test/wdt/merchantCompany/mapper/MerchantCompanyMapper.java

@@ -9,6 +9,8 @@ import com.jeeplus.test.wdt.merchantCompany.domain.MerchantCompany;
 import com.jeeplus.test.wdt.merchantCompany.service.dto.MerchantCompanyDTO;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * 入驻商家mapper
  * @author: 徐滕
@@ -40,6 +42,15 @@ public interface MerchantCompanyMapper extends BaseMapper<MerchantCompany> {
      */
     IPage<MerchantCompanyDTO> findList(Page<MerchantCompanyDTO> page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper);
 
+
+    /**
+     * 获取入驻商家表单列表
+     *
+     * @param queryWrapper
+     * @return
+     */
+    List<MerchantCompanyDTO> getListJson(@Param(Constants.WRAPPER) QueryWrapper queryWrapper);
+
     /**
      * 根据商户id删除入驻平台信息
      * @param id

jeeplus-modules/jeeplus-test/src/main/java/com/jeeplus/test/wdt/merchantCompany/mapper/MerchantDetailsMapper.java

@@ -0,0 +1,21 @@
+package com.jeeplus.test.wdt.merchantCompany.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.jeeplus.test.wdt.merchantCompany.domain.MerchantDetails;
+import com.jeeplus.test.wdt.merchantCompany.service.dto.MerchantDetailsDTO;
+
+/**
+ * 入驻详情mapper
+ * @author: 徐滕
+ * @version: 2024-01-04 10:59
+ */
+public interface MerchantDetailsMapper extends BaseMapper<MerchantDetails> {
+
+
+    /**
+     * 根据id获取入驻商家信息
+     * @param
+     * @return
+     */
+    MerchantDetailsDTO getLimit1();
+}

jeeplus-modules/jeeplus-test/src/main/java/com/jeeplus/test/wdt/merchantCompany/mapper/xml/MerchantCommanyMapper.xml

@@ -18,7 +18,7 @@
     </resultMap>
 
     <sql id="merchantCompanyColumns">
-		a.id AS "id",
+		distinct a.id AS "id",
 		a.create_by_id AS "createBy.id",
 		a.create_time AS "createTime",
 		a.update_by_id AS "updateBy.id",
@@ -63,6 +63,19 @@
     <select id="findList" resultType="com.jeeplus.test.wdt.merchantCompany.service.dto.MerchantCompanyDTO">
         SELECT
         <include refid="merchantCompanyColumns"/>
+        ,(select group_concat(msp.name) from merchant_settled_platform msp
+        LEFT JOIN merchant_company_occupancy_relation_info mcori ON msp.id = mcori.occupancy_id where mcori.company_id = a.id
+        ) as "settledPlatformStr"
+        FROM merchant_company_info a
+        <include refid="merchantCompanyJoins"/>
+        left join merchant_company_occupancy_relation_info mcori on mcori.company_id = a.id
+        left join merchant_settled_platform msp on msp.id = mcori.occupancy_id
+        ${ew.customSqlSegment}
+    </select>
+
+    <select id="getListJson" resultType="com.jeeplus.test.wdt.merchantCompany.service.dto.MerchantCompanyDTO">
+        SELECT
+        <include refid="merchantCompanyColumns"/>
         FROM merchant_company_info a
         <include refid="merchantCompanyJoins"/>
         ${ew.customSqlSegment}

jeeplus-modules/jeeplus-test/src/main/java/com/jeeplus/test/wdt/merchantCompany/mapper/xml/MerchantDetailsMapper.xml

@@ -0,0 +1,34 @@
+<?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.jeeplus.test.wdt.merchantCompany.mapper.MerchantDetailsMapper">
+
+
+    <sql id="merchantCompanyColumns">
+		distinct a.id AS "id",
+		a.create_by_id AS "createBy.id",
+		a.create_time AS "createTime",
+		a.update_by_id AS "updateBy.id",
+		a.update_time AS "updateTime",
+		a.del_flag AS "delFlag",
+		a.remarks AS "remarks",
+        a.settled_enterprise_number as "settledEnterpriseNumber",
+        a.practitioner_count AS "practitionerCount",
+        a.annual_sales AS "annualSales",
+        a.online_retail_sales AS "onlineRetailSales",
+        a.enter_number as "enterNumber"
+	</sql>
+
+    <sql id="merchantCompanyJoins">
+		LEFT JOIN sys_user user ON user.id = a.create_by_id
+	</sql>
+
+    <select id="getLimit1" resultType="com.jeeplus.test.wdt.merchantCompany.service.dto.MerchantDetailsDTO">
+        SELECT
+        <include refid="merchantCompanyColumns"/>
+        FROM merchant_details_info a
+        <include refid="merchantCompanyJoins"/>
+        order by a.update_time desc
+        limit 1
+    </select>
+
+</mapper>

jeeplus-modules/jeeplus-test/src/main/java/com/jeeplus/test/wdt/merchantCompany/service/MerchantCompanyService.java

@@ -15,6 +15,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.apache.commons.lang3.StringUtils;
 
+import java.util.List;
+
 /**
  * 入驻商家service
  * @author: 徐滕
@@ -68,8 +70,57 @@ public class MerchantCompanyService extends ServiceImpl<MerchantCompanyMapper, M
                 queryWrapper.between("a.create_time", merchantCompanyDTO.getDates()[0], merchantCompanyDTO.getDates()[1]);
             }
         }
+        if(StringUtils.isNotBlank(merchantCompanyDTO.getSettledPlatformId())){
+            queryWrapper.like("mcori.occupancy_id",merchantCompanyDTO.getSettledPlatformId());
+        }
         return  baseMapper.findList (page, queryWrapper);
     }
+    /**
+     * 自定义分页检索
+     * @param page
+     * @param merchantCompanyDTO
+     * @return
+     */
+    public List<MerchantCompanyDTO> getListJson(MerchantCompanyDTO merchantCompanyDTO) throws Exception {
+        QueryWrapper<MerchantCompany> queryWrapper = QueryWrapperGenerator.buildQueryCondition ( MerchantCompanyWrapper.INSTANCE.toEntity(merchantCompanyDTO), MerchantCompany.class );
+
+        queryWrapper.eq ("a.del_flag", 0 ); // 排除已经删除
+        queryWrapper.orderByDesc("a.update_time");
+        if(StringUtils.isNotBlank(merchantCompanyDTO.getCompanyName())){
+            queryWrapper.like("a.company_name",merchantCompanyDTO.getCompanyName());
+        }
+        if(StringUtils.isNotBlank(merchantCompanyDTO.getLinkmanName())){
+            queryWrapper.like("a.linkman_name",merchantCompanyDTO.getLinkmanName());
+        }
+        if(StringUtils.isNotBlank(merchantCompanyDTO.getLinkmanPhone())){
+            queryWrapper.like("a.linkman_phone",merchantCompanyDTO.getLinkmanPhone());
+        }
+        if (merchantCompanyDTO.getAnnualSalesList() != null && merchantCompanyDTO.getAnnualSalesList().length > 0) {
+            if(merchantCompanyDTO.getAnnualSalesList().length == 1){
+                queryWrapper.ge("a.annual_sales",merchantCompanyDTO.getAnnualSalesList()[0]);
+            }else{
+                queryWrapper.between("a.annual_sales", merchantCompanyDTO.getAnnualSalesList()[0], merchantCompanyDTO.getAnnualSalesList()[1]);
+            }
+        }
+        if (merchantCompanyDTO.getOnlineRetailSalesList() != null && merchantCompanyDTO.getOnlineRetailSalesList().length > 0) {
+            if(merchantCompanyDTO.getOnlineRetailSalesList().length == 1){
+                queryWrapper.ge("a.online_retail_sales",merchantCompanyDTO.getOnlineRetailSalesList()[0]);
+            }else {
+                queryWrapper.between("a.online_retail_sales", merchantCompanyDTO.getOnlineRetailSalesList()[0], merchantCompanyDTO.getOnlineRetailSalesList()[1]);
+            }
+        }
+        if (merchantCompanyDTO.getDates() != null && merchantCompanyDTO.getDates().length > 0) {
+            if(merchantCompanyDTO.getDates().length == 1){
+                queryWrapper.ge("a.create_time",merchantCompanyDTO.getDates()[0]);
+            }else {
+                queryWrapper.between("a.create_time", merchantCompanyDTO.getDates()[0], merchantCompanyDTO.getDates()[1]);
+            }
+        }
+        if(StringUtils.isNotBlank(merchantCompanyDTO.getSettledPlatformId())){
+            queryWrapper.like("mcori.occupancy_id",merchantCompanyDTO.getSettledPlatformId());
+        }
+        return  baseMapper.getListJson (queryWrapper);
+    }
 
 
     /**

jeeplus-modules/jeeplus-test/src/main/java/com/jeeplus/test/wdt/merchantCompany/service/MerchantDetailsService.java

@@ -0,0 +1,95 @@
+package com.jeeplus.test.wdt.merchantCompany.service;
+
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jeeplus.common.redis.RedisUtils;
+import com.jeeplus.sys.constant.CacheNames;
+import com.jeeplus.sys.domain.DictValue;
+import com.jeeplus.sys.service.DictTypeService;
+import com.jeeplus.sys.service.dto.DictValueDTO;
+import com.jeeplus.sys.service.mapstruct.DictValueWrapper;
+import com.jeeplus.sys.utils.DictUtils;
+import com.jeeplus.test.wdt.merchantCompany.domain.MerchantDetails;
+import com.jeeplus.test.wdt.merchantCompany.mapper.MerchantDetailsMapper;
+import com.jeeplus.test.wdt.merchantCompany.service.dto.MerchantDetailsDTO;
+import com.jeeplus.test.wdt.merchantCompany.service.mapstuct.MerchantDetailsWrapper;
+import org.checkerframework.checker.units.qual.A;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+/**
+ * 入驻详情service
+ * @author: 徐滕
+ * @version: 2024-01-04 10:56
+ */
+@Service
+@Transactional
+public class MerchantDetailsService extends ServiceImpl<MerchantDetailsMapper, MerchantDetails> {
+
+    @Autowired
+    private MerchantDetailsWrapper merchantDetailsWrapper;
+
+    @Autowired
+    private DictValueWrapper dictValueWrapper;
+
+    @Autowired
+    private DictTypeService dictTypeService;
+
+
+    /**
+     * 查询详情
+     * @return
+     */
+    public MerchantDetailsDTO getLimit1() {
+        MerchantDetailsDTO limit1 = baseMapper.getLimit1();
+        //查询字典中数据获取方式并修改
+        List<DictValueDTO> merchantDataSourcesList = DictUtils.getDictDTOList("merchant_data_sources");
+        if(merchantDataSourcesList.size()>0){
+            for (DictValueDTO dictValueDTO : merchantDataSourcesList) {
+                if("result".equals(dictValueDTO.getLabel())){
+                    if(null != limit1){
+                        limit1.setDataSourcesType(dictValueDTO.getValue());
+                    }
+                }
+            }
+        }
+        return limit1;
+    }
+
+
+    /**
+     * 保存或者更新详情信息
+     *
+     * @param merchantDetailsDTO
+     */
+    public void saveOrUpdate(MerchantDetailsDTO merchantDetailsDTO) {
+        MerchantDetails merchantDetails = merchantDetailsWrapper.toEntity ( merchantDetailsDTO );
+        super.saveOrUpdate ( merchantDetails );
+    }
+
+    /**
+     * 保存或者更新详情信息
+     *
+     * @param dataSources
+     */
+    public void saveDataSources(String dataSources) {
+
+        Integer redisLoginNumber = (Integer) RedisUtils.getInstance ().get ( CacheNames.MERCHANTDETAILS );
+
+        //查询字典中数据获取方式并修改
+        List<DictValueDTO> merchantDataSourcesList = DictUtils.getDictDTOList("merchant_data_sources");
+        if(merchantDataSourcesList.size()>0){
+            for (DictValueDTO dictValueDTO : merchantDataSourcesList) {
+                if("result".equals(dictValueDTO.getLabel())){
+                    dictValueDTO.setValue(dataSources);
+                    DictValue dictValue = dictValueWrapper.toEntity ( dictValueDTO );
+                    dictTypeService.saveDictValue(dictValue);
+                }
+            }
+        }
+    }
+
+}

jeeplus-modules/jeeplus-test/src/main/java/com/jeeplus/test/wdt/merchantCompany/service/dto/MerchantCompanyDTO.java

@@ -2,6 +2,7 @@ package com.jeeplus.test.wdt.merchantCompany.service.dto;
 
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.google.common.collect.Lists;
 import com.jeeplus.core.query.Query;
@@ -24,6 +25,7 @@ import java.util.stream.Collectors;
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
+@ColumnWidth(20)
 public class MerchantCompanyDTO extends BaseDTO {
 
     private static final long serialVersionUID = 1L;
@@ -64,6 +66,13 @@ public class MerchantCompanyDTO extends BaseDTO {
     @ExcelProperty("网络零售额")
     private String onlineRetailSales;
 
+    /**
+     * 入驻平台
+     */
+    @ExcelIgnore
+    @ExcelProperty("入驻平台")
+    private String settledPlatformStr;
+
 
     /**
      * 年销售额区间
@@ -84,6 +93,12 @@ public class MerchantCompanyDTO extends BaseDTO {
     private String[] dates;
 
     /**
+     * 入驻平台id
+     */
+    @ExcelIgnore
+    private String settledPlatformId;
+
+    /**
      * 入驻平台
      */
     @ExcelIgnore

jeeplus-modules/jeeplus-test/src/main/java/com/jeeplus/test/wdt/merchantCompany/service/dto/MerchantCompanyExportDTO.java

@@ -0,0 +1,134 @@
+package com.jeeplus.test.wdt.merchantCompany.service.dto;
+
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.google.common.collect.Lists;
+import com.jeeplus.core.query.Query;
+import com.jeeplus.core.query.QueryType;
+import com.jeeplus.core.service.dto.BaseDTO;
+import com.jeeplus.test.core.excel.converter.ExcelSettledPlatformListDTOConverter;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+
+/**
+ * 入驻商家表
+ * @author: 徐滕
+ * @version: 2024-01-04 10:42
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@ColumnWidth(20)
+public class MerchantCompanyExportDTO extends BaseDTO {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 公司名称
+     */
+    @ExcelProperty("公司名称")
+    private String companyName;
+
+    /**
+     * 联系人名称
+     */
+    @ExcelProperty("联系人名称")
+    private String linkmanName;
+
+    /**
+     * 联系人电话
+     */
+    @ExcelProperty("联系人电话")
+    private String linkmanPhone;
+
+    /**
+     * 从业人员
+     */
+    @ExcelProperty("从业人员")
+    private Integer practitionerCount;
+
+    /**
+     * 年销售额
+     */
+    @ExcelProperty("年销售额")
+    private String annualSales;
+
+    /**
+     * 网络零售额
+     */
+    @ExcelProperty("网络零售额")
+    private String onlineRetailSales;
+
+    /**
+     * 入驻平台
+     */
+    @ExcelProperty("入驻平台")
+    private String settledPlatformStr;
+
+
+    /**
+     * 年销售额区间
+     */
+    @ExcelIgnore
+    private String[] annualSalesList;
+
+    /**
+     * 网络零售额区间
+     */
+    @ExcelIgnore
+    private String[] onlineRetailSalesList;
+
+    /**
+     * 创建时间区间
+     */
+    @ExcelIgnore
+    private String[] dates;
+
+    /**
+     * 入驻平台
+     */
+    @ExcelIgnore
+    @Query(type = QueryType.EQ, javaField = "settledPlatformDTO.id", tableColumn = "msp.id")
+    private SettledPlatformDTO settledPlatformDTO;
+
+    /**
+     * 入驻平台列表
+     */
+    @ApiModelProperty(hidden = true)
+    @JsonIgnore
+    @ExcelProperty(value = "入驻平台", converter = ExcelSettledPlatformListDTOConverter.class)
+    private List<SettledPlatformDTO> settledPlatformDTOList = Lists.newArrayList ( );
+
+
+
+    /**
+     * 获取包含的入驻平台id列表
+     *
+     * @return
+     */
+    public List <String> getSettledPlatformIdList() {
+        if ( settledPlatformDTOList == null ) {
+            return Lists.newArrayList ( );
+        }
+        List <String> settledPlatformIdList = settledPlatformDTOList.stream ( ).map ( settledPlatformDTO -> settledPlatformDTO.getId ( ) ).collect ( Collectors.toList ( ) );
+        return settledPlatformIdList;
+    }
+
+    /**
+     * 设置入驻平台
+     *
+     * @param settledPlatformIdList
+     */
+    public void setSettledPlatformIdList(List <String> settledPlatformIdList) {
+        for (String settledPlatformId : settledPlatformIdList) {
+            SettledPlatformDTO postDTO = new SettledPlatformDTO ( settledPlatformId );
+            settledPlatformDTOList.add ( postDTO );
+        }
+    }
+}

jeeplus-modules/jeeplus-test/src/main/java/com/jeeplus/test/wdt/merchantCompany/service/dto/MerchantDetailsDTO.java

@@ -0,0 +1,61 @@
+package com.jeeplus.test.wdt.merchantCompany.service.dto;
+
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.google.common.collect.Lists;
+import com.jeeplus.core.query.Query;
+import com.jeeplus.core.query.QueryType;
+import com.jeeplus.core.service.dto.BaseDTO;
+import com.jeeplus.test.core.excel.converter.ExcelSettledPlatformListDTOConverter;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+
+/**
+ * 入驻商家表
+ * @author: 徐滕
+ * @version: 2024-01-04 10:42
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@ColumnWidth(20)
+public class MerchantDetailsDTO extends BaseDTO {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 入驻企业数
+     */
+    private Integer settledEnterpriseNumber;
+
+    /**
+     * 电商从业人员
+     */
+    private Integer practitionerCount;
+
+    /**
+     * 年销售额
+     */
+    private String annualSales;
+
+    /**
+     * 网络零售额
+     */
+    private String onlineRetailSales;
+
+    /**
+     * 抖音入驻商家数
+     */
+    private String enterNumber;
+
+    /**
+     * 开关数据获取类型
+     */
+    private String dataSourcesType;
+}

jeeplus-modules/jeeplus-test/src/main/java/com/jeeplus/test/wdt/merchantCompany/service/mapstuct/MerchantDetailsWrapper.java

@@ -0,0 +1,33 @@
+package com.jeeplus.test.wdt.merchantCompany.service.mapstuct;
+
+import com.jeeplus.core.mapstruct.TreeWrapper;
+import com.jeeplus.test.wdt.merchantCompany.domain.MerchantCompany;
+import com.jeeplus.test.wdt.merchantCompany.domain.MerchantDetails;
+import com.jeeplus.test.wdt.merchantCompany.service.dto.MerchantCompanyDTO;
+import com.jeeplus.test.wdt.merchantCompany.service.dto.MerchantDetailsDTO;
+import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
+import org.mapstruct.Mappings;
+import org.mapstruct.ReportingPolicy;
+import org.mapstruct.factory.Mappers;
+
+/**
+ * 入驻详情MAPPER接口
+ * @author 刘高峰
+ * @version 2024-01-04 10:42
+ */
+@Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE, uses = {} )
+public interface MerchantDetailsWrapper extends TreeWrapper<MerchantDetailsDTO, MerchantDetails> {
+
+    MerchantDetailsWrapper INSTANCE = Mappers.getMapper(MerchantDetailsWrapper.class);
+    @Mappings({
+            @Mapping(source = "createBy.id", target = "createById"),
+            @Mapping (source = "updateBy.id", target = "updateById")})
+    MerchantDetails toEntity(MerchantDetailsDTO dto);
+
+
+    @Mappings({
+            @Mapping (source = "createById", target = "createBy.id"),
+            @Mapping (source = "updateById", target = "updateBy.id")})
+    MerchantDetailsDTO toDTO(MerchantDetails entity);
+}

jeeplus-platform/jeeplus-admin/src/main/java/com/jeeplus/sys/constant/CacheNames.java

@@ -41,4 +41,6 @@ public interface CacheNames {
 
     String USER_CACHE_ONLINE_USERS = "user:cache:online:users";
 
+    String MERCHANTDETAILS = "merchant:details";    //大屏数据获取位置
+
 }

jeeplus-platform/jeeplus-admin/src/main/java/com/jeeplus/sys/controller/MenuController.java

@@ -67,6 +67,7 @@ public class MenuController {
     @PreAuthorize("hasAnyAuthority('sys:menu:add','sys:menu:edit')")
     @PostMapping("save")
     public ResponseEntity save(@Valid @RequestBody MenuDTO menuDTO) {
+        System.out.println(menuDTO);
         if ( !UserUtils.getCurrentUserDTO ( ).isAdmin ( ) ) {
             return ResponseEntity.badRequest ( ).body ( "越权操作，只有超级管理员才能添加或修改数据！" );
         }

jeeplus-web/src/main/resources/application-production.yml

@@ -50,7 +50,7 @@ spring:
         master:
           username: root
           password: root
-          url: jdbc:mysql://127.0.0.1:3306/jeeplus-vue-saas-v3?useUnicode=true&characterEncoding=utf-8&useSSL=false&nullCatalogMeansCurrent=true&serverTimezone=GMT%2B8
+          url: jdbc:mysql://192.168.2.131:3306/wdt_erp_process?useUnicode=true&characterEncoding=utf-8&useSSL=false&nullCatalogMeansCurrent=true&serverTimezone=GMT%2B8
           driver-class-name: com.mysql.cj.jdbc.Driver
 
           #oracle database settings
@@ -159,7 +159,7 @@ wps:
   downloadCallbackPath: /usr/local/wps
   webctx: /jeeplus-vue
 #演示模式
-demoMode: true
+demoMode: false
 #oss配置
 config:
   accessory:

jeeplus-web/src/main/resources/application.yml

@@ -1,6 +1,7 @@
 spring:
   profiles:
     active: development
+    #active: production
 ##############################################
 #
 # thymeleaf静态资源配置