diff --git a/schedule/src/main/java/com/hfkj/schedule/TransferSchedule.java b/schedule/src/main/java/com/hfkj/schedule/TransferSchedule.java index 8c9ad95..cfb7d8a 100644 --- a/schedule/src/main/java/com/hfkj/schedule/TransferSchedule.java +++ b/schedule/src/main/java/com/hfkj/schedule/TransferSchedule.java @@ -88,7 +88,7 @@ public class TransferSchedule { startTime.set(Calendar.SECOND, 00); Calendar endTime = Calendar.getInstance(); - startTime.add(Calendar.DAY_OF_MONTH, -1); + endTime.add(Calendar.DAY_OF_MONTH, -1); endTime.setTime(new Date()); endTime.set(Calendar.HOUR_OF_DAY, 00); endTime.set(Calendar.MINUTE, 00); @@ -113,6 +113,7 @@ public class TransferSchedule { transferAccounts.setOrderNo("1000"+System.currentTimeMillis()+""); transferAccounts.setAmount(new BigDecimal(MapUtils.getString(param, "totalPrice"))); transferAccounts.setRebateTransferCycleIdentifier(transferCycle.getId()); + transferAccounts.setContent(DateUtil.date2String(startTime.getTime(),"yyyy-MM-dd") + "活动结算"); transferAccountsService.transfer(transferAccounts); } } catch (Exception e) { diff --git a/service/src/main/java/com/hfkj/service/rebate/impl/BsRebateMerAccountOrderServerImpl.java b/service/src/main/java/com/hfkj/service/rebate/impl/BsRebateMerAccountOrderServerImpl.java index a373d5a..472fb6d 100644 --- a/service/src/main/java/com/hfkj/service/rebate/impl/BsRebateMerAccountOrderServerImpl.java +++ b/service/src/main/java/com/hfkj/service/rebate/impl/BsRebateMerAccountOrderServerImpl.java @@ -81,7 +81,7 @@ public class BsRebateMerAccountOrderServerImpl implements BsRebateMerAccountOrde RebateMerAccountTradeObject accountTradeObject = new RebateMerAccountTradeObject(); accountTradeObject.setTradeObjectType(RebateMerAccountObjectTypeEnum.type1); accountTradeObject.setTradeObjectId(accountOrder.getId()); - accountTradeObject.setTradeObjectContent(Objects.requireNonNull(TradeOrderPayModeEnum.getNameByCode(accountOrder.getPayType())).getName()+"充值:" + accountTradeObject.getTradeObjectContent() + "元"); + accountTradeObject.setTradeObjectContent(Objects.requireNonNull(TradeOrderPayModeEnum.getNameByCode(accountOrder.getPayType())).getName()+"充值:" + accountOrder.getTradePrice() + "元"); rebateMerAccountService.income(accountOrder.getAccountNumber(),accountOrder.getTradePrice(),accountTradeObject); } } else {