Merge branch 'develop-kjf' into develop

* develop-kjf:
  修改了股东大盘分红股东信息接口,股东大盘分红已添加查询逻辑

kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/vo/kxsapp/shop/ShopGoodsDetailVO.java

@@ -7,6 +7,7 @@ import lombok.Data;
 import java.io.Serial;
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -83,21 +84,21 @@ public class ShopGoodsDetailVO implements Serializable {
      * 商城商品SKU记录表
      */
     @Schema(description = "商城商品SKU记录表")
-    private List<ShopGoodsSpecVO> specList;
+    private List<ShopGoodsSpecVO> specList = new ArrayList<>();
 
 
     /**
      * 商城商品SKU表
      */
     @Schema(description = "商城商品SKU表")
-    private List<ShopGoodsSkuVO> skuList;
+    private List<ShopGoodsSkuVO> skuList = new ArrayList<>();
 
 
     /**
      * 商城商品图片表
      */
     @Schema(description = "商城商品图片表")
-    private List<String> picList;
+    private List<String> picList = new ArrayList<>();
 
 
 

kxs-user/kxs-user-api/src/main/java/com/kxs/user/api/model/KxsShdScore.java

@@ -101,8 +101,11 @@ public class KxsShdScore extends Model<KxsShdScore> implements Serializable {
     @Schema(description = "高级股东积分")
     private Integer highScore;
 
-
-
+    /**
+     * 统计月份
+     */
+    @Schema(description = "统计月份")
+    private String month;
 
 }
 

kxs-user/kxs-user-api/src/main/java/com/kxs/user/api/vo/kxsapp/shareholder/ShareholderGetMyStandardsAllVO.java

@@ -0,0 +1,51 @@
+package com.kxs.user.api.vo.kxsapp.shareholder;
+
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 股东大盘分红-获取达标统计vo
+ *
+ * @author 系统
+ * @date 2024-05-07 11:42:34
+ */
+@Data
+@Schema(description = "股东大盘分红-获取达标统计返回实体")
+public class ShareholderGetMyStandardsAllVO implements Serializable {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+
+
+    /**
+     * 全国初级股东积分
+     */
+    @Schema(description = "全国初级股东积分")
+    private Object firstScoreAll;
+
+
+    /**
+     * 全国中级股东积分
+     */
+    @Schema(description = "全国中级股东积分")
+    private Object centerScoreAll;
+
+
+    /**
+     * 全国高级股东积分
+     */
+    @Schema(description = "全国高级股东积分")
+    private Object highScoreAll;
+
+
+
+
+
+	
+
+}

kxs-user/kxs-user-api/src/main/java/com/kxs/user/api/vo/kxsapp/subGetShareholderUserList/CenterScoreListVO.java

@@ -1,59 +0,0 @@
-package com.kxs.user.api.vo.kxsapp.subGetShareholderUserList;
-
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import java.io.Serial;
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.List;
-
-/**
- * 股东大盘分红-获取达标股东信息股东大盘分红用户积分表vo
- *
- * @author 系统
- * @date 2024-05-07 11:42:34
- */
-@Data
-@Schema(description = "股东大盘分红-获取达标股东信息股东大盘分红用户积分表返回实体")
-public class CenterScoreListVO implements Serializable {
-
-	@Serial
-	private static final long serialVersionUID = 1L;
-
-
-    /**
-     * 主键ID
-     */
-    @Schema(description = "主键ID")
-    private Integer id;
-
-
-    /**
-     * 用户名
-     */
-    @Schema(description = "用户名")
-    private String username;
-
-
-    /**
-     * 用户编号
-     */
-    @Schema(description = "用户编号")
-    private String userCode;
-
-
-    /**
-     * 中级股东积分
-     */
-    @Schema(description = "中级股东积分")
-    private Integer centerScore;
-
-
-
-
-
-	
-
-}

kxs-user/kxs-user-api/src/main/java/com/kxs/user/api/vo/kxsapp/subGetShareholderUserList/FirstScoreListVO.java

@@ -1,59 +0,0 @@
-package com.kxs.user.api.vo.kxsapp.subGetShareholderUserList;
-
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import java.io.Serial;
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.List;
-
-/**
- * 股东大盘分红-获取达标股东信息股东大盘分红用户积分表vo
- *
- * @author 系统
- * @date 2024-05-07 11:42:34
- */
-@Data
-@Schema(description = "股东大盘分红-获取达标股东信息股东大盘分红用户积分表返回实体")
-public class FirstScoreListVO implements Serializable {
-
-	@Serial
-	private static final long serialVersionUID = 1L;
-
-
-    /**
-     * 主键ID
-     */
-    @Schema(description = "主键ID")
-    private Integer id;
-
-
-    /**
-     * 用户名
-     */
-    @Schema(description = "用户名")
-    private String username;
-
-
-    /**
-     * 用户编号
-     */
-    @Schema(description = "用户编号")
-    private String userCode;
-
-
-    /**
-     * 初级股东积分
-     */
-    @Schema(description = "初级股东积分")
-    private Integer firstScore;
-
-
-
-
-
-	
-
-}

kxs-user/kxs-user-api/src/main/java/com/kxs/user/api/vo/kxsapp/subGetShareholderUserList/ShareholderGetShareholderUserListVO.java

@@ -1,12 +0,0 @@
-package com.kxs.user.api.vo.kxsapp.subGetShareholderUserList;
-
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class ShareholderGetShareholderUserListVO {
-    private List<HighScoreListVO> highScoreList;
-    private List<FirstScoreListVO> firstScoreList;
-    private List<CenterScoreListVO> centerScoreList;
-}

kxs-user/kxs-user-api/src/main/java/com/kxs/user/api/vo/kxsapp/subGetShareholderUserList/HighScoreListVO.java → kxs-user/kxs-user-api/src/main/java/com/kxs/user/api/vo/kxsapp/subGetShareholderUserList/UserScoreListVO.java

@@ -6,8 +6,6 @@ import lombok.Data;
 
 import java.io.Serial;
 import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.List;
 
 /**
  * 股东大盘分红-获取达标股东信息股东大盘分红用户积分表vo
@@ -17,7 +15,7 @@ import java.util.List;
  */
 @Data
 @Schema(description = "股东大盘分红-获取达标股东信息股东大盘分红用户积分表返回实体")
-public class HighScoreListVO implements Serializable {
+public class UserScoreListVO implements Serializable {
 
 	@Serial
 	private static final long serialVersionUID = 1L;
@@ -45,12 +43,16 @@ public class HighScoreListVO implements Serializable {
 
 
     /**
-     * 高级股东积分
+     * 股东积分
      */
-    @Schema(description = "高级股东积分")
-    private Integer highScore;
-
+    @Schema(description = "股东积分")
+    private Integer score;
 
+    /**
+     * 用户头像
+     */
+    @Schema(description = "用户头像")
+    private String avatar;
 
 
 

kxs-user/kxs-user-biz/src/main/java/com/kxs/user/biz/controller/kxsapp/ShareholderController.java

@@ -2,9 +2,7 @@ package com.kxs.user.biz.controller.kxsapp;
 
 import com.kxs.common.core.util.R;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.kxs.user.api.vo.kxsapp.shareholder.ShareholderGetMyStandardsVO;
-import com.kxs.user.api.vo.kxsapp.shareholder.ShareholderGetShareholderAmountVO;
-import com.kxs.user.api.vo.kxsapp.subGetShareholderUserList.ShareholderGetShareholderUserListVO;
+import com.kxs.user.api.model.KxsShdScore;
 import org.springdoc.core.annotations.ParameterObject;
 
 import com.kxs.user.biz.service.KxsShdTradeAmtService;
@@ -64,8 +62,8 @@ public class ShareholderController {
      * @return 股东大盘分红-获取达标股东信息
      */
     @GetMapping("/getShareholderUserList")
-    public R getShareholderUserList(@ParameterObject Page<ShareholderGetShareholderUserListVO> page,@RequestParam("month") String month) {
-        return R.ok(kxsShdScoreService.getShareholderUserList(page,month));
+    public R getShareholderUserList(@ParameterObject Page<KxsShdScore> page, @RequestParam("month") String month, @RequestParam("type") Integer type) {
+        return R.ok(kxsShdScoreService.getShareholderUserList(page,month,type));
     }
 
 

kxs-user/kxs-user-biz/src/main/java/com/kxs/user/biz/mapper/KxsShdScoreMapper.java

@@ -1,8 +1,13 @@
 package com.kxs.user.biz.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.kxs.user.api.model.KxsShdScore;
+import com.kxs.user.api.vo.kxsapp.shareholder.ShareholderGetMyStandardsAllVO;
+import com.kxs.user.api.vo.kxsapp.shareholder.ShareholderGetMyStandardsVO;
+import com.kxs.user.api.vo.kxsapp.subGetShareholderUserList.UserScoreListVO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 股东大盘分红用户积分表(KxsShdScore)表数据库访问层
@@ -13,5 +18,10 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface KxsShdScoreMapper extends BaseMapper<KxsShdScore> {
 
+    ShareholderGetMyStandardsVO getMyStandards(@Param("month") String month,@Param("userCode") String userCode);
+
+    ShareholderGetMyStandardsAllVO getMyStandardsAll(@Param("month") String month);
+
+    Page<UserScoreListVO> getShareholderHighScoreUserList(Page<KxsShdScore> page, @Param("month") String month, @Param("type") Integer type);
 }
 

kxs-user/kxs-user-biz/src/main/java/com/kxs/user/biz/service/KxsShdScoreService.java

@@ -3,7 +3,6 @@ package com.kxs.user.biz.service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.kxs.user.api.model.KxsShdScore;
-import com.kxs.user.api.vo.kxsapp.subGetShareholderUserList.ShareholderGetShareholderUserListVO;
 
 /**
  * 股东大盘分红用户积分表(KxsShdScore)表服务接口
@@ -15,6 +14,11 @@ public interface KxsShdScoreService extends IService<KxsShdScore> {
 
     Object getMyStandards(String month);
 
-    Object getShareholderUserList(Page<ShareholderGetShareholderUserListVO> page, String month);
+    Object getShareholderUserList(Page<KxsShdScore> page, String month, Integer type);
+
+    /**
+     * 积分统计
+     */
+    void integralStat();
 }
 

kxs-user/kxs-user-biz/src/main/java/com/kxs/user/biz/service/impl/KxsShdScoreServiceImpl.java

@@ -1,19 +1,20 @@
 package com.kxs.user.biz.service.impl;
 
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.kxs.common.security.util.SecurityUtils;
+import com.kxs.user.api.model.KxsUser;
+import com.kxs.user.api.vo.kxsapp.shareholder.ShareholderGetMyStandardsAllVO;
 import com.kxs.user.api.vo.kxsapp.shareholder.ShareholderGetMyStandardsVO;
-import com.kxs.user.api.vo.kxsapp.subGetShareholderUserList.CenterScoreListVO;
-import com.kxs.user.api.vo.kxsapp.subGetShareholderUserList.FirstScoreListVO;
-import com.kxs.user.api.vo.kxsapp.subGetShareholderUserList.HighScoreListVO;
-import com.kxs.user.api.vo.kxsapp.subGetShareholderUserList.ShareholderGetShareholderUserListVO;
+import com.kxs.user.api.vo.kxsapp.subGetShareholderUserList.UserScoreListVO;
 import com.kxs.user.biz.mapper.KxsShdScoreMapper;
 import com.kxs.user.api.model.KxsShdScore;
+import com.kxs.user.biz.mapper.KxsUserMapper;
 import com.kxs.user.biz.service.KxsShdScoreService;
+import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
-import java.sql.Array;
-import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -23,45 +24,77 @@ import java.util.List;
  * @since 2024-05-07 09:11:27
  */
 @Service("kxsShdScoreService")
+@RequiredArgsConstructor
 public class KxsShdScoreServiceImpl extends ServiceImpl<KxsShdScoreMapper, KxsShdScore> implements KxsShdScoreService {
-
+    private final KxsShdScoreMapper kxsShdScoreMapper;
+    private final KxsUserMapper kxsUserMapper;
     @Override
     public Object getMyStandards(String month) {
-        //假数据
-
-        ShareholderGetMyStandardsVO shareholderGetMyStandardsVO = new ShareholderGetMyStandardsVO();
-
-        shareholderGetMyStandardsVO.setFirstScore(1);
-        shareholderGetMyStandardsVO.setCenterScore(2);
-        shareholderGetMyStandardsVO.setHighScore(3);
-        shareholderGetMyStandardsVO.setFirstScoreAll(4);
-        shareholderGetMyStandardsVO.setCenterScoreAll(5);
-        shareholderGetMyStandardsVO.setHighScoreAll(6);
-
+        Long id = SecurityUtils.getUser().getId();
+        KxsUser kxsUser = kxsUserMapper.selectById(id);
+        //获取个人积分
+        ShareholderGetMyStandardsVO shareholderGetMyStandardsVO = kxsShdScoreMapper.getMyStandards(month,kxsUser.getUserCode());
+        //获取全国积分
+        ShareholderGetMyStandardsAllVO allVO = kxsShdScoreMapper.getMyStandardsAll(month);
+        if (allVO != null){
+            shareholderGetMyStandardsVO.setCenterScoreAll(allVO.getCenterScoreAll());
+            shareholderGetMyStandardsVO.setFirstScoreAll(allVO.getFirstScoreAll());
+            shareholderGetMyStandardsVO.setHighScoreAll(allVO.getHighScoreAll());
+        }
         return shareholderGetMyStandardsVO;
     }
 
     @Override
-    public Object getShareholderUserList(Page<ShareholderGetShareholderUserListVO> page, String month) {
-        //假数据
-        ShareholderGetShareholderUserListVO shareholderGetShareholderUserListVO = new ShareholderGetShareholderUserListVO();
-        ArrayList<HighScoreListVO> highScoreListVOS = new ArrayList<>();
-        HighScoreListVO highScoreListVO = new HighScoreListVO();
-        highScoreListVOS.add(highScoreListVO);
-
-        ArrayList<FirstScoreListVO> firstScoreListVOS = new ArrayList<>();
-        FirstScoreListVO firstScoreListVO = new FirstScoreListVO();
-        firstScoreListVOS.add(firstScoreListVO);
-
-        ArrayList<CenterScoreListVO> centerScoreListVOS = new ArrayList<>();
-        CenterScoreListVO centerScoreListVO = new CenterScoreListVO();
-        centerScoreListVOS.add(centerScoreListVO);
-        shareholderGetShareholderUserListVO.setHighScoreList(highScoreListVOS);
-        shareholderGetShareholderUserListVO.setFirstScoreList(firstScoreListVOS);
-        shareholderGetShareholderUserListVO.setCenterScoreList(centerScoreListVOS);
-
-
-        return shareholderGetShareholderUserListVO;
+    public Object getShareholderUserList(Page<KxsShdScore> page, String month, Integer type) {
+        Page<UserScoreListVO> shareholderHighScoreUserList = kxsShdScoreMapper.getShareholderHighScoreUserList(page, month, type);
+        for (UserScoreListVO record : shareholderHighScoreUserList.getRecords()) {
+            String userCode = record.getUserCode();
+            //获取用户头像
+            KxsUser kxsUser = kxsUserMapper.selectOne(Wrappers.<KxsUser>query().lambda().eq(KxsUser::getUserCode, userCode));
+            if (kxsUser != null){
+                record.setAvatar(kxsUser.getAvatar());
+            }
+        }
+        return shareholderHighScoreUserList;
     }
+
+    @Override
+    public void integralStat() {
+        //初级积分
+        //获取全部用户职级 > K3
+        //循环用户查询直属用户数量大于3
+        Long aLong = kxsUserMapper.selectCount(Wrappers.<KxsUser>query().lambda().eq(KxsUser::getPid, 1));
+        if (aLong > 3){
+            List<KxsUser> kxsUsers = kxsUserMapper.selectList(Wrappers.<KxsUser>query().lambda().eq(KxsUser::getPid, 1));
+        }
+
+    }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 }
 

kxs-user/kxs-user-biz/src/main/java/com/kxs/user/biz/service/impl/KxsShdTradeAmtServiceImpl.java

@@ -1,11 +1,15 @@
 package com.kxs.user.biz.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.toolkit.BeanUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.kxs.common.core.util.AssertUtil;
 import com.kxs.user.api.vo.kxsapp.shareholder.ShareholderGetShareholderAmountVO;
 import com.kxs.user.biz.mapper.KxsShdTradeAmtMapper;
 import com.kxs.user.api.model.KxsShdTradeAmt;
 import com.kxs.user.biz.service.KxsShdTradeAmtService;
+import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
@@ -17,22 +21,18 @@ import java.math.BigDecimal;
  * @since 2024-05-07 09:11:27
  */
 @Service("kxsShdTradeAmtService")
+@RequiredArgsConstructor
 public class KxsShdTradeAmtServiceImpl extends ServiceImpl<KxsShdTradeAmtMapper, KxsShdTradeAmt> implements KxsShdTradeAmtService {
-
+    private final KxsShdTradeAmtMapper kxsShdTradeAmtMapper;
     @Override
     public Object getShareholderAmount(String tradeMonth) {
         //格式校验
         AssertUtil.isYyyyMM(tradeMonth);
-        //构造假数据返回
+        KxsShdTradeAmt kxsShdTradeAmt = kxsShdTradeAmtMapper.selectOne(Wrappers.<KxsShdTradeAmt>query().lambda().eq(KxsShdTradeAmt::getTradeMonth, tradeMonth));
         ShareholderGetShareholderAmountVO shareholderGetShareholderAmountVO = new ShareholderGetShareholderAmountVO();
-        shareholderGetShareholderAmountVO.setId(0);
-        String[] split = tradeMonth.split("-");
-        shareholderGetShareholderAmountVO.setTradeAmt(new BigDecimal(split[0]+"00"));
-        shareholderGetShareholderAmountVO.setTradeMonth(tradeMonth);
-        shareholderGetShareholderAmountVO.setBonusPool(new BigDecimal(split[0]+"1"));
-        shareholderGetShareholderAmountVO.setFirstBonus(new BigDecimal(split[0]+"2"));
-        shareholderGetShareholderAmountVO.setCenterBonus(new BigDecimal(split[0]+"3"));
-        shareholderGetShareholderAmountVO.setHighBonus(new BigDecimal(split[0]+"4"));
+        if (kxsShdTradeAmt != null){
+            BeanUtil.copyProperties(kxsShdTradeAmt,shareholderGetShareholderAmountVO);
+        }
         return shareholderGetShareholderAmountVO;
     }
 }

kxs-user/kxs-user-biz/src/main/resources/mapper/KxsShdScoreMapper.xml

@@ -15,5 +15,87 @@
         <result column="high_score" property="highScore" />
 
     </resultMap>
+    <select id="getMyStandards"
+            resultType="com.kxs.user.api.vo.kxsapp.shareholder.ShareholderGetMyStandardsVO">
+                SELECT
+                     first_score,center_score,high_score
+                 FROM kxs_shd_score
+                 WHERE
+                     del_flag != 1
+                     and user_code = #{userCode}
+                     and month = #{month}
+    </select>
+    <select id="getMyStandardsAll"
+            resultType="com.kxs.user.api.vo.kxsapp.shareholder.ShareholderGetMyStandardsAllVO">
+        SELECT
+            sum(first_score) as firstScoreAll ,
+            sum(center_score) as centerScoreAll ,
+            sum(high_score) as highScoreAll
+        FROM kxs_shd_score
+        WHERE
+            del_flag != 1
+          and month = #{month}
+    </select>
+
+    <select id="getShareholderHighScoreUserList"
+            resultType="com.kxs.user.api.vo.kxsapp.subGetShareholderUserList.UserScoreListVO">
+        SELECT
+        <choose>
+            <when test="type == 1">
+                first_score AS score
+            </when>
+            <when test="type == 2">
+                center_score AS score
+            </when>
+            <when test="type == 3">
+                high_score AS score
+            </when>
+        </choose>,
+        id,username,user_code,id
+        FROM kxs_shd_score
+        WHERE del_flag != 1
+        AND month = #{month}
+        <choose>
+            <when test="type == 1">
+                ORDER BY first_score
+            </when>
+            <when test="type == 2">
+                ORDER BY center_score
+            </when>
+            <when test="type == 3">
+                ORDER BY high_score
+            </when>
+        </choose>
+    </select>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 </mapper>