|
@@ -661,10 +661,6 @@ class WholeController extends Curd
|
|
|
|
|
|
try {
|
|
|
Db::beginTransaction();
|
|
|
- // 订单包含的产品
|
|
|
- // $sheet = OrderSheet::where('join_sheet_order_id', $request->post('order_id'))
|
|
|
- // ->select('join_sheet_goods_id')
|
|
|
- // ->get();
|
|
|
if ($params['express_type'] == 'S') {
|
|
|
$premises = SysDept::where('dept_name', $params['order_express_premises'])->first();
|
|
|
if (!$premises) {
|
|
@@ -698,6 +694,18 @@ class WholeController extends Curd
|
|
|
$redis->sadd($key, $params['order_id']);
|
|
|
|
|
|
$model = OrderExpress::where('join_express_order_id', $params['order_id'])->first();
|
|
|
+ if(!$model){
|
|
|
+ $model = new OrderExpress();
|
|
|
+ // $sheet = OrderSheet::where('join_sheet_order_id', $request->post('order_id'))
|
|
|
+ // ->select('join_sheet_goods_id')
|
|
|
+ // ->first();
|
|
|
+ // if(!empty($sheet->order_sheet_extend_json)){
|
|
|
+ // $extendJson = json_decode($sheet->order_sheet_extend_json,true);
|
|
|
+ // $address = ClientConfig::where('client_config_id',$extendJson['address_id'])->first();
|
|
|
+ // $params['']
|
|
|
+ // }
|
|
|
+
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
// 该订单状态
|