Merge branch 'dev_wf' of wugg/phpstock into version1.5

app/admin/controller/Good.php

@@ -5,6 +5,7 @@ namespace app\admin\controller;
 
 use app\admin\model\DataGroup as DataGroupModel;
 use app\admin\model\GoodLog;
+use app\txx\model\YzGood;
 use think\App;
 use think\db\Raw;
 use think\facade\Db;
@@ -311,6 +312,9 @@ class Good extends Base
             $value['is_allow_update'] = 0;
             if (in_array($this->roleid, [1, 33]) || in_array($value['createrid'], $role[DataGroupModel::$type_可编辑])) $value['is_allow_update'] = 1;
 
+            //补充商品详情链接字段
+            $value['detail_url'] =YzGood::where(['item_no'=>$value['skuCode'],'is_del'=>0])->value('detail_url','');
+
             $data[] = $value;
         }
         return app_show(0, "获取成功", ['list' => $data, 'count' => $count]);

app/youzan/logic/Goodup.php

@@ -4,6 +4,7 @@ namespace app\youzan\logic;
 
 use app\admin\model\ActionLog;
 use app\admin\model\ProcessOrder;
+use app\txx\model\YzGood;
 use app\youzan\model\PlatformYouzan;
 use think\Exception;
 use think\facade\Cache;
@@ -616,6 +617,10 @@ class Goodup
         $data['purchase_id'] = $temp_basic_info['purchase_id'];
         $data['purchase'] = $temp_basic_info['purchase'];
 
+        //补充商品详情链接字段
+        $data['detail_url'] = YzGood::where(['is_del' => 0, 'item_no' => $data['skuCode']])
+            ->value('detail_url', '');
+
         return app_show(0, "获取成功", $data);
     }