zenghuapei
/
cyywl_server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

分销数据统计

pull/2/head
perry 2023-05-29 12:54:00 +08:00
parent 21790ab31d
commit e79abc1405
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/app/member/MemberController.java
View File

@ -20,10 +20,7 @@ import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.util.List; import java.util.List;
@ -63,10 +60,10 @@ public class MemberController {
return CommonResult.success(rechargeOrderService.memberOrderInfo()); return CommonResult.success(rechargeOrderService.memberOrderInfo());
} }
@Operation(summary = "获取当前登录账号的推广员推广会员记录") @Operation(summary = "获取当前登录账号的推广员推广会员记录")
@RequestMapping(value = "/promoterOrderInfo", method = RequestMethod.GET) @RequestMapping(value = "/promoterOrderInfo", method = RequestMethod.POST)
@PreAuthenticated @PreAuthenticated
@TenantIgnore @TenantIgnore
public CommonResult<PageResult<RechargeOrderRespVO>> promoterOrderInfo(RechargeOrderPageReqVO pageRespVO) { public CommonResult<PageResult<RechargeOrderRespVO>> promoterOrderInfo(@RequestBody RechargeOrderPageReqVO pageRespVO) {
pageRespVO.setPromoterId(SecurityFrameworkUtils.getLoginUserId()); pageRespVO.setPromoterId(SecurityFrameworkUtils.getLoginUserId());
return CommonResult.success(rechargeOrderService.promoterOrderInfo(pageRespVO)); return CommonResult.success(rechargeOrderService.promoterOrderInfo(pageRespVO));
} }

5
yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/RechargeOrderServiceImpl.java
View File

@ -207,7 +207,7 @@ public class RechargeOrderServiceImpl implements RechargeOrderService {
appUserInfoReqDTO.setStartTime(LocalDateTimeUtil.beginOfDay(LocalDateTime.now())); appUserInfoReqDTO.setStartTime(LocalDateTimeUtil.beginOfDay(LocalDateTime.now()));
appUserInfoReqDTO.setEndTime(LocalDateTimeUtil.endOfDay(LocalDateTime.now())); appUserInfoReqDTO.setEndTime(LocalDateTimeUtil.endOfDay(LocalDateTime.now()));
}else if (type == 2){ }else if (type == 2){
LocalDateTime todayOfLastWeek = LocalDateTime.now(); LocalDateTime todayOfLastWeek = LocalDateTime.now().minusDays(7);
LocalDateTime monday = todayOfLastWeek.with(TemporalAdjusters.previous(DayOfWeek.SUNDAY)).plusDays(1); LocalDateTime monday = todayOfLastWeek.with(TemporalAdjusters.previous(DayOfWeek.SUNDAY)).plusDays(1);
LocalDateTime sunday = todayOfLastWeek.with(TemporalAdjusters.next(DayOfWeek.MONDAY)).minusDays(1); LocalDateTime sunday = todayOfLastWeek.with(TemporalAdjusters.next(DayOfWeek.MONDAY)).minusDays(1);
appUserInfoReqDTO.setStartTime(LocalDateTimeUtil.beginOfDay(monday)); appUserInfoReqDTO.setStartTime(LocalDateTimeUtil.beginOfDay(monday));
@ -219,7 +219,8 @@ public class RechargeOrderServiceImpl implements RechargeOrderService {
appUserInfoReqDTO.setStartTime(LocalDateTimeUtil.beginOfDay(firstDay)); appUserInfoReqDTO.setStartTime(LocalDateTimeUtil.beginOfDay(firstDay));
appUserInfoReqDTO.setEndTime(LocalDateTimeUtil.endOfDay(lastDay)); appUserInfoReqDTO.setEndTime(LocalDateTimeUtil.endOfDay(lastDay));
} }
promoterMemberOrderVO.setTotalAmount(rechargeOrderMapper.promoterOrderCount(appUserInfoReqDTO.getStartTime(),appUserInfoReqDTO.getEndTime(),promoterId)); BigDecimal totalAmount =rechargeOrderMapper.promoterOrderCount(appUserInfoReqDTO.getStartTime(),appUserInfoReqDTO.getEndTime(),promoterId);
promoterMemberOrderVO.setTotalAmount(totalAmount);
promoterMemberOrderVO.setMemberCount(memberUserApi.promoterOrderCount(appUserInfoReqDTO)); promoterMemberOrderVO.setMemberCount(memberUserApi.promoterOrderCount(appUserInfoReqDTO));
TenantDTO tenantDTO = tenantApi.getTenant(TenantContextHolder.getTenantId()); TenantDTO tenantDTO = tenantApi.getTenant(TenantContextHolder.getTenantId());
promoterMemberOrderVO.setMemberCommission(tenantDTO.getMemberCommission()); promoterMemberOrderVO.setMemberCommission(tenantDTO.getMemberCommission());