add - 调试UI字段

app/adminapi/lists/external/DouyinOrderLists.php

@@ -66,7 +66,7 @@ class DouyinOrderLists extends BaseAdminDataLists implements ListsSearchInterfac
      */
     public function lists(): array
     {
-        return DouyinOrder::where($this->searchWhere)->where($this->queryWhere())
+        return DouyinOrder::with(['goods', 'serviceWork'])->where($this->searchWhere)->where($this->queryWhere())
             ->field(['*'])
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['id' => 'desc'])

app/api/controller/DouYinController.php

@@ -33,7 +33,7 @@ use app\api\logic\LoginLogic;
 class DouYinController extends BaseApiController
 {
 
-    public array $notNeedLogin = ['register','account','payNotify'];
+    public array $notNeedLogin = ['register','account','getAllGoods','getGoodsDetail','payNotify'];
     /*手机号注册 + 通过code获取openId绑定
     (暂时无-试运营)授权手机号一键注册登录 - 通过code应该为getPhoneNumber返回
 

app/api/lists/GoodsLists.php

@@ -79,14 +79,13 @@ class GoodsLists  extends BaseApiDataLists implements ListsSearchInterface
         $lists = Goods::order(['id' => 'desc'])
             ->where($this->searchWhere)
             ->where($this->queryWhere())
-            ->visible(['id','goods_name','goods_image'])
+            ->visible(['id','goods_name','goods_image','service_fee','category_type','goods_category_ids','goods_category_id','goods_payment_type','base_service_fee','service_total'])
             ->limit($this->limitOffset, $this->limitLength)
             ->select()
             ->toArray();
         return $lists;
     }
 
-
     /**
      * @notes 获取数量
      * @return int

app/api/service/DouYinService.php

@@ -22,7 +22,7 @@ use think\facade\Log;
 class DouYinService
 {
     protected static int $terminal = \app\common\enum\user\UserTerminalEnum::DOUYIN;
-    protected static int $external_platform_id = 7;
+    protected static int $external_platform_id = 6;
     public static function register(array $params)
     {
         $userSn = User::createUserSn();
@@ -95,7 +95,7 @@ class DouYinService
                 throw new \Exception('请先补充您的联系方式后在提交订单');
             }
             // TODO tmp防抖1m
-            $isExist = DouyinOrder::where(['user_id'=>$params['user_id'],'goods_id'=>$goods['goods_id']])->where('create_time','>',(time() - 60))->findOrEmpty();
+            $isExist = DouyinOrder::where(['user_id'=>$params['user_id'],'goods_id'=>$goods['id']])->where('create_time','>',(time() - 60))->findOrEmpty();
             if(!$isExist->isEmpty()){
                 throw new \Exception('请勿重复下单！');
             }
@@ -106,7 +106,7 @@ class DouYinService
                 'mobile' => $params['user_info']['mobile'],
                 'title' => $goods['goods_name'],
 
-                'goods_id'=>$goods['goods_id'],
+                'goods_id'=>$goods['id'],
                 'unit_price' => $goods['service_fee'],
                 'quantity' => $quantity,
                 'total_amount' => $goods['service_fee'] * $quantity,
@@ -123,13 +123,13 @@ class DouYinService
 
     public static function payNotify($params)
     {
-            Log::write($params,JSON_UNESCAPED_UNICODE);
+            //Log::write(json_encode($params));
 
             // 查询抖音订单是否完成支付
 
             if ($params['trade_state'] === 'SUCCESS') {
-                $transaction_id = '';
-                $paid_amount = '';
+                $transaction_id = $params['transaction_id']??'';
+                $paid_amount = $params['paid_amount']??0;
                 $out_trade_no = $params['out_trade_no'];
                 $order = DouyinOrder::where('order_number', $out_trade_no)->findOrEmpty();
                 if(!$order->isEmpty()){
@@ -149,13 +149,13 @@ class DouYinService
                     ];
                     $consultation = ExternalConsultation::create([
                         'external_platform_id' => self::$external_platform_id,
-                        'form_detail' => $form_detail,
+                        'form_detail' => json_encode($form_detail),
                         'user_name' => $user['real_name']??'',
                         'mobile' => $user['mobile'],
                         'goods_id' => $order->goods_id,
                         'amount' => $paid_amount
                     ]);
-                    $order->consultation_id = $consultation['id'];
+                    $order->consultation_id = $consultation->id;
                     $order->save();
                     return true;
                 }
@@ -164,6 +164,10 @@ class DouYinService
     }
     public static function reservation($params)
     {
+        $lon_lat = get_address_lat_lng($params['user_address']);
+        $params['lon'] = $lon_lat['lon'];
+        $params['lat'] = $lon_lat['lat'];
+
         // $params['order_number']
         Db::startTrans();
         try {

app/common/model/external/DouyinOrder.php

@@ -13,7 +13,7 @@ class DouyinOrder extends BaseModel
     public function goods()
     {
         return $this->hasOne(Goods::class, 'id', 'goods_id')
-            ->field('id,goods_name');
+            ->field('id,goods_name,goods_image,service_fee,goods_category_id');
     }
     public function serviceWork()
     {