ad

app/admin/controller/Goldprice.php

@@ -14,7 +14,7 @@ class Goldprice extends BaseController
         1=>'18K',2=>'24K',3=>'白银'
     ];
     public $rate=[
-       1=> 0,2=>1,3=>3,4=>6,5=>9,6=>13
+       1=> 0,2=>1,3=>3,4=>5,5=>6,6=>9,7=>13
     ];
     public function __construct(App $app)
     {

app/admin/controller/Good.php

@@ -271,7 +271,7 @@ class Good extends Base
         $param['page'] = $param['page'] >= $total ? $total : $param['page'];
         $list = Db::name('platform_youzan')
             ->alias("b")
-            ->field("b.skuCode,b.platform_id platform_code,b.plat_code,b.id as platform_youzan_id,a.cat_id,a.good_name,a.good_img,a.good_info_img,a.good_thumb_img,b.createrid,a.is_exclusive,a.brand_id,a.supplierNo,a.good_unit,a.noble_metal,a.companyNo,a.spuCode,a.good_type,b.creater,b.addtime,b.updatetime,b.exam_status,a.createrid purchase_id,a.creater purchase")//成本表里的创建人，也是线上商品的采购人，为了防止混淆，给creater取个别名
+            ->field("b.skuCode,b.platform_id platform_code,a.is_stock,b.plat_code,b.id as platform_youzan_id,a.cat_id,a.good_name,a.good_img,a.good_info_img,a.good_thumb_img,b.createrid,a.is_exclusive,a.brand_id,a.supplierNo,a.good_unit,a.noble_metal,a.companyNo,a.spuCode,a.good_type,b.creater,b.addtime,b.updatetime,b.exam_status,a.createrid purchase_id,a.creater purchase")//成本表里的创建人，也是线上商品的采购人，为了防止混淆，给creater取个别名
             ->leftJoin("good_basic a", "a.spuCode=b.spuCode")
             ->where($where)
             ->page($param['page'], $param['size'])

app/admin/controller/OrderOutChild.php

@@ -492,7 +492,7 @@ class OrderOutChild extends Base
             ->where("status", "in", [1, 2, 3, 7, 8, 9, 10, 11, 12])
             ->findOrEmpty();
         if (!empty($is_reurn)) return json_show(1004, $is_reurn['orderCode'] . "存在退货未处理完成");
-
+		
 
         //判断供应商是否开通账号，若开通的话，则只能由供应商账号操作
 //        if ($this->level != 3) {
@@ -505,7 +505,9 @@ class OrderOutChild extends Base
             'outChildCode|发货工单号' => 'require|max:255',
             'post_name|物流公司' => 'require|max:255',
             'post_code|物流单号' => 'require|max:255',
-            'post_fee|物流费用' => 'require|egt:0|max:99999999.99'
+            'post_fee|物流费用' => 'require|egt:0|max:99999999.99',
+            'is_post|是否包邮' => 'require|egt:0|in:0,1',
+            'post_supplier_code|物流供应商' => 'require|max:255'
         ]);
 
         Db::startTrans();
@@ -515,11 +517,6 @@ class OrderOutChild extends Base
 
             //所有供应商负责人
             $person = get_personid_by_supplierNo(array_unique(array_column($child, 'supplierNo')));
-//            $userCommon = \app\admin\common\User::getIns();
-//            $person_temp = $userCommon->handle('sGetList', ['more_code' => array_unique(array_column($child, 'supplierNo')), 'size' => count(array_column($child, 'supplierNo'))]);
-//            $person = array_column($person_temp['data']['list'], 'personid', 'code');
-//            unset($userCommon);
-//            unset($person_temp);
 
             //所有仓库管理员
             $wsm_contactor = Db::name('warehouse_info')
@@ -527,7 +524,9 @@ class OrderOutChild extends Base
                 ->column('contactor', 'wsm_code');
 
             $yz_tmp = [];
-
+			$supplier=array_unique(array_column($param,"post_supplier_code"));
+			$supArr = \app\admin\common\User::getIns()->handle('getCodeAndName', ["code"=>$supplier]);
+			$suplierArr=$supArr["data"]??[];
             foreach ($param as $value) {
 
                 if ($val->check($value) == false) throw new \Exception($val->getError());
@@ -559,6 +558,9 @@ class OrderOutChild extends Base
                         'post_name' => $value['post_name'],
                         'post_code' => $value['post_code'],
                         'post_fee' => $value['post_fee'],
+                        'is_post' => $value['is_post'],
+                        'post_supplier_code' => $value['post_supplier_code'],
+                        'post_supplier_name' =>$suplierArr[$value['post_supplier_code']]??"",
                         'status' => 2,
                         'sendtime' => $date,
                         'updatetime' => $date,

app/admin/controller/Report.php

@@ -83,7 +83,7 @@ class Report extends Base
             'start_date|筛选开始时间' => 'require|date|elt:end_date',
             'end_date|筛选结束时间' => 'require|date',
             'platform_id|筛选平台ID' => 'require|number|gt:0',
-            'status|状态' => 'require|number|in:5,6,8',
+            'status|状态' => 'require|number|in:1,2,3,4,5',
         ]);
 
         if (!$val->check($param)) return json_show(1004, $val->getError());

app/command/SplitSale.php

@@ -73,7 +73,7 @@ class SplitSale extends Command
                 		"customerNo"=>"",
                 		"supplierNo"=>'',
                 		"supplierName"=>'',
-                		"status"=>$sale['th_num']==$sale['good_num']?3:0,
+                		"status"=>$sale['th_num']==$sale['good_num']?3:-1,
                 		"companyName"=>$sale['supplierName'],
                 		"companyNo"=>$sale['supplierNo'],
                 		];
@@ -430,7 +430,7 @@ class SplitSale extends Command
         	if($com->isEmpty()==false){
         		$item['id'] = $com->id;
         		$item['tyCode'] = $com->tyCode;
-        		if($com->status==1 || $com->status==2) $item['status']=$com->status;
+        		if(in_array($com->status,[0,1,2]))$item['status']=$com->status;
         	}else{
         		$item['id']=null;
         	}