|
@@ -195,10 +195,11 @@ class OrderController extends Controller {
|
195
|
195
|
|
196
|
196
|
//商品信息
|
197
|
197
|
$skus = $request->input('skus');
|
198
|
|
- $gnum = $request->input('gnum');
|
199
|
198
|
$order_goods = array();
|
200
|
199
|
if(!empty($skus)){
|
201
|
|
- foreach($skus as $k=>$sku_id){
|
|
200
|
+ foreach($skus as $k=>$sku){
|
|
201
|
+ $sku_id = $sku['sku_id'];
|
|
202
|
+ $num = $sku['num'];
|
202
|
203
|
$sku_info = GoodsSkus::where('id', $sku_id)->first();
|
203
|
204
|
$goods_info = Goods::where('id', $sku_info->goodsCode)->first();
|
204
|
205
|
$params = array();
|
|
@@ -211,7 +212,7 @@ class OrderController extends Controller {
|
211
|
212
|
$params['propertiesName'] = $sku_info->propsName;
|
212
|
213
|
$params['price'] = $sku_info->price;
|
213
|
214
|
|
214
|
|
- $params['quantity'] = $gnum[$k];
|
|
215
|
+ $params['quantity'] = $num;
|
215
|
216
|
$params['discountFee'] = 0;
|
216
|
217
|
$params['adjustFee'] = 0;
|
217
|
218
|
$params['refundStatus'] = '正常';
|
|
@@ -267,7 +268,7 @@ class OrderController extends Controller {
|
267
|
268
|
$order['team_id'] = $admin_info->team_id;
|
268
|
269
|
|
269
|
270
|
//新加is_able 9.4之前粉丝不参与销售复购统计
|
270
|
|
- $fanTime = $request->input('fanTime');
|
|
271
|
+ $fanTime = $request->input('fanTime');
|
271
|
272
|
if(!$fanTime && isset($if_e->id)) $fanTime = $if_e->fanTime;
|
272
|
273
|
if($fanTime < '2019-09-04'){
|
273
|
274
|
$order['is_able'] = 0;
|