新需求

src/main/java/com/huiju/estateagents/redpack/service/impl/TaOrgOrderServiceImpl.java

@@ -463,9 +463,9 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
         taOrgAccountDetailedListMapper.insert(taOrgAccountDetailedList);
 
         //更新账户退款申请
-        TaOrgRefundApplication updateRefundApplication = assembleRefundApplication(userId, CommConstant.ITEM_TYPE_REJECT, refundApplication);
+        TaOrgRefundApplication updateRefundApplication = assembleRefundApplication(userId, CommConstant.ITEM_TYPE_REFUND, refundApplication);
         QueryWrapper<TaOrgRefundApplication> taOrgRefundApplicationQueryWrapper = new QueryWrapper<>();
-        taOrgRefundApplicationQueryWrapper.eq("org_id", refundApplication.getOrgId());
+        taOrgRefundApplicationQueryWrapper.eq("order_id", id);
         taOrgRefundApplicationMapper.update(updateRefundApplication, taOrgRefundApplicationQueryWrapper);
 
         //更新账户冻结记录
@@ -505,7 +505,7 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
         //更新退款申请记录
         TaOrgRefundApplication updateRefundApplication = assembleRefundApplication(userId, CommConstant.ITEM_TYPE_REJECT, refundApplication);
         QueryWrapper<TaOrgRefundApplication> taOrgRefundApplicationQueryWrapper = new QueryWrapper<>();
-        taOrgRefundApplicationQueryWrapper.eq("org_id", refundApplication.getOrgId());
+        taOrgRefundApplicationQueryWrapper.eq("order_id", id);
         int taOrgRefundApplicationUpdateResult = taOrgRefundApplicationMapper.update(updateRefundApplication, taOrgRefundApplicationQueryWrapper);
 
         //更新订单状态

src/main/resources/mapper/redpack/TaOrgOrderMapper.xml

@@ -12,19 +12,18 @@
         b.name as miniAppName,
         t.is_offline,
         t.create_date,
-        t.trading_status,
-        <if test="orderType == 'recharge' || orderType == 'refund'">
+        <if test="orderType == 'refund'">
             d.audit_status,
             d.audit_result,
         </if>
-        GROUP_CONCAT(c.url) as certificateUrl
+        t.trading_status
         From ta_org_order t
         left join ta_org_order_detail a on t.order_id = a.order_id
         left join ta_miniapp b on t.org_id = b.org_id
         left join ta_org_account_certificate c on t.order_id = c.order_id
         left join ta_org_account e on t.org_id = e.org_id
-        <if test="orderType == 'recharge' || orderType == 'refund'">
-            left join ta_org_refund_application d on d.org_id = t.org_id
+        <if test="orderType == 'refund'">
+            left join ta_org_refund_application d on d.org_id = t.org_id and t.order_id = d.order_id
         </if>
         where
         a.item_type = #{orderType}
@@ -49,7 +48,7 @@
         <if test="miniAppName != null and miniAppName != ''">
             and b.name like concat('%', #{miniAppName}, '%')
         </if>
-        GROUP BY t.order_id
+        group by t.order_id
     </select>
 
     <select id="orderListByConsume" resultType="com.huiju.estateagents.redpack.entity.TaOrgOrder">