我的职级返回来客吧交易额

仓库订单列表

kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/feign/RemoteKxsProductService.java

@@ -148,4 +148,7 @@ public interface RemoteKxsProductService {
 	 */
 	@PostExchange("/merchant/changeToMchUser")
 	R changeToMchUser(@RequestBody KxsMerchant mchInfo, @RequestHeader(SecurityConstants.FROM) String from);
+
+
+
 }

kxs-stat/kxs-stat-api/src/main/java/com/kxs/stat/api/feign/RemoteKxsStatService.java

@@ -5,6 +5,7 @@ import com.kxs.common.core.constant.SecurityConstants;
 import com.kxs.common.core.util.R;
 
 import com.kxs.stat.api.dto.statUser.GetActivityStatByIdAndTimeDTO;
+import com.kxs.stat.api.model.KxsLkbTrade;
 import com.kxs.stat.api.model.KxsUserTrade;
 import com.kxs.stat.api.vo.GetActivityStatByIdAndTimeVO;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -44,6 +45,22 @@ public interface RemoteKxsStatService {
 	@GetExchange("/stat-job/autoStatTableCreationTasks")
     void autoStatTableCreationTasks(@RequestHeader(SecurityConstants.FROM) String from);
 
+	/**
+	 * 百城千团统计数据
+	 *
+	 * @param param 参数
+	 * @param from  从
+	 * @return {@link List}<{@link GetActivityStatByIdAndTimeVO}>
+	 */
 	@GetExchange("/campStat/getActivityStatByIdAndTime")
-	List<GetActivityStatByIdAndTimeVO> getActivityStatByIdAndTime(@RequestBody List<GetActivityStatByIdAndTimeDTO> param,@RequestHeader(SecurityConstants.FROM) String from);
+	List<GetActivityStatByIdAndTimeVO> getActivityStatByIdAndTime(@RequestBody List<GetActivityStatByIdAndTimeDTO> param, @RequestHeader(SecurityConstants.FROM) String from);
+
+	/**
+	 * 获取 LKB 交易额 AMT
+	 *
+	 * @param lkbTrade    lkbTrade
+	 * @return {@link KxsLkbTrade}
+	 */
+	@PostExchange("/stat/getLkbTradeAmt")
+	KxsLkbTrade getLkbTradeAmt(@RequestBody KxsLkbTrade lkbTrade, @RequestHeader(SecurityConstants.FROM) String from);
 }

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

@@ -2,12 +2,11 @@ package com.kxs.stat.biz.controller;
 
 
 import com.kxs.common.security.annotation.Inner;
+import com.kxs.stat.api.model.KxsLkbTrade;
+import com.kxs.stat.biz.service.KxsLkbTradeService;
 import com.kxs.stat.biz.service.KxsUserTradeService;
 import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.math.BigDecimal;
 
@@ -23,6 +22,7 @@ import java.math.BigDecimal;
 public class KxsStatController {
 
     private final KxsUserTradeService kxsUserTradeService;
+    private final KxsLkbTradeService lkbTradeService;
 
 
     /**
@@ -33,5 +33,17 @@ public class KxsStatController {
     public BigDecimal getStatAmount(@RequestParam("month") String month) {
         return kxsUserTradeService.getStatAmount(month);
     }
+
+    /**
+     * 获取来客吧交易额
+     */
+    @Inner
+    @PostMapping("/getLkbTradeAmt")
+    public KxsLkbTrade getLkbTradeAmt(@RequestBody KxsLkbTrade param) {
+
+        return lkbTradeService.getLkbTradeAmt(param);
+    }
+
+
 }
 

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

@@ -11,5 +11,12 @@ import com.kxs.stat.api.model.KxsLkbTrade;
  */
 public interface KxsLkbTradeService extends IService<KxsLkbTrade> {
 
+    /**
+     * 获取 LKB 交易额 AMT
+     *
+     * @param param 参数
+     * @return {@link KxsLkbTrade}
+     */
+    KxsLkbTrade getLkbTradeAmt(KxsLkbTrade param);
 }
 

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

@@ -6,6 +6,7 @@ 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;
 import com.kxs.stat.api.model.KxsUserTrade;
 
 import java.math.BigDecimal;
@@ -55,6 +56,12 @@ public interface KxsUserTradeService extends IService<KxsUserTrade> {
      */
     R getUserTradeStatList(StatUserGetUserTradeListDTO param);
 
+    /**
+     * 获取交易统计数据
+     *
+     * @param param 参数
+     * @return {@link R}
+     */
     R getTradeDetail(StatUserGetTradeDetailDTO param);
 }
 

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

@@ -1,6 +1,8 @@
 package com.kxs.stat.biz.service.impl;
 
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.kxs.stat.biz.constant.enums.TotalTypeEnum;
 import com.kxs.stat.biz.mapper.KxsLkbTradeMapper;
 import com.kxs.stat.api.model.KxsLkbTrade;
 import com.kxs.stat.biz.service.KxsLkbTradeService;
@@ -15,5 +17,15 @@ import org.springframework.stereotype.Service;
 @Service("kxsLkbTradeService")
 public class KxsLkbTradeServiceImpl extends ServiceImpl<KxsLkbTradeMapper, KxsLkbTrade> implements KxsLkbTradeService {
 
+    @Override
+    public KxsLkbTrade getLkbTradeAmt(KxsLkbTrade param) {
+
+
+        return baseMapper.selectOne(Wrappers.<KxsLkbTrade>lambdaQuery()
+                .eq(KxsLkbTrade::getUserId, param.getUserId())
+                .eq(KxsLkbTrade::getTotalType, TotalTypeEnum.TEAM.getType())
+                .eq(param.getTradeMonth() != null, KxsLkbTrade::getTradeMonth, param.getTradeMonth())
+                .eq(param.getTradeDate() != null, KxsLkbTrade::getTradeDate, param.getTradeDate()));
+    }
 }
 

kxs-store/kxs-store-api/src/main/java/com/kxs/store/api/dto/kxsapp/storeOrder/StoreOrderListDTO.java

@@ -1,6 +1,8 @@
 package com.kxs.store.api.dto.kxsapp.storeOrder;
 
 import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.DecimalMin;
+import jakarta.validation.constraints.Min;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 
@@ -19,6 +21,7 @@ public class StoreOrderListDTO {
      */
     @Schema(description = "品牌ID")
     @NotNull(message = "品牌ID不能为空")
+    @Min(value = 1)
     private Integer brandId;
 
 
@@ -27,6 +30,7 @@ public class StoreOrderListDTO {
      */
     @Schema(description = "仓库ID")
     @NotNull(message = "仓库ID不能为空")
+    @Min(value = 1)
     private Integer warehouseId;
 
 

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

@@ -3,11 +3,16 @@ package com.kxs.user.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.constant.SecurityConstants;
 import com.kxs.common.security.util.SecurityUtils;
+import com.kxs.product.api.feign.RemoteKxsProductService;
+import com.kxs.stat.api.feign.RemoteKxsStatService;
+import com.kxs.stat.api.model.KxsLkbTrade;
 import com.kxs.user.api.model.old.TradeDaySummary;
 import com.kxs.user.api.vo.kxsapp.userLevel.AmountDetailVO;
 import com.kxs.user.biz.mapper.old.TradeDaySummaryMapper;
 import com.kxs.user.biz.service.TradeDaySummaryService;
+import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
@@ -20,8 +25,10 @@ import java.time.LocalDateTime;
  * @date 2024-02-27
  */
 @Service
+@RequiredArgsConstructor
 public class TradeDaySummaryServiceImpl extends ServiceImpl<TradeDaySummaryMapper, TradeDaySummary> implements TradeDaySummaryService {
 
+    private final RemoteKxsStatService remoteKxsStatService;
 
     @Override
     public AmountDetailVO amountDetail() {
@@ -44,6 +51,12 @@ public class TradeDaySummaryServiceImpl extends ServiceImpl<TradeDaySummaryMappe
         zlb = zlb == null ? BigDecimal.ZERO : zlb;
         amountDetailVO.setZlb(zlb);
 
+        KxsLkbTrade kxsLkbTrade = new KxsLkbTrade();
+        kxsLkbTrade.setUserId(userId.intValue());
+        kxsLkbTrade.setTradeMonth(Integer.valueOf(thisMonth));
+        KxsLkbTrade lkbTradeAmt = remoteKxsStatService.getLkbTradeAmt(kxsLkbTrade, SecurityConstants.FROM_IN);
+        amountDetailVO.setLkb(lkbTradeAmt != null ? lkbTradeAmt.getTradeAmt() : BigDecimal.ZERO);
+
         return amountDetailVO;
     }
 }