autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-05-07 11:29:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

update优化清分账单逻辑

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2023-09-21 13:43:07 +08:00
parent 189a291624
commit ef1df1e39c
2 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/ClearingBillInfoServiceImpl.java
View File

@@ -1,6 +1,7 @@
package com.jsowell.pile.service.impl; package com.jsowell.pile.service.impl;
import com.jsowell.common.enums.DelFlagEnum; import com.jsowell.common.enums.DelFlagEnum;
import com.jsowell.common.util.DateUtils;
import com.jsowell.common.util.StringUtils; import com.jsowell.common.util.StringUtils;
import com.jsowell.pile.domain.ClearingBillInfo; import com.jsowell.pile.domain.ClearingBillInfo;
import com.jsowell.pile.dto.GetClearingBillDTO; import com.jsowell.pile.dto.GetClearingBillDTO;
@@ -82,6 +83,11 @@ public class ClearingBillInfoServiceImpl implements ClearingBillInfoService {
@Override @Override
public int insertOrUpdateSelective(ClearingBillInfo record) { public int insertOrUpdateSelective(ClearingBillInfo record) {
if (record.getId() != null) {
record.setUpdateTime(DateUtils.getNowDate());
} else {
record.setCreateTime(DateUtils.getNowDate());
}
return clearingBillInfoMapper.insertOrUpdateSelective(record); return clearingBillInfoMapper.insertOrUpdateSelective(record);
} }

15
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
View File

@@ -1323,10 +1323,17 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
String merchantId = adapayMemberAccount.getMerchantId(); String merchantId = adapayMemberAccount.getMerchantId();
String appId = pileMerchantInfoService.queryAppIdByMerchantId(merchantId); String appId = pileMerchantInfoService.queryAppIdByMerchantId(merchantId);
// 根据运营商id和结算日期查询清分账单
ClearingBillInfo queryBillInfo = clearingBillInfoService.selectByMerchantIdAndTradeDate(merchantId, tradeDate);
// 清分账单信息 // 清分账单信息
ClearingBillInfo clearingBillInfo = new ClearingBillInfo(); ClearingBillInfo clearingBillInfo = new ClearingBillInfo();
clearingBillInfo.setBillStatus("1");
String clearingBillCode = "CLE" + IdUtils.getOrderCode(); String clearingBillCode = "CLE" + IdUtils.getOrderCode();
if (queryBillInfo != null) {
clearingBillInfo.setId(queryBillInfo.getId());
clearingBillCode = queryBillInfo.getClearingBillCode();
}
clearingBillInfo.setBillStatus("1");
clearingBillInfo.setClearingBillCode(clearingBillCode); clearingBillInfo.setClearingBillCode(clearingBillCode);
clearingBillInfo.setClearingTime(DateUtils.getNowDate()); clearingBillInfo.setClearingTime(DateUtils.getNowDate());
clearingBillInfo.setMerchantId(merchantId); clearingBillInfo.setMerchantId(merchantId);
@@ -1403,16 +1410,10 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
clearingBillInfo.setFeeAmount(feeAmount); clearingBillInfo.setFeeAmount(feeAmount);
clearingBillInfo.setWithdrawableAmount(withdrawableAmount); clearingBillInfo.setWithdrawableAmount(withdrawableAmount);
clearingBillInfo.setActualClearingAmount(actualClearingAmount); clearingBillInfo.setActualClearingAmount(actualClearingAmount);
clearingBillInfo.setCreateTime(DateUtils.getNowDate());
clearingBillInfo.setDelFlag(DelFlagEnum.NORMAL.getValue()); clearingBillInfo.setDelFlag(DelFlagEnum.NORMAL.getValue());
clearingBillInfo.setBillStatus("2"); clearingBillInfo.setBillStatus("2");
clearingBillInfo.setTradeDate(tradeDate); clearingBillInfo.setTradeDate(tradeDate);
// 根据运营商id和结算日期查询清分账单
ClearingBillInfo queryBillInfo = clearingBillInfoService.selectByMerchantIdAndTradeDate(merchantId, tradeDate);
if (queryBillInfo != null) {
clearingBillInfo.setId(queryBillInfo.getId());
}
// 保存清分账单 // 保存清分账单
ClearingBillTransactionDTO dto = new ClearingBillTransactionDTO(); ClearingBillTransactionDTO dto = new ClearingBillTransactionDTO();
dto.setClearingBillInfo(clearingBillInfo); dto.setClearingBillInfo(clearingBillInfo);