魏超 преди 4 години
родител
ревизия
1a322aefe1

+ 3
- 3
src/main/java/com/huiju/estateagents/redpack/service/impl/TaOrgOrderServiceImpl.java Целия файл

463
         taOrgAccountDetailedListMapper.insert(taOrgAccountDetailedList);
463
         taOrgAccountDetailedListMapper.insert(taOrgAccountDetailedList);
464
 
464
 
465
         //更新账户退款申请
465
         //更新账户退款申请
466
-        TaOrgRefundApplication updateRefundApplication = assembleRefundApplication(userId, CommConstant.ITEM_TYPE_REJECT, refundApplication);
466
+        TaOrgRefundApplication updateRefundApplication = assembleRefundApplication(userId, CommConstant.ITEM_TYPE_REFUND, refundApplication);
467
         QueryWrapper<TaOrgRefundApplication> taOrgRefundApplicationQueryWrapper = new QueryWrapper<>();
467
         QueryWrapper<TaOrgRefundApplication> taOrgRefundApplicationQueryWrapper = new QueryWrapper<>();
468
-        taOrgRefundApplicationQueryWrapper.eq("org_id", refundApplication.getOrgId());
468
+        taOrgRefundApplicationQueryWrapper.eq("order_id", id);
469
         taOrgRefundApplicationMapper.update(updateRefundApplication, taOrgRefundApplicationQueryWrapper);
469
         taOrgRefundApplicationMapper.update(updateRefundApplication, taOrgRefundApplicationQueryWrapper);
470
 
470
 
471
         //更新账户冻结记录
471
         //更新账户冻结记录
505
         //更新退款申请记录
505
         //更新退款申请记录
506
         TaOrgRefundApplication updateRefundApplication = assembleRefundApplication(userId, CommConstant.ITEM_TYPE_REJECT, refundApplication);
506
         TaOrgRefundApplication updateRefundApplication = assembleRefundApplication(userId, CommConstant.ITEM_TYPE_REJECT, refundApplication);
507
         QueryWrapper<TaOrgRefundApplication> taOrgRefundApplicationQueryWrapper = new QueryWrapper<>();
507
         QueryWrapper<TaOrgRefundApplication> taOrgRefundApplicationQueryWrapper = new QueryWrapper<>();
508
-        taOrgRefundApplicationQueryWrapper.eq("org_id", refundApplication.getOrgId());
508
+        taOrgRefundApplicationQueryWrapper.eq("order_id", id);
509
         int taOrgRefundApplicationUpdateResult = taOrgRefundApplicationMapper.update(updateRefundApplication, taOrgRefundApplicationQueryWrapper);
509
         int taOrgRefundApplicationUpdateResult = taOrgRefundApplicationMapper.update(updateRefundApplication, taOrgRefundApplicationQueryWrapper);
510
 
510
 
511
         //更新订单状态
511
         //更新订单状态

+ 5
- 6
src/main/resources/mapper/redpack/TaOrgOrderMapper.xml Целия файл

12
         b.name as miniAppName,
12
         b.name as miniAppName,
13
         t.is_offline,
13
         t.is_offline,
14
         t.create_date,
14
         t.create_date,
15
-        t.trading_status,
16
-        <if test="orderType == 'recharge' || orderType == 'refund'">
15
+        <if test="orderType == 'refund'">
17
             d.audit_status,
16
             d.audit_status,
18
             d.audit_result,
17
             d.audit_result,
19
         </if>
18
         </if>
20
-        GROUP_CONCAT(c.url) as certificateUrl
19
+        t.trading_status
21
         From ta_org_order t
20
         From ta_org_order t
22
         left join ta_org_order_detail a on t.order_id = a.order_id
21
         left join ta_org_order_detail a on t.order_id = a.order_id
23
         left join ta_miniapp b on t.org_id = b.org_id
22
         left join ta_miniapp b on t.org_id = b.org_id
24
         left join ta_org_account_certificate c on t.order_id = c.order_id
23
         left join ta_org_account_certificate c on t.order_id = c.order_id
25
         left join ta_org_account e on t.org_id = e.org_id
24
         left join ta_org_account e on t.org_id = e.org_id
26
-        <if test="orderType == 'recharge' || orderType == 'refund'">
27
-            left join ta_org_refund_application d on d.org_id = t.org_id
25
+        <if test="orderType == 'refund'">
26
+            left join ta_org_refund_application d on d.org_id = t.org_id and t.order_id = d.order_id
28
         </if>
27
         </if>
29
         where
28
         where
30
         a.item_type = #{orderType}
29
         a.item_type = #{orderType}
49
         <if test="miniAppName != null and miniAppName != ''">
48
         <if test="miniAppName != null and miniAppName != ''">
50
             and b.name like concat('%', #{miniAppName}, '%')
49
             and b.name like concat('%', #{miniAppName}, '%')
51
         </if>
50
         </if>
52
-        GROUP BY t.order_id
51
+        group by t.order_id
53
     </select>
52
     </select>
54
 
53
 
55
     <select id="orderListByConsume" resultType="com.huiju.estateagents.redpack.entity.TaOrgOrder">
54
     <select id="orderListByConsume" resultType="com.huiju.estateagents.redpack.entity.TaOrgOrder">