|
@@ -184,6 +184,7 @@ class Project extends Base
|
|
|
$sale_price =$value['sale_price'];
|
|
|
}
|
|
|
$temp['sale_price']=$sale_price;
|
|
|
+ $temp['origin_price']=$sale_price;
|
|
|
$temp['num']=$projectinfo['num'];
|
|
|
$temp['status']=0;
|
|
|
$temp['is_del']=0;
|
|
@@ -317,14 +318,48 @@ class Project extends Base
|
|
|
$good['pakge_fee'] = isset($good['packing_fee'])?$good['packing_fee']:"0";
|
|
|
$good['nake_fee'] = isset($good['nake_price'])?$good['nake_price']:"0";
|
|
|
$good['metal_id'] = isset($good['noble_metal'])?$good['noble_metal']:"0";
|
|
|
+ $spec = Db::name("good_spec")->where(["spuCode"=>$good['spuCode'],"is_del"=>0])->find();
|
|
|
+ $good['specinfo']="";
|
|
|
+ if($spec!=false){
|
|
|
+ $specs=Db::name("specs")->where(["id"=>$spec['spec_id']])->find();
|
|
|
+ $spec_value = Db::name("spec_value")->where(["id"=>$spec["spec_value_id"]])->find();
|
|
|
+ $temp = ["specid"=>$spec['spec_id'],"spec_name"=>$specs['spec_name'],"spec_value_id"=>$spec['spec_value_id'],"spec_value_name"=>$spec_value["spec_value"]];
|
|
|
+ $good['specinfo']=$temp;
|
|
|
+ }
|
|
|
+ $nake =Db::name("good_nake")->where(["spuCode"=>$good['spuCode'],"is_del"=>0])->where([["min_num","<=",$value['num']]])
|
|
|
+ ->order("min_num desc")->find();
|
|
|
+ $good['origin_price']=$nake['nake_fee'];
|
|
|
}else{
|
|
|
$good=Db::name("consult_bids")->where(["spuCode"=>$value['spuCode'],"is_del"=>0])->find();
|
|
|
+ $good['specinfo'] = isset($good['specinfo'])&&$good['specinfo']!=""?json_decode($good['specinfo'],
|
|
|
+ true):"";
|
|
|
+ $catinfo = Db::name("cat")->where(["id"=>$good['cat_id']])->find();
|
|
|
+ $budget = isset($catinfo['order_rate']) ? $catinfo['order_rate']:100;
|
|
|
+ $god=[
|
|
|
+ "metal_id"=>$good['metal_id'],
|
|
|
+ "weight"=>$good["weight"],
|
|
|
+ "demo_fee"=>$good["demo_fee"],
|
|
|
+ "delivery_fee"=>$good["delivery_fee"],
|
|
|
+ "open_fee"=>$good["open_fee"],
|
|
|
+ "packing_fee"=>$good["pakge_fee"],
|
|
|
+ "mark_fee"=>$good["mark_fee"],
|
|
|
+ "nake_fee"=>$good["nake_fee"],
|
|
|
+ "cert_fee"=>$good["cert_fee"],
|
|
|
+ "cost_fee"=>$good["cost_fee"],
|
|
|
+ "num"=>$value["num"],
|
|
|
+ ];
|
|
|
+ if($good['is_gold_price']==1){
|
|
|
+ $price = GoldPrice($god, 0);
|
|
|
+ }else{
|
|
|
+ $price = GoodPrice($god, 0);
|
|
|
+ }
|
|
|
+ $good['origin_price'] = $price;
|
|
|
}
|
|
|
$value['good_name'] = isset($good['good_name'])?$good['good_name']:"";
|
|
|
$value['brand_id'] = isset($good['brand_id'])?$good['brand_id']:"";
|
|
|
$brand = Db::name("brand")->where(['id'=>$value["brand_id"]])->find();
|
|
|
$value['brand_name'] =isset($brand['brand_name']) ? $brand['brand_name']:"";
|
|
|
- $value['specinfo'] = isset($good['specinfo'])?json_decode($good['specinfo'],true):"";
|
|
|
+ $value['specinfo'] = isset($good['specinfo'])&&$good['specinfo']!=""?$good['specinfo']:"";
|
|
|
$value['unit_id'] = isset($good['unit_id'])?$good['unit_id']:"";
|
|
|
$unit = Db::name("unit")->where(['id'=>$value["unit_id"]])->find();
|
|
|
$value["unit_name"]=isset($unit['unit'])?$unit['unit']:"";
|
|
@@ -338,7 +373,7 @@ class Project extends Base
|
|
|
$value['tax'] = isset($good['tax'])?$good['tax']:"";
|
|
|
$value['send_way'] = isset($good['send_way'])?$good['send_way']:"";
|
|
|
$value['metal_id'] = isset($good['metal_id'])?$good['metal_id']:"";
|
|
|
- $value['is_gold_price'] = isset($good['is_gold_price'])?$good['is_gold_price']:"";
|
|
|
+ $value['is_gold_price'] = isset($good['is_gold_price'])?$good['is_gold_price']:"0";
|
|
|
$value['config'] = isset($good['config'])?$good['config']:"";
|
|
|
$value['weight'] = isset($good['weight'])?$good['weight']:"";
|
|
|
$value['is_diff'] = isset($good['is_diff'])?$good['is_diff']:"0";
|
|
@@ -351,6 +386,7 @@ class Project extends Base
|
|
|
$value['cert_fee'] = isset($good['cert_fee'])?$good['cert_fee']:"0";
|
|
|
$value['cost_fee'] = isset($good['cost_fee'])?$good['cost_fee']:"0";
|
|
|
//$value['total_fee'] = isset($good['total_fee'])?$good['total_fee']:"0";
|
|
|
+ $value['rate'] =round(($value['sale_price'] - $good['origin_price'])/$value['sale_price'] * 100,2);
|
|
|
$value['supply_area'] = isset($good['supply_area'])?$good['supply_area']:"";
|
|
|
$data[]=$value;
|
|
|
}
|
|
@@ -422,7 +458,8 @@ class Project extends Base
|
|
|
if($feedback==""){
|
|
|
return error_show(1004,"参数feedback不能为空");
|
|
|
}
|
|
|
- $feedinfo = Db::name("project_feedback")->where(['id'=>$feedback,"projectNo"=>$projectNo,"is_del"=>0])
|
|
|
+ $feedid =array_column($feedback,"feedid");
|
|
|
+ $feedinfo = Db::name("project_feedback")->where(['id'=>$feedid,"projectNo"=>$projectNo,"is_del"=>0])
|
|
|
->select()->toArray();
|
|
|
if(empty($feedinfo)){
|
|
|
return error_show(1004,"反馈数据未找到");
|
|
@@ -443,6 +480,15 @@ class Project extends Base
|
|
|
$total=0;
|
|
|
$dl=[];
|
|
|
foreach ($feedinfo as $value){
|
|
|
+ $key =array_search($value['id'],$feedback);
|
|
|
+ $price = $feedback[$key];
|
|
|
+ $value['sale_price'] = $price['sale_price'];
|
|
|
+ $value['updatetime'] = $price['sale_price'];
|
|
|
+ $cre=Db::name("project_feedback")->save($value);
|
|
|
+ if($cre==false){
|
|
|
+ Db::rollback();
|
|
|
+ return error_show(1004,"反馈商品价格修改失败");
|
|
|
+ }
|
|
|
$temp=[];
|
|
|
$temp['planNo']=$planNo;
|
|
|
$temp['feedback_id']=$value['id'];
|
|
@@ -784,4 +830,5 @@ class Project extends Base
|
|
|
return error_show(1004,"反馈数据删除失败");
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
}
|