|
@@ -157,8 +157,8 @@ class GoodsController extends Controller
|
157
|
157
|
foreach($sku as $key=>$item){
|
158
|
158
|
$sku_data = explode('@@', $item);
|
159
|
159
|
if(!$sku_data[2]) $sku_data[2] = null;
|
160
|
|
- if(!$sku_data[3]) $sku_data[3] = null;
|
161
|
|
- $sku_insert_data = $mjArr['skuList'][$key] = ['propsName'=>$sku_data[0], 'price'=>$sku_data[1], 'tagPrice'=>$sku_data[2], 'referenceCost'=>$sku_data[3], 'createTime'=>date('Y-m-d H:i:s'), 'modifyTime'=>date('Y-m-d H:i:s')];
|
|
160
|
+ if(!$sku_data[3]) $sku_data[3] = null;
|
|
161
|
+ $sku_insert_data = $mjArr['skuList'][$key] = ['propsName'=>$sku_data[0], 'price'=>$sku_data[1], 'tagPrice'=>$sku_data[2], 'referenceCost'=>$sku_data[3], 'is_weigh'=>$sku_data[4], 'createTime'=>date('Y-m-d H:i:s'), 'modifyTime'=>date('Y-m-d H:i:s')];
|
162
|
162
|
$skuProductCode = $goods['productCode'].'-0'.($key+1);
|
163
|
163
|
$sku_insert_data['code'] = $mjArr['skuList'][$key]['skuProductCode'] = $skuProductCode;
|
164
|
164
|
$sku_insert_data['goodsCode'] = $res;
|
|
@@ -176,18 +176,21 @@ class GoodsController extends Controller
|
176
|
176
|
$erpArr['goodsName'] = $goods['name'];
|
177
|
177
|
$erpArr['goodsCategoryName'] = $goods['goodsCategoryName'];
|
178
|
178
|
$erpArr['picUrl'] = $goods['picUrl'];
|
179
|
|
- foreach($mjArr['skuList'] as $k=>$v){
|
|
179
|
+ foreach($mjArr['skuList'] as $k=>&$v){
|
180
|
180
|
$erpArr['code'] = $v['skuProductCode'];
|
181
|
181
|
$erpArr['propsName'] = $v['propsName'];
|
182
|
|
- $erpArr['price'] = $v['price'];
|
183
|
|
- $erpArr['tagPrice'] = $v['tagPrice'];
|
184
|
|
- $erpArr['referenceCost'] = $v['referenceCost'];
|
|
182
|
+ $is_weigh = $v['is_weigh'];
|
|
183
|
+ $erpArr['price'] = $v['price'] = $is_weigh==1 ? round( $v['price']/2, 2 ) : $v['price'];
|
|
184
|
+ $erpArr['tagPrice'] = $is_weigh==1 ? round( $v['tagPrice']/2, 2 ) : $v['tagPrice'];
|
|
185
|
+ $erpArr['referenceCost'] = $is_weigh==1 ? round( $v['referenceCost']/2, 2 ) : $v['referenceCost'];
|
|
186
|
+
|
185
|
187
|
$erp = Order::mjErpGoodsAdd($erpArr);
|
186
|
188
|
if($erp == false){
|
187
|
189
|
throw new Exception("添加erp商品失败,对接卖家云出错");
|
188
|
190
|
}
|
189
|
191
|
unset($mjArr['skuList'][$k]['tagPrice']);
|
190
|
192
|
unset($mjArr['skuList'][$k]['referenceCost']);
|
|
193
|
+ unset($mjArr['skuList'][$k]['is_weigh']);
|
191
|
194
|
|
192
|
195
|
//更新erp信息到sku
|
193
|
196
|
$params = array();
|
|
@@ -434,9 +437,15 @@ class GoodsController extends Controller
|
434
|
437
|
$erpArr['goodsId'] = $lastSku->erpGoodsId; //erp商品id
|
435
|
438
|
$erpArr['code'] = $data['code'];
|
436
|
439
|
$erpArr['propsName'] = $data['propsName'];
|
437
|
|
- $erpArr['price'] = $data['price'];
|
438
|
|
- $erpArr['tagPrice'] = $data['tagPrice'];
|
439
|
|
- $erpArr['referenceCost'] = $data['referenceCost'];
|
|
440
|
+ if($data['is_weigh'] == 1){
|
|
441
|
+ $erpArr['price'] = round( $data['price']/2, 2 );
|
|
442
|
+ $erpArr['tagPrice'] = round( $data['tagPrice']/2, 2 );
|
|
443
|
+ $erpArr['referenceCost'] = round( $data['referenceCost']/2, 2 );
|
|
444
|
+ }else{
|
|
445
|
+ $erpArr['price'] = $data['price'];
|
|
446
|
+ $erpArr['tagPrice'] = $data['tagPrice'];
|
|
447
|
+ $erpArr['referenceCost'] = $data['referenceCost'];
|
|
448
|
+ }
|
440
|
449
|
$erp = Order::mjErpGoodsAdd($erpArr);
|
441
|
450
|
if( $erp == false ){
|
442
|
451
|
throw new Exception("erpSku同步到卖家云失败");
|
|
@@ -454,7 +463,7 @@ class GoodsController extends Controller
|
454
|
463
|
$shopArr['eshopCode'] = $lastSku->eshopCode;
|
455
|
464
|
$shopArr['goodsCode'] = $lastSku->goodsCode;
|
456
|
465
|
$shopArr['propsName'] = $data['propsName'];
|
457
|
|
- $shopArr['price'] = $data['price'];
|
|
466
|
+ $shopArr['price'] = $erpArr['price'];
|
458
|
467
|
$shopArr['skuProductCode'] = $data['code'];
|
459
|
468
|
$shopArr['createTime'] = date('Y-m-d H:i:s');
|
460
|
469
|
$shopArr['modifyTime'] = $shopArr['createTime'];
|
|
@@ -519,10 +528,16 @@ class GoodsController extends Controller
|
519
|
528
|
$erpArr = array();
|
520
|
529
|
$erpArr['skuId'] = $sku->erpSkuId;
|
521
|
530
|
$erpArr['propsName'] = $sku->propsName;
|
522
|
|
- $erpArr['price'] = $sku->price;
|
523
|
|
- $erpArr['tagPrice'] = $sku->tagPrice;
|
524
|
|
- $erpArr['referenceCost'] = $sku->referenceCost;
|
525
|
|
-
|
|
531
|
+ if($data['is_weigh'] == 1){
|
|
532
|
+ $erpArr['price'] = round( $sku->price/2, 2 );
|
|
533
|
+ $erpArr['tagPrice'] = round( $sku->tagPrice/2, 2 );
|
|
534
|
+ $erpArr['referenceCost'] = round( $sku->referenceCost/2, 2 );
|
|
535
|
+ }else{
|
|
536
|
+ $erpArr['price'] = $sku->price;
|
|
537
|
+ $erpArr['tagPrice'] = $sku->tagPrice;
|
|
538
|
+ $erpArr['referenceCost'] = $sku->referenceCost;
|
|
539
|
+ }
|
|
540
|
+
|
526
|
541
|
$erp_up = Order::mjErpSkuUpdate($erpArr);
|
527
|
542
|
if( $erp_up == false ){
|
528
|
543
|
throw new Exception("erpSku更新同步到卖家云失败");
|
|
@@ -534,7 +549,7 @@ class GoodsController extends Controller
|
534
|
549
|
$shopArr['goodsCode'] = $sku->goodsCode;
|
535
|
550
|
$shopArr['outerCode'] = $sku->id;
|
536
|
551
|
$shopArr['propsName'] = $sku->propsName;
|
537
|
|
- $shopArr['price'] = $sku->price;
|
|
552
|
+ $shopArr['price'] = $erpArr['price'];
|
538
|
553
|
|
539
|
554
|
$sku_up = Order::mjSkuUpdate($shopArr);
|
540
|
555
|
if( $sku_up == false ){
|