采购单的

app-hd/controllers/PurchaseController.php

@@ -137,8 +137,9 @@ class PurchaseController extends BaseController
         if (!empty($status)) {
             $where['status'] = $status;
         }
-        $list = PurchaseService::getPurchaseList($where);
-        util::success($list);
+        $respond = PurchaseService::getPurchaseList($where);
+        $respond['shop'] = $this->shop;
+        util::success($respond);
     }
 
     //采购详情 ssh 2021.01.25

sql.sql

@@ -2498,6 +2498,10 @@ ALTER TABLE xhPurchase MODIFY `status` TINYINT(2) NOT NULL DEFAULT '1' COMMENT '
 ALTER TABLE xhPurchase ADD INDEX expire(`status`,`deadline`);
 ALTER TABLE xhGhsOrder MODIFY `sendNum` VARCHAR(20) NOT NULL DEFAULT '' COMMENT '配送编号，方便寻找订单对应的花材' AFTER `orderSn`;
 ALTER TABLE xhGhsOrder MODIFY `sendNum` VARCHAR(20) NOT NULL DEFAULT '' COMMENT '配送编号，方便寻找订单对应的花材' AFTER `id`;
+ALTER TABLE xhShop ADD cgUnPay INT NOT NULL DEFAULT 0 COMMENT '采购待付款订单数' AFTER `totalPurchase`;
+ALTER TABLE xhShop ADD cgUnSend INT NOT NULL DEFAULT 0 COMMENT '采购待配送订单数' AFTER `cgUnPay`;
+ALTER TABLE xhShop ADD cgSending INT NOT NULL DEFAULT 0 COMMENT '采购配送中订单数' AFTER `cgUnSend`;
+ALTER TABLE xhShop ADD cgFinish INT NOT NULL DEFAULT 0 COMMENT '采购完成订单数' AFTER `cgSending`;
 
 
 -----linqh 2021.5.14  监控ws定时任务