zhangguidong 2 роки тому
батько
коміт
5180be9abf

+ 15 - 11
app/api/controller/Ordercreate.php

@@ -45,19 +45,23 @@ class Ordercreate extends BaseApi
 		$order_create = new OrderCreateModel();
 		$data = [
 			'cart_ids' => isset($this->params['cart_ids']) ? $this->params['cart_ids'] : '',
-			'sku_id' => isset($this->params['sku_id']) ? $this->params['sku_id'] : '',
-			'num' => isset($this->params['num']) ? $this->params['num'] : '',
+//			'sku_id' => isset($this->params['sku_id']) ? $this->params['sku_id'] : '',
+//			'num' => isset($this->params['num']) ? $this->params['num'] : '',
 			'member_id' => $this->member_id,
-			'is_balance' => isset($this->params['is_balance']) ? $this->params['is_balance'] : 0,//是否使用余额
-			'order_from' => 1,
-			'order_from_name' => '商城购买',
-			'pay_password' => isset($this->params['pay_password']) ? $this->params['pay_password'] : '',//支付密码
-			'buyer_message' => isset($this->params["buyer_message"]) && !empty($this->params["buyer_message"]) ? json_decode($this->params["buyer_message"], true) : [],
-			'delivery' => isset($this->params["delivery"]) && !empty($this->params["delivery"]) ? json_decode($this->params["delivery"], true) : [],
-			'coupon' => isset($this->params["coupon"]) && !empty($this->params["coupon"]) ? json_decode($this->params["coupon"], true) : [],
-			'member_address' => isset($this->params["member_address"]) && !empty($this->params["member_address"]) ? json_decode($this->params["member_address"], true) : []
+//			'is_balance' => isset($this->params['is_balance']) ? $this->params['is_balance'] : 0,//是否使用余额
+//			'order_from' => 1,
+//			'order_from_name' => '商城购买',
+//			'pay_password' => isset($this->params['pay_password']) ? $this->params['pay_password'] : '',//支付密码
+//			'buyer_message' => isset($this->params["buyer_message"]) && !empty($this->params["buyer_message"]) ? json_decode($this->params["buyer_message"], true) : [],
+//			'delivery' => isset($this->params["delivery"]) && !empty($this->params["delivery"]) ? json_decode($this->params["delivery"], true) : [],
+//			'coupon' => isset($this->params["coupon"]) && !empty($this->params["coupon"]) ? json_decode($this->params["coupon"], true) : [],
+			'member_address' =>  []
 		];
-		if (empty($data['cart_ids']) && empty($data['sku_id'])) {
+        if(isset($this->params["address_id"]) && !empty($this->params["address_id"])){
+            $address = ['member_id'=>$data['member_id'],'address_id'=>$this->params['address_id']];
+            $data['member_address'] = $order_create->member_address($address);
+        }
+		if (empty($data['cart_ids'])) {
 			return $this->response($this->error('', '缺少必填参数商品数据'));
 		}
 		$res = $order_create->create($data);

+ 1 - 2
app/model/goods/GoodsEvaluate.php

@@ -55,8 +55,7 @@ class GoodsEvaluate extends BaseModel
 					'sku_image' => $v['sku_image'],
 					'content' => $v['content'],
 					'images' => $v['images'],
-					'scores' => $v['scores'],
-					'explain_type' => $v['explain_type'],
+
 					'create_time' => time(),
 
                     'shop_desccredit' => $data["shop_desccredit"],

+ 1 - 0
app/model/order/OrderCreate.php

@@ -148,6 +148,7 @@ class OrderCreate extends BaseModel
                     return $stock_result;
                 }
             }
+            $this->addOrderCronClose($order_id);//增加关闭订单自动事件
 
         }
         catch(\Exception $e)