Merge branch 'develop-kjf-dev' into develop-kjf

kxs-stat/kxs-stat-api/src/main/java/com/kxs/stat/api/dto/statUser/StatUserGetTradeDetailDTO.java

@@ -0,0 +1,60 @@
+package com.kxs.stat.api.dto.statUser;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+
+/**
+ * 计奖交易-交易统计页面-交易明细-dto
+ *
+ * @author 系统
+ * @date 2024-06-03 16:33:51
+ */
+@Data
+public class StatUserGetTradeDetailDTO {
+
+    /**
+     * 0:个人 1:计奖
+     */
+    @Schema(description = "0:个人 1:计奖")
+    private Integer totalType;
+
+
+    /**
+     * 该参数有效获取月份格式yyyyMM   日格式yyyyMMdd
+     */
+    @Schema(description = "只有type=1时该参数有效获取月份格式yyyyMM")
+    private Integer date;
+
+
+    /**
+     * 1获取日详情 2获取月详情
+     */
+    @Schema(description = "1获取日详情 2获取月详情")
+    private Integer getType;
+
+
+    /**
+     * 1获取增量 2获取存量 3获取全部
+     */
+    @Schema(description = "1获取增量 2获取存量 3获取全部")
+    private Integer tradeType;
+
+
+    /**
+     * 查询用户 传0为查询自己
+     */
+    @Schema(description = "查询用户 传0为查询自己")
+    private Long userId;
+
+
+    /**
+     * 品牌id
+     */
+    @Schema(description = "品牌id")
+    private Long brandId;
+
+
+
+
+}

kxs-stat/kxs-stat-api/src/main/java/com/kxs/stat/api/vo/statUser/StatUserGetTradeDetailVO.java

@@ -0,0 +1,213 @@
+package com.kxs.stat.api.vo.statUser;
+
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * 计奖交易-交易统计页面-交易明细vo
+ *
+ * @author 系统
+ * @date 2024-06-03 16:33:51
+ */
+@Data
+@Schema(description = "计奖交易-交易统计页面-交易明细返回实体")
+public class StatUserGetTradeDetailVO implements Serializable {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+
+    /**
+     * 交易时间
+     */
+    @Schema(description = "交易时间")
+    private Integer date;
+
+
+
+
+    /**
+     * 品牌ID
+     */
+    @Schema(description = "品牌ID")
+    private Integer brandId;
+
+
+    /**
+     * 扶持期贷记卡交易额
+     */
+    @Schema(description = "扶持期贷记卡交易额")
+    private BigDecimal helpDirectTradeAmt = BigDecimal.ZERO;
+
+
+    /**
+     * 扶持期借记卡
+     */
+    @Schema(description = "扶持期借记卡")
+    private BigDecimal helpDebitTradeAmt= BigDecimal.ZERO;
+
+
+    /**
+     * 稳定期贷记卡
+     */
+    @Schema(description = "稳定期贷记卡")
+    private BigDecimal proDirectTradeAmt= BigDecimal.ZERO;
+
+
+    /**
+     * 稳定期借记卡
+     */
+    @Schema(description = "稳定期借记卡")
+    private BigDecimal proDebitTradeAmt= BigDecimal.ZERO;
+
+
+    /**
+     * 稳定期A贷记卡
+     */
+    @Schema(description = "稳定期A贷记卡")
+    private BigDecimal proADirectTradeAmt= BigDecimal.ZERO;
+
+
+    /**
+     * 稳定期A借记卡
+     */
+    @Schema(description = "稳定期A借记卡")
+    private BigDecimal proADebitTradeAmt= BigDecimal.ZERO;
+
+
+    /**
+     * 扶持期借记卡封顶交易额
+     */
+    @Schema(description = "扶持期借记卡封顶交易额")
+    private BigDecimal helpDebitCapTradeAmt= BigDecimal.ZERO;
+
+
+    /**
+     * 扶持期借记卡封顶交易笔数
+     */
+    @Schema(description = "扶持期借记卡封顶交易笔数")
+    private Integer helpDebitCapNum = 0;
+
+
+    /**
+     * 稳定期借记卡封顶交易额
+     */
+    @Schema(description = "稳定期借记卡封顶交易额")
+    private BigDecimal proDebitCapTradeAmt = BigDecimal.ZERO;
+
+
+    /**
+     * 稳定期借记卡封顶交易笔数
+     */
+    @Schema(description = "稳定期借记卡封顶交易笔数")
+    private Integer proDebitCapNum = 0;
+
+
+    /**
+     * 稳定期A借记卡封顶交易额
+     */
+    @Schema(description = "稳定期A借记卡封顶交易额")
+    private BigDecimal proADebitCapTradeAmt = BigDecimal.ZERO;
+
+
+    /**
+     * 稳定期A借记卡封顶交易笔数
+     */
+    @Schema(description = "稳定期A借记卡封顶交易笔数")
+    private Integer proADebitCapNum = 0;
+
+
+    /**
+     * 稳定期B借记卡
+     */
+    @Schema(description = "稳定期B借记卡")
+    private BigDecimal proBDebitTradeAmt = BigDecimal.ZERO;
+
+
+    /**
+     * 稳定期B贷记卡
+     */
+    @Schema(description = "稳定期B贷记卡")
+    private BigDecimal proBDirectTradeAmt = BigDecimal.ZERO;
+
+
+    /**
+     * 稳定期B借记卡封顶交易额
+     */
+    @Schema(description = "稳定期B借记卡封顶交易额")
+    private BigDecimal proBDebitCapTradeAmt = BigDecimal.ZERO;
+
+
+    /**
+     * 稳定期B借记卡封顶交易笔数
+     */
+    @Schema(description = "稳定期B借记卡封顶交易笔数")
+    private Integer proBDebitCapNum = 0;
+
+
+    /**
+     * 稳定期A云闪付交易额
+     */
+    @Schema(description = "稳定期A云闪付交易额")
+    private Object proACloudTrade = BigDecimal.ZERO;
+
+
+    /**
+     * 稳定期B云闪付交易额
+     */
+    @Schema(description = "稳定期B云闪付交易额")
+    private Object proBCloudTrade = BigDecimal.ZERO;
+
+
+    /**
+     * 稳定期云闪付交易额
+     */
+    @Schema(description = "稳定期云闪付交易额")
+    private Object proCloudTrade = BigDecimal.ZERO;
+
+
+    /**
+     * 扶持期云闪付交易额
+     */
+    @Schema(description = "扶持期云闪付交易额")
+    private Object helpCloudTrade = BigDecimal.ZERO;
+
+
+    /**
+     * 稳定期a非封顶借记卡交易额
+     */
+    @Schema(description = "稳定期a非封顶借记卡交易额")
+    private Object proADebitNotCapTrade = BigDecimal.ZERO;
+
+
+    /**
+     * 稳定期b非封顶借记卡交易额
+     */
+    @Schema(description = "稳定期b非封顶借记卡交易额")
+    private Object proBDebitNotCapTrade = BigDecimal.ZERO;
+
+
+    /**
+     * 稳定期非封顶借记卡交易额
+     */
+    @Schema(description = "稳定期非封顶借记卡交易额")
+    private Object proDebitNotCapTrade = BigDecimal.ZERO;
+
+    /**
+     * 扶持期b非封顶借记卡交易额
+     */
+    @Schema(description = "扶持期b非封顶借记卡交易额")
+    private Object helpBDebitNotCapTrade = BigDecimal.ZERO;
+
+
+
+	
+
+}

kxs-stat/kxs-stat-biz/src/main/java/com/kxs/stat/biz/controller/KxsStatUserController.java

@@ -6,6 +6,7 @@ import com.kxs.common.core.util.R;
 import com.kxs.common.security.util.SecurityUtils;
 import com.kxs.stat.api.dto.statUser.StatUserGetMyTradeDTO;
 
+import com.kxs.stat.api.dto.statUser.StatUserGetTradeDetailDTO;
 import com.kxs.stat.api.dto.statUser.StatUserGetUserStatByDayOrMonthDTO;
 import com.kxs.stat.api.dto.statUser.StatUserGetUserTradeListDTO;
 import com.kxs.stat.api.model.KxsUserActTrade;
@@ -116,6 +117,15 @@ public class KxsStatUserController {
     public R getMyTrade(@ParameterObject StatUserGetMyTradeDTO param) {
         return kxsUserTradeService.getMyTrade(param);
     }
-
+    /**
+     * 计奖交易-交易统计页面-交易明细
+     *
+     * @param param 查询实体
+     * @return 计奖交易-交易统计页面-交易明细
+     */
+    @GetMapping("/getTradeDetail")
+    public R getTradeDetail(@ParameterObject StatUserGetTradeDetailDTO param) {
+        return kxsUserTradeService.getTradeDetail(param);
+    }
 }
 

kxs-stat/kxs-stat-biz/src/main/java/com/kxs/stat/biz/mapper/KxsUserTradeMapper.java

@@ -100,12 +100,29 @@ public interface KxsUserTradeMapper extends BaseMapper<KxsUserTrade> {
 
     /**
      * 获取我的业绩
-     * @param param type 1:个人 2:计奖
+     * @param param type 1:个人 2:计奖   month  无用  不传
      * @param tradeType  0pos  1云闪付
      * @param date 该参数为是否根据日查询   不根据传""
      * @return
      */
     KxsUserTrade getMyPosOrCloudTrade(@Param("param")StatUserGetMyTradeDTO param, @Param("tableName")String tableName, @Param("tradeType")Integer tradeType,@Param("userId")Long userId,@Param("date") String date);
 
+    /**
+     * 查询用户所有交易额汇总
+     * @param userId 用户id
+     * @param date 时间参数
+     * @param getType  1获取日详情 2获取月详情
+     * @param tradeType 0pos  1云闪付
+     * @param brandId 品牌id
+     * @param totalType 0:个人 1:计奖
+     * @return
+     */
+    KxsUserTrade getAllUserTrderSum(@Param("userId")Long userId,
+                                    @Param("date") Integer date,
+                                    @Param("getType") Integer getType,
+                                    @Param("tradeType")Integer tradeType,
+                                    @Param("brandId") Long brandId,
+                                    @Param("totalType") Integer totalType,
+                                    @Param("tableName") String tableName);
 }
 

kxs-stat/kxs-stat-biz/src/main/java/com/kxs/stat/biz/service/KxsUserTradeService.java

@@ -3,6 +3,7 @@ package com.kxs.stat.biz.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.kxs.common.core.util.R;
 import com.kxs.stat.api.dto.statUser.StatUserGetMyTradeDTO;
+import com.kxs.stat.api.dto.statUser.StatUserGetTradeDetailDTO;
 import com.kxs.stat.api.dto.statUser.StatUserGetUserStatByDayOrMonthDTO;
 import com.kxs.stat.api.dto.statUser.StatUserGetUserTradeListDTO;
 import com.kxs.stat.api.model.KxsUserTrade;
@@ -54,5 +55,6 @@ public interface KxsUserTradeService extends IService<KxsUserTrade> {
      */
     R getUserTradeStatList(StatUserGetUserTradeListDTO param);
 
+    R getTradeDetail(StatUserGetTradeDetailDTO param);
 }
 

kxs-stat/kxs-stat-biz/src/main/java/com/kxs/stat/biz/service/impl/KxsUserTradeServiceImpl.java

@@ -12,6 +12,7 @@ import com.kxs.common.core.util.AssertUtil;
 import com.kxs.common.core.util.R;
 import com.kxs.common.security.util.SecurityUtils;
 import com.kxs.stat.api.dto.statUser.StatUserGetMyTradeDTO;
+import com.kxs.stat.api.dto.statUser.StatUserGetTradeDetailDTO;
 import com.kxs.stat.api.dto.statUser.StatUserGetUserStatByDayOrMonthDTO;
 import com.kxs.stat.api.dto.statUser.StatUserGetUserTradeListDTO;
 import com.kxs.stat.api.model.KxsLkbTrade;
@@ -327,7 +328,7 @@ public class KxsUserTradeServiceImpl extends ServiceImpl<KxsUserTradeMapper, Kxs
         //获取pos交易额
         try {
             //此处存在查询的月份不在统计范围,找不到表的错误,直接包裹跳过视为当月无交易
-            kxsUserPosTrade = baseMapper.getMyPosOrCloudTrade(param, tableName, 0, userId,"");
+            kxsUserPosTrade = baseMapper.getMyPosOrCloudTrade(param, tableName, 0, userId, "");
         } catch (Exception e) {
             log.info(e.getMessage());
         }
@@ -356,7 +357,7 @@ public class KxsUserTradeServiceImpl extends ServiceImpl<KxsUserTradeMapper, Kxs
         //获取云闪付交易额
         try {
             //此处存在查询的月份不在统计范围,找不到表的错误,直接包裹跳过视为当月无交易
-            kxsUserCloudTrade = baseMapper.getMyPosOrCloudTrade(param, tableName, 1, userId,"");
+            kxsUserCloudTrade = baseMapper.getMyPosOrCloudTrade(param, tableName, 1, userId, "");
         } catch (Exception e) {
             log.info(e.getMessage());
         }
@@ -458,35 +459,130 @@ public class KxsUserTradeServiceImpl extends ServiceImpl<KxsUserTradeMapper, Kxs
         if (tradeType.equals(3)) {//获取全部
             tableName = PREFIX_TABLE_NAME; //全部
             if (getType.equals(2)) {//查询近半年
-                ArrayList<StatUserGetUserTradeStatListVO> statUserGetUserTradeStatListVOS = getStatUserGetUserTradeStatListVOSByMonth(month, totalType, userId, getType, now, times, tableName,tradeType);
+                ArrayList<StatUserGetUserTradeStatListVO> statUserGetUserTradeStatListVOS = getStatUserGetUserTradeStatListVOSByMonth(month, totalType, userId, getType, now, times, tableName, tradeType);
                 return R.ok(statUserGetUserTradeStatListVOS);
             } else if (getType.equals(1)) {//查询月详细
-                ArrayList<StatUserGetUserTradeStatListVO> statUserGetUserTradeStatListVOS = getUserGetUserTradeStatListVOSByDay(month, totalType, userId, getType, now, times, tableName,tradeType);
+                ArrayList<StatUserGetUserTradeStatListVO> statUserGetUserTradeStatListVOS = getUserGetUserTradeStatListVOSByDay(month, totalType, userId, getType, now, times, tableName, tradeType);
                 return R.ok(statUserGetUserTradeStatListVOS);
             }
-        }else if (tradeType.equals(2)){
-            tableName =  PREFIX_TABLE_NAME_BEFORE; //存量
+        } else if (tradeType.equals(2)) {
+            tableName = PREFIX_TABLE_NAME_BEFORE; //存量
             if (getType.equals(2)) {//查询近半年
-                ArrayList<StatUserGetUserTradeStatListVO> statUserGetUserTradeStatListVOS = getStatUserGetUserTradeStatListVOSByMonth(month, totalType, userId, getType, now, times, tableName,tradeType);
+                ArrayList<StatUserGetUserTradeStatListVO> statUserGetUserTradeStatListVOS = getStatUserGetUserTradeStatListVOSByMonth(month, totalType, userId, getType, now, times, tableName, tradeType);
                 return R.ok(statUserGetUserTradeStatListVOS);
             } else if (getType.equals(1)) {//查询月详细
-                ArrayList<StatUserGetUserTradeStatListVO> statUserGetUserTradeStatListVOS = getUserGetUserTradeStatListVOSByDay(month, totalType, userId, getType, now, times, tableName,tradeType);
+                ArrayList<StatUserGetUserTradeStatListVO> statUserGetUserTradeStatListVOS = getUserGetUserTradeStatListVOSByDay(month, totalType, userId, getType, now, times, tableName, tradeType);
                 return R.ok(statUserGetUserTradeStatListVOS);
             }
-        }else if (tradeType.equals(1)){
+        } else if (tradeType.equals(1)) {
             tableName = PREFIX_TABLE_NAME_AFTER; //增量
             if (getType.equals(2)) {//查询近半年
-                ArrayList<StatUserGetUserTradeStatListVO> statUserGetUserTradeStatListVOS = getStatUserGetUserTradeStatListVOSByMonth(month, totalType, userId, getType, now, times, tableName,tradeType);
+                ArrayList<StatUserGetUserTradeStatListVO> statUserGetUserTradeStatListVOS = getStatUserGetUserTradeStatListVOSByMonth(month, totalType, userId, getType, now, times, tableName, tradeType);
                 return R.ok(statUserGetUserTradeStatListVOS);
             } else if (getType.equals(1)) {//查询月详细
-                ArrayList<StatUserGetUserTradeStatListVO> statUserGetUserTradeStatListVOS = getUserGetUserTradeStatListVOSByDay(month, totalType, userId, getType, now, times, tableName,tradeType);
+                ArrayList<StatUserGetUserTradeStatListVO> statUserGetUserTradeStatListVOS = getUserGetUserTradeStatListVOSByDay(month, totalType, userId, getType, now, times, tableName, tradeType);
                 return R.ok(statUserGetUserTradeStatListVOS);
             }
         }
         return R.failed("获取增存量类型错误");
     }
 
-    private ArrayList<StatUserGetUserTradeStatListVO> getUserGetUserTradeStatListVOSByDay(String month, Integer totalType, Long userId, Integer getType, LocalDate now, List<String> times,String tableName,Integer tradeType) {
+    @Override
+    public R getTradeDetail(StatUserGetTradeDetailDTO param) {
+        Integer totalType = param.getTotalType();//0:个人 1:计奖
+        Integer date = param.getDate();//该参数有效获取月份格式yyyyMM   日格式yyyyMMdd
+        Integer getType = param.getGetType();// 1获取日详情 2获取月详情
+        Integer tradeType = param.getTradeType();//1获取增量 2获取存量 3获取全部
+        Long userId = param.getUserId();//用户id
+        Long brandId = param.getBrandId();//品牌id
+        String month;
+        // 检查字符串长度是否至少为6个字符（yyyyMM）
+        if (date.toString().length() >= 6) {
+            // 截取前6个字符（yyyyMM）
+            month = date.toString().substring(0, 6);
+            // 现在yearMonth包含了yyyyMM格式的字符串
+            System.out.println(month); // 输出结果
+        } else {
+            return R.failed("date格式错误");
+        }
+        String tableName;
+        //拼接表名
+        if (tradeType.equals(3)) {
+            tableName = PREFIX_TABLE_NAME + month;
+        } else if (tradeType.equals(2)) {
+            tableName = PREFIX_TABLE_NAME_BEFORE + month;
+        } else if (tradeType.equals(1)) {
+            tableName = PREFIX_TABLE_NAME_AFTER + month;
+        } else {
+            return R.failed("获取类型错误");
+        }
+        KxsUserTrade kxsUserTradePos = null;
+        //查询pos交易
+        try {
+            kxsUserTradePos = baseMapper.getAllUserTrderSum(userId, date, getType, 0, brandId, totalType, tableName);//pos
+        }catch (Exception e){
+            log.info(e.getMessage());
+        }
+
+
+        StatUserGetTradeDetailVO statUserGetTradeDetailVO = new StatUserGetTradeDetailVO();
+        statUserGetTradeDetailVO.setDate(date);//交易时间
+        statUserGetTradeDetailVO.setBrandId(Math.toIntExact(brandId));//品牌
+        if (kxsUserTradePos != null) {
+            statUserGetTradeDetailVO.setHelpDirectTradeAmt(kxsUserTradePos.getHelpDirectTradeAmt());//扶持期贷记卡
+            statUserGetTradeDetailVO.setHelpDebitTradeAmt(kxsUserTradePos.getHelpDebitTradeAmt());//扶持期借记卡
+            statUserGetTradeDetailVO.setHelpDebitCapTradeAmt(kxsUserTradePos.getHelpDebitCapTradeAmt());//扶持期借记卡封顶交易额
+            statUserGetTradeDetailVO.setHelpDebitCapNum(kxsUserTradePos.getHelpDebitCapNum());//扶持期借记卡封顶交易笔数
+            BigDecimal helpNotCapTrade = kxsUserTradePos.getHelpDebitTradeAmt().subtract(kxsUserTradePos.getHelpDebitCapTradeAmt());//非封顶交易额
+            statUserGetTradeDetailVO.setHelpBDebitNotCapTrade(helpNotCapTrade);//扶持期非封顶借记卡交易额
+
+
+            statUserGetTradeDetailVO.setProDirectTradeAmt(kxsUserTradePos.getProDirectTradeAmt());//稳定期贷记卡
+            statUserGetTradeDetailVO.setProDebitTradeAmt(kxsUserTradePos.getProDebitTradeAmt());//稳定期借记卡
+            statUserGetTradeDetailVO.setProDebitCapTradeAmt(kxsUserTradePos.getProDebitCapTradeAmt());//稳定期借记卡封顶交易额
+            statUserGetTradeDetailVO.setProDebitCapNum(kxsUserTradePos.getProDebitCapNum());//稳定期借记卡封顶交易笔数
+            BigDecimal proNotCapTrade = kxsUserTradePos.getProDebitTradeAmt().subtract(kxsUserTradePos.getProDebitCapTradeAmt());//非封顶交易额
+            statUserGetTradeDetailVO.setProDebitNotCapTrade(proNotCapTrade);//稳定期非封顶借记卡交易额
+
+
+            statUserGetTradeDetailVO.setProADirectTradeAmt(kxsUserTradePos.getProADirectTradeAmt());//稳A贷记
+            statUserGetTradeDetailVO.setProADebitTradeAmt(kxsUserTradePos.getProADebitTradeAmt());//稳A借记
+            statUserGetTradeDetailVO.setProADebitCapTradeAmt(kxsUserTradePos.getProADebitCapTradeAmt());//稳定期A借记卡封顶交易额
+            statUserGetTradeDetailVO.setProADebitCapNum(kxsUserTradePos.getProADebitCapNum());//稳定期A借记卡封顶交易笔数
+            BigDecimal proANotCapTrade = kxsUserTradePos.getProADebitTradeAmt().subtract(kxsUserTradePos.getProADebitCapTradeAmt());//非封顶交易额
+            statUserGetTradeDetailVO.setProADebitNotCapTrade(proANotCapTrade);//稳定期b非封顶借记卡交易额
+
+
+            statUserGetTradeDetailVO.setProBDebitTradeAmt(kxsUserTradePos.getProBDirectTradeAmt());//稳定期B借记卡
+            statUserGetTradeDetailVO.setProBDirectTradeAmt(kxsUserTradePos.getProBDebitTradeAmt());//稳定期B贷记卡
+            statUserGetTradeDetailVO.setProBDebitCapTradeAmt(kxsUserTradePos.getProBDebitCapTradeAmt());//稳定期B借记卡封顶交易额
+            statUserGetTradeDetailVO.setProBDebitCapNum(kxsUserTradePos.getProBDebitCapNum());//稳定期B借记卡封顶交易笔数
+            BigDecimal proBNotCapTrade = kxsUserTradePos.getProBDebitTradeAmt().subtract(kxsUserTradePos.getProBDebitCapTradeAmt());//稳定期b非封顶交易额
+            statUserGetTradeDetailVO.setProBDebitNotCapTrade(proBNotCapTrade);//稳定期b非封顶借记卡交易额
+        }
+        KxsUserTrade kxsUserTradeCloud = null;
+        try {
+            kxsUserTradeCloud = baseMapper.getAllUserTrderSum(userId, date, getType, 1, brandId, totalType, tableName);//云闪付
+        }catch (Exception e){
+            log.info(e.getMessage());
+        }
+        if (kxsUserTradeCloud != null) {
+            BigDecimal helpTrade = kxsUserTradeCloud.getHelpDebitCapTradeAmt().add(kxsUserTradeCloud.getHelpDirectTradeAmt());//计算扶持期云闪付交易额
+            statUserGetTradeDetailVO.setHelpCloudTrade(helpTrade);//扶持期云闪付交易额
+
+            BigDecimal proTrade = kxsUserTradeCloud.getProDebitCapTradeAmt().add(kxsUserTradeCloud.getProDirectTradeAmt());//计算稳定期云闪付交易额
+            statUserGetTradeDetailVO.setProCloudTrade(proTrade);//稳定期云闪付交易额
+
+            BigDecimal proATrade = kxsUserTradeCloud.getProADebitCapTradeAmt().add(kxsUserTradeCloud.getProADirectTradeAmt());//计算稳定期b云闪付交易额
+            statUserGetTradeDetailVO.setProACloudTrade(proATrade);//稳定期A云闪付交易额
+
+            BigDecimal proBTrade = kxsUserTradeCloud.getProBDebitCapTradeAmt().add(kxsUserTradeCloud.getProBDirectTradeAmt());//计算稳定期a云闪付交易额
+            statUserGetTradeDetailVO.setProBCloudTrade(proBTrade);//稳定期B云闪付交易额
+        }
+        return R.ok(statUserGetTradeDetailVO);
+    }
+
+    private ArrayList<StatUserGetUserTradeStatListVO> getUserGetUserTradeStatListVOSByDay(String month, Integer totalType, Long userId, Integer getType, LocalDate now, List<String> times, String tableName, Integer tradeType) {
         //校验时间格式是yyyyMM
         AssertUtil.isyyyyMM(month);
         //判断month是否是本月  否则获取月份中全部日日期
@@ -522,21 +618,21 @@ public class KxsUserTradeServiceImpl extends ServiceImpl<KxsUserTradeMapper, Kxs
             KxsUserTrade myPosTrade = null;
             try {
                 //此处存在不存在表  跳过报错视为无数据
-                myPosTrade = baseMapper.getMyPosOrCloudTrade(statUserGetMyTradeDTO, lastTableName, 0, userId,time);
-            }catch (Exception e){
+                myPosTrade = baseMapper.getMyPosOrCloudTrade(statUserGetMyTradeDTO, lastTableName, 0, userId, time);
+            } catch (Exception e) {
                 log.info(e.getMessage());
             }
-            if(myPosTrade == null){
+            if (myPosTrade == null) {
                 myPosTrade = new KxsUserTrade();
             }
-            StatUserGetUserTradeStatListVO statUserGetUserTradeStatListVO = getMonthTrade(totalType, userId, getType, statUserGetMyTradeDTO, myPosTrade, month,time, tableName, tradeType);
+            StatUserGetUserTradeStatListVO statUserGetUserTradeStatListVO = getMonthTrade(totalType, userId, getType, statUserGetMyTradeDTO, myPosTrade, month, time, tableName, tradeType);
             statUserGetUserTradeStatListVO.setTime(time);
             statUserGetUserTradeStatListVOS.add(statUserGetUserTradeStatListVO);
         }
         return statUserGetUserTradeStatListVOS;
     }
 
-    private ArrayList<StatUserGetUserTradeStatListVO> getStatUserGetUserTradeStatListVOSByMonth(String month, Integer totalType, Long userId, Integer getType, LocalDate now, List<String> times,String tableName,Integer tradeType) {
+    private ArrayList<StatUserGetUserTradeStatListVO> getStatUserGetUserTradeStatListVOSByMonth(String month, Integer totalType, Long userId, Integer getType, LocalDate now, List<String> times, String tableName, Integer tradeType) {
         //近半年
         for (int i = 0; i < 6; i++) {
             // 计算过去半年每月月份
@@ -558,11 +654,11 @@ public class KxsUserTradeServiceImpl extends ServiceImpl<KxsUserTradeMapper, Kxs
                 //拼接表名  因有可能查询不存在的表导致报错我们try包裹视为无数据
                 String lastTableName = tableName + time;
                 //查询交易额
-                KxsUserTrade myPosTrade = baseMapper.getMyPosOrCloudTrade(statUserGetMyTradeDTO, lastTableName, 0, userId,"");
-                if (myPosTrade == null){
+                KxsUserTrade myPosTrade = baseMapper.getMyPosOrCloudTrade(statUserGetMyTradeDTO, lastTableName, 0, userId, "");
+                if (myPosTrade == null) {
                     myPosTrade = new KxsUserTrade();
                 }
-                StatUserGetUserTradeStatListVO statUserGetUserTradeStatListVO = getMonthTrade(totalType, userId, getType, statUserGetMyTradeDTO, myPosTrade, month,time, tableName,tradeType);
+                StatUserGetUserTradeStatListVO statUserGetUserTradeStatListVO = getMonthTrade(totalType, userId, getType, statUserGetMyTradeDTO, myPosTrade, month, time, tableName, tradeType);
                 statUserGetUserTradeStatListVO.setTime(time);
                 statUserGetUserTradeStatListVOS.add(statUserGetUserTradeStatListVO);
             } catch (Exception e) {
@@ -572,18 +668,18 @@ public class KxsUserTradeServiceImpl extends ServiceImpl<KxsUserTradeMapper, Kxs
         return statUserGetUserTradeStatListVOS;
     }
 
-    private StatUserGetUserTradeStatListVO getMonthTrade(Integer totalType, Long userId, Integer getType, StatUserGetMyTradeDTO statUserGetMyTradeDTO, KxsUserTrade kxsUserTrade,String month,String date,String tableName,Integer tradeType) {
-        BigDecimal helpDirectTradeAmt = kxsUserTrade.getHelpDirectTradeAmt() == null? BigDecimal.ZERO : kxsUserTrade.getHelpDirectTradeAmt();//扶贷
-        BigDecimal helpDebitTradeAmt = kxsUserTrade.getHelpDebitTradeAmt() == null? BigDecimal.ZERO : kxsUserTrade.getHelpDebitTradeAmt();//扶借
+    private StatUserGetUserTradeStatListVO getMonthTrade(Integer totalType, Long userId, Integer getType, StatUserGetMyTradeDTO statUserGetMyTradeDTO, KxsUserTrade kxsUserTrade, String month, String date, String tableName, Integer tradeType) {
+        BigDecimal helpDirectTradeAmt = kxsUserTrade.getHelpDirectTradeAmt() == null ? BigDecimal.ZERO : kxsUserTrade.getHelpDirectTradeAmt();//扶贷
+        BigDecimal helpDebitTradeAmt = kxsUserTrade.getHelpDebitTradeAmt() == null ? BigDecimal.ZERO : kxsUserTrade.getHelpDebitTradeAmt();//扶借
 
-        BigDecimal proDirectTradeAmt = kxsUserTrade.getProDirectTradeAmt() == null? BigDecimal.ZERO : kxsUserTrade.getProDirectTradeAmt();//稳贷
-        BigDecimal proDebitTradeAmt = kxsUserTrade.getProDebitTradeAmt() == null? BigDecimal.ZERO : kxsUserTrade.getProDebitTradeAmt();//稳借
+        BigDecimal proDirectTradeAmt = kxsUserTrade.getProDirectTradeAmt() == null ? BigDecimal.ZERO : kxsUserTrade.getProDirectTradeAmt();//稳贷
+        BigDecimal proDebitTradeAmt = kxsUserTrade.getProDebitTradeAmt() == null ? BigDecimal.ZERO : kxsUserTrade.getProDebitTradeAmt();//稳借
 
-        BigDecimal proADirectTradeAmt = kxsUserTrade.getProADirectTradeAmt() == null? BigDecimal.ZERO : kxsUserTrade.getProADirectTradeAmt();//稳A贷
-        BigDecimal proADebitTradeAmt = kxsUserTrade.getProADebitTradeAmt() == null? BigDecimal.ZERO : kxsUserTrade.getProADebitTradeAmt();//稳A借
+        BigDecimal proADirectTradeAmt = kxsUserTrade.getProADirectTradeAmt() == null ? BigDecimal.ZERO : kxsUserTrade.getProADirectTradeAmt();//稳A贷
+        BigDecimal proADebitTradeAmt = kxsUserTrade.getProADebitTradeAmt() == null ? BigDecimal.ZERO : kxsUserTrade.getProADebitTradeAmt();//稳A借
 
-        BigDecimal proBDebitTradeAmt = kxsUserTrade.getProBDebitTradeAmt() == null? BigDecimal.ZERO : kxsUserTrade.getProBDebitTradeAmt();//稳B借
-        BigDecimal proBDirectTradeAmt = kxsUserTrade.getProBDirectTradeAmt() == null? BigDecimal.ZERO : kxsUserTrade.getProBDirectTradeAmt();//稳B贷
+        BigDecimal proBDebitTradeAmt = kxsUserTrade.getProBDebitTradeAmt() == null ? BigDecimal.ZERO : kxsUserTrade.getProBDebitTradeAmt();//稳B借
+        BigDecimal proBDirectTradeAmt = kxsUserTrade.getProBDirectTradeAmt() == null ? BigDecimal.ZERO : kxsUserTrade.getProBDirectTradeAmt();//稳B贷
 
         BigDecimal totalAmount = BigDecimal.ZERO;
 
@@ -598,24 +694,24 @@ public class KxsUserTradeServiceImpl extends ServiceImpl<KxsUserTradeMapper, Kxs
         KxsUserTrade myCloudTrade = null;
         try {
             //存在表不存在的月份,跳过报错视为无数据
-            myCloudTrade = baseMapper.getMyPosOrCloudTrade(statUserGetMyTradeDTO, tableName, 1, userId,"");
-        }catch (Exception e){
+            myCloudTrade = baseMapper.getMyPosOrCloudTrade(statUserGetMyTradeDTO, tableName, 1, userId, "");
+        } catch (Exception e) {
             log.info(e.getMessage());
         }
-        if(myCloudTrade == null){
+        if (myCloudTrade == null) {
             myCloudTrade = new KxsUserTrade();
         }
-        BigDecimal helpDirectTradeAmtCloud = myCloudTrade.getHelpDirectTradeAmt() == null? BigDecimal.ZERO : myCloudTrade.getHelpDirectTradeAmt();//扶贷
-        BigDecimal helpDebitTradeAmtCloud = myCloudTrade.getHelpDebitTradeAmt() == null? BigDecimal.ZERO : myCloudTrade.getHelpDebitTradeAmt();//扶借
+        BigDecimal helpDirectTradeAmtCloud = myCloudTrade.getHelpDirectTradeAmt() == null ? BigDecimal.ZERO : myCloudTrade.getHelpDirectTradeAmt();//扶贷
+        BigDecimal helpDebitTradeAmtCloud = myCloudTrade.getHelpDebitTradeAmt() == null ? BigDecimal.ZERO : myCloudTrade.getHelpDebitTradeAmt();//扶借
 
-        BigDecimal proDirectTradeAmtCloud = myCloudTrade.getProDirectTradeAmt() == null? BigDecimal.ZERO : myCloudTrade.getProDirectTradeAmt();//稳贷
-        BigDecimal proDebitTradeAmtCloud = myCloudTrade.getProDebitTradeAmt() == null? BigDecimal.ZERO : myCloudTrade.getProDebitTradeAmt();//稳借
+        BigDecimal proDirectTradeAmtCloud = myCloudTrade.getProDirectTradeAmt() == null ? BigDecimal.ZERO : myCloudTrade.getProDirectTradeAmt();//稳贷
+        BigDecimal proDebitTradeAmtCloud = myCloudTrade.getProDebitTradeAmt() == null ? BigDecimal.ZERO : myCloudTrade.getProDebitTradeAmt();//稳借
 
-        BigDecimal proADirectTradeAmtCloud = myCloudTrade.getProADirectTradeAmt() == null? BigDecimal.ZERO : myCloudTrade.getProADirectTradeAmt();//稳A贷
-        BigDecimal proADebitTradeAmtCloud = myCloudTrade.getProADebitTradeAmt() == null? BigDecimal.ZERO : myCloudTrade.getProADebitTradeAmt();//稳A借
+        BigDecimal proADirectTradeAmtCloud = myCloudTrade.getProADirectTradeAmt() == null ? BigDecimal.ZERO : myCloudTrade.getProADirectTradeAmt();//稳A贷
+        BigDecimal proADebitTradeAmtCloud = myCloudTrade.getProADebitTradeAmt() == null ? BigDecimal.ZERO : myCloudTrade.getProADebitTradeAmt();//稳A借
 
-        BigDecimal proBDebitTradeAmtCloud = myCloudTrade.getProBDebitTradeAmt() == null? BigDecimal.ZERO : myCloudTrade.getProBDebitTradeAmt();//稳B借
-        BigDecimal proBDirectTradeAmtCloud = myCloudTrade.getProBDirectTradeAmt() == null? BigDecimal.ZERO : myCloudTrade.getProBDirectTradeAmt();//稳B贷
+        BigDecimal proBDebitTradeAmtCloud = myCloudTrade.getProBDebitTradeAmt() == null ? BigDecimal.ZERO : myCloudTrade.getProBDebitTradeAmt();//稳B借
+        BigDecimal proBDirectTradeAmtCloud = myCloudTrade.getProBDirectTradeAmt() == null ? BigDecimal.ZERO : myCloudTrade.getProBDirectTradeAmt();//稳B贷
         BigDecimal posAmount = helpDirectTradeAmtCloud
                 .add(helpDebitTradeAmtCloud)
                 .add(proDirectTradeAmtCloud)
@@ -628,9 +724,9 @@ public class KxsUserTradeServiceImpl extends ServiceImpl<KxsUserTradeMapper, Kxs
         statUserGetUserTradeStatListVO.setCloudAmunt(posAmount);
         totalAmount = totalAmount.add(posAmount);
 
-        if (!tradeType.equals(2)){//存量不存在以下数据
+        if (!tradeType.equals(2)) {//存量不存在以下数据
             //助力宝交易额
-            TotalTradeAmtVO TotalTradeAmtVO  = kxsZlbTradeMapper.getZlbTrade(userId, String.valueOf(date), getType, totalType);
+            TotalTradeAmtVO TotalTradeAmtVO = kxsZlbTradeMapper.getZlbTrade(userId, String.valueOf(date), getType, totalType);
             TotalTradeAmtVO = TotalTradeAmtVO == null ? new TotalTradeAmtVO() : TotalTradeAmtVO;
 
 
@@ -654,15 +750,15 @@ public class KxsUserTradeServiceImpl extends ServiceImpl<KxsUserTradeMapper, Kxs
             TotalTradeAmtVO = kxsUserGdTradeMapper.getGdTrade(userId, String.valueOf(date), getType, totalType);
             TotalTradeAmtVO = TotalTradeAmtVO == null ? new TotalTradeAmtVO() : TotalTradeAmtVO;
 
-            BigDecimal gdAmount = TotalTradeAmtVO.getGdAmount() == null ?  BigDecimal.ZERO : TotalTradeAmtVO.getGdAmount();
+            BigDecimal gdAmount = TotalTradeAmtVO.getGdAmount() == null ? BigDecimal.ZERO : TotalTradeAmtVO.getGdAmount();
             statUserGetUserTradeStatListVO.setGdTelephoneCharge(gdAmount);
             totalAmount = totalAmount.add(gdAmount);
 
-            if (tradeType.equals(3)){//广电获取全部
+            if (tradeType.equals(3)) {//广电获取全部
                 //广电激活量
-                if(getType == 1){
+                if (getType == 1) {
                     TotalTradeAmtVO = kxsUserGdTradeMapper.getGdActCount(userId, String.valueOf(date), 3, totalType);
-                }else {
+                } else {
                     TotalTradeAmtVO = kxsUserGdTradeMapper.getGdActCount(userId, String.valueOf(date), 4, totalType);
                 }
                 TotalTradeAmtVO = TotalTradeAmtVO == null ? new TotalTradeAmtVO() : TotalTradeAmtVO;
@@ -671,7 +767,7 @@ public class KxsUserTradeServiceImpl extends ServiceImpl<KxsUserTradeMapper, Kxs
                 statUserGetUserTradeStatListVO.setGdActivityAmount(gdActAmt);
                 totalAmount = totalAmount.add(gdActAmt);
             }
-            if (tradeType.equals(1)){//广电获取增量  只获取当前时间
+            if (tradeType.equals(1)) {//广电获取增量  只获取当前时间
                 //广电激活量
                 TotalTradeAmtVO = kxsUserGdTradeMapper.getGdActCount(userId, String.valueOf(date), getType, totalType);
                 TotalTradeAmtVO = TotalTradeAmtVO == null ? new TotalTradeAmtVO() : TotalTradeAmtVO;

kxs-stat/kxs-stat-biz/src/main/resources/mapper/KxsUserTradeMapper.xml

@@ -278,6 +278,38 @@
             </if>
         </where>
     </select>
+    <select id="getAllUserTrderSum" resultType="com.kxs.stat.api.model.KxsUserTrade">
+        select
+        sum(pro_b_debit_cap_num) as pro_b_debit_cap_num,
+        sum(pro_b_debit_cap_trade_amt) as pro_b_debit_cap_trade_amt,
+        sum(pro_b_direct_trade_amt) as pro_b_direct_trade_amt,
+        sum(pro_b_debit_trade_amt) as pro_b_debit_trade_amt,
+        sum(pro_a_debit_cap_num) as pro_a_debit_cap_num,
+        sum(pro_a_debit_cap_trade_amt) as pro_a_debit_cap_trade_amt,
+        sum(pro_debit_cap_num) as pro_debit_cap_num,
+        sum(pro_debit_cap_trade_amt) as pro_debit_cap_trade_amt,
+        sum(help_debit_cap_num) as help_debit_cap_num,
+        sum(help_debit_cap_trade_amt) as help_debit_cap_trade_amt,
+        sum(pro_a_debit_trade_amt) as pro_a_debit_trade_amt,
+        sum(pro_a_direct_trade_amt) as pro_a_direct_trade_amt,
+        sum(pro_debit_trade_amt) as pro_debit_trade_amt,
+        sum(pro_direct_trade_amt) as pro_direct_trade_amt,
+        sum(help_debit_trade_amt) as help_debit_trade_amt,
+        sum(help_direct_trade_amt) as help_direct_trade_amt
+        from ${tableName}
+        <where>
+            and total_type = #{totalType}
+            and user_id = #{userId}
+            and trade_type = #{tradeType}
+            and brand_id = #{brandId}
+            <if test="getType == 1">
+                and trade_date = #{date}
+            </if>
+            <if test="getType == 2">
+                and trade_month = #{date}
+            </if>
+        </where>
+    </select>
 
 
     <insert id="insertTempShdTableData">

kxs-store/kxs-store-api/src/main/java/com/kxs/store/api/vo/kxsapp/storeOrder/StoreOrderListVO.java

@@ -114,6 +114,11 @@ public class StoreOrderListVO implements Serializable {
     private List<String> snList;
 
 
+    /**
+     * 品牌id
+     */
+    @Schema(description = "品牌id")
+    private Long brandId;
 
 
 

kxs-store/kxs-store-biz/src/main/java/com/kxs/store/biz/controller/kxsapp/StoreAdvanceController.java

@@ -46,9 +46,9 @@ public class StoreAdvanceController {
      * @return 小分仓-列表
      */
     @GetMapping("/getUserWareHouseList")
-    public R getUserWareHouseList(@ParameterObject Page<UserWarehouseListVO> page) {
+    public R getUserWareHouseList(@ParameterObject Page<UserWarehouseListVO> page,@RequestParam("keyword") String keyword) {
 
-        return R.ok(kxsMachineAdvanceService.getUserWareHouseList(page));
+        return R.ok(kxsMachineAdvanceService.getUserWareHouseList(page,keyword));
     }
 
 

kxs-store/kxs-store-biz/src/main/java/com/kxs/store/biz/mapper/KxsMachineAdvanceMapper.java

@@ -40,7 +40,7 @@ public interface KxsMachineAdvanceMapper extends BaseMapper<KxsMachineAdvance> {
      * @param userId 用户 ID
      * @return {@link IPage}<{@link UserWarehouseListVO}>
      */
-    IPage<UserWarehouseListVO> getUserWareHouseList(Page<UserWarehouseListVO> page, @Param("userId") Long userId);
+    IPage<UserWarehouseListVO> getUserWareHouseList(Page<UserWarehouseListVO> page, @Param("userId") Long userId, @Param("keyword") String keyword);
 
     /**
      * 查询用户预发机数量 未确认和已确认 未申请的

kxs-store/kxs-store-biz/src/main/java/com/kxs/store/biz/mapper/KxsMachineApplyMapper.java

@@ -30,7 +30,7 @@ public interface KxsMachineApplyMapper extends BaseMapper<KxsMachineApply> {
      * @param param 参数
      * @return {@link IPage}<{@link StoreOrderListVO}>
      */
-    IPage<StoreOrderListVO> getByPage(Page<StoreOrderListVO> page, @Param("query") StoreOrderListDTO param);
+    IPage<StoreOrderListVO> getByPage(Page<StoreOrderListVO> page, @Param("query") StoreOrderListDTO param,@Param("userId") Long userId);
 
     /**
      * 发货统计

kxs-store/kxs-store-biz/src/main/java/com/kxs/store/biz/service/KxsMachineAdvanceService.java

@@ -39,7 +39,7 @@ public interface KxsMachineAdvanceService extends IService<KxsMachineAdvance> {
      * @param page 页
      * @return {@link IPage}<{@link UserWarehouseListVO}>
      */
-    IPage<UserWarehouseListVO> getUserWareHouseList(Page<UserWarehouseListVO> page);
+    IPage<UserWarehouseListVO> getUserWareHouseList(Page<UserWarehouseListVO> page, String keyword);
 
     /**
      * 撤回机具

kxs-store/kxs-store-biz/src/main/java/com/kxs/store/biz/service/impl/KxsMachineAdvanceServiceImpl.java

@@ -78,7 +78,7 @@ public class KxsMachineAdvanceServiceImpl extends ServiceImpl<KxsMachineAdvanceM
     }
 
     @Override
-    public IPage<UserWarehouseListVO> getUserWareHouseList(Page<UserWarehouseListVO> page) {
+    public IPage<UserWarehouseListVO> getUserWareHouseList(Page<UserWarehouseListVO> page, String keyword) {
 
         Long userId = SecurityUtils.getUser().getId();
 
@@ -89,8 +89,8 @@ public class KxsMachineAdvanceServiceImpl extends ServiceImpl<KxsMachineAdvanceM
               通过仓库用户和小分仓用户查询预发机订单的品牌信息
           </p>
          */
-        IPage<UserWarehouseListVO> userWareHouseList = baseMapper.getUserWareHouseList(page, userId);
-
+        IPage<UserWarehouseListVO> userWareHouseList = baseMapper.getUserWareHouseList(page, userId,keyword);
+        //todo 添加关键字查询
         for (UserWarehouseListVO record : userWareHouseList.getRecords()) {
 
             //查询用户信息
@@ -112,16 +112,16 @@ public class KxsMachineAdvanceServiceImpl extends ServiceImpl<KxsMachineAdvanceM
             ArrayList<Object> brandList = new ArrayList<>();
             advanceDevMap.forEach((brandName, item) -> {
                 HashMap<String, Object> map = new HashMap<>();
-                map.put("brandName", brandName);
+                map.put("brandName", brandName);//品牌名
                 ArrayList<Object> snList = new ArrayList<>();
                 if (item instanceof ArrayList<Map<String, Object>> list) {
                     for (Map<String, Object> info : list) {
                         HashMap<String, Object> sn = new HashMap<>();
-                        sn.put("id", info.get("infoId"));
-                        sn.put("posSn", info.get("posSn"));
-                        sn.put("isUseAmount", info.get("isUseAmount"));
-                        sn.put("isConfirm", info.get("isConfirm"));
-                        sn.put("createTime", info.get("createTime"));
+                        sn.put("id", info.get("infoId"));//预发机id
+                        sn.put("posSn", info.get("posSn"));//机具sn
+                        sn.put("isUseAmount", info.get("isUseAmount"));//是否占用语法额度  0否  1是
+                        sn.put("isConfirm", info.get("isConfirm"));//是否确认收货  0未确认 1已确认  2已拒绝
+                        sn.put("createTime", info.get("createTime"));//创建时间
                         snList.add(sn);
                     }
                 }

kxs-store/kxs-store-biz/src/main/java/com/kxs/store/biz/service/impl/KxsMachineApplyServiceImpl.java

@@ -391,8 +391,8 @@ public class KxsMachineApplyServiceImpl extends ServiceImpl<KxsMachineApplyMappe
 
     @Override
     public IPage<StoreOrderListVO> getByPage(Page<StoreOrderListVO> page, StoreOrderListDTO param) {
-
-        IPage<StoreOrderListVO> byPage = baseMapper.getByPage(page, param);
+        Long id = SecurityUtils.getUser().getId();
+        IPage<StoreOrderListVO> byPage = baseMapper.getByPage(page, param,id);
         //如果已完成的订单才去查询机具号
         for (StoreOrderListVO orderListVo : byPage.getRecords()) {
             if (Objects.equals(orderListVo.getStatus(), MachineOrderStatusEnum.APPLY_SUCCESSFUL.getType())) {

kxs-store/kxs-store-biz/src/main/resources/mapper/KxsMachineApplyMapper.xml

@@ -29,8 +29,9 @@
 
     </resultMap>
     <select id="getByPage" resultType="com.kxs.store.api.vo.kxsapp.storeOrder.StoreOrderListVO">
-        select a.id, a.create_time, a.order_sn, a.get_mode, a.apply_num, a.contacts, a.phone, a.address, a.apply_type, a.status, a.username, a.user_code from kxs_machine_apply a
+        select a.id, a.create_time, a.order_sn, a.get_mode, a.apply_num, a.contacts, a.phone, a.address, a.apply_type, a.status, a.username, a.user_code a.brand_id from kxs_machine_apply a
         <where>
+            and user_id = #{userId}
             <if test="query.brandId != null and query.brandId != 0">
                 and a.brand_id = #{query.brandId}
             </if>