线上余额版本回退

src/main/java/com/caimei/modules/order/service/SplitAccountService.java

@@ -47,14 +47,6 @@ public class SplitAccountService {
         String currentTime = format.format(calendar.getTime());
         // 查询未分账已支付收款
         List<OrderReceiptRelationPo> orderRelations = newOrderDao.getUndividedPaidReceipt(currentTime);
-        // 上面过滤了余额抵扣， 把线上余额抵扣单补充到list里面，线上余额抵扣的金额视为正常收款金额进行分账
-        List<OrderReceiptRelationPo> onlineRelations = newOrderDao.getOnlineBalance(currentTime);
-        if (null != onlineRelations && orderRelations.size() > 0) {
-            // 过滤不足分账金额的单
-//            onlineRelations.removeIf(o -> o.getAssociateAmount() < 0.01);
-            // 把线上余额抵扣订单加入分账
-            orderRelations.addAll(onlineRelations);
-        }
         if (null != orderRelations && orderRelations.size() > 0) {
             for (OrderReceiptRelationPo orderRelation : orderRelations) {
                 logger.info("【手动分账】>>>>>>>>>>订单id:" + orderRelation.getOrderId() + ",进入手动分账");

src/main/java/com/caimei/modules/order/web/SplitAccountController.java

@@ -57,14 +57,6 @@ public class SplitAccountController extends BaseController {
         String currentTime = format.format(calendar.getTime());
         // 查询未分账已支付收款
         List<OrderReceiptRelationPo> orderRelations = newOrderDao.getUndividedPaidReceipt(currentTime);
-        // 上面过滤了余额抵扣， 把线上余额抵扣单补充到list里面，线上余额抵扣的金额视为正常收款金额进行分账
-        List<OrderReceiptRelationPo> onlineRelations = newOrderDao.getOnlineBalance(currentTime);
-        if (null != onlineRelations && onlineRelations.size() > 0) {
-            // 过滤不足分账金额的单
-            onlineRelations.removeIf(o -> o.getAssociateAmount() < 0.01);
-            // 把线上余额抵扣订单加入分账
-            orderRelations.addAll(onlineRelations);
-        }
         if (null != orderRelations && orderRelations.size() > 0) {
             //设锁
             redisService.set("XSFZMDS", 1, 120L);