解决冲突，暂存

app/admin/common/YouZan.php

@@ -12,9 +12,32 @@ class YouZan
     private $Token;
     private  $clientId='deaaebe6484c129787';
     private  $clientSecret='3c654aa2fbc1b5da788ffdba45fb96f0';
-    private $method='https://open.youzanyun.com/api/';
+//    private $method='https://open.youzanyun.com/api/';
     private $apiVersion='3.0.0';
     private $authorityId='109334129';
+    private $methodlist=[
+        "youzan.item.update.listing",//上架商品
+        "youzan.item.incremental.update",//增量更新商品信息接口
+        "youzan.retail.open.spu.update",//更新单个商品库商品信息
+        "youzan.retail.open.sku.update.price",//更新商品价格
+        "youzan.item.sku.batch.update",//批量更新sku信息
+        "youzan.item.delete",//删除商品
+        "youzan.item.search",//分页查询微商城销售中和已售罄商品列表
+        "youzan.item.update",//更新商品信息
+        "youzan.item.add",//商品新建
+        "youzan.itemcategories.get",//商品类目二维列表
+        "youzan.item.detail.get",//单个商品明细
+        "youzan.item.full.sku.update",//商品sku信息全量更新,
+        "youzan.item.update.delisting",//商品下架,
+        "youzan.item.sku.update",//更新sku信息微商城单店
+        "youzan.retail.open.category.create",//商品分类信息新增,
+        "youzan.retail.open.brand.add",//新建品牌
+        "youzan.retail.open.sku.query",//商品查询 sku
+        "youzan.items.onsale.get",//获取出售中得商品
+        "youzan.retail.open.brand.delete",//品牌删除
+        "youzan.retail.open.category.query",//商品分类信息查询
+        "youzan.retail.open.brand.querypage"//品牌查询接口
+    ];
     public function __construct()
     {
         $this->Token =new Token($this->clientId,$this->clientSecret);

app/admin/controller/Consult.php

@@ -1987,7 +1987,7 @@ class Consult extends Base
         }
         $bargainNo = isset($this->post['bargainNo']) && $this->post['bargainNo'] !== "" ? trim($this->post['bargainNo']) : "";
         if ($bargainNo !== "") {
-            $where[] = ['bo.bargainNo','=',$bargainNo];
+            $where[] = ['bo.bargainNo', 'like', '%' . $bargainNo . '%'];
         }
 
         $status = isset($this->post['status']) && $this->post['status'] !== "" ? intval($this->post['status']) : "";

app/admin/controller/Login.php

@@ -23,8 +23,8 @@ class Login
             "keyword"=>"",
             "page_size"=>20
         ];
-        $data =$youzan->GetData("youzan.itemcategories.taglist.search",$params );
-        return  json_encode($data,JSON_UNESCAPED_UNICODE);
+
+        return $youzan->GetData("youzan.itemcategories.taglist.search",$params );
     }
 
     /**

app/admin/controller/Purchin.php

@@ -268,7 +268,7 @@ class Purchin extends Base
                         Db::rollback();
                         return error_show(1004,"新建失败");
                     }
-                    $good = Db::name("good_stock")->where(["wsm_code"=>$cgdinfo['wsm_code'],"spuCode"=>$cgdinfo['spuCode'],"is_del"=>0])->find();
+                    $good = Db::name("good_stock")->where(["wsm_code"=>$cgdinfo['wsm_code'],"spuCode"=>$cgdinfo['spuCode'],"is_del"=>0])->lock(true)->find();
                     if(empty($good)) {
                         $good=[
                             "spuCode"=>$cgdinfo['spuCode'],
@@ -811,18 +811,18 @@ class Purchin extends Base
                     $order = ["order_code"=>$good['spuCode'],"status"=>1,"action_remark"=>'', "action_type"=>"edit"];
                 }
                 $good['wait_in_stock']-=$wsm_num;
-                if($good['presale_stock']>0){
-                    if($good['presale_stock']>=$wsm_num){
-                        $good['presale_stock']-=$wsm_num;
-                        $good['wait_out_stock']+=$wsm_num;
-                    }else{
-                        $good['presale_stock']=0;
-                        $good['usable_stock']+=$wsm_num-$good['presale_stock'];
-                        $good['wait_out_stock']+=$good['presale_stock'];
-                    }
-                }else{
+//                if($good['presale_stock']>0){
+//                    if($good['presale_stock']>=$wsm_num){
+//                        $good['presale_stock']-=$wsm_num;
+//                        $good['wait_out_stock']+=$wsm_num;
+//                    }else{
+//                        $good['presale_stock']=0;
+//                        $good['usable_stock']+=$wsm_num-$good['presale_stock'];
+//                        $good['wait_out_stock']+=$good['presale_stock'];
+//                    }
+//                }else{
                     $good['usable_stock']+=$wsm_num;
-                }
+  //              }
 //                $good['usable_stock']+=$wsm_num;
 
                 $good['total_stock']=$good['usable_stock']+$good['wait_out_stock'];

app/admin/controller/Sale.php

@@ -90,7 +90,7 @@ class Sale extends Base
         }
         if($goodinfo['is_stock']==1){
             $stock =Db::name("good_stock")->alias("a")->leftJoin("warehouse_info b","a.wsm_code=b.wsm_code")->where
-            (["spuCode"=>$spuCode, "a.is_del"=>0,"a.status"=>1,"b.wsm_type"=>5,"b.companyNo"=>$supplierNo])->field("a.id,a.wait_in_stock,a.presale_stock,a.usable_stock,a.wait_out_stock")->find();
+            (["spuCode"=>$spuCode, "a.is_del"=>0,"a.status"=>1,"b.wsm_type"=>5,"b.companyNo"=>$supplierNo])->field("a.id,a.wait_in_stock,a.usable_stock,a.wait_out_stock")->find();
             if($stock==false ||$stock['usable_stock']<$good_num){
                 return error_show(1003,"库存数量不足");
             }
@@ -905,6 +905,11 @@ class Sale extends Base
 
         Db::startTrans();
         try{
+            $zx =Db::name("consult_info")->where(["infoNo"=>$zxinfo['infoNo'],"is_del"=>0])->lock(true)->find();
+            if($zx==false){
+                Db::rollback();
+                return error_show(1003,"未找到咨询单信息");
+            }
             $data=[
                 "orderCode"=>$orderCode,
                 "good_code"=>$spuCode,
@@ -1195,6 +1200,11 @@ class Sale extends Base
         $ri = isset($apply_id["data"]['nickname']) ? $apply_id["data"]['nickname'] : "";
         Db::startTrans();
         try {
+            $plan =Db::name("project_plan")->where(["planNo"=>$planNo,"is_del"=>0])->lock(true)->find();
+            if($plan==false){
+                Db::rollback();
+                return error_show(1004,"未找到方案信息");
+            }
             $feedid = array_column($feedbackid,"feedback_id");
             foreach ($planinfo as $value){
                 $good=[];

app/admin/controller/Stat.php

@@ -20,7 +20,7 @@ class Stat extends \app\BaseController
         $endtime = isset($post['date']) ? $post['date'] : date("Y-m-d");
 
         $sql = "
-   SELECT
+ SELECT
 	`month` AS m,
 	ifnull( month_total_fee, 0 ) AS total,
 	ifnull( `week`, '' ) AS w,
@@ -38,29 +38,19 @@ FROM
 	SELECT MONTH
 		( a.addtime ) AS `month`,
 		SUM( total_price ) AS month_total_fee,
-		((
+		(
 			SELECT
-			ifnull(sum(total_fee),0) 
+			ifnull(sum(e.th_fee),0) 
 			FROM
-				wsm_sale_return e
+				wsm_th_data e
 				LEFT JOIN wsm_depart_user k ON e.apply_id = k.uid 
+				LEFT JOIN wsm_sale f on e.orderCode=f.orderCode
 				AND k.is_del = 0 
-				AND k.STATUS = 1 and e.status=4
+				AND k.STATUS = 1 
 			WHERE
 				k.itemid = c.id 
-				AND e.platform_id = a.platform_id 
-				AND DATE_FORMAT( e.addtime, '%Y-%m' ) = DATE_FORMAT( '$endtime', '%Y-%m' )) + (
-			SELECT
-			ifnull(sum(total_fee),0)  
-			FROM
-				wsm_order_back f
-				LEFT JOIN wsm_depart_user p ON f.apply_id = p.uid 
-				AND p.is_del = 0 
-					AND p.STATUS = 1 and f.status=4
-			WHERE
-				p.itemid = c.id 
 				AND f.platform_id = a.platform_id 
-			AND DATE_FORMAT( f.addtime, '%Y-%m' ) = DATE_FORMAT( '$endtime', '%Y-%m' ))) AS month_thfee,
+				AND DATE_FORMAT( e.addtime, '%Y-%m' ) = DATE_FORMAT( '$endtime', '%Y-%m' )) AS month_thfee,
 		a.platform_id,
 		c.`name`,
 		c.id,
@@ -85,32 +75,19 @@ FROM
 	SELECT WEEK
 		( a.addtime, 1 ) AS `week`,
 		SUM( total_price ) AS week_total_fee,
-		((
-			SELECT
-				ifnull(sum(total_fee),0) 
+		(SELECT
+			ifnull(sum(e.th_fee),0) 
 			FROM
-				wsm_sale_return e
+				wsm_th_data e
 				LEFT JOIN wsm_depart_user k ON e.apply_id = k.uid 
+				LEFT JOIN wsm_sale f on e.orderCode=f.orderCode
 				AND k.is_del = 0 
-				AND k.STATUS = 1 and e.status=4
+				AND k.STATUS = 1 
 			WHERE
 				k.itemid = c.id 
-				AND e.platform_id = a.platform_id 
-				AND WEEK ( e.addtime, 1 ) = WEEK ( '$endtime', 1 ) 
-				AND DATE_FORMAT ( e.addtime, '%Y' ) = DATE_FORMAT ( '$endtime', '%Y' )) + (
-			SELECT
-				ifnull(sum(total_fee),0) 
-			FROM
-				wsm_order_back f
-				LEFT JOIN wsm_depart_user p ON f.apply_id = p.uid 
-				AND p.is_del = 0 
-					AND p.STATUS = 1 and f.status=4
-			WHERE
-				p.itemid = c.id 
 				AND f.platform_id = a.platform_id 
 				AND WEEK ( f.addtime, 1 ) = WEEK ( '$endtime', 1 ) 
-				AND DATE_FORMAT ( f.addtime, '%Y' ) = DATE_FORMAT ( '$endtime', '%Y' ) 
-			)) AS week_thfee,
+				AND DATE_FORMAT ( f.addtime, '%Y' ) = DATE_FORMAT ( '$endtime', '%Y' )) AS week_thfee,
 		a.platform_id,
 		c.`name`,
 		c.id,
@@ -136,29 +113,19 @@ FROM
 	SELECT
 		date_format( a.addtime, '%Y-%m-%d' ) AS `day`,
 		SUM( total_price ) AS day_total_fee,
-		((
-			SELECT
-				ifnull(sum(total_fee),0) 
+		(SELECT
+			ifnull(sum(e.th_fee),0) 
 			FROM
-				wsm_sale_return e
+				wsm_th_data e
 				LEFT JOIN wsm_depart_user k ON e.apply_id = k.uid 
+				LEFT JOIN wsm_sale f on e.orderCode=f.orderCode
 				AND k.is_del = 0 
-				AND k.STATUS = 1 and e.status=4
+				AND k.STATUS = 1 
 			WHERE
 				k.itemid = c.id 
-				AND e.platform_id = a.platform_id 
-				AND DATE_FORMAT( e.addtime, '%Y-%m-%d' ) = DATE_FORMAT( '$endtime', '%Y-%m-%d' )) + (
-			SELECT
-				ifnull(sum(total_fee),0) 
-			FROM
-				wsm_order_back f
-				LEFT JOIN wsm_depart_user p ON f.apply_id = p.uid 
-				AND p.is_del = 0 
-					AND p.STATUS = 1 and f.status=4
-			WHERE
-				p.itemid = c.id 
 				AND f.platform_id = a.platform_id 
-			AND DATE_FORMAT( f.addtime, '%Y-%m-%d' ) = DATE_FORMAT( '$endtime', '%Y-%m-%d' ))) AS day_thfee,
+				AND WEEK ( f.addtime, 1 ) = WEEK ( '$endtime', 1 ) 
+				AND DATE_FORMAT( f.addtime, '%Y-%m-%d' ) = DATE_FORMAT( '$endtime', '%Y-%m-%d' )) AS day_thfee, 
 		a.platform_id,
 		c.`name`,
 		c.id AS depar_id,