|
|
@@ -424,12 +424,17 @@ public class CorpTagServiceImpl implements CorpTagService {
|
|
|
public UserOrderDetailView getTagUserData(Integer start, Integer limit, String tagIdStr, String startTime, String endTime) {
|
|
|
UserOrderDetailView u = orderDonMapper.getTagUserData(tagIdStr, startTime, endTime);
|
|
|
|
|
|
- UserOrderDetailView u2 = corpUserTagMapper.countTagUser(tagIdStr, startTime, endTime);
|
|
|
+ UserOrderDetailView u2 = corpUserTagMapper.countTagUser(tagIdStr, startTime, endTime,null);
|
|
|
|
|
|
u.setNumOfUser(u2.getNumOfUser());
|
|
|
u.setDelNumOfUser(u2.getDelNumOfUser());
|
|
|
u.setOrderRate(u.getNumOfUser() == 0 ? BigDecimal.ZERO : BigDecimal.valueOf(u.getNumOfEpOrder()).divide(BigDecimal.valueOf(u.getNumOfUser()), 2, RoundingMode.HALF_DOWN));
|
|
|
Page<UserOrderDetailView> records = orderDonMapper.getTagUserDataPage(new Page<>(start, limit), tagIdStr, startTime, endTime);
|
|
|
+ records.getRecords().forEach(e->{
|
|
|
+ String date = e.getDate();
|
|
|
+ UserOrderDetailView userOrderDetailView = corpUserTagMapper.countTagUser(tagIdStr, null, null, date);
|
|
|
+ e.setNumOfUser(userOrderDetailView.getNumOfUser());
|
|
|
+ });
|
|
|
|
|
|
u.setRecords(records);
|
|
|
return u;
|