|
@@ -2430,19 +2430,17 @@ public class KwoTradeOrderService {
|
|
|
freezeDto.setOrderType(4);
|
|
freezeDto.setOrderType(4);
|
|
|
freezeDto.setTradeType(5);
|
|
freezeDto.setTradeType(5);
|
|
|
freezeDto.setRemark("贸易订单号:" + freezeDto.getOrderNo() + ",撤销订单");
|
|
freezeDto.setRemark("贸易订单号:" + freezeDto.getOrderNo() + ",撤销订单");
|
|
|
- BaseResult<Object> balanceResult;
|
|
|
|
|
|
|
+ BaseResult<Object> balanceResult = null;
|
|
|
try {
|
|
try {
|
|
|
log.info("贸易订单号:{},订单撤销调用钱包服务解冻预付余额,参数:{}", freezeDto.getOrderNo(), JSON.toJSONString(freezeDto));
|
|
log.info("贸易订单号:{},订单撤销调用钱包服务解冻预付余额,参数:{}", freezeDto.getOrderNo(), JSON.toJSONString(freezeDto));
|
|
|
balanceResult = paymentFeignService.updatePrepaidBalance(freezeDto);
|
|
balanceResult = paymentFeignService.updatePrepaidBalance(freezeDto);
|
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
|
String errMsg = freezeDto.getRemark() + "异常";
|
|
String errMsg = freezeDto.getRemark() + "异常";
|
|
|
log.error(errMsg, e);
|
|
log.error(errMsg, e);
|
|
|
- throw new BusinessException(errMsg);
|
|
|
|
|
}
|
|
}
|
|
|
if (balanceResult == null || balanceResult.getCode() != HttpStatus.SUCCESS_CODE || !Boolean.TRUE.equals(balanceResult.getData())) {
|
|
if (balanceResult == null || balanceResult.getCode() != HttpStatus.SUCCESS_CODE || !Boolean.TRUE.equals(balanceResult.getData())) {
|
|
|
String errMsg = freezeDto.getRemark() + "失败";
|
|
String errMsg = freezeDto.getRemark() + "失败";
|
|
|
log.error("{}:{}", errMsg, balanceResult != null ? balanceResult.getMessage() : "");
|
|
log.error("{}:{}", errMsg, balanceResult != null ? balanceResult.getMessage() : "");
|
|
|
- throw new BusinessException(errMsg);
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
// 3. 贸易合同该商品有采购数量,则更新采购数量(加回本单总量)
|
|
// 3. 贸易合同该商品有采购数量,则更新采购数量(加回本单总量)
|