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

Merge branch 'cc_20250523_fix_check' into 'master'

Browse Source 
放开缴纳加盟费检验缴费人必须是加盟商校验

See merge request hangzhou/java/custom_zxjp!95
This commit is contained in:
苏竹红
2025-05-23 06:23:46 +00:00
parent 060ace82d6 acb8c25cab
commit 7b30396dae
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -143,10 +143,10 @@ public class LinePayServiceImpl implements LinePayService {
if (request.getLineId() != null) { if (request.getLineId() != null) {
lineInfo = lineInfoDAO.getLineInfo(request.getLineId()); lineInfo = lineInfoDAO.getLineInfo(request.getLineId());
} }
//缴纳加盟费检验缴费人必须是签约人 // //缴纳加盟费检验缴费人必须是加盟商
if(PayBusinessTypeEnum.FRANCHISE_FEE.getCode().equals(request.getPayBusinessType()) && !lineInfo.getUsername().trim().equals(request.getPayUserName().trim())){ // if(PayBusinessTypeEnum.FRANCHISE_FEE.getCode().equals(request.getPayBusinessType()) && !lineInfo.getUsername().trim().equals(request.getPayUserName().trim())){
throw new ServiceException(ErrorCodeEnum.CHECK_PAYER_ERROR); // throw new ServiceException(ErrorCodeEnum.CHECK_PAYER_ERROR);
} // }
LinePayDO linePayDO = linePayDAO.getByLineIdAndPayTypeAndShopId(request.getLineId(), request.getPayBusinessType(), request.getShopId()); LinePayDO linePayDO = linePayDAO.getByLineIdAndPayTypeAndShopId(request.getLineId(), request.getPayBusinessType(), request.getShopId());
linePayDO = checkAndFill(linePayDO, request, partnerUser); linePayDO = checkAndFill(linePayDO, request, partnerUser);
Long payId = linePayDO.getId(); Long payId = linePayDO.getId();