|
|
@@ -329,15 +329,13 @@ class Sale extends BaseController
|
|
|
$iten['stock_id'] = 0;
|
|
|
$iten['num'] = $ion['num'];
|
|
|
$iten['status'] = 1;
|
|
|
- $iten['sale_price'] = $ct['sale_price'];
|
|
|
+ $iten['sale_price'] = $ct['original_price'];
|
|
|
isset($ion['id']) && $ion['id'] !== "" ? '' : $iten['addtime'] = date("Y-m-d H:i:s");
|
|
|
$iten['updatetime'] = date("Y-m-d H:i:s");
|
|
|
- //$inn[]=$iten;
|
|
|
+
|
|
|
$vp = Db::name('sale_info')->save($iten);
|
|
|
if ($vp == false)
|
|
|
{
|
|
|
- $stc = ["order_code"=>$good_code,"status"=>0,"action_remark"=>'',"action_type"=>"edit"];
|
|
|
- ActionLog::logAdd($this->post['token'],$stc,"xsd",1,$stc);
|
|
|
Db::rollback();
|
|
|
return error_show(1002, "更新失败");
|
|
|
}
|
|
|
@@ -361,8 +359,6 @@ class Sale extends BaseController
|
|
|
$temp['arrive_time'] = date("Y-m-d H:i:s");
|
|
|
$dat = Db::name('order_addr')->save($temp);
|
|
|
if ($dat == false) {
|
|
|
- $stu = ["order_code"=>$good_code,"status"=>0,"action_remark"=>'',"action_type"=>"edit"];
|
|
|
- ActionLog::logAdd($this->post['token'],$stu,"xsd",0,$stu);
|
|
|
Db::rollback();
|
|
|
return error_show(1002, "更新失败");
|
|
|
}
|
