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

Merge remote-tracking branch 'origin/cc_20250529_franchise_fee' into cc_20250529_franchise_fee

Browse Source
This commit is contained in:
shuo.wang
2025-06-04 16:58:43 +08:00
parent 86611d2178 61ebca6b92
commit d3bc5baa0a
3 changed files with 38 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -193,6 +193,7 @@ public class FranchiseFeeServiceImpl implements FranchiseFeeService {
}
@Override
@Transactional(rollbackFor = Exception.class)
public ApiResponse<Boolean> changePaymentStatus(FranchiseFeeCallBackRequest request) {
ShopInfoDO shopInfoDO = shopInfoMapper.selectByPrimaryKey(request.getShopId());
if (Objects.isNull(shopInfoDO)){
@@ -206,6 +207,9 @@ public class FranchiseFeeServiceImpl implements FranchiseFeeService {
franchiseFeeDO.setXgjRemainderPayableAmount(request.getRemainingFee());
franchiseFeeDO.setXgjFeesPaid(request.getPayableFee());
franchiseFeeMapper.updateByPrimaryKeySelective(franchiseFeeDO);
if (XGJCollectionStatusEnum.COMPLETED.getCode().equals(request.getPaymentStatus())){
shopStageInfoDAO.updateShopStageInfo(request.getShopId(),ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_73);
}
return ApiResponse.success(Boolean.TRUE);
}
}

1
coolstore-partner-service/src/main/java/com/cool/store/service/impl/LinePayServiceImpl.java
View File

@@ -279,6 +279,7 @@ public class LinePayServiceImpl implements LinePayService {
}
@Override
@Transactional(rollbackFor = Exception.class)
public ApiResponse<Boolean> ReceiptCallBack(ReceiptCallBackRequest request) {
LinePayDO linePayDO = linePayDAO.selectByPaymentReceiptCode(request.getReceiptId());
if (Objects.isNull(linePayDO)){