|
|
@@ -127,8 +127,6 @@ class OrderImport extends Base
|
|
|
'num' => $info['num'],
|
|
|
'before_discount_all_price' => $info['before_discount_all_price'],
|
|
|
'activity_name' => $info['activity_name'],
|
|
|
- 'discount_price' => $info['discount_price'],
|
|
|
- 'after_price' => $info['after_price'],
|
|
|
'mode' => $info['mode'],
|
|
|
'order_remark' => $info['order_remark'],
|
|
|
'contactor' => $info['contactor'],
|
|
|
@@ -148,9 +146,6 @@ class OrderImport extends Base
|
|
|
public function confirmImportData()
|
|
|
{
|
|
|
//每次编辑，都新增一条记录到extend表，同时原纪录作废，确保同一个order_import_from_c_id下只有一个正常的记录
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
$param = $this->request->only([
|
|
|
'id',
|
|
|
'platform_code',
|
|
|
@@ -161,21 +156,12 @@ class OrderImport extends Base
|
|
|
'price',
|
|
|
'num',
|
|
|
'before_discount_all_price',
|
|
|
- 'discount_price',
|
|
|
- 'after_price',
|
|
|
'activity_name',
|
|
|
'mode',
|
|
|
'order_remark',
|
|
|
'contactor',
|
|
|
'mobile',
|
|
|
'addr',
|
|
|
- 'spuCode',
|
|
|
- 'companyNo',
|
|
|
- 'customer_code',
|
|
|
- 'supplierNo',
|
|
|
- 'platform_codes',
|
|
|
- 'good_name',
|
|
|
- 'discount_reason',
|
|
|
'addr_code',
|
|
|
], 'post', 'trim');
|
|
|
|
|
|
@@ -189,19 +175,10 @@ class OrderImport extends Base
|
|
|
'price' => 'require',
|
|
|
'num' => 'require',
|
|
|
'before_discount_all_price' => 'require',
|
|
|
- 'discount_price' => 'require',
|
|
|
- 'after_price' => 'require',
|
|
|
'mode' => 'require',
|
|
|
'contactor' => 'require',
|
|
|
'mobile' => 'require',
|
|
|
'addr' => 'require',
|
|
|
- 'spuCode' => 'require',
|
|
|
- 'companyNo' => 'require',
|
|
|
- 'customer_code' => 'require',
|
|
|
- 'supplierNo' => 'require',
|
|
|
- 'platform_codes' => 'require',
|
|
|
- 'good_name' => 'require',
|
|
|
- 'discount_reason' => 'require',
|
|
|
'addr_code' => 'require',
|
|
|
]);
|
|
|
|
|
|
@@ -223,8 +200,6 @@ class OrderImport extends Base
|
|
|
'price' => $param['price'],
|
|
|
'num' => $param['num'],
|
|
|
'before_discount_all_price' => $param['before_discount_all_price'],
|
|
|
- 'discount_price' => $param['discount_price'],
|
|
|
- 'after_price' => $param['after_price'],
|
|
|
'activity_name' => $param['activity_name'],
|
|
|
'mode' => $param['mode'],
|
|
|
'order_remark' => $param['order_remark'],
|
|
|
@@ -242,13 +217,6 @@ class OrderImport extends Base
|
|
|
Db::name('order_import_from_c_extend')
|
|
|
->insert([
|
|
|
'order_import_from_c_id' => $param['id'],
|
|
|
- 'spuCode' => $param['spuCode'],
|
|
|
- 'companyNo' => $param['companyNo'],
|
|
|
- 'customer_code' => $param['customer_code'],
|
|
|
- 'supplierNo' => $param['supplierNo'],
|
|
|
- 'platform_codes' => $param['platform_codes'],
|
|
|
- 'good_name' => $param['good_name'],
|
|
|
- 'discount_reason' => $param['discount_reason'],
|
|
|
'addr_code' => $param['addr_code'],
|
|
|
'addtime' => date('Y-m-d H:i:s'),
|
|
|
'createrid' => isset($user["data"]['id']) ? $userinfo["data"]['id'] : 0,
|
|
|
@@ -305,8 +273,6 @@ class OrderImport extends Base
|
|
|
'price|单价' => 'require|float',
|
|
|
'num|数量' => 'require|number',
|
|
|
'before_discount_all_price|优惠前总金额' => 'require|float',
|
|
|
- 'discount_price|优惠金额' => 'require|float',
|
|
|
- 'after_price|商品优惠后金额' => 'require|float',
|
|
|
'activity_name|优惠活动名称' => 'length:0,255',
|
|
|
'mode|收费模式' => 'require|length:0,255',
|
|
|
'order_remark|订单备注' => 'length:0,255',
|
