|
|
@@ -8,6 +8,7 @@ import com.sckw.core.common.enums.enums.DictEnum;
|
|
|
import com.sckw.core.exception.BusinessException;
|
|
|
import com.sckw.core.model.constant.Global;
|
|
|
import com.sckw.core.model.page.PageRes;
|
|
|
+import com.sckw.core.utils.FileUtils;
|
|
|
import com.sckw.core.utils.IdWorker;
|
|
|
import com.sckw.core.web.context.LoginUserHolder;
|
|
|
import com.sckw.order.api.dubbo.TradeOrderInfoService;
|
|
|
@@ -123,6 +124,8 @@ public class KwpSettlementOfflineService {
|
|
|
}
|
|
|
settlementOfflineVo.setPayPrice(df.format(Objects.isNull(a.getPayPrice()) ? new BigDecimal("0.0") : a.getPayPrice()));
|
|
|
settlementOfflineVo.setTopayPrice(df.format(Objects.isNull(a.getTopayPrice()) ? new BigDecimal("0.0") : a.getTopayPrice()));
|
|
|
+ //附件拼接地址前缀 数据库存储相对路径
|
|
|
+ settlementOfflineVo.appendPrefix();
|
|
|
return settlementOfflineVo;
|
|
|
}).collect(Collectors.toList());
|
|
|
|
|
|
@@ -138,7 +141,9 @@ public class KwpSettlementOfflineService {
|
|
|
* @date 2023-07-19 09:11
|
|
|
*/
|
|
|
public SettlementOfflineDto detailLogisticsCollection(Long id) {
|
|
|
- return settlementOfflineMapper.detailLogisticsCollection(id);
|
|
|
+ SettlementOfflineDto settlementOfflineDto = settlementOfflineMapper.detailLogisticsCollection(id);
|
|
|
+ settlementOfflineDto.appendPrefix();
|
|
|
+ return settlementOfflineDto;
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -233,7 +238,7 @@ public class KwpSettlementOfflineService {
|
|
|
kwpSettlementOffline.setPayTime(LocalDateTime.now());
|
|
|
kwpSettlementOffline.setPayPrice(price);
|
|
|
kwpSettlementOffline.setTopayPrice(remainingReceivables);
|
|
|
- kwpSettlementOffline.setUrl(url);
|
|
|
+ kwpSettlementOffline.setUrl(FileUtils.replaceAll(url));
|
|
|
kwpSettlementOffline.setRemark(remark);
|
|
|
kwpSettlementOffline.setStatus(1);
|
|
|
kwpSettlementOffline.setCreateBy(LoginUserHolder.getUserId());
|
|
|
@@ -301,6 +306,7 @@ public class KwpSettlementOfflineService {
|
|
|
}
|
|
|
settlementOfflineVo.setPayPrice(df.format(Objects.isNull(a.getPayPrice()) ? new BigDecimal("0.0") : a.getPayPrice()));
|
|
|
settlementOfflineVo.setTopayPrice(df.format(Objects.isNull(a.getTopayPrice()) ? new BigDecimal("0.0") : a.getTopayPrice()));
|
|
|
+ settlementOfflineVo.appendPrefix();
|
|
|
return settlementOfflineVo;
|
|
|
}).collect(Collectors.toList());
|
|
|
return PageRes.build(pageInfo, collect);
|
|
|
@@ -381,7 +387,7 @@ public class KwpSettlementOfflineService {
|
|
|
kwpSettlementOffline.setPayTime(LocalDateTime.now());
|
|
|
kwpSettlementOffline.setPayPrice(payReq.getPayPrice());
|
|
|
kwpSettlementOffline.setTopayPrice(subtract1);
|
|
|
- kwpSettlementOffline.setUrl(payReq.getUrl());
|
|
|
+ kwpSettlementOffline.setUrl(FileUtils.replaceAll(payReq.getUrl()));
|
|
|
kwpSettlementOffline.setRemark(LoginUserHolder.getUserName() + "结算" + payReq.getPayPrice());
|
|
|
kwpSettlementOffline.setStatus(NumberConstant.ZERO);
|
|
|
kwpSettlementOffline.setCreateBy(LoginUserHolder.getUserId());
|
|
|
@@ -409,7 +415,6 @@ public class KwpSettlementOfflineService {
|
|
|
put("number", kwpSettlementTrade.getStOrderNo());
|
|
|
}}, kwpLedgerTradeUnit.getEntId(), MessageEnum.SETTLEMENT_CONFIRM_PURCHASE);
|
|
|
|
|
|
- //中台接口 todo-xcq
|
|
|
return "确认回款成功";
|
|
|
} finally {
|
|
|
redisLockUtil.unlock(key);
|