训练营报备修复

kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/service/impl/KxsMerchantServiceImpl.java

@@ -31,6 +31,7 @@ import com.kxs.product.biz.mapper.KxsMachineMapper;
 import com.kxs.product.biz.mapper.KxsMachineRatioMapper;
 import com.kxs.product.biz.mapper.KxsMerchantMapper;
 import com.kxs.product.biz.service.KxsMerchantService;
+import com.kxs.stat.api.feign.RemoteKxsStatService;
 import com.kxs.system.api.feign.RemoteOldService;
 import com.kxs.user.api.feign.RemoteKxsUserService;
 import com.kxs.user.api.model.KxsUser;
@@ -60,6 +61,7 @@ public class KxsMerchantServiceImpl extends ServiceImpl<KxsMerchantMapper, KxsMe
     private final KxsMerchantMapper kxsMerchantMapper;
     private final KxsMachineRatioMapper kxsMachineRatioMapper;
     private final RemoteOldService remoteOldService;
+    private final RemoteKxsStatService remoteKxsStatService;
 
 
 
@@ -90,6 +92,9 @@ public class KxsMerchantServiceImpl extends ServiceImpl<KxsMerchantMapper, KxsMe
         merchantDetailVO.setIsAct(kxsMachine.getIsAct());
         KxsBrand brand = kxsBrandMapper.selectById(kxsMachine.getBrandId());
         merchantDetailVO.setBrandName(brand.getName());
+        //查询总交易额
+//        R<BigDecimal> res = remoteKxsStatService.loadByMchTotalTrade(mchInfo.getId(), SecurityConstants.FROM_IN);
+
         //查询调费调升记录
         KxsMachineRatio upFee = kxsMachineRatioMapper.selectOne(Wrappers.<KxsMachineRatio>lambdaQuery()
                 .eq(KxsMachineRatio::getMachineId, kxsMachine.getId())

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

@@ -63,4 +63,12 @@ public interface RemoteKxsStatService {
 	 */
 	@PostExchange("/stat/getLkbTradeAmt")
 	KxsLkbTrade getLkbTradeAmt(@RequestBody KxsLkbTrade lkbTrade, @RequestHeader(SecurityConstants.FROM) String from);
+
+	/**
+	 * @param mchId MCH ID
+	 * @param from  从
+	 * @return {@link R}<{@link BigDecimal}>
+	 */
+	@GetExchange("/mchTrade/loadByMchTotalTrade")
+	R<BigDecimal> loadByMchTotalTrade(@RequestParam("mchId") Integer mchId, @RequestHeader(SecurityConstants.FROM) String from);
 }

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

@@ -4,7 +4,6 @@ import lombok.Builder;
 import lombok.Data;
 
 import java.math.BigDecimal;
-import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
 
@@ -17,7 +16,7 @@ import java.util.Map;
  */
 @Data
 @Builder
-public class MerchantTradeDetailVO {
+public class MchTradeDetailVO {
 
     /**
      * 交易月

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

@@ -0,0 +1,47 @@
+package com.kxs.stat.biz.controller;
+
+import com.kxs.common.core.util.R;
+import com.kxs.stat.biz.service.KxsMerchantTradeService;
+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;
+
+/**
+ * KXS 商户统计控制器
+ *
+ * @author 没秃顶的码农
+ * @date 2024-07-09
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("mchTrade")
+public class KxsMchTradeController {
+
+    private final KxsMerchantTradeService kxsMerchantTradeService;
+
+    /**
+     * 查询商户总交易额
+     * @param mchId MCH ID
+     * @return {@link R}
+     */
+    @GetMapping("/loadByMchTotalTrade")
+    public R loadByMchTotalTrade(@RequestParam("mchId") Long mchId) {
+
+        return kxsMerchantTradeService.loadByMchTotalTrade(mchId);
+    }
+
+
+    /**
+     * 商户交易记录
+     *
+     * @param id 商户id
+     * @return 商户交易记录
+     */
+    @GetMapping("/merchantTradeDetail")
+    public R merchantTradeDetail(@RequestParam("id") Long id, @RequestParam("month") String month) {
+
+        return kxsMerchantTradeService.merchantTradeDetail(id, month);
+    }
+}

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

@@ -33,7 +33,6 @@ public class KxsStatUserController {
      */
     private final KxsUserTradeService kxsUserTradeService;
 
-    private final KxsMerchantTradeService kxsMerchantTradeService;
     private final KxsUserActTradeService kxsUserActTradeService;
 
     /**
@@ -62,17 +61,6 @@ public class KxsStatUserController {
 
 
 
-    /**
-     * 商户交易记录
-     *
-     * @param id 商户id
-     * @return 商户交易记录
-     */
-    @GetMapping("/merchantTradeDetail")
-    public R merchantTradeDetail(@RequestParam("id") Long id, @RequestParam("month") String month) {
-        return kxsMerchantTradeService.merchantTradeDetail(id, month);
-    }
-
 
     /**
      * 计奖交易-首页交易总额

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

@@ -12,6 +12,19 @@ import com.kxs.stat.api.model.KxsMerchantTrade;
  */
 public interface KxsMerchantTradeService extends IService<KxsMerchantTrade> {
 
-    R merchantTradeDetail(Long id,String month);
+    /**
+     * 商户交易记录
+     * @param mchId    商户ID
+     * @param month 月份
+     * @return {@link R}
+     */
+    R merchantTradeDetail(Long mchId,String month);
+
+    /**
+     * 查询商户总交易额
+     * @param mchId MCH ID
+     * @return {@link R}
+     */
+    R loadByMchTotalTrade(Long mchId);
 }
 

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

@@ -1,12 +1,13 @@
 package com.kxs.stat.biz.service.impl;
 
 import cn.hutool.core.date.DatePattern;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.kxs.common.core.constant.CommonConstants;
 import com.kxs.common.core.util.AssertUtil;
 import com.kxs.common.core.util.R;
 import com.kxs.stat.api.model.KxsMerchantTrade;
-import com.kxs.stat.api.vo.statUser.MerchantTradeDetailVO;
+import com.kxs.stat.api.vo.statUser.MchTradeDetailVO;
 import com.kxs.stat.biz.mapper.KxsMerchantTradeMapper;
 import com.kxs.stat.biz.service.KxsMerchantTradeService;
 import lombok.RequiredArgsConstructor;
@@ -81,7 +82,7 @@ public class KxsMerchantTradeServiceImpl extends ServiceImpl<KxsMerchantTradeMap
             tradeDays.add(amtMap);
             totalAmt = totalAmt.add(tradeAmt);
         }
-        MerchantTradeDetailVO mchTradeVo = MerchantTradeDetailVO.builder().tradeAmt(tradeDays)
+        MchTradeDetailVO mchTradeVo = MchTradeDetailVO.builder().tradeAmt(tradeDays)
                 .tradeAmtMonth(totalAmt)
                 .tradeMonth(month)
                 .merchantId(mchId).build();
@@ -89,27 +90,11 @@ public class KxsMerchantTradeServiceImpl extends ServiceImpl<KxsMerchantTradeMap
         return R.ok(mchTradeVo);
     }
 
+    @Override
+    public R loadByMchTotalTrade(Long mchId) {
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+        return null;
+    }
 
 
 }

kxs-system/kxs-system-api/src/main/java/com/kxs/system/api/dto/admin/camp/CampReportAuditDTO.java

@@ -48,9 +48,9 @@ public class CampReportAuditDTO{
 	private Integer sourceNum;
 
 	/**
-	 * 来源类型 电签券=0 大机券=1 组合包=2 小盟主=3 大盟主=4 pos开机=5 广电卡激活=6 来客吧激活=7 大小盟主兑换券=8
+	 * 来源类型 电签券=0 大机券=1 组合包=2 小盟主=3 大盟主=4 pos开机=5 广电卡激活=6 来客吧激活=7 大小盟主兑换券=8 来客吧活动=9 来客吧非活动=10 好哒码牌=11 好哒pos=12
 	 */
-	@Schema(description = "来源类型 电签券=0 大机券=1 组合包=2 小盟主=3 大盟主=4 pos开机=5 广电卡激活=6 来客吧激活=7 大小盟主兑换券=8")
+	@Schema(description = "来源类型 电签券=0 大机券=1 组合包=2 小盟主=3 大盟主=4 pos开机=5 广电卡激活=6 来客吧激活=7 大小盟主兑换券=8 来客吧活动=9 来客吧非活动=10 好哒码牌=11 好哒pos=12")
 	private Integer sourceType;
 
 	/**

kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/service/impl/KxsCampReportServiceImpl.java

@@ -110,7 +110,7 @@ public class KxsCampReportServiceImpl extends ServiceImpl<KxsCampReportMapper, K
                     kxsCampUser.setTeamOrderNum(kxsCampUser.getTeamOpenNum() + param.getSourceNum());
                     kxsCampUser.setTeamLeaderNum(kxsCampUser.getTeamLeaderNum() + param.getSourceNum());
                 }//盟主订单
-                case 5 -> {
+                case 5,12 -> {
                     kxsCamp.setOpenNum(kxsCamp.getOrderNum() + param.getSourceNum());
                     kxsCampUser.setTeamOpenNum(kxsCampUser.getTeamOpenNum() + param.getSourceNum());
                     kxsCampUser.setTeamPosNum(kxsCampUser.getTeamPosNum() + param.getSourceNum());
@@ -120,11 +120,12 @@ public class KxsCampReportServiceImpl extends ServiceImpl<KxsCampReportMapper, K
                     kxsCampUser.setTeamOpenNum(kxsCampUser.getTeamOpenNum() + param.getSourceNum());
                     kxsCampUser.setTeamGdNum(kxsCampUser.getTeamGdNum() + param.getSourceNum());
                 }//广电激活
-                case 7 -> {
+                case 7,9,10,11 -> {
                     kxsCamp.setOpenNum(kxsCamp.getOrderNum() + param.getSourceNum());
                     kxsCampUser.setTeamOpenNum(kxsCampUser.getTeamOpenNum() + param.getSourceNum());
                     kxsCampUser.setTeamLkbNum(kxsCampUser.getTeamLkbNum() + param.getSourceNum());
                 } //来客吧激活
+
             }
             kxsCampMapper.updateById(kxsCamp);