Merge branch 'version1.5' into dev_wf

app/admin/controller/Good.php

@@ -121,7 +121,10 @@ class Good extends Base
         $page = $page >= $total ? $total : $page;
         $list = Db::name('good')
             ->alias("a")
-            ->field("b.skuCode,b.platform_code,b.plat_code,b.id as good_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,u.itemid")//成本表里的创建人，也是线上商品的采购人，为了防止混淆，给creater取个别名
+            ->field("b.skuCode,b.platform_code,b.plat_code,b.id as good_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,u.itemid,a.is_stock")
+            //成本表里的创建人，也是线上商品的采购人，为了防止混淆，给creater取个别名
             ->leftJoin("good_platform b","a.spuCode=b.spuCode")
 //            ->leftJoin("good_basic gb","gb.spuCode=a.spuCode")
             ->leftJoin("depart_user u", "u.uid=a.createrid AND u.is_del=0")

app/admin/controller/Sale.php

@@ -2292,6 +2292,7 @@ class Sale extends Base
                     $wsmcode = Db::name("warehouse_info")->where(["wsm_code" => $value['wsm_code']])->find();
                     $value['wsm_name'] =isset($wsmcode['name'])?$wsmcode['name']:"";
                 }
+                $value['sendtime'] = $value['status']<2 ? '':$value['sendtime'];
                 $addrs[] = $value;
             }
         }
@@ -3255,7 +3256,7 @@ class Sale extends Base
             $value['mobile'] = isset($addr['mobile']) ? $addr['mobile'] : "";
             $value['can'] = isset($goon['cat_id']) && $goon['cat_id'] != 0 ? made($goon['cat_id']) : [];
             $value['company_name'] = implode('/', array_column(GetPart($value['itemid']), 'name'));
-
+            $value['sendtime'] = $value['status']<2 ? '' :$value['sendtime'];
             $data[] = $value;
         }
         return app_show(0, "获取成功", ['list' => $data, 'count' => $count]);
@@ -3298,6 +3299,7 @@ class Sale extends Base
         $codeinfo['addr_code'] = isset($addr['addr_code']) ? $addr['addr_code'] : "";
         $codeinfo['contactor'] = isset($addr['contactor']) ? $addr['contactor'] : "";
         $codeinfo['mobile'] = isset($addr['mobile']) ? $addr['mobile'] : "";
+        $codeinfo['sendtime'] = $codeinfo['status']<2 ? '' :$codeinfo['sendtime'];
         $codeinfo['can'] = $int;
         $orderReturn = Db::name("order_return")->where(["outCode"=>$outCode,"is_del"=>0])->order("id desc")->find();
         $codeinfo['order_return'] = $orderReturn ;