|
@@ -9,11 +9,10 @@ import com.sckw.core.model.page.PageRes;
|
|
|
import com.sckw.core.utils.CollectionUtils;
|
|
import com.sckw.core.utils.CollectionUtils;
|
|
|
import com.sckw.core.utils.IdWorker;
|
|
import com.sckw.core.utils.IdWorker;
|
|
|
import com.sckw.core.utils.OrderGenerateUtils;
|
|
import com.sckw.core.utils.OrderGenerateUtils;
|
|
|
|
|
+import com.sckw.order.api.dubbo.TradeOrderInfoService;
|
|
|
|
|
+import com.sckw.order.api.model.OrderDetailRes;
|
|
|
import com.sckw.payment.dao.KwpLedgerTradeMapper;
|
|
import com.sckw.payment.dao.KwpLedgerTradeMapper;
|
|
|
-import com.sckw.payment.model.KwpLedgerTrade;
|
|
|
|
|
-import com.sckw.payment.model.KwpLedgerTradeTrack;
|
|
|
|
|
-import com.sckw.payment.model.KwpLedgerTradeUnit;
|
|
|
|
|
-import com.sckw.payment.model.KwpSettlementTrade;
|
|
|
|
|
|
|
+import com.sckw.payment.model.*;
|
|
|
import com.sckw.payment.model.constant.LedgerEnum;
|
|
import com.sckw.payment.model.constant.LedgerEnum;
|
|
|
import com.sckw.payment.model.constant.LedgerTrackEnum;
|
|
import com.sckw.payment.model.constant.LedgerTrackEnum;
|
|
|
import com.sckw.payment.model.constant.TradeUnitType;
|
|
import com.sckw.payment.model.constant.TradeUnitType;
|
|
@@ -53,6 +52,8 @@ public class KwpLedgerTradeService extends AbsLedger {
|
|
|
private KwpLedgerTradeUnitService tradeUnitService;
|
|
private KwpLedgerTradeUnitService tradeUnitService;
|
|
|
@DubboReference(version = "2.0.0", group = "design", check = false)
|
|
@DubboReference(version = "2.0.0", group = "design", check = false)
|
|
|
private RemoteSystemService remoteSystemService;
|
|
private RemoteSystemService remoteSystemService;
|
|
|
|
|
+ @DubboReference(version = "2.0.0", group = "design", check = false)
|
|
|
|
|
+ private TradeOrderInfoService tradeOrderInfoService;
|
|
|
|
|
|
|
|
private void changeDict(List<LedgerTradeDto> list) {
|
|
private void changeDict(List<LedgerTradeDto> list) {
|
|
|
List<SysDictResDto> taxRateDict = remoteSystemService.queryDictByType(DictTypeEnum.TAX_RATE.getType());
|
|
List<SysDictResDto> taxRateDict = remoteSystemService.queryDictByType(DictTypeEnum.TAX_RATE.getType());
|
|
@@ -137,6 +138,29 @@ public class KwpLedgerTradeService extends AbsLedger {
|
|
|
/*保存贸易订单关联数据*/
|
|
/*保存贸易订单关联数据*/
|
|
|
List<Long> ids = tradeSendReq.getIds();
|
|
List<Long> ids = tradeSendReq.getIds();
|
|
|
//todo dubbo拿取销售订单数据
|
|
//todo dubbo拿取销售订单数据
|
|
|
|
|
+ List<OrderDetailRes> resList = new ArrayList<>();
|
|
|
|
|
+ for (Long id : ids) {
|
|
|
|
|
+ OrderDetailRes orderDetailById = tradeOrderInfoService.getOrderDetailById(id);
|
|
|
|
|
+ if (Objects.isNull(orderDetailById)) {
|
|
|
|
|
+ throw new BusinessException("订单未找到");
|
|
|
|
|
+ }
|
|
|
|
|
+ resList.add(orderDetailById);
|
|
|
|
|
+ }
|
|
|
|
|
+ List<KwpLedgerTradeOrder> collect = resList.stream().map(a -> {
|
|
|
|
|
+ KwpLedgerTradeOrder kwpLedgerTradeOrder = new KwpLedgerTradeOrder();
|
|
|
|
|
+ kwpLedgerTradeOrder.setId(new IdWorker(1).nextId());
|
|
|
|
|
+ kwpLedgerTradeOrder.setTLedgerId(kwpLedgerTrade.getId());
|
|
|
|
|
+ kwpLedgerTradeOrder.setTOrderId(a.getId());
|
|
|
|
|
+ kwpLedgerTradeOrder.setRemark("");
|
|
|
|
|
+ kwpLedgerTradeOrder.setStatus(0);
|
|
|
|
|
+ kwpLedgerTradeOrder.setCreateBy(0L);
|
|
|
|
|
+ kwpLedgerTradeOrder.setCreateTime(LocalDateTime.now());
|
|
|
|
|
+ kwpLedgerTradeOrder.setUpdateBy(0L);
|
|
|
|
|
+ kwpLedgerTradeOrder.setUpdateTime(LocalDateTime.now());
|
|
|
|
|
+ kwpLedgerTradeOrder.setDelFlag(0);
|
|
|
|
|
+ return kwpLedgerTradeOrder;
|
|
|
|
|
+ }).collect(Collectors.toList());
|
|
|
|
|
+ tradeOrderService.saveList(collect);
|
|
|
/*保存企业单位相关信息*/
|
|
/*保存企业单位相关信息*/
|
|
|
//todo dubbo拿取采购客户单位的信息
|
|
//todo dubbo拿取采购客户单位的信息
|
|
|
Long purchaseEntId = tradeSendReq.getPurchaseEntId();
|
|
Long purchaseEntId = tradeSendReq.getPurchaseEntId();
|