github/CRMEB
1
0
Fork 0
mirror of https://github.com/crmeb/CRMEB.git synced 2025-12-13 11:52:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

更新已知bug

Browse Source
This commit is contained in:
evoxwht 2022-03-24 16:12:22 +08:00
parent f592f8bad1
commit 140cfe5d2b
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
crmeb/app/api/controller/v1/admin/StoreOrderController.php
View File

@ -538,6 +538,7 @@ class StoreOrderController
['time', ''], ['time', ''],
['refund_type', 0], ['refund_type', 0],
]); ]);
$where['is_cancel'] = 0;
$data = $services->refundList($where)['list']; $data = $services->refundList($where)['list'];
return app('json')->success($data); return app('json')->success($data);
} }

18
crmeb/app/services/message/notice/WechatTemplateListService.php
View File

@ -141,8 +141,8 @@ class WechatTemplateListService extends NoticeService
{ {
return $this->sendTemplate('ORDER_POSTAGE_SUCCESS', $uid, [ return $this->sendTemplate('ORDER_POSTAGE_SUCCESS', $uid, [
'keyword1' => $order['order_id'], 'keyword1' => $order['order_id'],
'keyword2' => $data['delivery_name'], 'keyword2' => $order['delivery_name'],
'keyword3' => $data['delivery_id'], 'keyword3' => $order['delivery_id'],
'first' => '亲,您的订单已发货,请注意查收', 'first' => '亲,您的订单已发货,请注意查收',
'remark' => '点击查看订单详情' 'remark' => '点击查看订单详情'
], '/pages/users/order_details/index?order_id=' . $order['order_id']); ], '/pages/users/order_details/index?order_id=' . $order['order_id']);
@ -213,19 +213,19 @@ class WechatTemplateListService extends NoticeService
/** /**
* 发送退款模板消息 * 发送退款模板消息
* @param array $data * @param $data
* @param $order * @param $order
* @return bool|mixed * @return bool|mixed
*/ */
public function sendOrderRefundSuccess($uid, array $data, $order) public function sendOrderRefundSuccess($uid, $data, $order)
{ {
return $this->sendTemplate('ORDER_REFUND_STATUS', $uid, [ return $this->sendTemplate('ORDER_REFUND_STATUS', $uid, [
'first' => '亲，您购买的商品已退款,本次退款' . $data['refund_price'] . '金额', 'first' => '亲，您购买的商品已退款,本次退款' . $data['refund_price'] . '金额',
'keyword1' => $order['order_id'], 'keyword1' => $data['order_id'],
'keyword2' => $order['pay_price'], 'keyword2' => $order['pay_price'],
'keyword3' => date('Y-m-d H:i:s', $order['add_time']), 'keyword3' => date('Y-m-d H:i:s', $order['add_time']),
'remark' => '点击查看订单详情' 'remark' => '点击查看订单详情'
], '/pages/users/order_details/index?order_id=' . $order['order_id']); ], '/pages/users/order_details/index?order_id=' . $data['order_id'] . '&isReturen=1');
} }
/** /**
@ -242,16 +242,16 @@ class WechatTemplateListService extends NoticeService
'keyword2' => $order['pay_price'], 'keyword2' => $order['pay_price'],
'keyword3' => date('Y-m-d H:i:s', $order['add_time']), 'keyword3' => date('Y-m-d H:i:s', $order['add_time']),
'remark' => '点击查看订单详情' 'remark' => '点击查看订单详情'
], '/pages/users/order_details/index?order_id=' . $order['order_id']); ], '/pages/users/order_details/index?order_id=' . $order['order_id'] . '&isReturen=1');
} }
/** /**
* 发送用户充值退款模板消息 * 发送用户充值退款模板消息
* @param array $data * @param $data
* @param $userRecharge * @param $userRecharge
* @return bool|mixed * @return bool|mixed
*/ */
public function sendRechargeRefundStatus($uid, array $data, $userRecharge) public function sendRechargeRefundStatus($uid, $data, $userRecharge)
{ {
return $this->sendTemplate('ORDER_REFUND_STATUS', $uid, [ return $this->sendTemplate('ORDER_REFUND_STATUS', $uid, [
'first' => '亲，您充值的金额已退款,本次退款' . 'first' => '亲，您充值的金额已退款,本次退款' .

2
crmeb/app/services/user/UserRechargeServices.php
View File

@ -257,7 +257,7 @@ class UserRechargeServices extends BaseServices
$userMoneyServices->income('user_recharge_refund', $UserRecharge['uid'], $number, $now_money, $id); $userMoneyServices->income('user_recharge_refund', $UserRecharge['uid'], $number, $now_money, $id);
//提醒推送 //提醒推送
event('notice.notice', [['user_type' => strtolower($UserRecharge['recharge_type']), 'data' => $data, 'UserRecharge' => $UserRecharge, 'now_money' => $refund_price], 'recharge_order_refund_status']); event('notice.notice', [['user_type' => strtolower($userInfo['user_type']), 'data' => $data, 'UserRecharge' => $UserRecharge, 'now_money' => $refund_price], 'recharge_order_refund_status']);
return true; return true;
} }