From 30f124fbe2c638eecda3d74c6dde053af5d574f0 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期六, 11 十月 2025 14:26:17 +0800
Subject: [PATCH] 提交代码
---
user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/model/BranchOffice.java | 10 ++++++++++
user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/OrderServiceImpl.java | 25 ++++++-------------------
2 files changed, 16 insertions(+), 19 deletions(-)
diff --git a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/model/BranchOffice.java b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/model/BranchOffice.java
index 09b68c9..62758b7 100644
--- a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/model/BranchOffice.java
+++ b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/model/BranchOffice.java
@@ -82,4 +82,14 @@
*/
@TableField("createTime")
private Date createTime;
+ /**
+ * 中台企业编号
+ */
+ @TableField("enterCode")
+ private String enterCode;
+ /**
+ * 中台新增标识（0=否，1=是）
+ */
+ @TableField("enterNew")
+ private Integer enterNew;
}
diff --git a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/OrderServiceImpl.java b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/OrderServiceImpl.java
index bf878f9..57069a5 100644
--- a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/OrderServiceImpl.java
+++ b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/OrderServiceImpl.java
@@ -7,7 +7,6 @@
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.supersavedriving.user.core.util.ToolUtil;
import com.supersavedriving.user.modular.system.dao.OrderMapper;
-import com.supersavedriving.user.modular.system.dao.TCompanyMapper;
import com.supersavedriving.user.modular.system.model.*;
import com.supersavedriving.user.modular.system.service.*;
import com.supersavedriving.user.modular.system.util.*;
@@ -20,7 +19,6 @@
import com.supersavedriving.user.modular.system.util.qianyuntong.OrderUtil;
import com.supersavedriving.user.modular.system.util.qianyuntong.model.*;
import com.supersavedriving.user.modular.system.warpper.*;
-import org.redisson.api.RLock;
import org.redisson.api.RedissonClient;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -40,9 +38,7 @@
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.text.SimpleDateFormat;
-import java.time.LocalDate;
import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.ThreadPoolExecutor;
@@ -112,12 +108,6 @@
private IRevenueService revenueService;
@Autowired
- private IAgentService agentService;
-
- @Autowired
- private IPlatformRechargeRecordService platformRechargeRecordService;
-
- @Autowired
private IDivisionRecordService divisionRecordService;
@Autowired
@@ -139,9 +129,6 @@
@Value("${callbackPath}")
private String callbackPath;//支付回调网关地址
-
- @Autowired
- private TCompanyMapper companyMapper;
@@ -539,13 +526,13 @@
boolean insert = this.insert(order);
if(null != order.getDriverId()){
Driver driver = driverService.selectById(order.getDriverId());
- TCompany company = companyMapper.selectById(order.getDriverId());
+ BranchOffice branchOffice = branchOfficeService.selectById(order.getBranchOfficeId());
//调三方订单中心创建行程单
CreateTravelItineraryRequest request = new CreateTravelItineraryRequest();
request.setOrderNo("DJ" + order.getId());
request.setCustomerId(appUser.getOnconUUID());
request.setDriverId(driver.getEmpId().toString());
- request.setSupplierShopId(company.getEnterCode());
+ request.setSupplierShopId(branchOffice.getEnterCode());
request.setServiceType(2);
String travelItinerary = OrderUtil.createTravelItinerary(request);
order.setTravelId(travelItinerary);
@@ -875,9 +862,9 @@
ModifyTravelItineraryRequest request = new ModifyTravelItineraryRequest();
request.setOrderId(order.getTravelId());
request.setStatus(getState(order.getState()));
- TCompany company = companyMapper.selectById(driver.getBranchOfficeId());
+ BranchOffice branchOffice = branchOfficeService.selectById(order.getBranchOfficeId());
request.setDriverId(driver.getEmpId().toString());
- request.setSupplierShopId(company.getEnterCode());
+ request.setSupplierShopId(branchOffice.getEnterCode());
OrderUtil.modifyTravelItinerary(request);
}
@@ -1575,9 +1562,9 @@
ModifyTravelItineraryRequest request = new ModifyTravelItineraryRequest();
request.setOrderId(order.getTravelId());
request.setStatus(getState(order.getState()));
- TCompany company = companyMapper.selectById(driver.getBranchOfficeId());
+ BranchOffice branchOffice = branchOfficeService.selectById(order.getBranchOfficeId());
request.setDriverId(driver.getEmpId().toString());
- request.setSupplierShopId(company.getEnterCode());
+ request.setSupplierShopId(branchOffice.getEnterCode());
OrderUtil.modifyTravelItinerary(request);
}
--
Gitblit v1.7.1