suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'cc_20260422_feeItemId'

Browse Source
This commit is contained in:
suzhuhong
2026-04-23 10:46:31 +08:00
parent 18d5e9c3dd cb1da9a26f
commit 4cafc87961
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coolstore-partner-service/src/main/java/com/cool/store/service/AdjustmentOrderService.java
View File

@@ -72,7 +72,7 @@ public interface AdjustmentOrderService {
* @param transferAmount * @param transferAmount
* @return * @return
*/ */
Boolean calculateAmount(Long id ,String transferAmount); Boolean calculateAmount(String no ,String transferAmount);
/** /**
* 确认充值 * 确认充值

4
coolstore-partner-service/src/main/java/com/cool/store/service/impl/AdjustmentOrderServiceImpl.java
View File

@@ -371,8 +371,8 @@ public class AdjustmentOrderServiceImpl implements AdjustmentOrderService {
} }
@Override @Override
public Boolean calculateAmount(Long id, String transferAmount) { public Boolean calculateAmount(String no, String transferAmount) {
AdjustmentOrderDO adjustmentOrderDO = adjustmentOrderDAO.getById(id); AdjustmentOrderDO adjustmentOrderDO = adjustmentOrderDAO.getByAdjustmentNo(no);
if (adjustmentOrderDO==null){ if (adjustmentOrderDO==null){
log.info("calculateAmount:费用单/费用调整单为空"); log.info("calculateAmount:费用单/费用调整单为空");
return Boolean.FALSE; return Boolean.FALSE;

4
coolstore-partner-service/src/main/java/com/cool/store/service/impl/SplitOrderServiceImpl.java
View File

@@ -272,7 +272,7 @@ public class SplitOrderServiceImpl implements SplitOrderService {
//如果是分账完成 需要变更单据已分账金额 //如果是分账完成 需要变更单据已分账金额
if (AllocationPayStatusEnum.PAID.getStatus().equals(accountTransferDTO.getTradeStatus())){ if (AllocationPayStatusEnum.PAID.getStatus().equals(accountTransferDTO.getTradeStatus())){
log.info("confirmSplitOrder 分账完成分账单ID：{}",id); log.info("confirmSplitOrder 分账完成分账单ID：{}",id);
adjustmentOrderService.calculateAmount(id,accountTransferDTO.getAmount()); adjustmentOrderService.calculateAmount(existing.getRelatedDocNo(),accountTransferDTO.getAmount());
} }
return result > 0; return result > 0;
} }
@@ -313,7 +313,7 @@ public class SplitOrderServiceImpl implements SplitOrderService {
splitOrderDAO.update(split); splitOrderDAO.update(split);
if (AllocationPayStatusEnum.PAID.getStatus().equals(billDetail.getTradeStatus())){ if (AllocationPayStatusEnum.PAID.getStatus().equals(billDetail.getTradeStatus())){
log.info("confirmSplitOrder 分账完成分账单ID：{}",split.getId()); log.info("confirmSplitOrder 分账完成分账单ID：{}",split.getId());
adjustmentOrderService.calculateAmount(split.getId(),billDetail.getAmount()); adjustmentOrderService.calculateAmount(split.getRelatedDocNo(),billDetail.getAmount());
} }
return null; return null;
} }