订单列表

app/ghs/controllers/CustomController.php

@@ -46,6 +46,7 @@ class CustomController extends BaseController
 		$customId = $get['id'] ?? 0;
 		$info = CustomService::getCustomInfo($customId);
 		CustomClass::valid($info, $this->merchantId);
+		$info['sn'] = 1254358;
 		util::success($info);
 	}
 	

app/ghs/controllers/OrderController.php

@@ -43,7 +43,7 @@ class OrderController extends BaseController
 		$data = OrderClass::getOrderList($where);
 		util::success($data);
 	}
-	
+
 	//商城下单操作 shish 2021.1.14
 	public function actionCreateOrder()
 	{

biz-ghs/order/classes/OrderClass.php

@@ -13,9 +13,9 @@ use bizGhs\base\classes\BaseClass;
 
 class OrderClass extends BaseClass
 {
-	
+
 	public static $baseFile = '\bizGhs\order\models\Order';
-	
+
 	//已完成
 	const ORDER_STATUS_COMPLETE = 6;
 	//已取消
@@ -79,31 +79,38 @@ class OrderClass extends BaseClass
 	public static function getOrderList($where)
 	{
 		$data = self::getList('*', $where, 'addTime DESC');
-		$data['list'] = self::groupOrder($data['list']);
+		$data['list'] = self::groupOrder($data['list'], true);
 		return $data;
 	}
 	
-	//整订单员工、供货商信息 shish 2021.1.19
-	public static function groupOrder($list)
+	//整合订单员工和供货商等信息 shish 2021.1.19
+	public static function groupOrder($list, $showButton = false)
 	{
 		if (empty($list)) {
 			return $list;
 		}
-
+		
 		$customIds = array_unique(array_filter(array_column($list, 'customId')));
 		$customInfo = CustomClass::getCustomByIds($customIds);
-dd($customInfo);
+		
 		$adminIds = array_unique(array_filter(array_column($list, 'adminId')));
 		$adminInfo = AdminClass::getAdminByIds($adminIds, null, 'id');
-
+		
 		foreach ($list as $key => $val) {
 			$adminId = $val['adminId'] ?? 0;
 			$list[$key]['adminName'] = $adminInfo[$adminId]['adminName'] ?? '';
 			$customId = $val['customId'] ?? 0;
-			$list[$key]['customName'] = $customInfo[$customId]['shopName'] ?? '';
-			$list[$key]['customAvatar'] = '';
+			$list[$key]['customName'] = $customInfo[$customId]['name'] ?? '';
+			$list[$key]['customAvatar'] = $customInfo[$customId]['smallAvatar'] ?? '';
+			if ($showButton) {
+				$list[$key]['buttonList'] = [
+					['type' => 'item', 'status' => 0],
+					['type' => 'send', 'status' => 1],
+					['type' => 'selfGet', 'status' => 1],
+				];
+			}
 		}
 		return $list;
 	}
-
+	
 }

sql.sql

@@ -739,4 +739,10 @@ ALTER TABLE `xhGhsOrder` DROP COLUMN `userId`;
 ALTER TABLE xhGhsOrder CHANGE `ghsId` `merchantId` INT NOT NULL DEFAULT 0 COMMENT '商家id';
 ALTER TABLE `xhGhsCustom` CHANGE `retailId` `downId` INT(11) NOT NULL DEFAULT '0' COMMENT '客户商id，下游商家id';
 ALTER TABLE `xhGhsCustom` CHANGE `retailShopId` `downShopId` INT(11) NOT NULL DEFAULT '0' COMMENT '客户门店id，下游门店id';
-ALTER TABLE `xhGhsCustom` CHANGE `shopName` `name` VARCHAR(30) NOT NULL DEFAULT '' COMMENT '客户名称，纯彩花艺 集美店';
+ALTER TABLE `xhGhsCustom` CHANGE `shopName` `name` VARCHAR(30) NOT NULL DEFAULT '' COMMENT '客户名称，纯彩花艺 集美店';
+ALTER TABLE `xhGhsOrder` MODIFY `sendStatus` TINYINT(4) NOT NULL DEFAULT '1' COMMENT '配送状态 1未发货，待接单 2已发货，已接单 3已送达';
+ALTER TABLE `xhGhsOrder` MODIFY `sendSide` TINYINT(4) NOT NULL DEFAULT '1' COMMENT '配送方 1未选择 2达达 3顺丰同城 4闪送 5美团';
+ALTER TABLE `xhGhsOrder` MODIFY `refund` TINYINT(4) NOT NULL DEFAULT '1' COMMENT '1正常订单 2已退款';
+ALTER TABLE `xhGhsOrder` MODIFY `payStatus` TINYINT(4) NOT NULL DEFAULT '1' COMMENT '1待付款 2已付款';
+ALTER TABLE `xhGhsOrder` MODIFY `printStatus` TINYINT(4) NOT NULL DEFAULT '1' COMMENT '1未打印 2已打印';
+ALTER TABLE xhGhsOrder MODIFY `status` TINYINT(4) NOT NULL DEFAULT '1' COMMENT '订单状态 1待付款 2待配送 3配送中 4待通知 5已取消 6已完成';