提交代码

service/src/main/java/com/hfkj/service/merchant/impl/BsMerchantAccountRecordServiceImpl.java

@@ -77,7 +77,7 @@ public class BsMerchantAccountRecordServiceImpl implements BsMerchantAccountReco
             criteria.andMerNoEqualTo(MapUtils.getString(param, "merNo"));
         }
 
-        example.setOrderByClause("create_time desc");
+        example.setOrderByClause("create_time desc,id desc");
         return merchantAccountRecordMapper.selectByExample(example);
     }
 }

service/src/main/java/com/hfkj/service/order/OrderPaySuccessService.java

@@ -114,8 +114,6 @@ public class OrderPaySuccessService {
                             merchantAccountService.consume(gasOrder.getMerNo(), gasOrder.getGasRefuelPrice(), consumeMap);
                         }
                     } else {
-                        // 商户额度
-                        if (merchant.getChainBrandSettleType().equals(MerchantChainBrandSettleTypeEnum.type2.getNumber())) {
                             // 商户额度
                             Map<String,Object> consumeMap = new HashMap<>();
                             consumeMap.put("sourceType", MerchantAccountRecordSourceTypeEnum.type2.getType());
@@ -124,7 +122,6 @@ public class OrderPaySuccessService {
                             merchantAccountService.consume(gasOrder.getMerNo(), gasOrder.getGasRefuelPrice(), consumeMap);
                     }
                 }
-                }
 
             } else if (gasOrder.getChannelType().equals(MerchantSourceTypeEnum.type2.getNumber())) {
                 try {