供货商 名称 统一

app/ghs/controllers/SupplierController.php

@@ -21,7 +21,7 @@ class SupplierController extends BaseController
             if (stringUtil::isLetter($name)) {
                 $where['py'] = ['like', $name];
             } else {
-                $where['upName'] = ['like', $name];
+                $where['name'] = ['like', $name];
             }
         }
         $list = SupplierService::getSupplierList($where);

biz-ghs/merchant/classes/SupplierClass.php

@@ -8,45 +8,42 @@ use bizGhs\base\classes\BaseClass;
 
 class SupplierClass extends BaseClass
 {
-
-    public static $baseFile = '\bizGhs\merchant\models\Supplier';
-
-    //根据xhSupplier的id数组 取供货商信息 shish 2021.1.18
-    public static function getSupplierByIds($ids)
-    {
-        $list = self::getByIds($ids, null, 'id');
-        if (empty($list)) {
-            return [];
-        }
-        $list = self::groupBaseInfo($list);
-        return $list;
-    }
-
-    public static function groupBaseInfo($list)
-    {
-        if (empty($list)) {
-            return $list;
-        }
-        foreach ($list as $key => $val) {
-            //头像大图
-            $list[$key]['logoUrl'] = Yii::$app->params['imgHost'] . '/hhb_small.png';
-            //头像小图
-            $list[$key]['smallLogoUrl'] = Yii::$app->params['imgHost'] . '/hhb_small.png';
-            $list[$key]['mobile'] = 15280215347;
-            $list[$key]['address'] = '厦门市集美区印斗北路与乐海路交叉路口西北侧';
-        }
-        return $list;
-    }
-
-    //根据xhSupplier的id取供货商信息 shish 2021.1.18
-    public static function getInfo($id)
-    {
-        return [
-            'upName' => '茗星花卉',
-            'upShopName' => '呈贡店',
-            'mobile' => '15280215347',
-            'address' => '昆明市呈贡区鲜花大道与花都路交叉路口往西南约150米',
-        ];
-    }
-
+	
+	public static $baseFile = '\bizGhs\merchant\models\Supplier';
+	
+	//根据xhSupplier的id数组 取供货商信息 shish 2021.1.18
+	public static function getSupplierByIds($ids)
+	{
+		$list = self::getByIds($ids, null, 'id');
+		if (empty($list)) {
+			return [];
+		}
+		$list = self::groupBaseInfo($list);
+		return $list;
+	}
+	
+	public static function groupBaseInfo($list)
+	{
+		if (empty($list)) {
+			return $list;
+		}
+		foreach ($list as $key => $val) {
+			//头像大图
+			$list[$key]['logoUrl'] = Yii::$app->params['imgHost'] . '/hhb_small.png';
+			//头像小图
+			$list[$key]['smallLogoUrl'] = Yii::$app->params['imgHost'] . '/hhb_small.png';
+			$list[$key]['mobile'] = 15280215347;
+			$list[$key]['address'] = '厦门市集美区印斗北路与乐海路交叉路口西北侧';
+		}
+		return $list;
+	}
+
+	//根据供货商信息 shish 2021.1.18
+	public static function getSupplierInfo($id)
+	{
+		$info = self::getById($id);
+		$list = self::groupBaseInfo([$info]);
+		return current($list);
+	}
+	
 }

biz-ghs/order/classes/PurchaseOrderClass.php

@@ -134,9 +134,14 @@ class PurchaseOrderClass extends BaseClass
             }
         }
         $orderData = self::groupAdmin($orderData);
-        $gysInfo = SupplierClass::getById($orderData['supplierId']);
-        $orderData['upName'] = $gysInfo['adminName']??'';
-        $orderData['upCover'] = $gysInfo['upCover']??'';
+
+		//供货商信息
+        $supplierId = $orderData['supplierId'] ?? 0;
+        $supplierInfo = SupplierClass::getSupplierInfo($supplierId);
+        $orderData['supplierName'] = $supplierInfo['name'] ?? '';
+        $orderData['supplierMobile'] = $supplierInfo['mobile'] ?? '';
+	    $orderData['supplierAddress'] = $supplierInfo['address'] ?? '';
+
         $orderData['itemInfo'] = $itemData;
         return $orderData;
     }

biz-ghs/order/traits/OrderTrait.php

@@ -14,75 +14,78 @@ use common\services\xhItemService;
 
 trait OrderTrait
 {
+	
+	//二维数组拼装admin信息
+	public static function groupAdminList($list)
+	{
+		if (empty($list)) {
+			return $list;
+		}
+		$adminIds = array_unique(array_filter(array_column($list, 'adminId')));
+		$adminInfo = AdminClass::getAdminByIds($adminIds, null, 'id');
+		foreach ($list as $k => $val) {
+			$adminId = $val['adminId'] ?? 0;
+			$list[$k]['adminName'] = $adminInfo[$adminId]['adminName']??'';
+			$list[$k]['nickName'] = $adminInfo[$adminId]['nickName']??'';
+			$list[$k]['avatar'] = $adminInfo[$adminId]['avatar'] ?? '';
+		}
+		return $list;
+	}
+	
+	//2021.1.22 linqh 一维数组拼装admin信息
+	public static function groupAdmin($data)
+	{
+		$adminId = $data['adminId']??0;
+		$adminInfo = AdminClass::getAdminById($adminId);
+		$data['adminName'] = $adminInfo['adminName']??'';
+		$data['nickName'] = $adminInfo['nickName']??'';
+		$data['avatar'] = $adminInfo['avatar']??'';
+		return $data;
+		
+	}
+	
+	public static function groupSupplierList($list)
+	{
+		if (empty($list)) {
+			return $list;
+		}
+		$supplierIds = array_unique(array_filter(array_column($list, 'supplierId')));
+		$supplierInfo = SupplierClass::getSupplierByIds($supplierIds);
 
-    //二维数组拼装admin信息
-    public static function groupAdminList($list)
-    {
-        if(empty($list)){
-            return $list;
-        }
-        $adminIds = array_unique(array_filter(array_column($list,'adminId')));
-        $adminInfo = AdminClass::getAdminByIds($adminIds,null,'id');
-        foreach($list as $k => $val){
-            $adminId = $val['adminId'] ?? 0;
-            $list[$k]['adminName'] = $adminInfo[$adminId]['adminName']??'';
-            $list[$k]['nickName'] = $adminInfo[$adminId]['nickName']??'';
-            $list[$k]['avatar'] = $adminInfo[$adminId]['avatar'] ?? '';
-        }
-        return $list;
-    }
-
-    //2021.1.22 linqh 一维数组拼装admin信息
-    public static function groupAdmin($data)
-    {
-        $adminId = $data['adminId']??0;
-        $adminInfo = AdminClass::getAdminById($adminId);
-        $data['adminName'] = $adminInfo['adminName']??'';
-        $data['nickName'] = $adminInfo['nickName']??'';
-        $data['avatar'] = $adminInfo['avatar']??'';
-        return $data;
-
-    }
-
-    public static function groupSupplierList($list)
-    {
-        if(empty($list)){
-            return $list;
-        }
-        $supplierIds = array_unique(array_filter(array_column($list,'supplierId')));
-        $supplierInfo = SupplierClass::getByIds($supplierIds,null,'id');
-        foreach($list as $k => $val){
-            $supplierId = $val['supplierId'] ?? 0;
-            $list[$k]['upName'] = $supplierInfo[$supplierId]['upName'] ?? '';
-            $list[$k]['upCover'] = $supplierInfo[$supplierId]['upCover'] ?? '';
-        }
-        return $list;
-    }
-
-    //通过itemInfo 获取商品ID 对应数据（库存） linqh 2021.1.23
-    public static function getProductMapData($itemInfo)
-    {
-        $productIds = array_column($itemInfo,'productId');
-        $productData = ProductClass::getProductByIds($productIds);
-        $productData =  array_column($productData, NULL, 'id');
-        return $productData;
-    }
-
-    //通过itemInfo  求和大、小单位数  linqh 2021.1.25
-    public static function sumNumByItemInfo($itemInfo)
-    {
-        $bigNum = 0; //总共多少扎
-        $smallNum = 0; //总共多少支
-        if(!empty($itemInfo)){
-            foreach ($itemInfo as $v){
-                $bigNum += $v['bigNum']??0;
-                $smallNum += $v['smallNum']??0;
-            }
-        }
-        return [
-            'bigNum'=>$bigNum,
-            'smallNum'=>$smallNum
-        ];
-    }
-
+		foreach ($list as $k => $val) {
+			$supplierId = $val['supplierId'] ?? 0;
+			$list[$k]['supplierName'] = $supplierInfo[$supplierId]['name'] ?? '';
+			$list[$k]['supplierAvatar'] = $supplierInfo[$supplierId]['smallLogoUrl'] ?? '';
+			$list[$k]['supplierMobile'] = $supplierInfo[$supplierId]['mobile'] ?? '';
+			$list[$k]['supplierAddress'] = $supplierInfo[$supplierId]['address'] ?? '';
+		}
+		return $list;
+	}
+	
+	//通过itemInfo 获取商品ID 对应数据（库存） linqh 2021.1.23
+	public static function getProductMapData($itemInfo)
+	{
+		$productIds = array_column($itemInfo, 'productId');
+		$productData = ProductClass::getProductByIds($productIds);
+		$productData = array_column($productData, NULL, 'id');
+		return $productData;
+	}
+	
+	//通过itemInfo  求和大、小单位数  linqh 2021.1.25
+	public static function sumNumByItemInfo($itemInfo)
+	{
+		$bigNum = 0; //总共多少扎
+		$smallNum = 0; //总共多少支
+		if (!empty($itemInfo)) {
+			foreach ($itemInfo as $v) {
+				$bigNum += $v['bigNum']??0;
+				$smallNum += $v['smallNum']??0;
+			}
+		}
+		return [
+			'bigNum' => $bigNum,
+			'smallNum' => $smallNum
+		];
+	}
+	
 }

biz/purchase/classes/PurchaseClass.php

@@ -80,7 +80,7 @@ class PurchaseClass extends BaseClass
             $list[$key]['adminName'] = $adminInfo[$adminId]['adminName'] ?? '';
 
             $supplierId = $val['supplierId'] ?? 0;
-            $list[$key]['supplierName'] = $supplierInfo[$supplierId]['upName'] ?? '';
+            $list[$key]['supplierName'] = $supplierInfo[$supplierId]['name'] ?? '';
             $list[$key]['supplierAvatar'] = $supplierInfo[$supplierId]['smallLogoUrl'] ?? '';
             $list[$key]['supplierMobile'] = $supplierInfo[$supplierId]['mobile'] ?? '';
             $list[$key]['supplierAddress'] = $supplierInfo[$supplierId]['address'] ?? '';

biz/purchase/services/PurchaseService.php

@@ -42,7 +42,7 @@ class PurchaseService extends BaseService
 
         foreach ($list as $key => $val) {
             $supplierId = $val['supplierId'];
-            $list[$key]['supplierName'] = $supplierInfo[$supplierId]['upName'] ?? '';
+            $list[$key]['supplierName'] = $supplierInfo[$supplierId]['name'] ?? '';
             $list[$key]['supplierAvatar'] = $supplierInfo[$supplierId]['logoUrl'] ?? Yii::$app->params['imgHost'] . '/hhb_small.png';
             $adminId = $val['adminId'] ?? 0;
             $list[$key]['adminName'] = $adminInfo[$adminId]['adminName'] ?? '';

sql.sql

@@ -908,19 +908,19 @@ ALTER TABLE `xhPurchase` CHANGE `ghsId` `upId` INT(11) UNSIGNED NOT NULL DEFAULT
 ALTER TABLE `xhPurchase` CHANGE `ghsShopId` `upShopId` INT(11) UNSIGNED NOT NULL DEFAULT '0' COMMENT '供货商门店id，上游门店id';
 
 =====
-== linqh 20210124
+== linqh 2021-01-24
 ALTER TABLE `xhGhsProduct`
 MODIFY COLUMN `addTime`  timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '添加时间' AFTER `adminId`,
 MODIFY COLUMN `updateTime`  timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间' AFTER `addTime`;
 
 
 ====
-==linqh 2021.1.25
+==linqh 2021-01-25
 ALTER TABLE `xhGhsPurchaseOrderItem`
 ADD COLUMN `itemStock`  decimal(10,2) NOT NULL DEFAULT 0 COMMENT '当时的库存' AFTER `itemId`;
 
 =====
-== shish 20210125
+== shish 2021-01-25
 ALTER TABLE `xhPurchase` ADD `supplierId` INT NOT NULL DEFAULT 0 COMMENT '供货商id' AFTER `shopId`;
 ALTER TABLE `xhPurchase` DROP COLUMN `addTime`;
 ALTER TABLE `xhPurchase` DROP COLUMN `updateTime`;
@@ -931,4 +931,5 @@ ALTER TABLE `xhPurchase` ADD smallNum SMALLINT NOT NULL DEFAULT 0 COMMENT '小
 ALTER TABLE `xhPurchase` ADD adminId INT NOT NULL DEFAULT 0 COMMENT '采购员' AFTER `smallNum`;
 ALTER TABLE xhPurchase ADD kindNum SMALLINT NOT NULL DEFAULT 0 COMMENT '多少种' AFTER `sendCost`;
 ALTER TABLE xhSupplier ADD debt TINYINT NOT NULL DEFAULT 1 COMMENT '1没有欠款 2有欠款' AFTER `upShopId`;
-ALTER TABLE `xhSupplier` ADD debtNum SMALLINT NOT NULL DEFAULT 0 COMMENT '欠款订单数，欠款笔数' AFTER `debt`;
+ALTER TABLE `xhSupplier` ADD debtNum SMALLINT NOT NULL DEFAULT 0 COMMENT '欠款订单数，欠款笔数' AFTER `debt`;
+ALTER TABLE xhSupplier CHANGE `upName` `name` VARCHAR(30) NOT NULL DEFAULT '' COMMENT '供货商名称';