买样订单

app/api/controller/v1/Order.php

@@ -4,6 +4,7 @@ namespace app\api\controller\v1;
 
 use app\BaseController;
 use app\model\api\ExpCost;
+use app\model\api\Member;
 use app\model\api\MemberDetail;
 use app\model\Api\MemberShop;
 use app\model\api\Order as OrderModel;

app/api/controller/v1/User.php

@@ -724,7 +724,6 @@ class User extends AuthController
             ], $request
         );
         $where           = $post;
-        $where['sassid'] = $request->site['sassid'];
         $where['id']     = $post['id'];
         $where['uid']    = $request->user['uid'];
         list($pageCount, $data) = (new OrderInfo)->getList($post['page'], $where, $pageSize, "*", "id desc");

app/model/system/Order.php

@@ -19,19 +19,31 @@ class Order extends BaseModel
      * @param $desc
      */
     public function getList($page,$where = [],$pageCount = 20,$filed = '*',$desc = 'id desc'){
-        $data = $this
-            ->field(
-                "o.*,p.store_name as pro_title,p.image as pro_img,m.mobile,m.avatar,
-                (select count(*) from table_order_info where o_id = o.id) as order_count,
-                (select count(*) from table_order_info where o_id = o.id and status = 2) as send_count,
-                (SELECT title from table_express where id = o.express_id) as exp_name,
-                (SELECT name from table_warehouse where id = o.warehouse_id) as ck_name"
-            )
-            ->alias("o")
-            //->join('platform pf',"pf.id=o.platform_id")
-            ->join('member m','m.uid=o.uid')
-            ->leftJoin('product p',"p.id = o.pro_id")
-            ->when(!empty($where),function ($query) use($where){
+        if($where['type'] == 1){
+            $model = $this
+                ->field(
+                    "o.*,p.store_name as pro_title,p.image as pro_img,m.mobile,m.avatar,
+                    (select count(*) from table_order_info where o_id = o.id) as order_count,
+                    (select count(*) from table_order_info where o_id = o.id and status = 2) as send_count,
+                    (SELECT title from table_express where id = o.express_id) as exp_name,
+                    (SELECT name from table_warehouse where id = o.warehouse_id) as ck_name"
+                )
+                ->alias("o")
+                //->join('platform pf',"pf.id=o.platform_id")
+                ->leftJoin('member m','m.uid=o.uid')
+                ->leftJoin('product p',"p.id = o.pro_id")
+                ->where('o.type',1);
+        }else{
+            $model = $this
+                ->field("o.*,p.store_name as pro_title,a.image as pro_img,m.mobile,m.avatar,f.name,f.mobile,f.address,a.suk")
+                ->alias("o")
+                ->leftJoin('orderInfo f',"f.o_id=o.id")
+                ->leftJoin('member m','m.uid=o.uid')
+                ->leftJoin('product p',"p.id = o.pro_id")
+                ->leftJoin('product_attr_value a',"a.product_id = o.pro_id and a.unique = o.unique")
+                ->where('o.type',0);
+        }
+        $data = $model->when(!empty($where),function ($query) use($where){
                 //用户
                 if(!empty($where['uid'])) {
                     $query->where('o.uid',$where['uid']);

app/system/controller/v1/Order.php

@@ -34,30 +34,51 @@ class Order extends BaseController
                 ['data',[]],
                 ['orderType',''],
                 ['timeType',''],
-                ['uid','']
+                ['uid',''],
+                ['type',0]
             ],$request
         );
         $where = $post;
         $order = new OrderModel;
         list($pageCount,$data) = $order->getList($post['page'],$where,$pageSize,'id desc');
-        $result = UtilService::getParam([
-            "id",
-            ['time','time','date("Y-m-d H:i:s",$1)'],
-            "order_id",
-            "mobile",
-            "avatar",
-            "order_count",
-            "all_price",
-            "status",
-            "ck_name",
-            "exp_name",
-            "pro_title",
-            "send_count",
-            "uid",
-            "pro_img",
-            "mono",
-            "err_msg"
+        if($post['type'] == 1){
+            $result = UtilService::getParam([
+                "id",
+                ['time','time','date("Y-m-d H:i:s",$1)'],
+                "order_id",
+                "mobile",
+                "avatar",
+                "order_count",
+                "all_price",
+                "status",
+                "ck_name",
+                "exp_name",
+                "pro_title",
+                "send_count",
+                "uid",
+                "pro_img",
+                "mono",
+                "err_msg"
+                ],$data);
+        }else{
+            $result = UtilService::getParam([
+                "id",
+                ['time','time','date("Y-m-d H:i:s",$1)'],
+                "order_id",
+                "avatar",
+                "mobile",
+                "pro_img",
+                "pro_title",
+                "suk",
+                "pro_price",
+                "num",
+                "all_price",
+                "pay_type",
+                "mono",
+                "status",
+                "uid"
             ],$data);
+        }
         return app('json')->success([
             'list'      => $result,
             'pageCount' => $pageCount,
@@ -66,7 +87,6 @@ class Order extends BaseController
         ]);
     }
 
-
     public function getOrderPushList(Request $request) {
         $pageSize = 20;
         $post =  UtilService::getMore(
@@ -460,7 +480,42 @@ class Order extends BaseController
     }
 
     /**
-     * 订单发货
+     * 买样订单发货
+     * @param Request $request
+     */
+    public function orderSend(Request $request) {
+        $post =  UtilService::getMore(
+            [
+                ['o_id',"","empty","参数错误"],
+                ['exp_id',""],
+                ['exp_number',""],
+            ],$request
+        );
+        //订单
+        $order = (new OrderModel)->where('id',$post['o_id'])->find();
+        if(empty($order)) {
+            return app('json')->fail("找不到订单，无法处理");
+        }
+        if($order['status'] < 1) {
+            return app('json')->fail("当前订单无法处理");
+        }
+        $bool = orderInfo::where('o_id',$post['o_id'])->save([
+            'exp_id'=>$post['exp_id'],
+            'exp_number'=>$post['exp_number'],
+            'status'=>2,
+            'send_time'=>time()
+        ]);
+        if($order['status'] == 1) {
+            (new OrderModel)->where('id',$post['o_id'])->save([
+                'express_id'=>$post['exp_id'],
+                'status' => 2
+            ]);
+        }
+        return app('json')->success(['status'=>$bool]);
+    }
+
+    /**
+     * 代发订单发货
      * @param Request $request
      */
     public function orderFahuo(Request $request) {

app/system/controller/v1/Warehouse.php

@@ -1,17 +1,7 @@
 <?php
-// +----------------------------------------------------------------------
-// | [ WE CAN DO IT MORE SIMPLE  ]
-// +----------------------------------------------------------------------
-// | Copyright (c) 2018-2020 rights reserved.
-// +----------------------------------------------------------------------
-// | Author: TABLE ME
-// +----------------------------------------------------------------------
-// | Date: 2020-08-31 20:43
-// +----------------------------------------------------------------------
 
 namespace app\system\controller\v1;
 
-
 use app\BaseController;
 use app\model\system\ExpCost;
 use app\model\system\Express;
@@ -25,6 +15,13 @@ use library\utils\MakeSite;
 
 class Warehouse extends  BaseController
 {
+    /**
+     * 获取快递公司
+     */
+    public function expressList() {
+        $list = Express::field('id,title')->where('show', 1)->select()->toArray();
+        return app('json')->success($list);
+    }
 
     /**
      * 获取管理列表

app/system/route/order.php

@@ -34,7 +34,9 @@ Route::group('order', function () {
     Route::rule('subOrderTui','v1.Order/subOrderTui');
     //异常处理
     Route::rule('orderYc','v1.Order/orderYc');
-    //我要发货
+    //买样订单发货
+    Route::rule('orderSend','v1.Order/orderSend');
+    //代发订单发货
     Route::rule('orderFahuo','v1.Order/orderFahuo');
     //揽件报警
     Route::rule('getWarningList','v1.Order/orderWarningList');

app/system/route/warehouse.php

@@ -12,6 +12,8 @@
 use think\facade\Route;
 
 Route::group('warehouse', function () {
+    //获取快递公司
+    Route::rule('expressList', 'v1.warehouse/expressList');
     //获取仓库列表
     Route::rule('list', 'v1.warehouse/list');
     //修改|添加仓库列表
@@ -34,4 +36,4 @@ Route::group('warehouse', function () {
     \app\system\middleware\AllowOriginMiddleware::class,
     \app\system\middleware\AdminAuthTokenMiddleware::class
     // \app\adminapi\middleware\AdminCkeckRole::class
-]);
+]);