From bda6c079db7ff359d1aa08b205a9f050119a1e58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E6=98=8A=E5=A4=A9?= <442384644@qq.com>
Date: Wed, 22 Feb 2023 17:52:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E4=BB=98=E6=96=B9=E5=BC=8F=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD=EF=BC=8C=E9=80=80=E6=AC=BE=E8=AE=A2=E5=8D=95=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E4=BF=AE=E5=A4=8D=EF=BC=8Cpc=E7=AB=AF=E5=8F=96?=
 =?UTF-8?q?=E6=B6=88=E7=94=B3=E8=AF=B7=E6=8C=89=E9=92=AE=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 crmeb/app/services/order/StoreOrderRefundServices.php        | 5 +++++
 crmeb/app/services/pay/OrderPayServices.php                  | 4 ++--
 crmeb/crmeb/services/app/WechatService.php                   | 2 +-
 crmeb/crmeb/utils/Arr.php                                    | 2 ++
 template/admin/src/pages/marketing/point_statistic/index.vue | 2 +-
 template/uni-app/pages/goods/order_details/index.vue         | 2 +-
 6 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/crmeb/app/services/order/StoreOrderRefundServices.php b/crmeb/app/services/order/StoreOrderRefundServices.php
index 70f309414..202672f61 100644
--- a/crmeb/app/services/order/StoreOrderRefundServices.php
+++ b/crmeb/app/services/order/StoreOrderRefundServices.php
@@ -1171,6 +1171,8 @@ class StoreOrderRefundServices extends BaseServices
         $orderData['pay_postage'] = $this->getOrderSumPrice($orderData['cart_info'], 'origin_postage_price', false);
         $orderData['member_price'] = 0;
         $orderData['routine_contact_type'] = sys_config('routine_contact_type', 0);
+        $orderData['levelPrice'] = $this->getOrderSumPrice($orderData['cart_info'], 'level');//获取会员等级优惠
+        $orderData['memberPrice'] = $this->getOrderSumPrice($orderData['cart_info'], 'member');//获取付费会员优惠
 
         switch ($orderInfo['pay_type']) {
             case PayServices::WEIXIN_PAY:
@@ -1185,6 +1187,9 @@ class StoreOrderRefundServices extends BaseServices
             case PayServices::ALIAPY_PAY:
                 $pay_type_name = '支付宝支付';
                 break;
+            case PayServices::ALLIN_PAY:
+                $pay_type_name = '通联支付';
+                break;
             default:
                 $pay_type_name = '其他支付';
                 break;
diff --git a/crmeb/app/services/pay/OrderPayServices.php b/crmeb/app/services/pay/OrderPayServices.php
index 9375255ea..a34747be9 100644
--- a/crmeb/app/services/pay/OrderPayServices.php
+++ b/crmeb/app/services/pay/OrderPayServices.php
@@ -51,12 +51,12 @@ class OrderPayServices
     public function getPayType(string $payType)
     {
         //微信支付没有开启，通联支付开启，用户访问端在小程序或者公众号的时候，使用通联微信H5支付
-        if ($payType == PayServices::WEIXIN_PAY) {
+        if ($payType == PayServices::WEIXIN_PAY && !request()->isH5() && !request()->isApp()) {
             $payType = sys_config('pay_weixin_open', 0);
         }
 
         //支付宝没有开启，通联支付开了，用户使用支付宝支付，并且在app端访问的时候，使用通联app支付宝支付
-        if ($payType == PayServices::ALIAPY_PAY) {
+        if ($payType == PayServices::ALIAPY_PAY && request()->isApp()) {
             $payType = sys_config('ali_pay_status', 0);
         }
 
diff --git a/crmeb/crmeb/services/app/WechatService.php b/crmeb/crmeb/services/app/WechatService.php
index d1f15b2d9..b732f623e 100644
--- a/crmeb/crmeb/services/app/WechatService.php
+++ b/crmeb/crmeb/services/app/WechatService.php
@@ -80,7 +80,7 @@ class WechatService
         ];
         if (isset($wechat['wechat_encode']) && (int)$wechat['wechat_encode'] > 0 && isset($wechat['wechat_encodingaeskey']) && !empty($wechat['wechat_encodingaeskey']))
             $config['aes_key'] = $wechat['wechat_encodingaeskey'];
-        if (isset($payment['pay_weixin_open']) && $payment['pay_weixin_open'] == 'weixin') {
+        if (isset($payment['pay_weixin_open'])) {
             $config['payment'] = [
                 'app_id' => $appId,
                 'merchant_id' => trim($payment['pay_weixin_mchid']),
diff --git a/crmeb/crmeb/utils/Arr.php b/crmeb/crmeb/utils/Arr.php
index eb34f10f5..f67cb131d 100644
--- a/crmeb/crmeb/utils/Arr.php
+++ b/crmeb/crmeb/utils/Arr.php
@@ -59,6 +59,8 @@ class Arr
         $newData = [];
         foreach ($data as $k => $v) {
             $temp = [];
+            $temp['id'] = $v['id'];
+            $temp['pid'] = $v['pid'];
             $temp['path'] = $v['menu_path'];
             $temp['title'] = $v['menu_name'];
             $temp['icon'] = $v['icon'];
diff --git a/template/admin/src/pages/marketing/point_statistic/index.vue b/template/admin/src/pages/marketing/point_statistic/index.vue
index cdead2684..a024c0d1b 100644
--- a/template/admin/src/pages/marketing/point_statistic/index.vue
+++ b/template/admin/src/pages/marketing/point_statistic/index.vue
@@ -375,6 +375,6 @@ export default {
 .num {
   white-space: nowrap;
   margin: 0 10px;
-  width: 15px;
+  width: 17px;
 }
 </style>
diff --git a/template/uni-app/pages/goods/order_details/index.vue b/template/uni-app/pages/goods/order_details/index.vue
index a4ea83406..faa47261b 100644
--- a/template/uni-app/pages/goods/order_details/index.vue
+++ b/template/uni-app/pages/goods/order_details/index.vue
@@ -369,7 +369,7 @@
 					<view class='bnt bg-color' v-if="status.class_status==5" @tap='goOrderConfirm'>{{$t(`再次购买`)}}
 					</view>
 					<view class='bnt bg-color refundBnt'
-						v-if="[1,2,4].includes(orderInfo.refund_type) && !orderInfo.is_cancel && orderInfo.type !=3"
+						v-if="[1,2,4].includes(orderInfo.refund_type) && !orderInfo.is_cancel && orderInfo.type !=3 && orderInfo.refund_status != 2"
 						@tap='cancelRefundOrder'>
 						{{$t(`取消申请`)}}
 					</view>