github/CRMEB
1
0
Fork 0
mirror of https://github.com/crmeb/CRMEB.git synced 2026-10-29 22:10:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

支付方式判断，退款订单详情修复，pc端取消申请按钮处理

Browse Source
This commit is contained in:
吴昊天 2023-02-22 17:52:03 +08:00
parent 2bcc983ee7
commit bda6c079db
6 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
crmeb/app/services/order/StoreOrderRefundServices.php
View File

@ -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;

4
crmeb/app/services/pay/OrderPayServices.php
View File

@ -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);
}

2
crmeb/crmeb/services/app/WechatService.php
View File

@ -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']),

2
crmeb/crmeb/utils/Arr.php
View File

@ -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'];

2
template/admin/src/pages/marketing/point_statistic/index.vue
View File

@ -375,6 +375,6 @@ export default {
.num {
white-space: nowrap;
margin: 0 10px;
width: 15px;
width: 17px;
}
</style>

2
template/uni-app/pages/goods/order_details/index.vue
View File

@ -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>