1

app/api/controller/Recovery.php

@@ -263,7 +263,6 @@ class Recovery extends Controller
                 return $this->renderError('门牌号不能为空');
             }
         }
-        $shipping_address .= $house_number;
         $express_id = intval($this->request->post('express_id'));
         $express_no = $this->request->post('express_no');
         $data = [
@@ -283,6 +282,7 @@ class Recovery extends Controller
             'recovery_type' => $recovery_type,
             'shop_id' => $shop_id,
             'recovery_name' => $recovery_name,
+            'house_number' => $house_number,
         ];
         $model = new RecoveryOrder();
         if ($model->add($data, $imageIds)) {
@@ -354,7 +354,6 @@ class Recovery extends Controller
                 return $this->renderError('门牌号不能为空');
             }
         }
-        $shipping_address .= $house_number;
         $express_id = intval($this->request->post('express_id'));
         $express_no = $this->request->post('express_no');
         $data = [
@@ -372,6 +371,7 @@ class Recovery extends Controller
             'username' => $username,
             'recovery_type' => $recovery_type,
             'shop_id' => $shop_id,
+            'house_number' => $house_number,
         ];
         $model = new RecoveryOrder();
         if ($model->edit($data, $order_id, $imageIds)) {
@@ -379,4 +379,25 @@ class Recovery extends Controller
         }
         return $this->renderError('操作失败');
     }
+
+    /**
+     * @notes:订单验收
+     * @return Json
+     * @author: wanghousheng
+     */
+    public function completeOrder(): Json
+    {
+        $order_id = intval($this->request->post('order_id'));
+        if (!$order_id) {
+            return $this->renderError('缺少必要参数');
+        }
+        if (RecoveryOrder::detail(['order_id' => $order_id, 'order_status' => RecoveryStatusEnum::ACCEPTED])->isEmpty()) {
+            return $this->renderError('订单信息不存在');
+        }
+        $model = new RecoveryOrder();
+        if ($model->where(['order_id' => $order_id])->save(['order_status' => RecoveryStatusEnum::ALREADY])) {
+            return $this->renderSuccess('操作成功');
+        }
+        return $this->renderError('操作失败');
+    }
 }

app/api/controller/User.php

@@ -12,16 +12,16 @@ declare (strict_types=1);
 
 namespace app\api\controller;
 
-use app\api\model\user\UserInvoice;
-use app\api\model\user\InvoiceOrder;
-use app\api\service\Feedback;
-use think\response\Json;
 use app\api\model\User as UserModel;
+use app\api\model\user\BalanceLog;
+use app\api\model\user\GoodSource as GoodsSourceModel;
+use app\api\model\user\InvoiceOrder;
+use app\api\model\user\UserInvoice;
 use app\api\model\UserCoupon as UserCouponModel;
+use app\api\service\Feedback;
 use app\api\service\User as UserService;
 use cores\exception\BaseException;
-use app\api\model\user\BalanceLog;
-use app\api\model\user\GoodSource as GoodsSourceModel;
+use think\response\Json;
 
 /**
  * 用户管理
@@ -45,13 +45,43 @@ class User extends Controller
         $userInfo['finace_count'] = BalanceLog::where(['user_id' => $userInfo->user_id, 'scene' => 50])->count() ?? 0;
         //获取用户收入
         $userInfo['income'] = BalanceLog::where(['user_id' => $userInfo->user_id])
-                ->whereIn('scene', [10, 30, 40, 60])
-                ->where('money', '>', 0)
-                ->sum('money') ?? 0;
+            ->whereIn('scene', [10, 30, 40, 60])
+            ->where('money', '>', 0)
+            ->sum('money') ?? 0;
 
         return $this->renderSuccess(compact('userInfo'));
     }
 
+    /**
+     * @notes:编辑用户信息
+     * @return Json|void
+     * @throws BaseException
+     * @author: wanghousheng
+     */
+    public function editUser()
+    {
+        $userId = UserService::getCurrentLoginUserId();
+        $data = [];
+        $avatar_id = intval($this->request->post('avatar_id'));
+        if ($avatar_id) {
+            $data['avatar_id'] = $avatar_id;
+        }
+        $nick_name = $this->request->post('nick_name');
+        if ($nick_name) {
+            $data['nick_name'] = $nick_name;
+        }
+        $gender = intval($this->request->post('gender'));
+        if ($gender) {
+            $data['gender'] = $gender;
+        }
+        if ($data) {
+            $model = new UserModel();
+            $model->where(['user_id' => $userId])->save($data);
+            return $this->renderSuccess('操作成功');
+        }
+        $this->renderError('操作失败');
+    }
+
     /**
      * 账户资产
      * @return Json