|
@@ -233,7 +233,7 @@ class Project extends \app\BaseController
|
|
|
$value['platform_code']=isset($info['platform_code'])?$info['platform_code']:"";
|
|
|
$khinfo = Db::name("customer_info")->where(["companyNo"=>$value['khNo']])->find();
|
|
|
$value['khName'] = isset($khinfo['companyName'])?$khinfo['companyName']:"";
|
|
|
- $company = Db::name("business")->where(["companyNo"=>$info['companyNo']])->find();
|
|
|
+ $company = Db::name("business")->where(["companyNo"=>$value['companyNo']])->find();
|
|
|
$value['company'] = isset($company['company'])?$company['company']:"";
|
|
|
$data[]=$value;
|
|
|
}
|
|
@@ -505,32 +505,61 @@ class Project extends \app\BaseController
|
|
|
return error_show(1004,"未找到数据");
|
|
|
}
|
|
|
$prject = Db::name("project")->where(["projectNo"=>$backinfo['projectNo'],"is_del"=>0])->find();
|
|
|
- if($prject==false){
|
|
|
- return error_show(1004,"未找到项目数据");
|
|
|
+ if($prject==false) {
|
|
|
+ return error_show(1004, "未找到项目数据");
|
|
|
}
|
|
|
-
|
|
|
+ $send_type =isset($this->post['send_type'])&&$this->post['send_type']!=""? intval($this->post['send_type']):"";
|
|
|
+ if($send_type==""){
|
|
|
+ return error_show(1004,"参数send_type不能为空");
|
|
|
+ }
|
|
|
+ if($send_type==1){
|
|
|
+ $va = isset($this->post['order_addr']) && $this->post['order_addr'] !== "" ? $this->post['order_addr'] : "";
|
|
|
+ if ($va == "") {
|
|
|
+ return error_show(1002, "参数order_addr不能为空");
|
|
|
+ }
|
|
|
+ }
|
|
|
+ $plat = Db::name("platform")->where(["id"=>$prject['platform_id']])->find();
|
|
|
+ $token = isset($this->post['token'])&& $this->post['token']!=="" ? trim($this->post['token']):"";
|
|
|
+ if($token==""){
|
|
|
+ return error_show(1004,"参数token不能为空");
|
|
|
+ }
|
|
|
+ $apply_id = GetUserInfo($token);
|
|
|
+ if (empty($apply_id) || $apply_id['code'] != 0) {
|
|
|
+ return error_show(1002, "申请人数据不存在");
|
|
|
+ }
|
|
|
+ $rm = isset($apply_id["data"]['id']) ? $apply_id["data"]['id'] : "";
|
|
|
+ $ri = isset($apply_id["data"]['nickname']) ? $apply_id["data"]['nickname'] : "";
|
|
|
+ $orderCode = makeNo("CX");
|
|
|
$data = [
|
|
|
"orderCode" => $orderCode,
|
|
|
- "good_code" => $good_code,
|
|
|
- "customer_code" => $customer_code,
|
|
|
- "good_name" => $ct['good_name'],
|
|
|
- "good_num" => $good_num,
|
|
|
+ "good_code" => $backinfo['spuCode'],
|
|
|
+ "customer_code" => $prject['khNo'],
|
|
|
+ "good_name" => $backinfo['good_name'],
|
|
|
+ "good_num" => $backinfo['num'],
|
|
|
+ "order_type" =>3,
|
|
|
+ "item_code"=>isset($plat['platform_code'])? $plat['platform_code']:"",
|
|
|
+ "good_type"=>1,
|
|
|
"apply_id" => $rm,
|
|
|
"apply_name" => $ri,
|
|
|
- "origin_price" => $ct['original_price'],
|
|
|
- "sale_price" => $ct['original_price'],
|
|
|
- "post_fee" => $post_fee,
|
|
|
- "status" => $status,
|
|
|
- "supplierNo" => $supplierNo,
|
|
|
+ "origin_price" =>$backinfo['nake_price'],
|
|
|
+ "sale_price" => $backinfo['sale_price'],
|
|
|
+ "post_fee" => 0,
|
|
|
+ "status" => 0,
|
|
|
+ "supplierNo" =>$prject['companyNo'],
|
|
|
"send_num" => 0,
|
|
|
- "wsend_num" => $good_num,
|
|
|
+ "zxNo"=>$backinfo['pgNo'],
|
|
|
+ "wsend_num" => $backinfo['num'],
|
|
|
+ "send_type" => $send_type,
|
|
|
"send_status" => 1,
|
|
|
"is_del" => 0,
|
|
|
"addtime" => date("Y-m-d H:i:s"),
|
|
|
"updatetime" => date("Y-m-d H:i:s"),
|
|
|
- 'total_price' => $ct['original_price'] * $good_num,
|
|
|
+ 'total_price' => $backinfo['sale_price'] * $backinfo['num'],
|
|
|
];
|
|
|
$datainfo = Db::name('sale')->insert($data, true);
|
|
|
+ if($datainfo>0){
|
|
|
+
|
|
|
+ }
|
|
|
|
|
|
}
|
|
|
}
|