调用老系统开机数

kxs-system/kxs-system-api/src/main/java/com/kxs/system/api/feign/RemoteOldService.java

@@ -3,6 +3,7 @@ package com.kxs.system.api.feign;
 import com.kxs.common.core.util.R;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.service.annotation.GetExchange;
 import org.springframework.web.service.annotation.PostExchange;
 
 import java.util.Map;
@@ -24,10 +25,10 @@ public interface RemoteOldService {
 	R savePosAdvance(@RequestParam Map<String, Object> param);
 
 	/**
-	 * 创客欠款扣除
+	 * 团队开机统计-开机统计查询
 	 * @param param 请求实体
 	 */
-	@PostExchange("/v1/kxsmain/users/deductmakerdebts")
-	R deductMakerDebts(@RequestParam Map<String, Object> param);
+	@GetExchange("/v1/kxs/users/getteamopenposinfo")
+	R teamOpenTotalData(@RequestParam("value") String param);
 
 }

kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/controller/admin/SysCampController.java

@@ -52,7 +52,8 @@ public class SysCampController {
     @GetMapping("/page")
     public R page(Page<KxsCamp> page, @ParameterObject KxsCamp param) {
 
-        return R.ok(kxsCampService.page(page, new QueryWrapper<>(param)));
+        return R.ok(kxsCampService.page(page, Wrappers.<KxsCamp>lambdaQuery()
+                .eq(StrUtil.isNotEmpty(param.getCreateCode()), KxsCamp::getCreateCode, param.getCreateCode()) ));
     }
 
     /**

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

@@ -6,6 +6,7 @@ import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.LocalDateTimeUtil;
 import cn.hutool.core.util.NumberUtil;
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -19,6 +20,7 @@ import com.kxs.common.core.util.SysUtils;
 import com.kxs.common.security.util.SecurityUtils;
 import com.kxs.product.api.feign.RemoteKxsProductService;
 import com.kxs.product.api.vo.kxsapp.shop.ShopOrderGoodsUserVO;
+import com.kxs.system.api.feign.RemoteOldService;
 import com.kxs.system.api.model.KxsCampUser;
 import com.kxs.system.api.vo.admin.CampUserExcelVO;
 import com.kxs.system.api.vo.kxsapp.camp.CampGetByIdVO;
@@ -42,6 +44,7 @@ import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.BindingResult;
 
+import javax.json.Json;
 import java.math.BigDecimal;
 import java.util.*;
 
@@ -61,6 +64,8 @@ public class KxsCampServiceImpl extends ServiceImpl<KxsCampMapper, KxsCamp> impl
 
     private final RemoteKxsProductService remoteKxsProductService;
 
+    private final RemoteOldService remoteOldService;
+
 
     private final KxsCampUserService kxsCampUserService;
 
@@ -183,7 +188,7 @@ public class KxsCampServiceImpl extends ServiceImpl<KxsCampMapper, KxsCamp> impl
             //初始化奖金池
             BigDecimal totalBonusPool = BigDecimal.ZERO;
             //开机数
-            int openNum;
+            int openNum = 0;
             //下单数
             int orderNum = 0;
 
@@ -288,13 +293,35 @@ public class KxsCampServiceImpl extends ServiceImpl<KxsCampMapper, KxsCamp> impl
             /*
              * 查询活动区间开机数
              */
+            for (Integer userId : campUsersMap.keySet()) {
+                KxsCampUser kxsCampUser = campUsersMap.get(userId);
+                HashMap<String, Object> data = new HashMap<>();
+                data.put("UserId", userId);
+                data.put("StartTime", LocalDateTimeUtil.format(kxsCamp.getStartTime(), DatePattern.PURE_DATE_PATTERN));
+                data.put("EndTime", LocalDateTimeUtil.format(kxsCamp.getStartTime(), DatePattern.PURE_DATE_PATTERN));
+                R resR = remoteOldService.teamOpenTotalData(JSON.toJSONString(data));
+                if(resR.getStatus() == 1){
+                    if(resR.getData() != null){
+                        JSONObject jsonObject = JSON.parseObject(resR.getData().toString());
+                        int total = jsonObject.getInteger("SelfPosMerchantCount")
+                                + jsonObject.getInteger("TeamPosMerchantCount")
+                                + jsonObject.getInteger("SelfSimMerchantCount")
+                                + jsonObject.getInteger("TeamSimMerchantCount")
+                                + jsonObject.getInteger("SelfMpMerchantCount")
+                                + jsonObject.getInteger("TeamMpMerchantCount");
+                        openNum += total;
+                        kxsCampUser.setTeamOpenNum(kxsCampUser.getTeamOpenNum() + total);
+                    }
+                }
+            }
 
             kxsCamp.setBonusPool(totalBonusPool);
             kxsCamp.setOrderNum(orderNum);
+            kxsCamp.setOpenNum(openNum);
             baseMapper.updateById(kxsCamp);
             //刷新参与创客的统计
             kxsCampUserService.updateBatchById(new ArrayList<>(campUsersMap.values()));
-
+            log.info("训练营{}统计结束", kxsCamp.getCampNum());
         }
 
     }

kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/task/KxsSystemTask.java

@@ -40,7 +40,7 @@ public class KxsSystemTask {
      * 一个小时执行一次
      * 异步执行
      */
-    @Inner
+    @Inner(value = false)
     @GetMapping("/prizePoolIsRefreshed")
     public void prizePoolIsRefreshed(@RequestParam("param") String para)  {