Merge branch 'master' into dev

app-hd/controllers/WorkController.php

@@ -103,7 +103,7 @@ class WorkController extends BaseController
         $orderSn = orderSn::getWorkSn();
         $mainId = $this->mainId;
         $post['workSn'] = $orderSn;
-        if (isset($post['staffId']) && !empty($post['staffId'])) {
+        if (!empty($post['staffId'])) {
             $staffId = $post['staffId'];
             $staffName = $post['staffName'] ?? '';
         } else {
@@ -112,8 +112,9 @@ class WorkController extends BaseController
         }
         $post['staffId'] = $staffId;
         $post['staffName'] = $staffName;
-        $post['name'] = isset($post['name']) && !empty($post['name']) ? $post['name'] : '花束';
-        $post['cover'] = isset($post['cover']) && !empty($post['cover']) ? $post['cover'] : 'default-img.png';
+        $post['name'] = !empty($post['name']) ? $post['name'] : '花束';
+        $post['cover'] = !empty($post['cover']) ? $post['cover'] : 'default-img.png';
+        $post['reachDate'] = date("Y-m-d");
         $connection = Yii::$app->db;
         $transaction = $connection->beginTransaction();
         try {

biz-hd/work/classes/WorkClass.php

@@ -286,7 +286,7 @@ class WorkClass extends BaseClass
     {
         $work->status = self::STATUS_COMPLETE;
         $work->finishTime = date("Y-m-d H:i:s");
-        if (isset($staff) && !empty($staff)) {
+        if (!empty($staff)) {
             $currentStaffId = $staff['staffId'] ?? 0;
             $currentStaffName = $staff['staffName'] ?? '';
         } else {
@@ -335,7 +335,6 @@ class WorkClass extends BaseClass
                 'content' => '',
                 'createTime' => $date,
                 'sjId' => $sjId,
-                'mainId' => $mainId,
                 'shopId' => $shopId,
                 'bigNum' => $bigNum,
                 'smallNum' => $smallNum,