训练营定时任务

kxs-product/kxs-product-biz/src/main/resources/mapper/KxsShopOrderMapper.xml

@@ -71,14 +71,14 @@
     </select>
     <select id="getDateBetweenOrders" resultType="com.kxs.product.api.vo.kxsapp.shop.ShopOrderGoodsUserVO">
         SELECT a.id, a.total_price, a.user_id
-        FROM shop_order a
-        LEFT JOIN shop_order_info b ON a.id = b.order_id
+        FROM kxs_shop_order a
+        LEFT JOIN kxs_shop_order_info b ON a.id = b.order_id
         <where>
             and a.del_flag = 0
             and b.goods_id in (10, 11)
             and a.status in(1,2,3)
             and a.return_status = 0
-            and a.create_time between #{startDate} and #{endDate}
+            and a.create_time between #{startTime} and #{endTime}
         </where>
 
     </select>

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

@@ -5,6 +5,7 @@ import com.kxs.system.api.model.SysLog;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.service.annotation.GetExchange;
 import org.springframework.web.service.annotation.PostExchange;
 
 /**
@@ -19,7 +20,7 @@ public interface RemoteSysJobService {
 	 * 个人及散下团队购买电签券/大POS券1组，1组计入60元，1组按实收金额5%计算，
 	 * 个人及散下团队购买电签券/大POS券计1组
 	 */
-	@PostExchange("/system-job/prizePoolIsRefreshed")
+	@GetExchange("/system-job/prizePoolIsRefreshed")
 	void prizePoolIsRefreshed(@RequestParam("param") String param, @RequestHeader(SecurityConstants.FROM) String from);
 
 }

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

@@ -239,7 +239,7 @@ public class KxsCampServiceImpl extends ServiceImpl<KxsCampMapper, KxsCamp> impl
                     orderNum += NumberUtil.div(order.getTotalPrice(), 600).intValue();
 
                     //刷新参与创客的团队累计
-                    KxsCampUser kxsCampUser = campUsersMap.get(order.getUserId());
+                    KxsCampUser kxsCampUser = campUsersMap.get(userId);
                     kxsCampUser.setTeamBonusPool(NumberUtil.add(kxsCampUser.getTeamBonusPool(), amount));
                     kxsCampUser.setTeamOrderNum(kxsCampUser.getTeamOrderNum() + orderNum);
                 }
@@ -279,7 +279,7 @@ public class KxsCampServiceImpl extends ServiceImpl<KxsCampMapper, KxsCamp> impl
                     totalBonusPool = NumberUtil.add(totalBonusPool, amount);
 
                     //刷新参与创客的团队累计
-                    KxsCampUser kxsCampUser = campUsersMap.get(leader.getUserId());
+                    KxsCampUser kxsCampUser = campUsersMap.get(userId);
                     kxsCampUser.setTeamBonusPool(NumberUtil.add(kxsCampUser.getTeamBonusPool(), amount));
                     kxsCampUser.setTeamOrderNum(kxsCampUser.getTeamOrderNum() + orderNum);
                 }
@@ -289,11 +289,6 @@ public class KxsCampServiceImpl extends ServiceImpl<KxsCampMapper, KxsCamp> impl
              * 查询活动区间开机数
              */
 
-
-
-
-
-
             kxsCamp.setBonusPool(totalBonusPool);
             kxsCamp.setOrderNum(orderNum);
             baseMapper.updateById(kxsCamp);

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

@@ -1,29 +1,7 @@
 package com.kxs.system.biz.task;
 
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.date.DatePattern;
-import cn.hutool.core.date.LocalDateTimeUtil;
-import cn.hutool.core.util.NumberUtil;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.kxs.common.core.constant.SecurityConstants;
-import com.kxs.common.core.constant.enums.ErrorTypeEnum;
-import com.kxs.common.core.exception.GlobalCustomerException;
-import com.kxs.common.core.util.R;
-import com.kxs.common.core.util.RetOps;
-import com.kxs.common.core.util.SysUtils;
 import com.kxs.common.security.annotation.Inner;
-import com.kxs.product.api.feign.RemoteKxsProductService;
-import com.kxs.product.api.vo.kxsapp.shop.ShopOrderGoodsUserVO;
-import com.kxs.system.api.model.KxsCamp;
-import com.kxs.system.api.model.KxsCampBonusLog;
-import com.kxs.system.api.model.KxsCampUser;
-import com.kxs.system.biz.constant.enums.CampStatusEnum;
-import com.kxs.system.biz.service.KxsCampBonusLogService;
 import com.kxs.system.biz.service.KxsCampService;
-import com.kxs.system.biz.service.KxsCampUserService;
-import com.kxs.user.api.feign.RemoteKxsUserService;
-import com.kxs.user.api.model.KxsLeader;
-import com.kxs.user.api.model.KxsUser;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -31,10 +9,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.math.BigDecimal;
-import java.util.*;
-import java.util.stream.Collectors;
-
 
 /**
  * KXS 系统模块异步任务

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

@@ -31,6 +31,7 @@ public class KxsLeaderController {
     public R getDateBetweenLeaders(@RequestParam("startTime") String startTime, @RequestParam("endTime") String endTime){
 
         return R.ok(kxsLeaderService.list(Wrappers.<KxsLeader>lambdaQuery()
+                .select(KxsLeader::getUserId, KxsLeader::getLeaderType)
                 .eq(KxsLeader::getLeaderType, LeaderTypeEnum.BIG_LEADER.getType())
                 .between(KxsLeader::getLastBuyDate, startTime, endTime)));
     }