Merge branch 'feature/mall_product' into test

2023-06-20 17:38:28 +08:00 · 2023-06-20 17:38:28 +08:00 · bd806cc2ba
parent 5846de1445 7b919a32e4
commit bd806cc2ba
1 changed files with 7 additions and 1 deletions
--- a/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/recharge/RechargeOrderMapper.xml
+++ b/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/recharge/RechargeOrderMapper.xml
@ -119,7 +119,13 @@
        a.status,
        CONVERT(a.pay_price*e.member_commission/100, DECIMAL(15,2)) as commissionPrice,
        a.paid,
-        d.parent_organization_name
+        d.parent_organization_name,
+        a.refund_type,
+        a.refund_name,
+        a.member_reason,
+        a.admin_reason,
+        a.apply_time,
+        a.apply_succeed_time
        from cy_recharge_order a
        left join member_user b on a.promoter_id = b.id
        left join system_dept d on d.id = a.dept_id