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

app-ghs/controllers/ClearController.php

@@ -27,8 +27,8 @@ class ClearController extends BaseController
     //获取基本信息 shish 20210625
     public function actionGetFullInfo()
     {
-        $orderSn = Yii::$app->request->get('orderSn','');
-        $respond = ClearClass::getSaleInfo($orderSn);
+        $id = Yii::$app->request->get('id','');
+        $respond = ClearClass::getSaleInfo($id);
         util::success($respond);
     }
 

app-ghs/controllers/ItemController.php

@@ -65,9 +65,6 @@ class ItemController extends BaseController
 
     public function actionDelete()
     {
-//        $get = Yii::$app->request->get();
-//        $id = isset($get['id']) ? $get['id'] : 0;
-//        ItemService::deleteGhsItem($id, $this->shopId, $this->sjId, $this->adminId);
         util::fail('不能删除哦！');
     }
 

app-ghs/controllers/ProductController.php

@@ -208,6 +208,7 @@ class ProductController extends BaseController
     //批量修改product 排序，成本价，加价
     public function actionBatchUpdate()
     {
+
         $shopAdmin = $this->shopAdmin;
         $roleId = $shopAdmin['roleId'] ?? 0;
         $role = AdminRoleClass::getById($roleId);
@@ -216,13 +217,12 @@ class ProductController extends BaseController
             util::fail('您没有权限操作哦');
         }
 
-
         $data = Yii::$app->request->post('data', ''); //data = [{id:1,inTurn:10,addPrice:2,cost:10}]
         $type = Yii::$app->request->post('type', '');
         if (empty($data) || empty($type)) {
             util::fail("参数错误");
         }
-        if (in_array($type, ['inTurn', 'addPrice', 'cost', 'weight', 'ratio', 'delStatus','ratio'])) {
+        if (in_array($type, ['inTurn', 'addPrice', 'cost', 'weight', 'ratio', 'delStatus', 'ratio'])) {
             $data = json_decode($data, true);
         }
         foreach ($data as $v) {
@@ -233,16 +233,22 @@ class ProductController extends BaseController
                 }
             }
         }
-
         foreach ($data as $v) {
             $id = $v['id'];
             $val = $v[$type] ?? '';
+
+            if ($type == 'ratio') {
+                if (preg_match("/^[1-9][0-9]*$/", $val) == false || $val <= 0) {
+                    util::fail('单位比请填写整数，并且要大于0');
+                }
+            }
+
             $where = [];
             $where['id'] = $id;
             $where['shopId'] = $this->shopId;
             $where['sjId'] = $this->sjId;
             if (empty($val)) {
-                util::fail("参数错误1");
+                util::fail("参数错误！");
             }
             $data = [
                 $type => $val
@@ -264,7 +270,6 @@ class ProductController extends BaseController
         if ($roleName == '员工') {
             util::fail('您没有权限操作哦');
         }
-
         ProductClass::updateProduct($post);
         util::complete();
     }

biz-ghs/clear/classes/ClearClass.php

@@ -147,9 +147,9 @@ class ClearClass extends BaseClass
     }
 
     //完整信息 shish 20210625
-    public static function getSaleInfo($orderSn)
+    public static function getSaleInfo($id)
     {
-        $info = self::getByCondition(['orderSn' => $orderSn]);
+        $info = self::getById($id);
         if (empty($info)) {
             return $info;
         }
@@ -164,9 +164,9 @@ class ClearClass extends BaseClass
     }
 
     //完整信息 shish 20210625
-    public static function getCgInfo($orderSn)
+    public static function getCgInfo($id)
     {
-        $info = self::getByCondition(['orderSn' => $orderSn]);
+        $info = self::getById($id);
         if (empty($info)) {
             return $info;
         }

biz-ghs/product/classes/ProductClass.php

@@ -281,8 +281,8 @@ class ProductClass extends BaseClass
         self::updateStockById($productId, $newStock);
         //减库存，加销量 2021.6.21 linqh
         $actualSold = $productData->actualSold;
-        $newActualSold = bcadd($actualSold,$itemNum,2);
-        self::updateActualSoldById($productId,$newActualSold);
+        $newActualSold = bcadd($actualSold, $itemNum, 2);
+        self::updateActualSoldById($productId, $newActualSold);
 
         util::unlock($key);
         return ['oldStock' => $productData['stock'], 'newStock' => $newStock];
@@ -290,6 +290,7 @@ class ProductClass extends BaseClass
 
 
     //根据数量减库存
+
     /**
      * @param $productId
      * @param $itemNum
@@ -317,8 +318,8 @@ class ProductClass extends BaseClass
 
         //减库存，加销量 2021.6.21 linqh
         $actualSold = $productData['actualSold'];
-        $newActualSold = bcadd($actualSold,$itemNum,2);
-        self::updateActualSoldById($productId,$newActualSold);
+        $newActualSold = bcadd($actualSold, $itemNum, 2);
+        self::updateActualSoldById($productId, $newActualSold);
 
         util::unlock($key);
         return ['oldStock' => $productData['stock'], 'newStock' => $newStock];
@@ -603,12 +604,6 @@ class ProductClass extends BaseClass
             }
             $upData['cover'] = $data['cover'];
         }
-//        if (isset($data['alias'])) {
-//            if (empty($data['alias'])) {
-//                util::fail("请输入花材别名");
-//            }
-//            $upData['alias'] = $data['alias'];
-//        }
         if (isset($data['cost'])) {
             if (empty($data['cost'])) {
                 util::fail("请输入花材成本价");
@@ -619,6 +614,9 @@ class ProductClass extends BaseClass
             if (empty($data['ratio'])) {
                 util::fail("请输入花材比例");
             }
+            if (preg_match("/^[1-9][0-9]*$/", $data['ratio']) == false || $data['ratio'] <= 0) {
+                util::fail('比例请填写整数，并且大于0');
+            }
             $upData['ratio'] = $data['ratio'];
         }
         if (isset($data['weight'])) {
@@ -627,8 +625,6 @@ class ProductClass extends BaseClass
         if (isset($data['addPrice'])) {
             $upData['addPrice'] = $data['addPrice'];
         }
-
-
         if (isset($data['stockWarning'])) {
             $upData['stockWarning'] = $data['stockWarning'];
         }
@@ -649,7 +645,7 @@ class ProductClass extends BaseClass
         }
 
         if (isset($data['delStatus'])) {
-            if(!in_array($data['delStatus'],[0,1])){
+            if (!in_array($data['delStatus'], [0, 1])) {
                 util::fail("上下架参数错误");
             }
             $upData['delStatus'] = $data['delStatus'];
@@ -819,8 +815,8 @@ class ProductClass extends BaseClass
         $weight = $data['weight'] ?? false;
         $data['bigUnit'] = $data['bigUnit'] ?? '';
         $data['smallUnit'] = $data['smallUnit'] ?? '';
-        $data['shopId'] = $data['shopId']??0;
-        $data['sjId'] = $data['sjId']??0;
+        $data['shopId'] = $data['shopId'] ?? 0;
+        $data['sjId'] = $data['sjId'] ?? 0;
         if (!$data['sjId']) {
             util::fail("参数错误");
         }
@@ -848,34 +844,34 @@ class ProductClass extends BaseClass
             util::fail("请输入花材重量");
         }
 
-        $existItemClass = ItemClassClass::exists(['id' => $classId,'sjId'=>$data['sjId']]);
+        $existItemClass = ItemClassClass::exists(['id' => $classId, 'sjId' => $data['sjId']]);
         if (!$existItemClass) {
             util::fail("花材分类不存在");
         }
         //
         $connection = Yii::$app->db;
         $transaction = $connection->beginTransaction();
-        try{
+        try {
             //新增到平台，分类为18
             $itemData = $data;
             $itemData['classId'] = 18;
             $itemRes = PtItemClass::addItem($itemData);
             $data['price'] = $data['cost'] + $data['addPrice'];
             //获取到itemId
-            if($itemRes && $itemRes['id']){
+            if ($itemRes && $itemRes['id']) {
                 $data['itemId'] = $itemRes['id'];
                 //根据sjId, 找到所有的shopId,都添加
                 $shopIds = ShopService::getShopIds($data['sjId']);
-                foreach ($shopIds as $shopId){
+                foreach ($shopIds as $shopId) {
                     $data['shopId'] = $shopId;
                     self::add($data);
                 }
                 $transaction->commit();
-            }else{
+            } else {
                 $transaction->rollBack();
                 util::fail("花材添加失败");
             }
-        }catch (\Exception $exception){
+        } catch (\Exception $exception) {
             $transaction->rollBack();
             util::fail($exception->getMessage());
         }

biz/item/classes/PtItemClass.php

@@ -72,11 +72,15 @@ class PtItemClass extends BaseClass
         $name = $data['name'] ?? false;
         $data['alias'] = $data['alias'] ?? '';
         $data['cover'] = $data['cover'] ?? '';
-        $ratio = $data['ratio'] ?? false;
+        $ratio = $data['ratio'] ?? 0;
         $weight = $data['weight'] ?? false;
         $data['bigUnit'] = $data['bigUnit'] ?? '';
         $data['smallUnit'] = $data['smallUnit'] ?? '';
 
+        if (preg_match("/^[1-9][0-9]*$/", $data['ratio']) == false || $data['ratio'] <= 0) {
+            util::fail('比例请填写整数，并且大于0');
+        }
+
         if (!$classId) {
             util::fail("请选择分类");
         }
@@ -92,9 +96,6 @@ class PtItemClass extends BaseClass
         if ($name === false) {
             util::fail("请输入花材名称");
         }
-//        if($py===false){
-//            util::fail("请输入花材拼音");
-//        }
         if ($ratio === false) {
             util::fail("请输入花材比例");
         }
@@ -157,6 +158,9 @@ class PtItemClass extends BaseClass
             if (empty($data['ratio'])) {
                 util::fail("请输入花材比例");
             }
+            if (preg_match("/^[1-9][0-9]*$/", $data['ratio']) == false || $data['ratio'] <= 0) {
+                util::fail('比例请填写整数，并且大于0');
+            }
             $upData['ratio'] = $data['ratio'];
         }
         if (isset($data['weight'])) {
@@ -172,7 +176,6 @@ class PtItemClass extends BaseClass
             $upData['addPrice'] = $data['addPrice'];
         }
 
-
         if (isset($data['stockWarning'])) {
             if (empty($data['stockWarning'])) {
                 util::fail("请输入花材库存预警");