From adccc4d1309744170c24dcde991e406127546a26 Mon Sep 17 00:00:00 2001
From: liaofei <136327134@qq.com>
Date: Mon, 26 Jun 2023 11:42:50 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=80=E7=BA=A7?=
 =?UTF-8?q?=E5=88=86=E7=B1=BB=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 crmeb/app/services/product/product/StoreProductServices.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/crmeb/app/services/product/product/StoreProductServices.php b/crmeb/app/services/product/product/StoreProductServices.php
index 0ac022ee6..44f6f180e 100644
--- a/crmeb/app/services/product/product/StoreProductServices.php
+++ b/crmeb/app/services/product/product/StoreProductServices.php
@@ -127,6 +127,9 @@ class StoreProductServices extends BaseServices
         /** @var StoreCategoryServices $categoryService */
         $categoryService = app()->make(StoreCategoryServices::class);
         $cateList = $categoryService->getCateParentAndChildName($cateIds);
+        $preantCateList = $categoryService->getColumn([
+            ['id', 'in', $cateIds]
+        ], 'cate_name', 'id');
         foreach ($list as &$item) {
             $cateName = array_filter($cateList, function ($val) use ($item) {
                 if (in_array($val['id'], explode(',', $item['cate_id']))) {
@@ -137,6 +140,9 @@ class StoreProductServices extends BaseServices
             foreach ($cateName as $k => $v) {
                 $item['cate_name'][] = $v['one'] . '/' . $v['two'];
             }
+            if (!count($item['cate_name']) && isset($preantCateList[$item['cate_id']])) {
+                $item['cate_name'][] = $preantCateList[$item['cate_id']];
+            }
             $item['cate_name'] = is_array($item['cate_name']) ? implode(',', $item['cate_name']) : '';
             $item['stock_attr'] = $item['stock'] > 0;//库存
             $item['product_type'] = $this->productType[$item['virtual_type']];

From b7d38eb602fbdb6f802bdfae7cc28ecc790cb56e Mon Sep 17 00:00:00 2001
From: liaofei <136327134@qq.com>
Date: Mon, 26 Jun 2023 11:58:00 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=80=80=E6=AC=BE?=
 =?UTF-8?q?=E6=96=87=E5=AD=97=E6=8F=90=E9=86=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 crmeb/app/services/order/StoreOrderRefundServices.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/crmeb/app/services/order/StoreOrderRefundServices.php b/crmeb/app/services/order/StoreOrderRefundServices.php
index cc394c4af..3639ffb28 100644
--- a/crmeb/app/services/order/StoreOrderRefundServices.php
+++ b/crmeb/app/services/order/StoreOrderRefundServices.php
@@ -688,7 +688,7 @@ class StoreOrderRefundServices extends BaseServices
 
             $storeOrderServices->update($oid, ['refund_status' => 0, 'refund_type' => 3]);
             //处理订单商品cart_info
-            $this->cancelOrderRefundCartInfo($id, $oid, $orderRefundInfo);
+            $this->cancelOrderRefundCartInfo($id, $oid, $orderRefundInfo, '不退款原因:' . ($data['refund_reason'] ?? ''));
             //记录
             /** @var StoreOrderStatusServices $statusService */
             $statusService = app()->make(StoreOrderStatusServices::class);
@@ -1277,7 +1277,7 @@ class StoreOrderRefundServices extends BaseServices
      * @throws \think\db\exception\DbException
      * @throws \think\db\exception\ModelNotFoundException
      */
-    public function cancelOrderRefundCartInfo(int $id, int $oid, $orderRefundInfo = [])
+    public function cancelOrderRefundCartInfo(int $id, int $oid, $orderRefundInfo = [], string $title = '')
     {
         if (!$orderRefundInfo) {
             $orderRefundInfo = $this->dao->get(['id' => $id, 'is_cancel' => 0]);
@@ -1306,7 +1306,7 @@ class StoreOrderRefundServices extends BaseServices
         $statusService->save([
             'oid' => $oid,
             'change_type' => 'cancel_refund_order',
-            'change_message' => '取消退款',
+            'change_message' => $title ?: '取消退款',
             'change_time' => time()
         ]);
 

From 591797c91ab622a0759198ecc7dbbe2d020b6188 Mon Sep 17 00:00:00 2001
From: liaofei <136327134@qq.com>
Date: Mon, 26 Jun 2023 12:08:31 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=BF=E9=97=AE?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 crmeb/crmeb/services/serve/storage/Crmeb.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crmeb/crmeb/services/serve/storage/Crmeb.php b/crmeb/crmeb/services/serve/storage/Crmeb.php
index 2c0c4e6a3..e2731bb53 100644
--- a/crmeb/crmeb/services/serve/storage/Crmeb.php
+++ b/crmeb/crmeb/services/serve/storage/Crmeb.php
@@ -49,7 +49,7 @@ class Crmeb extends BaseStorage
      */
     public function getUser()
     {
-        return $this->accessToken->httpRequest('user/info');
+        return $this->accessToken->httpRequest('v2/user/info');
     }
 
     /**