Merge branch 'cc_20250523_fix_check' into 'master'

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

See merge request hangzhou/java/custom_zxjp!95
This commit is contained in:
苏竹红
2025-05-23 06:23:46 +00:00

View File

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