Просмотр исходного кода

训练营盟主下单时间去掉结束时间

mac 2 лет назад
Родитель
Сommit
8b6905c531

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

@@ -339,7 +339,7 @@ public class KxsCampServiceImpl extends ServiceImpl<KxsCampMapper, KxsCamp> impl
              * 查询活动区间开通的大盟主添加到奖金池
              */
             R<List<KxsLeader>> leadersR = remoteKxsUserService.getDateBetweenLeaders(LocalDateTimeUtil.format(kxsCamp.getStartTime(), DatePattern.NORM_DATETIME_PATTERN)
-                    , LocalDateTimeUtil.format(kxsCamp.getEndTime(), DatePattern.NORM_DATETIME_PATTERN), SecurityConstants.FROM_IN);
+                    , SecurityConstants.FROM_IN);
             List<KxsLeader> leaders = RetOps.of(leadersR)
                     .getData()
                     .orElse(Collections.emptyList());

+ 1 - 2
kxs-user/kxs-user-api/src/main/java/com/kxs/user/api/feign/RemoteKxsUserService.java

@@ -163,10 +163,9 @@ public interface RemoteKxsUserService {
 	 *
 	 * @param from  调用标志
 	 * @param startTime 开始时间
-	 * @param endTime 结束时间
 	 */
 	@GetExchange("/leader/getDateBetweenLeaders")
-	R<List<KxsLeader>> getDateBetweenLeaders(@RequestParam("startTime") String startTime, @RequestParam("endTime") String endTime, @RequestHeader(SecurityConstants.FROM) String from);
+	R<List<KxsLeader>> getDateBetweenLeaders(@RequestParam("startTime") String startTime, @RequestHeader(SecurityConstants.FROM) String from);
 
 	/**
 	 * 校验支付密码

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

@@ -27,11 +27,11 @@ public class KxsLeaderController {
 
     @Inner
     @GetMapping("getDateBetweenLeaders")
-    public R getDateBetweenLeaders(@RequestParam("startTime") String startTime, @RequestParam("endTime") String endTime){
+    public R getDateBetweenLeaders(@RequestParam("startTime") String startTime){
 
         return R.ok(kxsLeaderService.list(Wrappers.<KxsLeader>lambdaQuery()
                 .select(KxsLeader::getUserId, KxsLeader::getLeaderType)
-                .between(KxsLeader::getLastBuyDate, startTime, endTime)));
+                .gt(KxsLeader::getLastBuyDate, startTime)));
     }
 
 }