Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/huiju/estateagents/redpack/controller/TaOrgAccountController.java

@@ -134,7 +134,7 @@ public class TaOrgAccountController extends BaseController {
             export.setConsumeAmount(NumberUtils.fenToYuan(e.getPurchaseAmount().toString()));
             export.setRefundAmount(NumberUtils.fenToYuan(e.getTotalRefund().toString()));
             Integer balance = totalRechargeAmount - e.getPurchaseAmount() - e.getTotalRefund() - totalBlockAmount;
-            export.setBalance(NumberUtils.fenToYuan(totalRechargeAmount.toString()));
+            export.setBalance(NumberUtils.fenToYuan(balance.toString()));
 
             data.add(export);
         });

src/main/java/com/huiju/estateagents/redpack/entity/TaOrgRefundApplication.java

@@ -88,6 +88,11 @@ public class TaOrgRefundApplication implements Serializable {
      */
     private LocalDateTime createDate;
 
+    /**
+     * 冻结ID
+     */
+    private Integer blockedId;
+
     /**
      * 状态
      */

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

@@ -119,7 +119,6 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
         IPage<TaOrgOrder> result = pg;
 
         if (CommConstant.ITEM_TYPE_RECHARGE.equals(orderType) || CommConstant.ITEM_TYPE_REFUND.equals(orderType)) {
-            List<String> urlList = new ArrayList<>();
             result = taOrgOrderMapper.orderListByRechargeOrRefund(pg, orderType, orgId, tradeNo, isOffline, tradingStatus, startDate, endDate, miniAppName, auditStatus, payStartDate, payEndDate);
             result.getRecords().forEach(e -> {
                 e.setCertificateUrlList(getCertificateByOrderId(e.getOrderId()));
@@ -346,7 +345,17 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
             return responseBean;
         }
 
-        // 4.创建账户退款申请表信息
+        // 4.创建冻结表数据
+        TaOrgAccountBlocked taOrgAccountBlocked = new TaOrgAccountBlocked();
+        taOrgAccountBlocked.setAccountId(taOrgAccount.getAccountId());
+        taOrgAccountBlocked.setBlockedBalance(amount);
+        taOrgAccountBlocked.setBlockedReason("线上退款申请");
+        taOrgAccountBlocked.setCreateDate(LocalDateTime.now());
+        taOrgAccountBlocked.setStatus(CommConstant.STATUS_NORMAL);
+        taOrgAccountBlocked.setOrgId(orgId);
+        taOrgAccountBlockedMapper.insert(taOrgAccountBlocked);
+
+        // 5.创建账户退款申请表信息
         TaOrgRefundApplication taOrgRefundApplication = new TaOrgRefundApplication();
         taOrgRefundApplication.setOrgId(orgId);
         taOrgRefundApplication.setUserId(userId);
@@ -355,6 +364,7 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
         taOrgRefundApplication.setAuditStatus(CommConstant.CHECK_STATUS_CHECKING);
         taOrgRefundApplication.setOrderId(taOrgOrder.getOrderId());
         taOrgRefundApplication.setStatus(CommConstant.STATUS_NORMAL);
+        taOrgRefundApplication.setBlockedId(taOrgAccountBlocked.getSerialNo());
         taOrgRefundApplication.setCreateDate(LocalDateTime.now());
         taOrgRefundApplication.setReason("线上申请退款");
         if (taOrgRefundApplicationMapper.insert(taOrgRefundApplication) < 1) {
@@ -364,15 +374,7 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
             return responseBean;
         }
 
-        // 5.创建冻结表数据
-        TaOrgAccountBlocked taOrgAccountBlocked = new TaOrgAccountBlocked();
-        taOrgAccountBlocked.setAccountId(taOrgAccount.getAccountId());
-        taOrgAccountBlocked.setBlockedBalance(amount);
-        taOrgAccountBlocked.setBlockedReason("线上退款申请");
-        taOrgAccountBlocked.setCreateDate(LocalDateTime.now());
-        taOrgAccountBlocked.setStatus(CommConstant.STATUS_NORMAL);
-        taOrgAccountBlocked.setOrgId(orgId);
-        taOrgAccountBlockedMapper.insert(taOrgAccountBlocked);
+
 
         // 6.更新账户新金额
         taOrgAccountMapper.updateAvailableBalanceById(taOrgAccount.getAccountId(), amount);
@@ -545,13 +547,16 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
         taOrgAccountDetailedListMapper.insert(taOrgAccountDetailedList);
 
         //更新账户退款申请
+        TaOrgRefundApplication selectRefundApplication = selectRefundApplication(id);
+
         TaOrgRefundApplication updateRefundApplication = assembleRefundApplication(userId, CommConstant.ITEM_TYPE_REFUND, refundApplication);
         QueryWrapper<TaOrgRefundApplication> taOrgRefundApplicationQueryWrapper = new QueryWrapper<>();
         taOrgRefundApplicationQueryWrapper.eq("order_id", id);
+        taOrgRefundApplicationQueryWrapper.eq("blocked_id", selectRefundApplication.getBlockedId());
         taOrgRefundApplicationMapper.update(updateRefundApplication, taOrgRefundApplicationQueryWrapper);
 
         //更新账户冻结记录
-        updateOrgAccountBlock(refundApplication);
+        updateOrgAccountBlock(refundApplication, selectRefundApplication.getBlockedId());
 
         //插入凭证记录
         if (CollectionUtils.isNotEmpty(refundApplication.getCertificateList())) {
@@ -574,15 +579,17 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
         TaOrgAccount taOrgAccount = assembleRefundAccount(refundApplication.getOrgId(), refundApplication, CommConstant.ITEM_TYPE_REJECT);
         taOrgAccountMapper.updateById(taOrgAccount);
 
-        //更新账户冻结记录
-        int taOrgAccountBlockedUpdateResult = updateOrgAccountBlock(refundApplication);
-
         //更新退款申请记录
+        TaOrgRefundApplication selectRefundApplication = selectRefundApplication(id);
+
         TaOrgRefundApplication updateRefundApplication = assembleRefundApplication(userId, CommConstant.ITEM_TYPE_REJECT, refundApplication);
         QueryWrapper<TaOrgRefundApplication> taOrgRefundApplicationQueryWrapper = new QueryWrapper<>();
         taOrgRefundApplicationQueryWrapper.eq("order_id", id);
         int taOrgRefundApplicationUpdateResult = taOrgRefundApplicationMapper.update(updateRefundApplication, taOrgRefundApplicationQueryWrapper);
 
+        //更新账户冻结记录
+        int taOrgAccountBlockedUpdateResult = updateOrgAccountBlock(refundApplication, selectRefundApplication.getBlockedId());
+
         //更新订单状态
         TaOrgOrder taOrgOrder = new TaOrgOrder();
         taOrgOrder.setOrderId(id);
@@ -614,13 +621,13 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
         rechargeAccount.setAccountId(selectOneAccount.getAccountId());
 
         if (CommConstant.ITEM_TYPE_REFUND.equals(operateType)) {
-            TaOrgRefundApplication taOrgRefundApplication = selectRefundApplication(refundApplication);
+            TaOrgRefundApplication taOrgRefundApplication = selectRefundApplication(refundApplication.getOrderId());
             rechargeAccount.setRealBalance(selectOneAccount.getRealBalance() - taOrgRefundApplication.getAmount());
             rechargeAccount.setTotalRefund(selectOneAccount.getTotalRefund() + taOrgRefundApplication.getAmount());
         }
 
         if (CommConstant.ITEM_TYPE_REJECT.equals(operateType)) {
-            TaOrgRefundApplication taOrgRefundApplication = selectRefundApplication(refundApplication);
+            TaOrgRefundApplication taOrgRefundApplication = selectRefundApplication(refundApplication.getOrderId());
             rechargeAccount.setAvailableBalance(selectOneAccount.getAvailableBalance() + taOrgRefundApplication.getAmount());
         }
 
@@ -737,12 +744,13 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
         return taOrgRefundApplication;
     }
 
-    private Integer updateOrgAccountBlock(TaOrgRefundApplication refundApplication) {
+    private Integer updateOrgAccountBlock(TaOrgRefundApplication refundApplication, Integer blockedId) {
         //更新账户冻结记录
         TaOrgAccountBlocked taOrgAccountBlocked = new TaOrgAccountBlocked();
         taOrgAccountBlocked.setStatus(CommConstant.STATUS_UNACCALIMED);
         QueryWrapper<TaOrgAccountBlocked> taOrgAccountBlockedQueryWrapper = new QueryWrapper<>();
         taOrgAccountBlockedQueryWrapper.eq("org_id", refundApplication.getOrgId());
+        taOrgAccountBlockedQueryWrapper.eq("serial_no", blockedId);
         return taOrgAccountBlockedMapper.update(taOrgAccountBlocked, taOrgAccountBlockedQueryWrapper);
     }
 
@@ -767,9 +775,9 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
         return sysUser;
     }
 
-    public TaOrgRefundApplication selectRefundApplication(TaOrgRefundApplication refundApplication) {
+    public TaOrgRefundApplication selectRefundApplication(String orderId) {
         QueryWrapper<TaOrgRefundApplication> taOrgRefundApplicationQueryWrapper = new QueryWrapper<>();
-        taOrgRefundApplicationQueryWrapper.eq("order_id", refundApplication.getOrderId());
+        taOrgRefundApplicationQueryWrapper.eq("order_id", orderId);
         return taOrgRefundApplicationMapper.selectOne(taOrgRefundApplicationQueryWrapper);
     }
 

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

@@ -63,7 +63,6 @@ public class TaRedPacketServiceImpl extends ServiceImpl<TaRedPacketMapper, TaRed
         // 获取小程序信息
         QueryWrapper<TaMiniapp> miniappQueryWrapper =new QueryWrapper<>();
         miniappQueryWrapper.eq("org_id",orgId);
-        miniappQueryWrapper.eq("status",CommConstant.STATUS_NORMAL);
         TaMiniapp taMiniapp = taMiniappMapper.selectOne(miniappQueryWrapper);
 
         // 初始化数据

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

@@ -120,7 +120,7 @@
         if(t.is_offline = 1, '运营手工充值', '业务线上充值') as isOffline,
         t.create_date as createDate,
         if(t.trading_status = 'processing', '待支付', if(t.trading_status = 'success', '已支付','已超时')) as tradingStatus,
-        t.pay_date as payDate
+        if(t.is_offline = 0, t.pay_date, '') as payDate
         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