|
|
|
@@ -14,6 +14,7 @@ import com.iformall.annotation.SystemControllerLog; |
|
|
|
import com.iformall.controller.base.BaseController; |
|
|
|
import com.iformall.domain.dto.MarkingCouponDataReportDto; |
|
|
|
import com.iformall.domain.po.WxCouponOrder; |
|
|
|
import com.iformall.domain.po.base.TenantEntity; |
|
|
|
import com.iformall.mapper.WxCUserBasicInfoMapper; |
|
|
|
import com.iformall.service.WxCUserBasicInfoService; |
|
|
|
import com.iformall.utils.DataUtil; |
|
|
|
@@ -261,7 +262,7 @@ public class WxCUserDataController extends BaseController { |
|
|
|
@SystemControllerLog(description = "会员首页-报表数据-查询用户消费金额") |
|
|
|
public ResultData findUserAmountData() { |
|
|
|
logger.debug("[" + getIpAddr() + "] WxCUserDataController::findUserAmountData"); |
|
|
|
String tenantId = getTenantId(); |
|
|
|
TenantEntity tenantEntity = getTenantInfo(); |
|
|
|
Calendar c = Calendar.getInstance(); |
|
|
|
Date today = c.getTime(); |
|
|
|
c.add(Calendar.DAY_OF_YEAR, 1); |
|
|
|
@@ -272,7 +273,7 @@ public class WxCUserDataController extends BaseController { |
|
|
|
c.add(Calendar.DAY_OF_YEAR, -30);//三十天前 |
|
|
|
Date startTime = c.getTime(); |
|
|
|
WxCouponOrder wxCouponOrder = new WxCouponOrder(); |
|
|
|
wxCouponOrder.setTenantId(tenantId); |
|
|
|
wxCouponOrder.updateTenantInfo(tenantEntity); |
|
|
|
wxCouponOrder.setStartTime(startTime); |
|
|
|
wxCouponOrder.setEndTime(endTime); |
|
|
|
int thisMonthCount = wxCouponOrderService.queryPriceTotal(wxCouponOrder);//月消费金额 |
|
|
|
@@ -281,7 +282,7 @@ public class WxCUserDataController extends BaseController { |
|
|
|
Date eTime = c.getTime(); |
|
|
|
c.add(Calendar.DAY_OF_YEAR, -30); |
|
|
|
Date sTime = c.getTime(); |
|
|
|
List<CUserDateAmountVo> datas = wxCouponOrderService.queryPriceTotalGroup(tenantId, sTime, eTime); |
|
|
|
List<CUserDateAmountVo> datas = wxCouponOrderService.queryPriceTotalGroup(tenantEntity, sTime, eTime); |
|
|
|
Map<String, Integer> dataMap = new HashMap<>(); |
|
|
|
for (CUserDateAmountVo v : datas) { |
|
|
|
dataMap.put(v.getXTime(), v.getPrice()); |
|
|
|
|