课程开单

app-ghs/controllers/SetMealController.php

@@ -63,7 +63,7 @@ class SetMealController extends BaseController
 			['name' => '优惠券管理', 'has' => 1],
 			['name' => '订单管理', 'has' => 1],
 			['name' => '发货管理', 'has' => 1],
-			['name' => '人脸支付', 'has' => 0],
+			['name' => '刷脸支付', 'has' => 0],
 		];
 		$free = rand(0, 1);
 		$data = ['detail' => $detail, 'function' => $function, 'free' => $free];

app-hd/controllers/SetMealController.php

@@ -63,7 +63,7 @@ class SetMealController extends BaseController
             ['name' => '优惠券管理', 'has' => 1],
             ['name' => '订单管理', 'has' => 1],
             ['name' => '发货管理', 'has' => 1],
-            ['name' => '人脸支付', 'has' => 0],
+            ['name' => '刷脸支付', 'has' => 0],
         ];
         $free = rand(0, 1);
         $data = ['detail' => $detail, 'function' => $function, 'free' => $free];

app-pt/controllers/BaseController.php

@@ -4,8 +4,8 @@ namespace pt\controllers;
 
 use bizHd\saas\services\StaffService;
 use common\components\jwt;
+use common\components\util;
 use Yii;
-use yii\web\Controller;
 
 /**
  * 平台次级基类，次于PublicController

app-pt/controllers/SetMealController.php

@@ -53,7 +53,7 @@ class SetMealController extends BaseController
 			['name' => '微信商城', 'has' => 1],
 			['name' => '节日自动涨价', 'has' => 1],
 			['name' => '小程序商城', 'has' => 1],
-			['name' => '人脸支付', 'has' => 0],
+			['name' => '刷脸支付', 'has' => 0],
 		];
 		$free = rand(0, 1);
 		$data = ['detail' => $detail, 'function' => $function, 'free' => $free];

biz-ghs/order/classes/OrderClass.php

@@ -12,6 +12,7 @@ use bizGhs\admin\classes\AdminClass;
 use bizGhs\custom\classes\CustomClass;
 use bizGhs\stat\classes\StatOrderCountClass;
 use bizGhs\stat\classes\StatYjClass;
+use common\components\imgUtil;
 use common\components\orderSn;
 use common\components\stringUtil;
 use common\components\util;
@@ -287,14 +288,16 @@ class OrderClass extends BaseClass
 
             //获取配送进展
             $expressProgress = '';
-            if($val['sendType'] == 4){
-                $expressInfo = OrderExpressClass::getByCondition(['orderSn'=>$val['orderSn']]);
-                if($expressInfo){
-                    $expressProgress = ['progressName'=> OrderExpressClass::$statusMap[$expressInfo['status']]??''];
+            if ($val['sendType'] == 4) {
+                $expressInfo = OrderExpressClass::getByCondition(['orderSn' => $val['orderSn']]);
+                if ($expressInfo) {
+                    $expressProgress = ['progressName' => OrderExpressClass::$statusMap[$expressInfo['status']] ?? ''];
                 }
             }
-             //$list[$key]['expressProgress'] = OrderExpressClass::getProgress($showExpress, $val);
-            $list[$key]['expressProgress'] =$expressProgress;
+            $list[$key]['expressProgress'] = $expressProgress;
+
+            $list[$key]['customAvatarUrl'] = imgUtil::groupAvatar($val['customAvatar']);
+
         }
         return $list;
     }
@@ -357,7 +360,7 @@ class OrderClass extends BaseClass
         $id = $order['id'];
         $expressId = $expressInfo['expressId'] ?? 1;
         $expressName = $expressInfo['deliveryName'] ?? '达达';
-        self::updateById($id, ['status' => self::ORDER_STATUS_SENDING, 'sendType' => self::SEND_TYPE_THIRD,'expressId'=>$expressId]);
+        self::updateById($id, ['status' => self::ORDER_STATUS_SENDING, 'sendType' => self::SEND_TYPE_THIRD, 'expressId' => $expressId]);
 
         $express = OrderExpressClass::getByCondition(['orderId' => $id]);
         if (!empty($express)) {
@@ -518,18 +521,18 @@ class OrderClass extends BaseClass
     }
 
     //修改订单表的配送信息 linqh 2021.3.28
-    public static function updateCustomExpressInfo($id,$expressAddInfo)
+    public static function updateCustomExpressInfo($id, $expressAddInfo)
     {
         $data = [
-            'province'=>$expressAddInfo['province'],
-            'city'=>$expressAddInfo['city'],
-            'address'=>$expressAddInfo['address'],
-            'floor'=>$expressAddInfo['floor'],
-            'fullAddress'=>$expressAddInfo['province'].$expressAddInfo['city'].$expressAddInfo['address'].$expressAddInfo['floor'],
-            'lat'=>$expressAddInfo['lat'],
-            'long'=>$expressAddInfo['long'],
-            'sendTime'=>$expressAddInfo['sendTime'],
+            'province' => $expressAddInfo['province'],
+            'city' => $expressAddInfo['city'],
+            'address' => $expressAddInfo['address'],
+            'floor' => $expressAddInfo['floor'],
+            'fullAddress' => $expressAddInfo['province'] . $expressAddInfo['city'] . $expressAddInfo['address'] . $expressAddInfo['floor'],
+            'lat' => $expressAddInfo['lat'],
+            'long' => $expressAddInfo['long'],
+            'sendTime' => $expressAddInfo['sendTime'],
         ];
-        return self::updateById($id,$data);
+        return self::updateById($id, $data);
     }
 }

biz-hd/stat/classes/StatStudentMonthClass.php

@@ -13,7 +13,7 @@ class StatStudentMonthClass extends BaseClass
 	//月订单数增加 ssh 2020.5.25
 	public static function addStudent($shop, $month = null)
 	{
-		$shopId = $shop['id'];
+        $sjId = $shop['merchantId'];
 		$month = isset($month) ? $month : date("Ym");
 		$stat = self::getByCondition(['sjId' => $sjId, 'time' => $month], true);
 		if (empty($stat)) {
@@ -23,5 +23,5 @@ class StatStudentMonthClass extends BaseClass
 		$stat->totalNum = $shop['totalStudent'] + 1;
 		$stat->save();
 	}
-	
+
 }

common/components/imgUtil.php

@@ -29,4 +29,14 @@ class imgUtil
         }
     }
 
+    //组合出头像 shish 2021.4.9
+    public static function groupAvatar($avatar)
+    {
+        $prefix = self::getPrefix();
+        if (empty($avatar)) {
+            return $prefix . 'hhb_small.png';
+        }
+        return $prefix . $avatar;
+    }
+
 }