|
|
@@ -139,10 +139,10 @@ public class WxCouponController extends BaseController { |
|
|
Map<String,Integer> payMentMap = getDateMap(wxCoupon.getStartdate(),wxCoupon.getEnddate()); |
|
|
Map<String,Integer> payMentMap = getDateMap(wxCoupon.getStartdate(),wxCoupon.getEnddate()); |
|
|
|
|
|
|
|
|
for (WxCoupon coupon:saleMoneyList){ |
|
|
for (WxCoupon coupon:saleMoneyList){ |
|
|
saleMap.put(coupon.getxTime(),coupon.getSaleAmount()); |
|
|
|
|
|
|
|
|
saleMap.put(coupon.getXtime(),coupon.getSaleAmount()); |
|
|
} |
|
|
} |
|
|
for (WxCoupon coupon:paymentList){ |
|
|
for (WxCoupon coupon:paymentList){ |
|
|
payMentMap.put(coupon.getxTime(),coupon.getSumPayment()); |
|
|
|
|
|
|
|
|
payMentMap.put(coupon.getXtime(),coupon.getSumPayment()); |
|
|
} |
|
|
} |
|
|
result.put("list",wxCouponService.findCountData(wxCoupon,pageNum,pageSize)); |
|
|
result.put("list",wxCouponService.findCountData(wxCoupon,pageNum,pageSize)); |
|
|
result.put("saleHistory",saleMap); |
|
|
result.put("saleHistory",saleMap); |
|
|
|