计算销售报表-增加计算字段 调整本年销量，本年销售金额,本年毛利额,本年毛利额

lidee-admin/src/main/resources/application-prod.yaml

@@ -30,7 +30,7 @@ spring:
         erp_bi_data: # 报表平台 mysql
           url: jdbc:mysql://127.0.0.1:3306/erp_bi_data?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
           username: root
-          password: root
+          password: gryy@8888
   redis:
     host: 127.0.0.1 # 地址
     port: 6379 # 端口

lidee-admin/src/main/resources/application.yaml

@@ -2,8 +2,8 @@ spring:
   application:
     name: lideeyunji-server
   profiles:
-    active: local # 读取配置
-#    active: prod # 读取配置
+#    active: local # 读取配置
+    active: prod # 读取配置
   main:
     allow-circular-references: true # 允许循环依赖，因为项目是三层架构，无法避免这个情况。
 

lidee-core/src/main/java/com/lideeyunji/core/framework/config/job/GenerateSalesReportJob.java

@@ -0,0 +1,34 @@
+package com.lideeyunji.core.framework.config.job;
+
+import com.lideeyunji.core.framework.service.IGrBiSaAggService;
+import com.lideeyunji.tool.framework.common.constant.lideeYunJiBaseConstant;
+import com.lideeyunji.tool.framework.quartz.core.handler.JobHandler;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+
+/**
+ * 计算销售报表
+ * erp_bi_data.GR_BI_PUB_GOODS
+ * erp_bi_data.GR_BI_PUB_SALEZONE
+ * erp_bi_data.GR_BI_PUB_PROVINCE
+ * erp_bi_data.GR_BI_PUB_SALETYPE
+ * erp_bi_data.GR_BI_PUB_DOSAGE
+ * erp_bi_data.GR_BI_PUB_CUSTOM
+ * erp_bi_data.GR_BI_PUB_SALER
+ * --> mysql erp_bi_data.yunji_gr_bi_sa_agg
+ */
+@Slf4j
+@Component("generateSalesReportJob")
+public class GenerateSalesReportJob implements JobHandler {
+
+    @Resource
+    private IGrBiSaAggService grBiSaAggService;
+    public String execute(String param) {
+        log.info("*********** 开始生成销售报表 ************");
+        grBiSaAggService.generateSalesReportJob(lideeYunJiBaseConstant.DS_ERP_BI_DATA);
+        log.info("*********** 生成销售报表完成 ************");
+        return "*********** 生成销售报表完成 ************";
+    }
+}

lidee-core/src/main/java/com/lideeyunji/core/framework/entity/GrBiSaAgg.java

@@ -0,0 +1,142 @@
+package com.lideeyunji.core.framework.entity;
+
+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 lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@TableName("yunji_gr_bi_sa_agg")
+@Data
+@EqualsAndHashCode
+public class GrBiSaAgg implements Serializable {
+    private final static long serialVersionUID = 1L;
+
+    @TableId(value = "ID", type = IdType.INPUT)
+    private Integer id;
+
+    @TableField(value = "USEYEAR")
+    private Integer useYear;
+
+    @TableField(value = "USEMONTH")
+    private Integer useMonth;
+
+    @TableField(value = "ZONEID")
+    private String zoneId;
+
+    @TableField(value = "ZONENAME")
+    private String zoneName;
+
+    @TableField(value = "SALETYPEID")
+    private String saleTypeId;
+
+    @TableField(value = "SALETYPENAME")
+    private String saleTypeName;
+
+    @TableField(value = "CUSTOMID")
+    private String customId;
+
+    @TableField(value = "CUSTOMNAME")
+    private String customName;
+
+    @TableField(value = "DOSAGEID")
+    private String dosageId;
+
+    @TableField(value = "DOSAGENAME")
+    private String dosageName;
+
+    @TableField(value = "GOODSNAME")
+    private String goodsName;
+
+    @TableField(value = "GOODSID")
+    private String goodsId;
+
+    @TableField(value = "PROVINCEID")
+    private String provinceId;
+
+    @TableField(value = "PROVINCENAME")
+    private String provinceName;
+
+    @TableField(value = "SALERID")
+    private String salerId;
+
+    @TableField(value = "SALERNAME")
+    private String salerName;
+
+    @TableField(value = "MONTHSAQTY")
+    private String monthSaqty;
+
+    @TableField(value = "THISSAQTY")
+    private String thisSaqty;
+
+    @TableField(value = "LASTSAQTY")
+    private String lastSaqty;
+
+    @TableField(value = "MONTHSAMONEY")
+    private String monthSaMoney;
+
+    @TableField(value = "THISSAMONEY")
+    private String thisSaMoney;
+
+    @TableField(value = "LASTSAMONEY")
+    private String lastSaMoney;
+
+    @TableField(value = "MONTHPROFIT")
+    private String monthProfit;
+
+    @TableField(value = "THISPROFIT")
+    private String thisProfit;
+
+    @TableField(value = "LASTPROFIT")
+    private String lastProfit;
+
+    @TableField(value = "MONTHCOST")
+    private String monthCost;
+
+    @TableField(value = "THISCOST")
+    private String thisCost;
+
+    @TableField(value = "LASTCOST")
+    private String lastCost;
+
+    @TableField(value = "MONTHPROFITRATE")
+    private String monthProfitRate;
+
+    @TableField(value = "THISPROFITRATE")
+    private String thisProfitRate;
+
+    @TableField(value = "LASTPROFITRATE")
+    private String lastProfitRate;
+
+    @TableField(value = "MONTHSAMONEYSHARE")
+    private String monthSaMoneyShare;
+
+    @TableField(value = "THISSAMONEYSHARE")
+    private String thisSaMoneyShare;
+
+    @TableField(value = "LASTSAMONEYSHARE")
+    private String lastSaMoneyShare;
+
+    @TableField(value = "MONTHPROFITSHARE")
+    private String monthProfitShare;
+
+    @TableField(value = "THISPROFITSHARE")
+    private String thisProfitShare;
+
+    @TableField(value = "LASTPROFITSHARE")
+    private String lastProfitShare;
+
+    @TableField(value = "SAMONEYGROWTH")
+    private String saMoneyGrowth;
+
+    @TableField(value = "PROFITGROWTH")
+    private String profitGrowth;
+
+    @TableField(value = "PROFITCHANGE")
+    private String profitChange;
+
+}

lidee-core/src/main/java/com/lideeyunji/core/framework/mapper/GrBiSaAggMapper.java

@@ -0,0 +1,31 @@
+package com.lideeyunji.core.framework.mapper;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.lideeyunji.core.framework.entity.GrBiSaAgg;
+import com.lideeyunji.tool.framework.common.constant.lideeYunJiBaseConstant;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+
+@DS(lideeYunJiBaseConstant.DS_ERP_BI_DATA)
+public interface GrBiSaAggMapper extends BaseMapper<GrBiSaAgg> {
+
+
+    List<GrBiSaAgg> generateSalesReport(@Param("pastYearMonth") Integer pastYearMonth,
+                                        @Param("currentYearMonth") Integer currentYearMonth);
+
+    int deleteSalesReport(@Param("pastYearMonth") Integer pastYearMonth,
+                          @Param("currentYearMonth") Integer currentYearMonth);
+
+    void updateThisData();
+
+    void updateLastData();
+
+    void updateComplexCalculate1();
+    void updateComplexCalculate2();
+    void updateComplexCalculate3();
+    void updateComplexCalculate4();
+    void updateComplexCalculate5();
+}

lidee-core/src/main/java/com/lideeyunji/core/framework/service/IGrBiSaAggService.java

@@ -0,0 +1,12 @@
+package com.lideeyunji.core.framework.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.lideeyunji.core.framework.entity.GrBiSaAgg;
+import org.apache.ibatis.annotations.Param;
+
+public interface IGrBiSaAggService extends IService<GrBiSaAgg> {
+
+    //同步销售明细表
+    void generateSalesReportJob(@Param("dataSourceType") String dataSourceType);
+
+}

lidee-core/src/main/java/com/lideeyunji/core/framework/service/impl/GrBiSaAggServiceImpl.java

@@ -0,0 +1,90 @@
+package com.lideeyunji.core.framework.service.impl;
+
+import cn.hutool.core.collection.CollUtil;
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.lideeyunji.core.framework.entity.GrBiSaAgg;
+import com.lideeyunji.core.framework.mapper.GrBiSaAggMapper;
+import com.lideeyunji.core.framework.service.IGrBiSaAggService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Slf4j
+@Service
+public class GrBiSaAggServiceImpl extends ServiceImpl<GrBiSaAggMapper, GrBiSaAgg> implements IGrBiSaAggService {
+
+    /**
+     * 计算销售报表
+     */
+    @Override
+    @Transactional
+    @DS(value = "#dataSourceType")
+    public void generateSalesReportJob(@Param("dataSourceType") String dataSourceType) {
+        //获取本地mysql数据库中表中UPDATE_TIME最新的数据
+        LambdaQueryWrapper<GrBiSaAgg> queryWrapper = new LambdaQueryWrapper<GrBiSaAgg>().orderByDesc(GrBiSaAgg::getUseYear, GrBiSaAgg::getUseMonth).last("LIMIT 1");
+        GrBiSaAgg grBiSaAgg = this.baseMapper.selectOne(queryWrapper);
+        int lastUserYear = 2022;
+        int lastUserMonth = 1;
+        if(grBiSaAgg != null){
+            lastUserYear = grBiSaAgg.getUseYear();
+            lastUserMonth = grBiSaAgg.getUseMonth();
+        }
+        // 获取当前时间的年和月
+        LocalDateTime now = LocalDateTime.now();
+        int currentYear = now.getYear();
+        int currentMonth = now.getMonthValue();
+
+        // 获取三个月前的时间和年月
+        LocalDateTime threeMonthsAgo = now.minusMonths(3);
+        int pastYear = threeMonthsAgo.getYear();
+        int pastMonth = threeMonthsAgo.getMonthValue();
+
+        log.info("最后更新的年月：{}年{}月", lastUserYear, lastUserMonth);
+        log.info("当前：{}年{}月", currentYear, currentMonth);
+        log.info("三个月前：{}年{}月", pastYear, pastMonth);
+        if (lastUserYear < pastYear || (lastUserYear == pastYear && lastUserMonth < pastMonth)) {
+            pastYear = lastUserYear;
+            pastMonth = lastUserMonth;
+
+        }
+        log.info("开始时间：{}年{}月, 结束时间：{}年{}月", pastYear, pastMonth, currentYear, currentMonth);
+        // 获取三个月前的数据
+        List<GrBiSaAgg> grBiSaSetdtlList = this.baseMapper.generateSalesReport(pastYear * 100 + pastMonth, currentYear * 100 + currentMonth);
+        if (CollUtil.isEmpty(grBiSaSetdtlList)) {
+            return;
+        }
+        //保存数据
+        removeAndSaveBatch(pastYear, pastMonth, currentYear, currentMonth, grBiSaSetdtlList);
+        this.baseMapper.updateThisData();
+        this.baseMapper.updateLastData();
+        this.baseMapper.updateComplexCalculate1();
+        this.baseMapper.updateComplexCalculate2();
+        this.baseMapper.updateComplexCalculate3();
+        this.baseMapper.updateComplexCalculate4();
+        this.baseMapper.updateComplexCalculate5();
+    }
+
+
+    //批量新增
+
+    public void removeAndSaveBatch(Integer pastYear, Integer pastMonth, Integer currentYear, Integer currentMonth, List<GrBiSaAgg> grBiSaSetdtlList) {
+
+        int reNum = this.baseMapper.deleteSalesReport(pastYear * 100 + pastMonth, currentYear * 100 + currentMonth);
+        log.info("删除数量：{}", reNum);
+        int result = 0;
+        for (GrBiSaAgg grBiSaSetdtl : grBiSaSetdtlList) {
+            int re = this.baseMapper.insert(grBiSaSetdtl);
+            if (re < 1) {
+                throw new RuntimeException("批量新增异常");
+            }
+            result += re;
+        }
+    }
+
+}

lidee-core/src/main/resources/mapper/framework/GrBiSaAggMapper.xml

@@ -0,0 +1,254 @@
+<?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.lideeyunji.core.framework.mapper.GrBiSaAggMapper">
+
+
+
+    <select id="generateSalesReport" resultType="com.lideeyunji.core.framework.entity.GrBiSaAgg">
+        select a.USEYEAR,
+               a.USEMONTH,
+               goods.goodsid as GOODSID,
+               goods.GOODSNAME,
+               sales.SALEZONEID as ZONEID,
+               sales.SALEZONENAME as ZONENAME,
+               province.PROVINCEID,
+               province.PROVINCENAME,
+               salestype.SALETYPEID,
+               salestype.SALETYPENAME,
+               dosage.DOSAGEID,
+               dosage.DOSAGENAME,
+               custom.CUSTOMID,
+               custom.CUSTOMNAME,
+               saler.SALERID,
+               saler.SALERNAME,
+               a.`本月销量` as MONTHSAQTY,
+               a.`含税销售额` as MONTHSAMONEY,
+               a.`销售成本` as MONTHCOST,
+               a.`毛利额` as MONTHPROFIT
+        from erp_bi_data.GR_BI_PUB_GOODS as goods
+                 inner join erp_bi_data.GR_BI_PUB_SALEZONE as sales
+                 inner join erp_bi_data.GR_BI_PUB_PROVINCE as province
+                 inner join erp_bi_data.GR_BI_PUB_SALETYPE as salestype
+                 inner join erp_bi_data.GR_BI_PUB_DOSAGE as dosage
+                 inner join erp_bi_data.GR_BI_PUB_CUSTOM as custom
+                 INNER join erp_bi_data.GR_BI_PUB_SALER as saler
+                 left join
+             (SELECT USEYEAR,
+                     USEMONTH,
+                     SALEZONEID,
+                     SALEZONENAME,
+                     PROVINCEID,
+                     PROVINCENAME,
+                     SALETYPE,
+                     SALETYPENAME,
+                     CUSTOMNAME,
+                     SALERNAME,
+                     DOSAGENAME,
+                     goodsid,
+                     GOODSNAME,
+                     GOODSTYPE,
+                     sum(SAQTY) as            本月销量,
+                     DOSAGEID,
+                     CUSTOMID,
+                     SALERID,
+                     round(SUM(SAMONEY), 2)   除税销售额,
+                     round(sum(SAMONEYTX), 2) 含税销售额,
+                     round(sum(COST), 2)      销售成本,
+                     round(sum(PROFIT), 2)    毛利额
+              FROM GR_BI_SA_SETDTL
+              where USESTATUS = 2
+              GROUP BY SALETYPE, SALEZONEID, SALEZONENAME, PROVINCEID, PROVINCENAME, SALETYPE, SALETYPENAME, CUSTOMID,
+                       CUSTOMNAME, SALERID, SALERNAME, DOSAGEID, DOSAGENAME, GOODSID, GOODSNAME, GOODSTYPE, USEYEAR,
+                       USEMONTH) a
+             on a.goodsid = goods.goodsid and a.SALEZONEID = sales.SALEZONEID and a.PROVINCEID = province.PROVINCEID
+                 and salestype.SALETYPEID = a.SALETYPE and dosage.DOSAGEID = a.DOSAGEID and
+                custom.CUSTOMID = a.CUSTOMID and saler.SALERID = a.SALERID
+        <where>
+            a.USEYEAR is not NULL
+            and (a.USEYEAR * 100 + a.USEMONTH) BETWEEN #{pastYearMonth} AND #{currentYearMonth}
+        </where>
+        order by a.USEYEAR, a.USEMONTH
+    </select>
+
+    <delete id="deleteSalesReport">
+        delete from yunji_gr_bi_sa_agg
+        where  (USEYEAR * 100 + USEMONTH) BETWEEN #{pastYearMonth} AND #{currentYearMonth}
+    </delete>
+
+    <update id="updateThisData">
+        UPDATE yunji_gr_bi_sa_agg a
+            LEFT JOIN (
+                SELECT
+                    USEYEAR,
+                    GOODSID,
+                    ZONEID,
+                    PROVINCEID,
+                    SALETYPEID,
+                    DOSAGEID,
+                    CUSTOMID,
+                    SALERID,
+                    SUM( MONTHSAQTY ) AS THISSAQTY,  -- 本年销量
+                    SUM( MONTHSAMONEY ) AS THISSAMONEY, -- 本年销售金额
+                    SUM( MONTHCOST) as  THISCOST, -- 本年毛利额
+                    SUM( MONTHPROFIT ) AS THISPROFIT  -- 本年毛利额
+                FROM
+                    yunji_gr_bi_sa_agg
+                GROUP BY
+                    USEYEAR,
+                    GOODSID,
+                    ZONEID,
+                    PROVINCEID,
+                    SALETYPEID,
+                    DOSAGEID,
+                    CUSTOMID,
+                    SALERID
+            ) b ON b.USEYEAR = a.USEYEAR
+                AND b.GOODSID = a.GOODSID
+                AND b.ZONEID = a.ZONEID
+                AND b.PROVINCEID = a.PROVINCEID
+                AND b.SALETYPEID = a.SALETYPEID
+                AND b.DOSAGEID = a.DOSAGEID
+                AND b.CUSTOMID = a.CUSTOMID
+                AND b.SALERID = a.SALERID
+        SET a.THISSAQTY = COALESCE ( b.THISSAQTY, 0 ),
+            a.THISSAMONEY = COALESCE ( b.THISSAMONEY, 0 ),
+            a.THISCOST = COALESCE ( b.THISCOST, 0 ),
+            a.THISPROFIT = COALESCE ( b.THISPROFIT, 0 );
+    </update>
+
+    <update id="updateLastData">
+        UPDATE yunji_gr_bi_sa_agg a
+            LEFT JOIN (
+                SELECT
+                    USEYEAR,
+                    GOODSID,
+                    ZONEID,
+                    PROVINCEID,
+                    SALETYPEID,
+                    DOSAGEID,
+                    CUSTOMID,
+                    SALERID,
+                    SUM( MONTHSAQTY ) AS LASTSAQTY,
+                    SUM( MONTHSAMONEY ) AS LASTSAMONEY,
+                    SUM( MONTHCOST) as  LASTCOST,
+                    SUM( MONTHPROFIT ) AS LASTPROFIT
+                FROM
+                    yunji_gr_bi_sa_agg
+                GROUP BY
+                    USEYEAR,
+                    GOODSID,
+                    ZONEID,
+                    PROVINCEID,
+                    SALETYPEID,
+                    DOSAGEID,
+                    CUSTOMID,
+                    SALERID
+            ) b ON b.USEYEAR = a.USEYEAR-1
+                AND b.GOODSID = a.GOODSID
+                AND b.ZONEID = a.ZONEID
+                AND b.PROVINCEID = a.PROVINCEID
+                AND b.SALETYPEID = a.SALETYPEID
+                AND b.DOSAGEID = a.DOSAGEID
+                AND b.CUSTOMID = a.CUSTOMID
+                AND b.SALERID = a.SALERID
+        SET a.LASTSAQTY = COALESCE ( b.LASTSAQTY, 0 ),
+            a.LASTSAMONEY = COALESCE ( b.LASTSAMONEY, 0 ),
+            a.LASTCOST = COALESCE ( b.LASTCOST, 0 ),
+            a.LASTPROFIT = COALESCE ( b.LASTPROFIT, 0 );
+    </update>
+
+
+    <update id="updateComplexCalculate1">
+        -- 本月毛利率 MONTHPROFITRATE 本月销售毛利/本月销售收入×100%
+        -- 本年毛利率 THISPROFITRATE 本年销售毛利/本年销售收入×100%
+        -- 上年毛利率 LASTPROFITRATE 上年销售毛利/上年销售收入×100%
+        UPDATE yunji_gr_bi_sa_agg
+        SET
+            MONTHPROFITRATE = CASE WHEN MONTHSAMONEY = 0 or MONTHSAMONEY is null THEN
+                                       IF(MONTHPROFIT > 0, 100, 0) ELSE MONTHPROFIT/ MONTHSAMONEY * 100 END,
+            THISPROFITRATE = CASE WHEN THISSAMONEY = 0 or THISSAMONEY is null THEN
+                                      IF(THISPROFIT > 0, 100, 0) ELSE THISPROFIT/ THISSAMONEY * 100 END,
+            LASTPROFITRATE =CASE WHEN LASTSAMONEY = 0 or LASTSAMONEY is null THEN
+                                     IF(LASTPROFIT > 0, 100, 0) ELSE LASTPROFIT/ LASTSAMONEY * 100 END;
+
+
+    </update>
+    <update id="updateComplexCalculate2">
+        -- 本月销售金额占比 MONTHSAMONEYSHARE  当前行本月销售额/本月销售额总和*100%
+        -- 本月毛利额占比 MONTHPROFITSHARE 当前行本月毛利额/本月毛利额总和*100%
+        UPDATE yunji_gr_bi_sa_agg a
+            LEFT JOIN (
+                SELECT
+                    USEYEAR,
+                    USEMONTH,
+                    SUM( MONTHSAMONEY ) AS MONTHSAMONEY_SUM,
+                    SUM(MONTHPROFIT) AS MONTHPROFIT_SUM
+                FROM
+                    yunji_gr_bi_sa_agg
+                GROUP BY
+                    USEYEAR,
+                    USEMONTH
+            ) b ON b.USEYEAR = a.USEYEAR
+                AND b.USEMONTH = a.USEMONTH
+        SET a.MONTHSAMONEYSHARE = COALESCE (ROUND( a.MONTHSAMONEY/b.MONTHSAMONEY_SUM * 100, 2), 0 ),
+            a.MONTHPROFITSHARE = COALESCE (ROUND( a.MONTHPROFIT/b.MONTHPROFIT_SUM * 100, 2), 0 );
+    </update>
+    <update id="updateComplexCalculate3">
+
+        -- 本年销售金额占比 THISSAMONEYSHARE当前行本年销售额/本年销售额总和*100%
+        -- 本年毛利额占比 THISPROFITSHARE 当前行本年毛利额/本年毛利额总和*100%
+        UPDATE yunji_gr_bi_sa_agg a
+            LEFT JOIN (
+                SELECT
+                    USEYEAR,
+                    SUM( THISSAMONEY ) AS THISSAMONEY_SUM,
+                    SUM( THISPROFIT ) AS THISPROFIT_SUM
+                FROM
+                    yunji_gr_bi_sa_agg
+                GROUP BY
+                    USEYEAR
+            ) b ON b.USEYEAR = a.USEYEAR
+        SET a.THISSAMONEYSHARE = COALESCE (ROUND( a.THISSAMONEY/b.THISSAMONEY_SUM * 100, 2), 0 ),
+            a.THISPROFITSHARE = COALESCE (ROUND( a.THISPROFIT/b.THISPROFIT_SUM * 100, 2), 0 );
+
+    </update>
+    <update id="updateComplexCalculate4">
+
+        -- 上年销售金额占比 LASTSAMONEYSHARE 当前行上年销售额/上年销售额总和*100%
+        -- 上年毛利额占比 LASTPROFITSHARE 当前行上年毛利额/上年毛利额总和*100%
+        UPDATE yunji_gr_bi_sa_agg a
+        LEFT JOIN (
+        SELECT
+        USEYEAR,
+        SUM(LASTSAMONEY) AS LASTSAMONEY_SUM,
+        SUM(LASTPROFIT) AS LASTPROFIT_SUM
+
+        FROM
+        yunji_gr_bi_sa_agg
+        GROUP BY
+        USEYEAR,
+        USEMONTH
+        ) b ON b.USEYEAR = a.USEYEAR
+        SET a.LASTSAMONEYSHARE = COALESCE (ROUND( CASE WHEN LASTSAMONEY_SUM = 0 or LASTSAMONEY_SUM is null  THEN IF(a.LASTSAMONEY > 0, 100, 0) ELSE a.LASTSAMONEY/b.LASTSAMONEY_SUM * 100 END, 2), 0 ),
+        a.LASTPROFITSHARE = COALESCE (ROUND( CASE WHEN LASTPROFIT_SUM = 0 or LASTPROFIT_SUM is null  THEN IF(a.LASTPROFIT > 0, 100, 0) ELSE a.LASTPROFIT/b.LASTPROFIT_SUM * 100 END, 2), 0 );
+
+    </update>
+    <update id="updateComplexCalculate5">
+        -- 销售金额增长率 SAMONEYGROWTH (本年销售额-上年销售额)÷上年销售额×100%
+        -- 毛利额增长率 PROFITGROWTH  (本年毛利额 - 上年毛利额) / 上年毛利额 × 100%
+        -- 毛利变动 PROFITCHANGE 本年毛利额 - 上年毛利额
+        UPDATE yunji_gr_bi_sa_agg
+        SET
+            SAMONEYGROWTH = CASE
+                                WHEN ( LASTSAMONEY = 0 OR LASTSAMONEY IS NULL ) AND THISSAMONEY IS NOT NULL
+                                THEN IF((THISSAMONEY - LASTSAMONEY) > 0, 100, 0)
+                                ELSE ( THISSAMONEY - LASTSAMONEY )/ LASTSAMONEY * 100
+                END,
+            PROFITGROWTH = CASE
+                               WHEN ( LASTPROFIT = 0 OR LASTPROFIT IS NULL ) AND THISPROFIT IS NOT NULL
+                               THEN IF((THISSAMONEY - LASTSAMONEY) > 0, 100, 0)
+                               ELSE ( THISPROFIT - LASTPROFIT )/ LASTPROFIT * 100
+                END,
+            PROFITCHANGE = ( THISPROFIT - LASTPROFIT);
+    </update>
+</mapper>

lidee-service/lidee-service-system-biz/src/main/java/com/lideeyunji/service/system/controller/AuthController.java

@@ -85,6 +85,15 @@ public class AuthController {
         return success(true);
     }
 
+    @PostMapping("/logout-client")
+    @PermitAll
+    @Operation(tags = "授权管理",summary = "登出系统")
+    @OperateLog(enable = false) // 避免 Post 请求被记录操作日志
+    public CommonResult<Boolean> logoutClient(@RequestParam("refreshToken") String refreshToken) {
+        logoutService(refreshToken);
+        return success(true);
+    }
+
     @PostMapping("/switch-login")
     @Operation(tags = "授权管理",summary = "切换部门登录")
     @OperateLog(enable = false) // 避免 Post 请求被记录操作日志
@@ -164,7 +173,9 @@ public class AuthController {
     @Parameter(name = "refreshToken", description = "根据token获取用户信息", required = true)
     @OperateLog(enable = false) // 避免 Post 请求被记录操作日志
     public CommonResult<AdminUserDO> getUerInfo(@RequestParam("refreshToken") String refreshToken) {
-        return success(authService.getTokenTouserInfo(refreshToken));
+
+        CommonResult<AdminUserDO> result = CommonResult.success(authService.getTokenTouserInfo(refreshToken));
+        return result;
     }
 
     @GetMapping("/get-permission-info")
@@ -291,7 +302,23 @@ public class AuthController {
             authService.logout(token, LoginLogTypeEnum.LOGOUT_SELF.getType());
         }
         //清空个人信息
-        String userRedisKey="JEE_LOW_CODE:USER:"+loginUserId+":*";
+        String userRedisKey="LIDEE_LOW_CODE:USER:"+loginUserId+":*";
+        Set<String> keys = stringRedisTemplate.keys(userRedisKey);
+        if(keys!=null && keys.size()>0){
+            keys.forEach(key->{
+                stringRedisTemplate.delete(key);
+            });
+        }
+    }
+    private void logoutService(String token){
+        AdminUserDO user = authService.getTokenTouserInfo(token);
+        Long loginUserId = user.getId();
+
+        if (StrUtil.isNotBlank(token)) {
+            authService.logout(token, LoginLogTypeEnum.LOGOUT_SELF.getType());
+        }
+        //清空个人信息
+        String userRedisKey="LIDEE_LOW_CODE:USER:"+loginUserId+":*";
         Set<String> keys = stringRedisTemplate.keys(userRedisKey);
         if(keys!=null && keys.size()>0){
             keys.forEach(key->{

lidee-service/lidee-service-system-biz/src/main/java/com/lideeyunji/service/system/service/impl/LideeYunJiPermissionServiceImpl.java

@@ -100,7 +100,7 @@ public class LideeYunJiPermissionServiceImpl implements ILideeYunJiPermissionSer
         }
         //根据角色id来判断我是否是开发者，如果有开发者，则说明直接可以访问
         boolean devUserFlag=false;
-        String isDevUserRedisKey="JEE_LOW_CODE:USER:"+userId+":DEVUSER";
+        String isDevUserRedisKey="LIDEE_LOW_CODE:USER:"+userId+":DEVUSER";
         if(!stringRedisTemplate.hasKey(isDevUserRedisKey)){//没有数据，则查询获取 TODO 优化
             //所有菜单列表
             Set<Long> menuIdList = permissionService.getRoleMenuListByRoleId(roleIds);

lidee-service/lidee-service-system-biz/src/main/java/com/lideeyunji/service/system/service/impl/OAuth2TokenServiceImpl.java

@@ -85,6 +85,8 @@ public class OAuth2TokenServiceImpl implements IOAuth2TokenService {
         // 获得用户基本信息
         OAuth2AccessTokenDO accessTokenDO=     oauth2AccessTokenMapper.selectByAccessToken(refreshToken);
         AdminUserDO user = adminUserService.getUser(accessTokenDO.getUserId());
+        user.setPassword("");
+        user.setEmail("");
         return  user;
     }
 

lidee-tool/tool-spring-boot-starter-yunji/src/main/java/com/lideeyunji/tool/framework/yunji/constant/lideeRedisConstants.java

@@ -9,7 +9,7 @@ package com.lideeyunji.tool.framework.yunji.constant;
 public interface lideeRedisConstants {
 
     //低代码
-    String lideeyunji_PREFIX = "JEE_LOW_CODE:";
+    String lideeyunji_PREFIX = "LIDEE_LOW_CODE:";
 
     //js增强加锁
     String ENHANCE_JS_LOCK = "LOCK_JS:%s";