shish пре 5 година
родитељ
комит
bcec589e8c
3 измењених фајлова са 19 додато и 8 уклоњено
  1. 10 2
      app-ghs/controllers/OrderController.php
  2. 0 5
      biz-ghs/order/classes/OrderClass.php
  3. 9 1
      sql.sql

+ 10 - 2
app-ghs/controllers/OrderController.php

@@ -58,8 +58,16 @@ class OrderController extends BaseController
                 $where['customName'] = ['like', $name];
             }
         }
-        $data = OrderClass::getOrderList($where);
-        util::success($data);
+        $respond = OrderClass::getOrderList($where);
+
+        $shop = $this->shop;
+        $respond['allNum'] = $shop['totalOrder'] ?? 0;
+        $respond['unPayNum'] = $shop['unPayOrder'] ?? 0;
+        $respond['unSendNum'] = $shop['unSendOrder'] ?? 0;
+        $respond['sendingNum'] = $shop['sendingOrder'] ?? 0;
+        $respond['finishNum'] = $shop['finishOrder'] ?? 0;
+
+        util::success($respond);
     }
 
     //商城下单操作 shish 2021.1.14

+ 0 - 5
biz-ghs/order/classes/OrderClass.php

@@ -106,11 +106,6 @@ class OrderClass extends BaseClass
     {
         $data = self::getList('*', $where, 'addTime DESC');
         $data['list'] = self::groupOrder($data['list'], true, false, false, true);
-        $data['allNum'] = 0;
-        $data['unPayNum'] = 0;
-        $data['unSendNum'] = 0;
-        $data['sendingNum'] = 0;
-        $data['finishNum'] = 0;
         return $data;
     }
 

+ 9 - 1
sql.sql

@@ -1655,4 +1655,12 @@ ALTER TABLE xhGhsCustom ADD `dist` VARCHAR(100) NOT NULL DEFAULT '' COMMENT '区
 ALTER TABLE xhGhsCustom ADD `floor` VARCHAR(50) NOT NULL DEFAULT '' COMMENT '楼号门牌号' AFTER `province`;
 ALTER TABLE xhGhsCustom ADD `fullAddress` VARCHAR(500) NOT NULL DEFAULT '' COMMENT '完整地址' AFTER `floor`;
 ALTER TABLE xhGhsCustom ADD `lat` VARCHAR(20) NOT NULL DEFAULT '' COMMENT '纬度' AFTER `fullAddress`;
-ALTER TABLE xhGhsCustom ADD `long` VARCHAR(20) NOT NULL DEFAULT '' COMMENT '经度' AFTER `lat`;
+ALTER TABLE xhGhsCustom ADD `long` VARCHAR(20) NOT NULL DEFAULT '' COMMENT '经度' AFTER `lat`;
+
+ALTER TABLE xhShop ADD `totalOrder` INT(11) NOT NULL DEFAULT '0' COMMENT '总订单数;包括付款和未付款的' AFTER `default`;
+ALTER TABLE xhShop ADD `payOrder` INT(11) NOT NULL DEFAULT '0' COMMENT '付款订单数' AFTER `totalOrder`;
+ALTER TABLE xhShop ADD `finishOrder` INT(11) NOT NULL DEFAULT '0' COMMENT '完成订单数' AFTER `payOrder`;
+ALTER TABLE xhShop ADD `unPayOrder` INT(11) NOT NULL DEFAULT '0' COMMENT '待付款订单数' AFTER `finishOrder`;
+ALTER TABLE xhShop ADD `unSendOrder` INT(11) NOT NULL DEFAULT '0' COMMENT '待配送订单数' AFTER `unPayOrder`;
+ALTER TABLE xhShop ADD `sendingOrder` INT(11) NOT NULL DEFAULT '0' COMMENT '配送中订单数' AFTER `unSendOrder`;
+ALTER TABLE xhShop ADD `cancelOrder` INT(11) NOT NULL DEFAULT '0' COMMENT '已取消订单数' AFTER `sendingOrder`;