提交 ca052edd 作者: xiaowang

可以吗?

上级 13749d97
...@@ -75,7 +75,7 @@ public class ContractController extends BaseController { ...@@ -75,7 +75,7 @@ public class ContractController extends BaseController {
@ApiOperation(value = "根据订单编号数组获取合同的信息") @ApiOperation(value = "根据订单编号数组获取合同的信息")
@ApiResponses({@ApiResponse(code = 200, message = "OK", response = ContractInfoDTO.class)}) @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ContractInfoDTO.class)})
@PostMapping("/listContractInfoByOrderNo") @PostMapping("/listContractInfoByOrderNo")
public ResultBody<ContractInfoDTO> getContractInfo(@ApiParam(value = "订单编号list") @RequestBody List<String> orderNos) { public List<ContractInfoDTO> getContractInfo(@ApiParam(value = "订单编号list") @RequestBody List<String> orderNos) {
return contractService.listContractInfoByOrderNo(orderNos); return contractService.listContractInfoByOrderNo(orderNos);
} }
} }
...@@ -39,5 +39,5 @@ public interface ContractService { ...@@ -39,5 +39,5 @@ public interface ContractService {
ResultBody file(String contractId, LoginSuccessDTO loginSuccessDTO, Integer port); ResultBody file(String contractId, LoginSuccessDTO loginSuccessDTO, Integer port);
ResultBody<ContractInfoDTO> listContractInfoByOrderNo(List<String> orderNos); List<ContractInfoDTO> listContractInfoByOrderNo(List<String> orderNos);
} }
...@@ -223,9 +223,9 @@ public class ContractServiceImpl implements ContractService { ...@@ -223,9 +223,9 @@ public class ContractServiceImpl implements ContractService {
} }
@Override @Override
public ResultBody<ContractInfoDTO> listContractInfoByOrderNo(List<String> orderNos) { public List<ContractInfoDTO> listContractInfoByOrderNo(List<String> orderNos) {
// 根据订单编号获取合同信息 // 根据订单编号获取合同信息
List<ContractInfoDO> contractInfoDOList = contractDao.listContractInfoByOrderNo(orderNos); List<ContractInfoDO> contractInfoDOList = contractDao.listContractInfoByOrderNo(orderNos);
return ResultBody.success(contractInfoDOList == null ? null : contractInfoDOList.stream().map(ContractInfoDO::buildContractInfoDTO).collect(Collectors.toList())); return contractInfoDOList == null ? null : contractInfoDOList.stream().map(ContractInfoDO::buildContractInfoDTO).collect(Collectors.toList());
} }
} }
...@@ -472,12 +472,6 @@ public class PayWalletServiceImpl implements PayWalletService { ...@@ -472,12 +472,6 @@ public class PayWalletServiceImpl implements PayWalletService {
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public boolean releaseOrCancelOrderWallet(PublisherWalletFlowVO publisherWalletFlowVO, PayWalletDO wallet) { public boolean releaseOrCancelOrderWallet(PublisherWalletFlowVO publisherWalletFlowVO, PayWalletDO wallet) {
PayWalletDO publishUpdatePayWallet = new PayWalletDO(); PayWalletDO publishUpdatePayWallet = new PayWalletDO();
if (publisherWalletFlowVO.getCashAmount() == null) {
publisherWalletFlowVO.setCashAmount(BigDecimal.ZERO);
}
if (publisherWalletFlowVO.getSalaryAmount() == null) {
publisherWalletFlowVO.setSalaryAmount(BigDecimal.ZERO);
}
publishUpdatePayWallet.setUserAccountId(publisherWalletFlowVO.getUserAccountId()); publishUpdatePayWallet.setUserAccountId(publisherWalletFlowVO.getUserAccountId());
publishUpdatePayWallet.setPid(wallet.getPid()); publishUpdatePayWallet.setPid(wallet.getPid());
publishUpdatePayWallet.setCashAmt(wallet.getCashAmt().add(publisherWalletFlowVO.getCashAmount())); publishUpdatePayWallet.setCashAmt(wallet.getCashAmt().add(publisherWalletFlowVO.getCashAmount()));
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论