其他

app/admin/logic/InventoryExchangeLogic.php

@@ -120,8 +120,9 @@ class InventoryExchangeLogic extends BaseLogic
     public static function read(int $id = 0): Json
     {
         $res = InventoryExchangeModel::alias('a')
-            ->field('a.*,b.good_cover_img,b.moq,b.step,b.type,b.price,b.good_banner_img,b.good_img,b.good_param,b.good_remark,b.unit_id,b.status as good_status')
+            ->field('a.*,b.good_cover_img,b.moq,b.step,b.type,b.price,b.good_banner_img,b.good_img,b.good_param,b.good_remark,c.unit,b.status as good_status')
             ->leftJoin('good b', 'b.id=a.good_id AND b.is_del=' . CommonModel::$del_normal)
+            ->leftJoin('unit c','c.id=b.unit_id AND c.is_del='.CommonModel::$del_normal)
             ->withAttr('good_banner_img', function ($val) {
                 return explode(',', $val);
             })->withAttr('good_img', function ($val) {

app/admin/logic/InventoryShoppingLogic.php

@@ -98,8 +98,9 @@ class InventoryShoppingLogic extends BaseLogic
     public static function read(int $id = 0): Json
     {
         $res = InventoryShoppingModel::alias('a')
-            ->field('a.*,b.good_cover_img,b.moq,b.step,b.type,b.price,b.good_banner_img,b.good_img,b.good_param,b.good_remark,b.unit_id,b.status as good_status')
+            ->field('a.*,b.good_cover_img,b.moq,b.step,b.type,b.price,b.good_banner_img,b.good_img,b.good_param,b.good_remark,c.unit,b.status as good_status')
             ->leftJoin('good b', 'b.id=a.good_id AND b.is_del=' . CommonModel::$del_normal)
+            ->leftJoin('unit c','c.id=b.unit_id AND c.is_del='.CommonModel::$del_normal)
             ->withAttr('good_banner_img', function ($val) {
                 return explode(',', $val);
             })->withAttr('good_img', function ($val) {

app/mobile/controller/Service.php

@@ -9,20 +9,31 @@ use app\mobile\logic\ServiceLogic;
 //服务
 class Service extends BaseController
 {
-    //列表
+    //服务列表
     public function list()
     {
         $param = $this->request->only(['page' => 1, 'size' => 10], 'post');
         return ServiceLogic::list($param);
     }
     
-    //详情
+    //服务详情
     public function read()
     {
         $id = $this->request->post('id/d', 0);
         return ServiceLogic::read($id);
     }
 
+    //服务订单列表
+    public function orderList(){
+        $param = $this->request->only(['page' => 1, 'size' => 10,'status'=>''], 'post');
+        return ServiceLogic::orderList($param);
+    }
+
+    //服务订单详情
+    public function orderInfo(){
+        $id = $this->request->post('id/d', 0);
+        return ServiceLogic::orderInfo($id);
+    }
 
 
 }

app/mobile/logic/ServiceLogic.php

@@ -48,4 +48,49 @@ class ServiceLogic extends BaseLogic
     }
 
 
+    //订单列表
+    public static function list(array $data = []): Json
+    {
+        $db = OrderModel::alias('a')
+            ->leftJoin('good b', 'b.id=a.good_id AND b.is_del=' . CommonModel::$del_normal)
+            ->where(['a.is_del'=>CommonModel::$del_normal, 'a.uid' => self::$aid]);
+
+        if ($data['status'] != '') $db->where('a.status', $data['status']);
+
+        $count = $db->count('a.id');
+
+        $list = $db
+            ->field('a.id,a.orderCode,b.good_name,a.num,a.status,a.addtime,a.type,a.price,a.total_price')
+            ->page($data['page'], $data['size'])
+            ->order('a.id', 'desc')
+            ->select()
+            ->toArray();
+
+        return json_show(CommonModel::$success, '获取订单列表成功', ['count' => $count, 'list' => $list]);
+
+    }
+
+    //订单详情
+    public static function info(int $id = 0): Json
+    {
+        $rs = OrderModel::alias('a')
+            ->field('a.id,a.orderCode,a.status,a.addtime,a.type,b.good_name,a.num,c.contactor,c.mobile,c.addr,c.addr_code,a.price,a.total_price,a.post_name,a.post_code,a.remark,"支付流水号" p')
+            ->leftJoin('good b', 'b.id=a.good_id AND b.is_del=' . CommonModel::$del_normal)
+            ->leftJoin('addr c', 'c.id=a.addr_id AND c.is_del=' . CommonModel::$del_normal)
+            ->leftJoin('pay_info d', 'd.id=a.pay_info_id')
+            ->where(['a.is_del' => CommonModel::$del_normal, 'a.id' => $id, 'a.uid' => self::$aid])
+            ->withAttr('addr', function ($val, $da) {
+                return $da['addr_code'] ? get_addr_name($da['addr_code']) . $val : $val;
+            })
+            ->findOrEmpty()
+            ->toArray();
+
+        return $rs ? json_show(CommonModel::$success, '获取订单详情成功', $rs) : json_show(CommonModel::$error_param, '该订单不存在');
+
+    }
+
+
+
+
+
 }

app/mobile/route/app.php

@@ -25,6 +25,8 @@ Route::rule('addrDelete', 'Addr/delete');//删除
 //【服务和商品】
 Route::rule('serviceList', 'Service/list');//服务列表
 Route::rule('serviceRead', 'Service/read');//服务详情
+Route::rule('serviceOrderList', 'Service/orderList');//服务订单列表
+Route::rule('serviceOrderInfo', 'Service/orderInfo');//服务订单详情
 Route::rule('exchangeGoodList', 'Exchange/goodList');//兑换商品列表
 Route::rule('exchangeGoodInfo', 'Exchange/goodInfo');//兑换商品详情
 Route::rule('shoppingGoodList', 'Shopping/goodList');//商城商品列表
@@ -35,7 +37,7 @@ Route::rule('orderAdd', 'Order/add');//兑换商品下单
 Route::rule('orderList', 'Order/list');//订单列表
 Route::rule('orderInfo', 'Order/info');//订单详情
 
-//【商城商品】
+