ad

app/admin/controller/Base.php

@@ -5,6 +5,7 @@ namespace app\admin\controller;
 
 
 use think\App;
+use think\facade\Db;
 
 class Base extends \app\BaseController
 {
@@ -42,7 +43,9 @@ class Base extends \app\BaseController
         $action['private_field']=isset($role['private_field'])? $role['private_field']:'';
         $action['read']=$uid;
         $action['write']=$uid;
-        $share =Db::name("role_share")->where(["to_user"=>$this->uid,"is_del"=>0,"status"=>1])->select();
+        $group = Db::name("role_group")->where("FIND_IN_SET($uid,group_user) >0")->column("id");
+        $share =Db::name("role_share")->where(["to_user"=>$this->uid,"is_del"=>0,"status"=>1])->whereOr
+        (["to_user"=>$this->uid,"to_group"=>$group])->select();
         if(!empty($share)){
             foreach ($share as $value){
                 $action['action_conllect'].=$value['action_collect']!=""? ",".$value['action_collect']:"";
@@ -51,7 +54,5 @@ class Base extends \app\BaseController
                 }
             }
         }
-        $group = Db::name("role_group")->where("FIND_IN_SET($uid,group_user) >0")->select();
-
     }
 }

app/admin/controller/Consult.php

@@ -1258,7 +1258,7 @@ class Consult extends Base
                 "bargain_type"=>1,
                 "bargain_reason"=>$bargain_reason,
                 "sale_price"=>$info['sale_price'],
-                "cost_before_price"=>$info['cost_fee'],
+                "cost_before_price"=>$info['sale_cost_fee'],
                 "cost_after_price"=>$cost_price,
                 "before_rate"=>round(($info['sale_price']-$info['total_fee'])/$info['sale_price'],2),
                 "after_rate"=>round(($bargain_price-$info['total_fee'])/$bargain_price,2),
@@ -1718,13 +1718,14 @@ class Consult extends Base
                     "mark_fee"=>$value["mark_fee"],
                     "nake_fee"=>$value["nake_fee"],
                     "cert_fee"=>$value["cert_fee"],
-                    "cost_fee"=>$value["cost_fee"],
+                    "cost_fee"=>$value['status']==5? $value["sale_cost_fee"]: $value["cost_fee"],
                     "num"=>$bidinfo["num"],
                 ];
             if($value['is_gold_price']==1){
                 $price = GoldPrice($god, $budget/100);
                 $value['sale_price'] = round($price,2);
             }
+            $value['cost_fee'] =$value['origin_cost_fee'];
             $value['specinfo'] = json_decode($value['specinfo'],true);
             $value['metal_name']=isset($value['metal_id'])&& $value['metal_id']!=0?$this->noble[$value['metal_id']]:"";
             $value['bargain_status']=$bidinfo['bargain_status'];

app/admin/controller/Sale.php

@@ -194,7 +194,7 @@ class Sale extends Base
                 "origin_price"=>$origin_price,
                 "sale_price"=>$sale_price,
                 "post_fee"=>0,
-                "status"=>$send_num == 0 ? 0 : ($good_num==$send_num ? 2 : 1),
+                "status"=>$send_num == 0 ? 0 : 1,
                 "send_num"=>$send_num,
                 "wsend_num"=>$good_num-$send_num,
                 "send_status"=>$good_num==$send_num? 3 :($send_num==0?1 :2) ,
@@ -808,7 +808,7 @@ class Sale extends Base
                 "origin_price"=>$zxinfo['total_fee'],
                 "sale_price" => $sale_price,//销售单价支持修改
                 "post_fee"=>0,
-                "status"=>$send_num == 0 ? 0 : ($good_num==$send_num ?2 : 1),
+                "status"=>$send_num == 0 ? 0 : 1,
                 "send_num"=>$send_num,
                 "wsend_num"=>$good_num-$send_num,
                 "send_status"=>$good_num==$send_num? 3 :($send_num==0?1 :2) ,
@@ -1238,7 +1238,7 @@ class Sale extends Base
             "origin_price"=>$goodinfo['total_fee'],
             "sale_price"=>$data['sale_price'],
             "post_fee"=>0,
-            "status"=>$data['good_num']==$data['send_num']?2:($data['send_num']==0?0 :1),
+            "status"=>$data['send_num']==0?0 :1,
             "send_num"=>$data['send_num'],
             "wsend_num"=>$data['good_num']-$data['send_num'],
             "send_status"=>$data['good_num']==$data['send_num']? 3 :($data['send_num']==0?1 :2),
@@ -1449,7 +1449,7 @@ class Sale extends Base
             "origin_price"=>$origin_price,
             "sale_price"=>$sale_price,
             "post_fee"=>0,
-            "status"=>$data['good_num']==$data['send_num']? 2 :($data['send_num']==0?0 :1),
+            "status"=>$data['send_num']==0?0 :1,
             "send_num"=>$data['send_num'],
             "wsend_num"=>$data['good_num']-$data['send_num'],
             "send_status"=>$data['good_num']==$data['send_num']? 3 :($data['send_num']==0?1 :2) ,
@@ -3102,7 +3102,17 @@ class Sale extends Base
         try{
             $up =Db::name("order_out")->save($outinfo);
             if($up){
-
+                $sendnum = Db::name("order_out")->where([['orderCode',"=", $outinfo['orderCode']], ['is_del',"=", 0],
+                    ["status","<",2]])->count();
+                if($sendnum==0 && $einfo['wsend_num']==0){
+                    $einfo['status']=2;
+                    $einfo['updatetime']=date("Y-m-d H:i:s");
+                    $saleup=Db::name("sale")->save($einfo);
+                    if($saleup==false){
+                        Db::rollback();
+                        return error_show(1002, "销售单状态更新失败");
+                    }
+                }
                 //修改状态，添加待办
                 ActionLog::logAdd($this->post['token'], [
                     "order_code" => $outinfo['outCode'],//出库单号