diff --git a/service/src/main/java/com/hfkj/service/merchant/impl/BsMerchantAccountRecordServiceImpl.java b/service/src/main/java/com/hfkj/service/merchant/impl/BsMerchantAccountRecordServiceImpl.java index 868a04b..1d03311 100644 --- a/service/src/main/java/com/hfkj/service/merchant/impl/BsMerchantAccountRecordServiceImpl.java +++ b/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); } } diff --git a/service/src/main/java/com/hfkj/service/order/OrderPaySuccessService.java b/service/src/main/java/com/hfkj/service/order/OrderPaySuccessService.java index d7453a1..d0c647d 100644 --- a/service/src/main/java/com/hfkj/service/order/OrderPaySuccessService.java +++ b/service/src/main/java/com/hfkj/service/order/OrderPaySuccessService.java @@ -114,15 +114,12 @@ public class OrderPaySuccessService { merchantAccountService.consume(gasOrder.getMerNo(), gasOrder.getGasRefuelPrice(), consumeMap); } } else { - // 商户额度 - if (merchant.getChainBrandSettleType().equals(MerchantChainBrandSettleTypeEnum.type2.getNumber())) { // 商户额度 Map consumeMap = new HashMap<>(); consumeMap.put("sourceType", MerchantAccountRecordSourceTypeEnum.type2.getType()); consumeMap.put("sourceId", gasOrder.getId()); consumeMap.put("sourceOrderNo", gasOrder.getOrderNo()); merchantAccountService.consume(gasOrder.getMerNo(), gasOrder.getGasRefuelPrice(), consumeMap); - } } }