Merge branch 'master' of http://git.huaml.com/zhh/huahuibao

app-ghs/controllers/ProductController.php

@@ -123,10 +123,11 @@ class ProductController extends BaseController
             //获取该花材的每扎成本价和每扎加价
             //自动调价=每扎成本价+每扎加价
             $itemData = ItemClass::getItemData($itemId, $this->sjId);
-            if (!$itemData) {
-                util::fail("出错拉");
-            }
-            $price = bcadd($itemData['cost'], $itemData['addPrice'], 2);
+//            if (!$itemData) {
+//                util::fail("出错拉");
+//            }
+//            $price = bcadd($itemData['cost'], $itemData['addPrice'], 2);
+            $price = bcadd($productData['cost'], $productData['addPrice'], 2);
             ProductClass::changePrice($productId, $this->shopId, $price, ProductClass::PRICE_LABEL_AUTO);
         }
         util::success(['price'=>$price]);
@@ -140,17 +141,33 @@ class ProductController extends BaseController
         if (!$productData) {
             util::fail("花材不存在");
         }
-        $itemId = $productData['itemId'];
+        //$itemId = $productData['itemId'];
         //获取该花材的每扎成本价和每扎加价
         //自动调价=每扎成本价+每扎加价
-        $itemData = ItemClass::getItemData($itemId, $this->sjId);
-        if (!$itemData) {
-            util::fail("出错拉");
-        }
-        $price = bcadd($itemData['cost'], $itemData['addPrice'], 2);
+//        $itemData = ItemClass::getItemData($itemId, $this->sjId);
+//        if (!$itemData) {
+//            util::fail("出错拉");
+//        }
+        //2021.04.06改为用product中的成本价+加价
+        $price = bcadd($productData['cost'], $productData['addPrice'], 2);
         ProductClass::changePrice($productId, $this->shopId, $price, ProductClass::PRICE_LABEL_AUTO);
         util::complete("操作成功");
     }
 
 
+    //修改加价
+    public function actionChangeAddPrice()
+    {
+        $productId = Yii::$app->request->post('productId', 0);
+        $addPrice = Yii::$app->request->post('addPrice', '');
+        if($addPrice < 0 ){
+            util::fail("加价不能小于0");
+        }
+        $productData = ProductClass::getProductData($productId, $this->shopId);
+        if (!$productData) {
+            util::fail("花材不存在");
+        }
+        ProductClass::changeAddPrice($productId,$addPrice);
+        util::complete();
+    }
 }

biz-ghs/item/classes/ItemClass.php

@@ -111,7 +111,7 @@ class ItemClass extends BaseClass
         return self::getByCondition(['itemId' => $itemId, 'merchantId' => $merchantId]);
     }
 
-    //修改某个花材的成本价（采购之后要用到） linqh 2021.1.28
+    //修改某个花材的成本价（采购之后要用到） linqh 2021.1.28 （废弃不用，更新product）
     public static function changeCost($itemId, $merchantId, $cost)
     {
         return self::updateByCondition(['itemId' => $itemId, 'merchantId' => $merchantId], ['cost' => $cost]);

biz-ghs/item/services/ItemService.php

@@ -6,6 +6,7 @@
 
 namespace bizGhs\item\services;
 
+use biz\item\classes\PtItemClass;
 use bizGhs\base\services\BaseService;
 use bizGhs\item\classes\ItemClass;
 use bizGhs\item\classes\ItemClassClass;
@@ -26,6 +27,8 @@ class ItemService extends BaseService
         $merchantId = $data['merchantId']??0;
         $classId = $data['classId']??0;
         $itemId = $data['itemId']??0;
+        $cost = $data['cost']??false;
+        $addPrice = $data['addPrice']??false;
         //$shopId = $data['shopId']??0;
         if(!$merchantId ){
             util::fail("请选择供应商");
@@ -36,8 +39,18 @@ class ItemService extends BaseService
         if(!$itemId){
             util::fail("请选择花材");
         }
+        if($cost===false){
+            util::fail("请输入花材的成本价");
+        }
+        if($addPrice===false){
+            util::fail("请输入花材的加价");
+        }
+
         //判断花材是否存在 调用平台花材的方法
-        //todo
+        $checkItem = PtItemClass::getById($itemId);
+        if(!$checkItem){
+            util::fail("花材不存在");
+        }
 
         $existItemClass = ItemClassClass::exists(['id'=>$classId,'merchantId'=>$merchantId]);
         if(!$existItemClass){
@@ -60,6 +73,11 @@ class ItemService extends BaseService
             }
             foreach ($shopIds as $shopId){
                 $data['shopId'] = $shopId;
+                //判断product 是否存在，若存在，则不再处理
+                $existItem = ProductClass::exists(['itemId'=>$itemId,'merchantId'=>$merchantId,'shopId'=>$shopId]);
+                if($existItem){
+                    continue;
+                }
                 ProductClass::add($data);
             }
             $transaction->commit();

biz-ghs/order/classes/PurchaseOrderClass.php

@@ -133,7 +133,10 @@ class PurchaseOrderClass extends BaseClass
                 // 每扎采购价+每扎运费 = 每扎成本价
                 $avgCost = bcadd($avgItemCost,$avgFreight,2);
                 //修改 ghsItem 中的成本价
-                ItemClass::changeCost($itemId,$merchantId,$avgCost);
+                // ItemClass::changeCost($itemId,$merchantId,$avgCost);
+
+                //2021.4.6修改product 成本价
+                ProductClass::changeCost($productId,$avgCost);
 
             }
             $transaction->commit();

biz-ghs/product/classes/ProductClass.php

@@ -460,4 +460,16 @@ class ProductClass extends BaseClass
 		return $data;
 	}
 
+	//  //修改某个花材的成本价（采购之后要用到） linqh 2021.04.06
+    public static function changeCost($productId, $cost)
+    {
+        return self::updateById($productId, ['cost' => $cost]);
+    }
+
+    //更新某个花材的加价 2021.04.06
+    public static function changeAddPrice($productId,$addPrice)
+    {
+        return self::updateById($productId, ['addPrice' => $addPrice]);
+    }
+
 }

sql.sql

@@ -1946,3 +1946,9 @@ CHANGE COLUMN `unitNum` `ratio`  tinyint(4) NOT NULL DEFAULT 0 COMMENT '大小
 ALTER TABLE `xhPtItem`
 MODIFY COLUMN `ratio`  tinyint(4) NOT NULL DEFAULT 1 COMMENT '大小单位转换比例，每扎多少支' AFTER `classId`;
 
+=====linqh 2021-04-06
+==
+ALTER TABLE `xhGhsProduct`
+ADD COLUMN `cost`  decimal(9,2) NOT NULL DEFAULT 0 COMMENT '成本价' AFTER `adminId`,
+ADD COLUMN `addPrice`  decimal(9,1) NOT NULL DEFAULT 0 COMMENT '每扎加价' AFTER `cost`;
+