dd

ruoyi-admin/src/main/java/com/ruoyi/web/controller/shop/business/BusinessDayBillController.java

@@ -229,9 +229,8 @@ public class BusinessDayBillController extends BaseController {
         BusinessDayBillVo yesterday = iBusinessDayBillService.getStatistics(bo);
         Map<String, Object> map = new HashMap<>();
         map.put("todayOnlineOrderNum", today.getOnlineOrderNum());
-        map.put("yesterdayOnlineOrderNum", yesterday.getOnlineOrderNum());
         map.put("todayOnlineOrderAmount", today.getOnlineOrderAmount());
-        map.put("yesterdayOnlineOrderAmount", yesterday.getOnlineOrderAmount());
+
         if (yesterday.getOnlineOrderNum() > 0) {
             double v = (today.getOnlineOrderNum() - yesterday.getOnlineOrderNum()) / (double) yesterday.getOnlineOrderNum();
             map.put("onlineOrderOnDay", MathUtils.setScale(v * 100D, 1));
@@ -239,12 +238,13 @@ public class BusinessDayBillController extends BaseController {
             map.put("onlineOrderOnDay", 100);
         }
 
-
-        if (yesterday.getOnlineOrderAmount().compareTo(BigDecimal.ZERO) > 0) {
-            double v = (today.getOnlineOrderAmount().doubleValue() - yesterday.getOnlineOrderAmount().doubleValue()) / yesterday.getOnlineOrderAmount().doubleValue();
-            map.put("onlineOrderAmountOnDay", MathUtils.setScale(v * 100D, 1));
+        map.put("todayShopOrderNum", today.getShopOrderNum());
+        map.put("todayShopOrderAmount", today.getShopOrderAmount());
+        if (yesterday.getOnlineOrderNum() > 0) {
+            double v = (today.getShopOrderNum() - yesterday.getShopOrderNum()) / (double) yesterday.getShopOrderNum();
+            map.put("shopOrderOnDay", MathUtils.setScale(v * 100D, 1));
         } else {
-            map.put("onlineOrderAmountOnDay", 100);
+            map.put("shopOrderOnDay", 100);
         }
         return map;
     }

ruoyi-api/src/main/java/com/ruoyi/api/controller/business/ApiBusinessDayBillController.java

@@ -109,9 +109,8 @@ public class ApiBusinessDayBillController extends AbstractApiController {
         BusinessDayBillVo yesterday = iBusinessDayBillService.getStatistics(bo);
         Map<String, Object> map = new HashMap<>();
         map.put("todayOnlineOrderNum", today.getOnlineOrderNum());
-        map.put("yesterdayOnlineOrderNum", yesterday.getOnlineOrderNum());
         map.put("todayOnlineOrderAmount", today.getOnlineOrderAmount());
-        map.put("yesterdayOnlineOrderAmount", yesterday.getOnlineOrderAmount());
+
         if (yesterday.getOnlineOrderNum() > 0) {
             double v = (today.getOnlineOrderNum() - yesterday.getOnlineOrderNum()) / (double) yesterday.getOnlineOrderNum();
             map.put("onlineOrderOnDay", MathUtils.setScale(v * 100D, 1));
@@ -119,12 +118,14 @@ public class ApiBusinessDayBillController extends AbstractApiController {
             map.put("onlineOrderOnDay", 100);
         }
 
+        map.put("todayShopOrderNum", today.getShopOrderNum());
+        map.put("todayShopOrderAmount", today.getShopOrderAmount());
 
-        if (yesterday.getOnlineOrderAmount().compareTo(BigDecimal.ZERO) > 0) {
-            double v = (today.getOnlineOrderAmount().doubleValue() - yesterday.getOnlineOrderAmount().doubleValue()) / yesterday.getOnlineOrderAmount().doubleValue();
-            map.put("onlineOrderAmountOnDay", MathUtils.setScale(v * 100D, 1));
+        if (yesterday.getOnlineOrderNum() > 0) {
+            double v = (today.getShopOrderNum() - yesterday.getShopOrderNum()) / (double) yesterday.getShopOrderNum();
+            map.put("shopOrderOnDay", MathUtils.setScale(v * 100D, 1));
         } else {
-            map.put("onlineOrderAmountOnDay", 100);
+            map.put("shopOrderOnDay", 100);
         }
         return R.ok(map);
     }