花材

app-pt/controllers/ItemController.php

@@ -9,13 +9,17 @@ namespace pt\controllers;
 use  Yii;
 use common\components\util;
 use biz\item\classes\PtItemClass;
+
 class ItemController extends BaseController
 {
 
     public function actionList()
     {
         $classId = Yii::$app->request->get('classId', 0);
-        $where['classId'] = $classId;
+        $where = [];
+        if (!empty($classId)) {
+            $where['classId'] = $classId;
+        }
         $list = PtItemClass::getItemList($where);
         util::success($list);
     }
@@ -32,16 +36,16 @@ class ItemController extends BaseController
         $post = Yii::$app->request->post();
         $data = $post['data']; //[{classId:2,cost:1,addPrice:1,stockWarning:1,name:'花材名称',py:'py','cover':'',weight:'0.01','alias':'',ratio:1}]
 
-        if(empty($data)){
+        if (empty($data)) {
             util::fail("参数错误");
         }
-        $data = json_decode($data,true);
+        $data = json_decode($data, true);
 
-        if(!is_array($data) || empty($data)){
+        if (!is_array($data) || empty($data)) {
             util::fail("参数格式错误");
         }
 
-        foreach ($data as $v){
+        foreach ($data as $v) {
             PtItemClass::addItem($v);
         }
 
@@ -52,15 +56,22 @@ class ItemController extends BaseController
     public function actionUpdate()
     {
         $data = Yii::$app->request->post();
-        $sync = $data['sync']??false; //是否同步修改 各个商家的item
-        PtItemClass::updateItem($data,$sync);
+        $sync = $data['sync'] ?? false; //是否同步修改 各个商家的item
+        PtItemClass::updateItem($data, $sync);
         util::complete('修改成功');
     }
 
     public function actionDelete()
     {
-
         util::fail('不能删除哦！');
     }
 
+    //详情 shish 2021.4.11
+    public function actionDetail()
+    {
+        $id = Yii::$app->request->get('id', 0);
+        $respond = PtItemClass::getItemInfo($id);
+        util::success($respond);
+    }
+
 }

biz-ghs/order/classes/OrderClass.php

@@ -305,7 +305,7 @@ class OrderClass extends BaseClass
             }
             $list[$key]['expressProgress'] = $expressProgress;
 
-            $list[$key]['customAvatarUrl'] = imgUtil::groupAvatar($val['customAvatar']);
+            $list[$key]['customAvatarUrl'] = imgUtil::groupImg($val['customAvatar']);
 
         }
         return $list;

biz/item/classes/PtItemClass.php

@@ -5,19 +5,21 @@ namespace biz\item\classes;
 use biz\base\classes\BaseClass;
 use common\components\imgUtil;
 use bizGhs\item\classes\ItemClass;
+use common\components\stringUtil;
 use common\components\util;
+
 class PtItemClass extends BaseClass
 {
 
     public static $baseFile = '\biz\item\models\PtItem';
 
     //列表数据
-    public static function getItemList($where, $showSelect = false,$sjId = '')
+    public static function getItemList($where, $showSelect = false, $sjId = '')
     {
         $data = self::getList('*', $where, 'id DESC');
         $list = $data['list'];
         $sjItemIds = [];
-        if($showSelect && $sjId){
+        if ($showSelect && $sjId) {
             $sjItemIds = ItemClass::getGhsItemAll($sjId);
             $sjItemIds = array_column($sjItemIds, 'itemId');
         }
@@ -29,9 +31,9 @@ class PtItemClass extends BaseClass
                 $list[$k]['smallUnit'] = self::getUnitName($v['smallUnit']);
                 if ($showSelect) {
                     //1未选 2已选
-                    if(in_array($v['id'],$sjItemIds)){
+                    if (in_array($v['id'], $sjItemIds)) {
                         $num = 2;
-                    }else{
+                    } else {
                         $num = 1;
                     }
                     $list[$k]['select'] = $num;
@@ -56,46 +58,46 @@ class PtItemClass extends BaseClass
     public static function addItem($data)
     {
 
-        $classId = $data['classId']??0;
-        $cost = $data['cost']??false;
-        $addPrice = $data['addPrice']??false;
-        $stockWarning = $data['stockWarning']??false;
-        $py = $data['py']??false;
-        $name = $data['name']??false;
-        $data['alias'] = $data['alias']??'';
-        $data['cover'] = $data['cover']??'';
-        $ratio = $data['ratio']??false;
-        $weight = $data['weight']??false;
-        $data['bigUnit'] = $data['bigUnit']??1;
-        $data['smallUnit'] = $data['smallUnit']??2;
-
-        if(!$classId){
+        $classId = $data['classId'] ?? 0;
+        $cost = $data['cost'] ?? false;
+        $addPrice = $data['addPrice'] ?? false;
+        $stockWarning = $data['stockWarning'] ?? false;
+        $data['py'] = stringUtil::getSpelling($data['py']);
+        $name = $data['name'] ?? false;
+        $data['alias'] = $data['alias'] ?? '';
+        $data['cover'] = $data['cover'] ?? '';
+        $ratio = $data['ratio'] ?? false;
+        $weight = $data['weight'] ?? false;
+        $data['bigUnit'] = $data['bigUnit'] ?? 1;
+        $data['smallUnit'] = $data['smallUnit'] ?? 2;
+
+        if (!$classId) {
             util::fail("请选择分类");
         }
-        if($cost===false){
+        if ($cost === false) {
             util::fail("请输入花材的成本价");
         }
-        if($addPrice===false){
+        if ($addPrice === false) {
             util::fail("请输入花材的加价");
         }
-        if($stockWarning===false){
+        if ($stockWarning === false) {
             util::fail("请输入库存预警值");
         }
-        if($name===false){
+        if ($name === false) {
             util::fail("请输入花材名称");
         }
-        if($py===false){
-            util::fail("请输入花材拼音");
-        }
-        if($ratio===false){
+//        if($py===false){
+//            util::fail("请输入花材拼音");
+//        }
+        if ($ratio === false) {
             util::fail("请输入花材比例");
         }
-        if($weight===false){
+        if ($weight === false) {
             util::fail("请输入花材重量");
         }
 
-        $existItemClass = PtItemClassClass::exists(['id'=>$classId]);
-        if(!$existItemClass){
+        $existItemClass = PtItemClassClass::exists(['id' => $classId]);
+        if (!$existItemClass) {
             util::fail("花材分类不存在");
         }
 
@@ -104,80 +106,80 @@ class PtItemClass extends BaseClass
     }
 
     //修改花材信息
-    public static function updateItem($data,$sync=false)
+    public static function updateItem($data, $sync = false)
     {
-        $id = $data['id']??0;
+        $id = $data['id'] ?? 0;
 
         $model = self::getById($id);
-        if(!$model){
+        if (!$model) {
             util::fail("该花材不存在");
         }
         $upData = [];
-        if(isset($data['name'])){
-            if(empty($data['name'])){
+        if (isset($data['name'])) {
+            if (empty($data['name'])) {
                 util::fail("请输入花材名称");
             }
             $upData['name'] = $data['name'];
         }
-        if(isset($data['py'])){
-            if(empty($data['py'])){
+        if (isset($data['py'])) {
+            if (empty($data['py'])) {
                 util::fail("请输入花材拼音");
             }
             $upData['py'] = $data['py'];
         }
 
-        if(isset($data['cover'])){
-            if(empty($data['cover'])){
+        if (isset($data['cover'])) {
+            if (empty($data['cover'])) {
                 util::fail("请输入花材图片");
             }
             $upData['cover'] = $data['cover'];
         }
-        if(isset($data['alias'])){
-            if(empty($data['alias'])){
+        if (isset($data['alias'])) {
+            if (empty($data['alias'])) {
                 util::fail("请输入花材别名");
             }
             $upData['alias'] = $data['alias'];
         }
-        if(isset($data['cost'])){
-            if(empty($data['cost'])){
+        if (isset($data['cost'])) {
+            if (empty($data['cost'])) {
                 util::fail("请输入花材成本价");
             }
             $upData['cost'] = $data['cost'];
         }
-        if(isset($data['ratio'])){
-            if(empty($data['ratio'])){
+        if (isset($data['ratio'])) {
+            if (empty($data['ratio'])) {
                 util::fail("请输入花材比例");
             }
             $upData['ratio'] = $data['ratio'];
         }
-        if(isset($data['weight'])){
-            if(empty($data['weight'])){
+        if (isset($data['weight'])) {
+            if (empty($data['weight'])) {
                 util::fail("请输入花材重量");
             }
             $upData['weight'] = $data['weight'];
         }
-        if(isset($data['addPrice'])){
-            if(empty($data['addPrice'])){
+        if (isset($data['addPrice'])) {
+            if (empty($data['addPrice'])) {
                 util::fail("请输入花材价加");
             }
             $upData['addPrice'] = $data['addPrice'];
         }
 
 
-        if(isset($data['stockWarning'])){
-            if(empty($data['stockWarning'])){
+        if (isset($data['stockWarning'])) {
+            if (empty($data['stockWarning'])) {
                 util::fail("请输入花材库存预警");
             }
             $upData['stockWarning'] = $data['stockWarning'];
         }
-        if(isset($data['bigUnit'])){
-            if(empty($data['bigUnit'])){
+        if (isset($data['bigUnit'])) {
+            if (empty($data['bigUnit'])) {
                 util::fail("请输入花材大单位");
             }
             $upData['bigUnit'] = $data['bigUnit'];
         }
-        if(isset($data['smallUnit'])){
-            if(empty($data['smallUnit'])){
+        if (isset($data['smallUnit'])) {
+            if (empty($data['smallUnit'])) {
                 util::fail("请输入花材小单位");
             }
             $upData['smallUnit'] = $data['smallUnit'];
@@ -185,13 +187,36 @@ class PtItemClass extends BaseClass
 
 
         unset($data['id']);
-        if(empty($upData)){
+        if (empty($upData)) {
             util::fail("参数错误");
         }
-        self::updateById($id,$upData);
-        if($sync){
+        self::updateById($id, $upData);
+        if ($sync) {
             //同步各个商户的Item todo
         }
     }
 
+    //获取详情 shish 2021.4.11
+    public static function getItemInfo($id)
+    {
+        $info = self::getById($id);
+        if (empty($info)) {
+            return $info;
+        }
+        $list = self::groupInfo([$info]);
+        return current($list);
+    }
+
+    public static function groupInfo($list)
+    {
+        if (empty($list)) {
+            return $list;
+        }
+        foreach ($list as $key => $val) {
+            $list[$key]['shortCover'] = $val['cover'];
+            $list[$key]['cover'] = imgUtil::groupImg($val['cover']);
+        }
+        return $list;
+    }
+
 }

common/components/imgUtil.php

@@ -30,7 +30,7 @@ class imgUtil
     }
 
     //组合出头像 shish 2021.4.9
-    public static function groupAvatar($avatar)
+    public static function groupImg($avatar)
     {
         $prefix = self::getPrefix();
         if (empty($avatar)) {