修改linepayimpl
This commit is contained in:
@@ -56,9 +56,9 @@ public class LinePayServiceImpl implements LinePayService {
|
||||
public LinePayVO getLinePayInfo(Long lineId) {
|
||||
LinePayVO result = null;
|
||||
LinePayDO linePayDO = linePayDAO.getLinePayByLineId(lineId);
|
||||
if (linePayDO != null){
|
||||
if (linePayDO != null) {
|
||||
result = new LinePayVO();
|
||||
BeanUtil.copyProperties(linePayDO,result);
|
||||
BeanUtil.copyProperties(linePayDO, result);
|
||||
LineInfoDO lineInfo = lineInfoDAO.getLineInfo(lineId);
|
||||
result.setPartnerName(lineInfo != null ? lineInfo.getUsername() : "");
|
||||
result.setMobile(lineInfo != null ? lineInfo.getMobile() : "");
|
||||
@@ -70,14 +70,14 @@ public class LinePayServiceImpl implements LinePayService {
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public Long submitPayInfo(LinePaySubmitRequest request, PartnerUserInfoVO partnerUser) {
|
||||
LineInfoDO lineInfo = lineInfoDAO.getLineInfo(request.getLineId());
|
||||
if(Objects.isNull(lineInfo)){
|
||||
if (Objects.isNull(lineInfo)) {
|
||||
throw new ServiceException(ErrorCodeEnum.LINE_ID_IS_NOT_EXIST);
|
||||
}
|
||||
if (request.getPayBusinessType() != null
|
||||
&& request.getPayBusinessType() == Constants.ONE_INTEGER
|
||||
&& request.getShopId() != null){
|
||||
LinePayDO linePayDO = linePayDAO.getLinePayByLineIdAndPayType(request.getLineId(),request.getPayBusinessType());
|
||||
if (Objects.isNull(linePayDO)){
|
||||
&& request.getShopId() != null) {
|
||||
LinePayDO linePayDO = linePayDAO.getLinePayByLineIdAndPayType(request.getLineId(), request.getPayBusinessType());
|
||||
if (Objects.isNull(linePayDO)) {
|
||||
fillLinePay(true, linePayDO, request, partnerUser);
|
||||
Long aLong = linePayDAO.addLinePay(linePayDO);
|
||||
FranchiseFeeDO franchiseFeeDO = new FranchiseFeeDO();
|
||||
@@ -85,21 +85,31 @@ public class LinePayServiceImpl implements LinePayService {
|
||||
FranchiseFeeDO result = franchiseFeeMapper.selectOneByExample(franchiseFeeDO);
|
||||
result.setPayId(aLong);
|
||||
franchiseFeeMapper.updateByPrimaryKeySelective(result);
|
||||
}else {
|
||||
} else {
|
||||
fillLinePay(false, linePayDO, request, partnerUser);
|
||||
linePayDAO.updateLinePay(linePayDO);
|
||||
}
|
||||
shopStageInfoDAO.updateShopStageInfo(request.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_72);
|
||||
}
|
||||
if(request.getPayBusinessType() != null
|
||||
&& request.getPayBusinessType() == 0
|
||||
} else if (request.getPayBusinessType() != null
|
||||
&& request.getPayBusinessType() == PayBusinessTypeEnum.DECORATION_MODEL.getCode()
|
||||
&& request.getShopId() != null) {
|
||||
LinePayDO linePayDO = linePayDAO.getLinePayByLineIdAndPayType(request.getLineId(),0);
|
||||
if(linePayDO == null){
|
||||
LinePayDO linePayDO = linePayDAO.getLinePayByLineIdAndPayType(request.getLineId(), PayBusinessTypeEnum.DECORATION_MODEL.getCode());
|
||||
if (linePayDO == null) {
|
||||
linePayDO = new LinePayDO();
|
||||
fillLinePay(true, linePayDO, request, partnerUser);
|
||||
linePayDAO.addLinePay(linePayDO);
|
||||
}else {
|
||||
} else {
|
||||
fillLinePay(false, linePayDO, request, partnerUser);
|
||||
linePayDAO.updateLinePay(linePayDO);
|
||||
}
|
||||
return linePayDO.getId();
|
||||
} else {
|
||||
LinePayDO linePayDO = linePayDAO.getLinePayByLineIdAndPayType(request.getLineId(), 0);
|
||||
if (linePayDO == null) {
|
||||
linePayDO = new LinePayDO();
|
||||
fillLinePay(true, linePayDO, request, partnerUser);
|
||||
linePayDAO.addLinePay(linePayDO);
|
||||
} else {
|
||||
fillLinePay(false, linePayDO, request, partnerUser);
|
||||
linePayDAO.updateLinePay(linePayDO);
|
||||
}
|
||||
@@ -109,20 +119,7 @@ public class LinePayServiceImpl implements LinePayService {
|
||||
lineInfoDAO.insertOrUpdate(lineInfo);
|
||||
return linePayDO.getId();
|
||||
}
|
||||
if (request.getPayBusinessType() != null
|
||||
&& request.getPayBusinessType() == PayBusinessTypeEnum.DECORATION_MODEL.getCode()
|
||||
&& request.getShopId() != null){
|
||||
LinePayDO linePayDO = linePayDAO.getLinePayByLineIdAndPayType(request.getLineId(),PayBusinessTypeEnum.DECORATION_MODEL.getCode());
|
||||
if(linePayDO == null){
|
||||
linePayDO = new LinePayDO();
|
||||
fillLinePay(true, linePayDO, request, partnerUser);
|
||||
linePayDAO.addLinePay(linePayDO);
|
||||
}else {
|
||||
fillLinePay(false, linePayDO, request, partnerUser);
|
||||
linePayDAO.updateLinePay(linePayDO);
|
||||
}
|
||||
return linePayDO.getId();
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
@@ -139,13 +136,13 @@ public class LinePayServiceImpl implements LinePayService {
|
||||
linePayDO.setPromisePic(request.getPromisePic());
|
||||
linePayDO.setPayStatus(WorkflowSubStageStatusEnum.PAY_DEPOSIT_50.getCode());
|
||||
linePayDO.setPayBusinessType(request.getPayBusinessType());
|
||||
if(isAdd){
|
||||
if (isAdd) {
|
||||
linePayDO.setPartnerId(partnerUser.getPartnerId());
|
||||
linePayDO.setLineId(request.getLineId());
|
||||
linePayDO.setCreateTime(new Date());
|
||||
linePayDO.setCreateUserId(partnerUser.getPartnerId());
|
||||
linePayDO.setDeleted(false);
|
||||
}else {
|
||||
} else {
|
||||
linePayDO.setUpdateTime(new Date());
|
||||
linePayDO.setUpdateUserId(partnerUser.getPartnerId());
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user