确认收货，改bill

addons/shopro/controller/order/Order.php

@@ -313,7 +313,7 @@ class Order extends Common
             return $order;
         });
 
-        $order = OrderModel::with(['items', 'invoice'])->find($id);
+//        $order = OrderModel::with(['items', 'invoice'])->find($id);
 //        $this->success('收货成功', $order);
         $this->success('收货成功');
     }

addons/shopro/job/OrderPaid.php

@@ -64,7 +64,7 @@ class OrderPaid extends BaseJob
                         Db::name('live_room_log')->where('id',$order['room_log_id'])->update($room_data);
                     }
 
-                    //支付完成,冗余到bill表
+                    //商城,支付完成,冗余到bill表
                     Db::name('bill')->where([
                         'table_name' => 'shopro_order',
                         'table_id' => $order['id'],

addons/shopro/service/order/OrderCreate.php

@@ -1314,7 +1314,7 @@ class OrderCreate
         return $order;
     }
 
-    //下单,冗余到bill表
+    //商城,下单,冗余到bill表
     public function createBill($order_id,$orderData,$bill_args){
 
         $num_sum = array_sum(array_column($bill_args,'goods_num'));

addons/shopro/service/order/OrderDispatch.php

@@ -92,7 +92,7 @@ class OrderDispatch
             'order_express_id' => 0,
         ])->find();
         if(empty($check_nosend)){
-            //发货,冗余到bill表
+            //商城,发货,冗余到bill表
             Db::name('bill')->where([
                 'table_name' => 'shopro_order',
                 'table_id' => $this->order->id,
@@ -231,7 +231,7 @@ class OrderDispatch
             'order_express_id' => 0,
         ])->find();
         if($check_nosend){
-            //取消发货,冗余到bill表
+            //商城,取消发货,冗余到bill表
             Db::name('bill')->where([
                 'table_name' => 'shopro_order',
                 'table_id' => $this->order->id,

addons/shopro/service/order/OrderOper.php

@@ -9,6 +9,7 @@ use app\admin\model\shopro\order\Action;
 use app\admin\model\shopro\goods\Comment;
 use app\admin\model\shopro\activity\GiftLog;
 use app\admin\model\shopro\activity\Order as ActivityOrderModel;
+use think\Db;
 
 class OrderOper
 {
@@ -143,6 +144,14 @@ class OrderOper
             \think\Hook::listen('order_confirm_after', $data);
         }
 
+        //商城,确认收货,冗余到bill表
+        Db::name('bill')->where([
+            'table_name' => 'shopro_order',
+            'table_id' => $order->id,
+        ])->update([
+            'status' => 3, //已完成
+        ]);
+
         return $order;
     }