diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserDataController.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserDataController.java index 8d4d2361c..ca068c0e3 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserDataController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserDataController.java @@ -396,6 +396,7 @@ public class WxCUserDataController extends BaseController { weekPercentage = nf.format(count.doubleValue() / new Double(dayOfWeekCount).doubleValue()); } Map map = new HashMap<>(); + map.put("todayCount", todayCount);//今日 map.put("dayPercentage", dayPercentage);//日环比 map.put("weekPercentage", weekPercentage); //周同比 map.put("weekVos", weekVos);//一周金额列表 diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java index f7822cc03..b87fe3b16 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java @@ -2631,7 +2631,8 @@ public class WxOrderServiceImpl implements WxOrderService { params.put("order_status", "4"); Long allRefundOrderSummary = wxOrderMapper.queryOrderForSum(params); result.put("allRefundOrderSummary", allRefundOrderSummary); - Long allOrderSummary = allPayOrderSummary - allRefundOrderSummary; +// Long allOrderSummary = allPayOrderSummary - allRefundOrderSummary; + Long allOrderSummary = allPayOrderSummary; result.put("allOrderSummary", allOrderSummary); //今日 params.put("startdate", systemTime + " 00:00:00");