diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/ClearingBillInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/ClearingBillInfoServiceImpl.java index 2ccdddb1e..764be5cd2 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/ClearingBillInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/ClearingBillInfoServiceImpl.java @@ -1,6 +1,7 @@ package com.jsowell.pile.service.impl; import com.jsowell.common.enums.DelFlagEnum; +import com.jsowell.common.util.DateUtils; import com.jsowell.common.util.StringUtils; import com.jsowell.pile.domain.ClearingBillInfo; import com.jsowell.pile.dto.GetClearingBillDTO; @@ -82,6 +83,11 @@ public class ClearingBillInfoServiceImpl implements ClearingBillInfoService { @Override public int insertOrUpdateSelective(ClearingBillInfo record) { + if (record.getId() != null) { + record.setUpdateTime(DateUtils.getNowDate()); + } else { + record.setCreateTime(DateUtils.getNowDate()); + } return clearingBillInfoMapper.insertOrUpdateSelective(record); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java index 3d4673874..0ec878896 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java @@ -1323,10 +1323,17 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { String merchantId = adapayMemberAccount.getMerchantId(); String appId = pileMerchantInfoService.queryAppIdByMerchantId(merchantId); + // 根据运营商id和结算日期查询清分账单 + ClearingBillInfo queryBillInfo = clearingBillInfoService.selectByMerchantIdAndTradeDate(merchantId, tradeDate); + // 清分账单信息 ClearingBillInfo clearingBillInfo = new ClearingBillInfo(); - clearingBillInfo.setBillStatus("1"); String clearingBillCode = "CLE" + IdUtils.getOrderCode(); + if (queryBillInfo != null) { + clearingBillInfo.setId(queryBillInfo.getId()); + clearingBillCode = queryBillInfo.getClearingBillCode(); + } + clearingBillInfo.setBillStatus("1"); clearingBillInfo.setClearingBillCode(clearingBillCode); clearingBillInfo.setClearingTime(DateUtils.getNowDate()); clearingBillInfo.setMerchantId(merchantId); @@ -1403,16 +1410,10 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { clearingBillInfo.setFeeAmount(feeAmount); clearingBillInfo.setWithdrawableAmount(withdrawableAmount); clearingBillInfo.setActualClearingAmount(actualClearingAmount); - clearingBillInfo.setCreateTime(DateUtils.getNowDate()); clearingBillInfo.setDelFlag(DelFlagEnum.NORMAL.getValue()); clearingBillInfo.setBillStatus("2"); clearingBillInfo.setTradeDate(tradeDate); - // 根据运营商id和结算日期查询清分账单 - ClearingBillInfo queryBillInfo = clearingBillInfoService.selectByMerchantIdAndTradeDate(merchantId, tradeDate); - if (queryBillInfo != null) { - clearingBillInfo.setId(queryBillInfo.getId()); - } // 保存清分账单 ClearingBillTransactionDTO dto = new ClearingBillTransactionDTO(); dto.setClearingBillInfo(clearingBillInfo);