From a131e4c8196b47ba1e880fc2fa946b995265a728 Mon Sep 17 00:00:00 2001
From: lccsw <1127794702@qq.com>
Date: Wed, 30 Mar 2022 13:57:28 +0800
Subject: [PATCH] edit-api-liche_pay_desc

---
 api/controllers/wxapp/liche/Pay.php | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/api/controllers/wxapp/liche/Pay.php b/api/controllers/wxapp/liche/Pay.php
index 5b998cc5..fb59cf92 100644
--- a/api/controllers/wxapp/liche/Pay.php
+++ b/api/controllers/wxapp/liche/Pay.php
@@ -173,9 +173,16 @@ class Pay extends Wxapp{
                 $total = 0.01;
             }
             if($row['o_id']>=Orders_v2_entity::V2_START_ID){
-                $order_row = $this->receiver_orders_v2_model->get(['id'=>$row['o_id']],'name,brand_id,s_id,biz_id');
+                $order_row = $this->receiver_orders_v2_model->get(['id'=>$row['o_id']],'name,brand_id,s_id,biz_id,main_type,info_json,owner_name');
+                if($order_row['main_type']){//公司
+                    $info_json = json_decode($order_row['info_json'],true);
+                    $name = $order_row['c_company'];
+                }else{
+                    $name = $order_row['owner_name'];
+                }
             }else{
                 $order_row = $this->orders_model->get(['id'=>$row['o_id']],'name,brand_id,s_id,biz_id');
+                $name = $order_row['name'];
             }
             $brand_row = $this->auto_brand_model->get(['id'=>$order_row['brand_id']],'name');
             $s_row = $this->auto_series_model->get(['id'=>$order_row['s_id']],'name');
@@ -186,7 +193,7 @@ class Pay extends Wxapp{
             //}
             $type_name = $type_arr[$row['type']];
             //$description = "{$brand_row['name']}{$s_row['name']}-{$order_row['name']}-{$biz_row['biz_name']}-{$type_name}-{$company_row['short']}";
-            $description = "{$brand_row['name']}{$s_row['name']}-{$order_row['name']}-{$biz_row['biz_name']}-{$type_name}";
+            $description = "{$brand_row['name']}{$s_row['name']}-{$name}-{$biz_row['biz_name']}-{$type_name}";
             $this->config->load('wxpay');
             $wx_config = $this->config->item('default');
             $params = [