blackteay/ThinkAdmin
1
0
Fork 0
mirror of https://gitee.com/zoujingli/ThinkAdmin.git synced 2026-06-08 04:48:10 +08:00
Code Issues Projects Releases Wiki Activity

fix: 优化售后返利退回

Browse Source
This commit is contained in:
邹景立 2024-11-05 01:19:07 +08:00
parent be578184d5
commit b83331d7e0
4 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugin/think-plugs-wemall/src/controller/api/auth/Rebate.php
View File

@ -39,7 +39,9 @@ class Rebate extends Auth
*/ */
public function get() public function get()
{ {
$query = PluginWemallUserRebate::mQuery()->where(['unid' => $this->unid]); $query = PluginWemallUserRebate::mQuery()->where([
'unid' => $this->unid, 'deleted' => 0
]);
$query->equal('type,status')->like('name|code|order_no#keys')->whereRaw('amount>0'); $query->equal('type,status')->like('name|code|order_no#keys')->whereRaw('amount>0');
$this->success('获取返佣统计', $query->order('id desc')->page(true, false, false, 15)); $this->success('获取返佣统计', $query->order('id desc')->page(true, false, false, 15));
} }

2
plugin/think-plugs-wemall/src/controller/shop/Refund.php
View File

@ -138,7 +138,7 @@ class Refund extends Controller
// 如果已经退款了，不让改金额 // 如果已经退款了，不让改金额
if ($refund->getAttr('status') > 4) { if ($refund->getAttr('status') > 4) {
// 取消订单奖励 // 取消订单奖励
UserOrder::cancel($refund->getAttr('order_no')); UserOrder::cancel($refund->getAttr('order_no'), true);
// 去除不相关的字段 // 去除不相关的字段
unset($data['payment_amount'], $data['balance_amount'], $data['integral_amount']); unset($data['payment_amount'], $data['balance_amount'], $data['integral_amount']);
} }

2
plugin/think-plugs-wemall/src/controller/user/Rebate.php
View File

@ -46,6 +46,8 @@ class Rebate extends Controller
$this->title = '代理返佣管理'; $this->title = '代理返佣管理';
$this->rebate = UserRebate::recount(0); $this->rebate = UserRebate::recount(0);
}, static function (QueryHelper $query) { }, static function (QueryHelper $query) {
// 删除状态
$query->where(['deleted' => 0]);
// 数据关联 // 数据关联
$query->equal('type,status')->like('name,order_no')->dateBetween('create_time')->with([ $query->equal('type,status')->like('name,order_no')->dateBetween('create_time')->with([
'user' => function (Query $query) { 'user' => function (Query $query) {

2
plugin/think-plugs-wemall/src/service/UserRebate.php
View File

@ -214,7 +214,7 @@ abstract class UserRebate
public static function cancel($order): bool public static function cancel($order): bool
{ {
$order = UserOrder::widthOrder($order); $order = UserOrder::widthOrder($order);
if ($order->isEmpty() || $order->getAttr('status') > 0) { if ($order->isEmpty()) {
throw new Exception('订单状态异常！'); throw new Exception('订单状态异常！');
} }
// 更新返佣记录 // 更新返佣记录