提交 00d12fcb 作者: zhenjie

收货修复

上级 1d912593
...@@ -406,7 +406,7 @@ public class UavOrderServiceImpl implements UavOrderService { ...@@ -406,7 +406,7 @@ public class UavOrderServiceImpl implements UavOrderService {
userPayUavWalletVO.setCashAmount(uavOrderDO.getShareAmount()); userPayUavWalletVO.setCashAmount(uavOrderDO.getShareAmount());
userPayUavWalletVO.setOrderStatus(999); userPayUavWalletVO.setOrderStatus(999);
userPayUavWalletVO.setRemark("商城订单金额解冻"); userPayUavWalletVO.setRemark("商城订单金额解冻");
ResultBody resultBody = userAppApi.feignPayUavWallet(userPayUavWalletVO, null); ResultBody resultBody = userAppApi.feignPayUavWallet(userPayUavWalletVO, currentAccount.getToken());
if (!resultBody.getCode().equals(ResultEnum.SUCCESS.getResultCode())) { if (!resultBody.getCode().equals(ResultEnum.SUCCESS.getResultCode())) {
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return resultBody; return resultBody;
...@@ -433,7 +433,7 @@ public class UavOrderServiceImpl implements UavOrderService { ...@@ -433,7 +433,7 @@ public class UavOrderServiceImpl implements UavOrderService {
return managerRes; return managerRes;
} }
payUavWalletVO.setUserAccountId((Integer) managerRes.getResult()); payUavWalletVO.setUserAccountId((Integer) managerRes.getResult());
ResultBody resultBody = userAppApi.feignPayUavWallet(payUavWalletVO, null); ResultBody resultBody = userAppApi.feignPayUavWallet(payUavWalletVO, currentAccount.getToken());
if (!resultBody.getCode().equals(ResultEnum.SUCCESS.getResultCode())) { if (!resultBody.getCode().equals(ResultEnum.SUCCESS.getResultCode())) {
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return resultBody; return resultBody;
......
...@@ -99,7 +99,7 @@ public class UavPOServiceImpl implements UavPOService { ...@@ -99,7 +99,7 @@ public class UavPOServiceImpl implements UavPOService {
uavPOrderQO.buildCurrentPage(); uavPOrderQO.buildCurrentPage();
List<UavPurchaseOrderDO> uavPurchaseOrderDOS = uavPODao.listPurchaseOrder(uavPOrderQO); List<UavPurchaseOrderDO> uavPurchaseOrderDOS = uavPODao.listPurchaseOrder(uavPOrderQO);
List<UavPurchaseOrderDTO> purchaseOrderDTOS = uavPurchaseOrderDOS.stream().map(UavPurchaseOrderDO::buildUavPurchaseOrderDTO).collect(Collectors.toList()); List<UavPurchaseOrderDTO> purchaseOrderDTOS = uavPurchaseOrderDOS.stream().map(UavPurchaseOrderDO::buildUavPurchaseOrderDTO).collect(Collectors.toList());
// TODO 买家和买家信息 // TODO 提供商信息
return ResultBody.success(PageResult.buildPage(pageNo, uavPOrderQO.getPageSize(), count, purchaseOrderDTOS)); return ResultBody.success(PageResult.buildPage(pageNo, uavPOrderQO.getPageSize(), count, purchaseOrderDTOS));
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论