新增商户交易记录接口,新增校验推荐码接口,用户所属仓库接口新增未发货数量字段

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

@@ -0,0 +1,37 @@
+package com.kxs.stat.api.vo.statUser;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * 我的商户-商户交易记录VO
+ */
+@Data
+public class MerchantTradeDetailVO {
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+    /**
+     * 交易日
+     */
+    private String tradeDate;
+    /**
+     * 交易月
+     */
+    private String tradeMonth;
+    /**
+     * 交易金额
+     */
+    private BigDecimal tradeAmt;
+    /**
+     * 月交易总金额
+     */
+    private BigDecimal tradeAmtMonth;
+    /**
+     * 商户id
+     */
+    private Long merchantId;
+}

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

@@ -3,6 +3,7 @@ package com.kxs.stat.biz.controller;
 import com.kxs.common.core.util.R;
 
 import com.kxs.stat.api.dto.statUser.StatUserGetUserStatByDayOrMonthDTO;
+import com.kxs.stat.biz.service.KxsMerchantTradeService;
 import com.kxs.stat.biz.service.KxsUserTradeService;
 
 import jakarta.validation.Valid;
@@ -27,7 +28,7 @@ public class KxsStatUserController {
      */
     private final KxsUserTradeService kxsUserTradeService;
 
-
+    private final KxsMerchantTradeService kxsMerchantTradeService;
 
     /**
      * 用户详情-获取用户统计数据
@@ -42,6 +43,16 @@ public class KxsStatUserController {
 
 
 
+    /**
+     * 商户交易记录
+     *
+     * @param id 商户id
+     * @return 商户交易记录
+     */
+    @GetMapping("/merchantTradeDetail")
+    public R merchantTradeDetail(@RequestParam("id") Long id) {
+        return kxsMerchantTradeService.merchantTradeDetail(id);
+    }
 
 
 }

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

@@ -1,8 +1,11 @@
 package com.kxs.stat.biz.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.kxs.common.core.util.R;
 import com.kxs.stat.api.model.KxsMerchantTrade;
+import com.kxs.stat.api.vo.statUser.MerchantTradeDetailVO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 商户交易统计总表(KxsMerchantTrade)表数据库访问层
@@ -14,5 +17,7 @@ import org.apache.ibatis.annotations.Mapper;
 public interface KxsMerchantTradeMapper extends BaseMapper<KxsMerchantTrade> {
 
     void automaticTableCreationTasks(String tableName);
+
+    MerchantTradeDetailVO merchantTradeDetail(@Param("id") Long id, @Param("month") String month);
 }
 

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

@@ -1,6 +1,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.model.KxsMerchantTrade;
 
 /**
@@ -11,5 +12,6 @@ import com.kxs.stat.api.model.KxsMerchantTrade;
  */
 public interface KxsMerchantTradeService extends IService<KxsMerchantTrade> {
 
+    R merchantTradeDetail(Long id);
 }
 

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

@@ -26,5 +26,6 @@ public interface KxsUserTradeService extends IService<KxsUserTrade> {
 
     R getUserStatByDayOrMonth(StatUserGetUserStatByDayOrMonthDTO param);
 
+
 }
 

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

@@ -1,11 +1,18 @@
 package com.kxs.stat.biz.service.impl;
 
+import cn.hutool.core.date.DatePattern;
+import cn.hutool.core.date.LocalDateTimeUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.kxs.common.core.util.R;
+import com.kxs.stat.api.vo.statUser.MerchantTradeDetailVO;
 import com.kxs.stat.biz.mapper.KxsMerchantTradeMapper;
 import com.kxs.stat.api.model.KxsMerchantTrade;
 import com.kxs.stat.biz.service.KxsMerchantTradeService;
+import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDate;
+
 /**
  * 商户交易统计总表(KxsMerchantTrade)表服务实现类
  *
@@ -13,7 +20,13 @@ import org.springframework.stereotype.Service;
  * @since 2024-05-07 17:25:06
  */
 @Service("kxsMerchantTradeService")
+@RequiredArgsConstructor
 public class KxsMerchantTradeServiceImpl extends ServiceImpl<KxsMerchantTradeMapper, KxsMerchantTrade> implements KxsMerchantTradeService {
-
+    private final KxsMerchantTradeMapper kxsMerchantTradeMapper;
+    @Override
+    public R merchantTradeDetail(Long id) {
+        String month = LocalDateTimeUtil.format(LocalDate.now(), DatePattern.SIMPLE_MONTH_PATTERN);
+        return R.ok(kxsMerchantTradeMapper.merchantTradeDetail(id, month));
+    }
 }
 

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

@@ -245,6 +245,7 @@ public class KxsUserTradeServiceImpl extends ServiceImpl<KxsUserTradeMapper, Kxs
         }
     }
 
+
     private StatUserGetUserStatByDayOrMonthVO getStatUserGetUserStatByDayOrMonthVO(Long userId, LocalDate now, List<String> times, List<String> lastMonthTimes, Integer type) {
         StatUserGetUserStatByDayOrMonthVO statUserGetUserStatByDayOrMonthVO = new StatUserGetUserStatByDayOrMonthVO();
         /* ------ 交易趋势图 ------ */

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

@@ -18,5 +18,26 @@
     <update id="automaticTableCreationTasks">
         CREATE TABLE IF NOT EXISTS `${tableName}` LIKE kxs_merchant_trade;
     </update>
+    <select id="merchantTradeDetail" resultType="com.kxs.stat.api.vo.statUser.MerchantTradeDetailVO">
+        select
+            create_time,
+            trade_date,
+            trade_month,
+            merchant_id,
+            trade_amt,
+            sum(trade_amt)
+        from
+            kxs_merchant_trade
+        where
+            del_flag != 1
+            and merchant_id = #{id}
+            and trade_month = #{month}
+        GROUP BY
+            create_time,
+            trade_date,
+            trade_month,
+            merchant_id,
+            trade_amt
+    </select>
 
 </mapper>

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

@@ -65,7 +65,11 @@ public class StoreListVO implements Serializable {
 
 
 
-
+    /**
+     * 未发货机具数量
+     */
+    @Schema(description = "未发货机具数量")
+    private Integer unfilledTotal;
 
 	
 

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

@@ -51,8 +51,15 @@ public class KxsWarehouseServiceImpl extends ServiceImpl<KxsWarehouseMapper, Kxs
     @Override
     public List<StoreListVO> userStoreList() {
         Long userId = SecurityUtils.getUser().getId();
-
-        return baseMapper.userStoreList(userId);
+        List<StoreListVO> storeListVOS = baseMapper.userStoreList(userId);
+        for (StoreListVO storeListVO : storeListVOS) {
+            //待发货
+            Long unSendCount = kxsMachineApplyMapper.selectCount(Wrappers.<KxsMachineApply>lambdaQuery()
+                    .eq(KxsMachineApply::getStatus, MachineOrderStatusEnum.UNDER_REVIEW.getType())
+                    .eq(KxsMachineApply::getWarehouseId, storeListVO.getId()));
+            storeListVO.setUnfilledTotal(unSendCount.intValue());
+        }
+        return storeListVOS;
     }
 
     @Override

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

@@ -317,5 +317,17 @@ public class KxsUserController {
 
         return kxsUserService.myUserDetail(id);
     }
+
+    /**
+     * 校验推荐码
+     *
+     * @param userCode 用户编码
+     */
+    @GetMapping("/verifyUserCode")
+    public R verifyUserCode(@RequestParam("userCode") String userCode) {
+
+        return R.ok(kxsUserService.verifyUserCode(userCode));
+    }
+
 }
 

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

@@ -217,5 +217,7 @@ public interface KxsUserService extends IService<KxsUser> {
     Object myUserStatistics();
 
     R myUserDetail(Integer id);
+
+    Object verifyUserCode(String userCode);
 }
 

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

@@ -421,6 +421,15 @@ public class KxsUserServiceImpl extends ServiceImpl<KxsUserMapper, KxsUser> impl
         return R.ok(userMyUserDetailVO);
     }
 
+    @Override
+    public Object verifyUserCode(String userCode) {
+        KxsUser one = getOne(Wrappers.<KxsUser>query().lambda().eq(KxsUser::getUserCode, userCode));
+        if (one == null){
+            return R.failed("该用户不存在");
+        }
+        return R.ok(one.getUsername());
+    }
+
 
     @Override
     public R updatePwd(UserUpdatePwdDTO param) {