From 06fccc2ccaa9ca2b4005ace8a12e8c167dfbd1ef Mon Sep 17 00:00:00 2001 From: lzq <2495532633@qq.com> Date: Mon, 22 Dec 2025 18:32:42 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=AB=99=E7=82=B9=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supervisory/biz/pojo/entity/BizCompanyEntity.java | 1 + .../biz/pojo/param/ModifyBizCompanyParam.java | 1 + .../supervisory/order/pojo/result/OrderPagingResult.java | 1 + .../supervisory/order/pojo/result/TrainBillResult.java | 1 + .../supervisory/order/service/OrderInfoService.java | 9 ++++++--- .../src/main/resources/mapper/order/OrderInfoMapper.xml | 1 + 6 files changed, 11 insertions(+), 3 deletions(-) diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/pojo/entity/BizCompanyEntity.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/pojo/entity/BizCompanyEntity.java index db44ced..cbd396d 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/pojo/entity/BizCompanyEntity.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/pojo/entity/BizCompanyEntity.java @@ -25,6 +25,7 @@ public class BizCompanyEntity { @TableId(type = IdType.ASSIGN_ID) private Long id; + private Integer stationType; /** * 归属用户 */ diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/pojo/param/ModifyBizCompanyParam.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/pojo/param/ModifyBizCompanyParam.java index 6494d81..97b5803 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/pojo/param/ModifyBizCompanyParam.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/pojo/param/ModifyBizCompanyParam.java @@ -41,6 +41,7 @@ public class ModifyBizCompanyParam { */ private Long userId; + private Integer stationType; /** * 业务对象; 字典代码：biz_obj */ diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/pojo/result/OrderPagingResult.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/pojo/result/OrderPagingResult.java index 82e20d3..e0944ff 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/pojo/result/OrderPagingResult.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/pojo/result/OrderPagingResult.java @@ -24,6 +24,7 @@ public class OrderPagingResult { * 昵称 */ private String nickname; + private Integer stationType; /** * 手机号 diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/pojo/result/TrainBillResult.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/pojo/result/TrainBillResult.java index 817668a..c746231 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/pojo/result/TrainBillResult.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/pojo/result/TrainBillResult.java @@ -25,6 +25,7 @@ public class TrainBillResult { */ private String nickname; private BizObj bizObj; + private Integer stationType; /** * 手机号 diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/service/OrderInfoService.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/service/OrderInfoService.java index 08d1f44..1fcbfb6 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/service/OrderInfoService.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/service/OrderInfoService.java @@ -126,6 +126,10 @@ public class OrderInfoService extends ServiceImpl Exceptions.clierr("站点信息错误")); + Assert.isTrue(Integer.valueOf(1).equals(stationInfo.getStationType()), () -> Exceptions.clierr("系统暂未对接，预约失败")); Assert.isFalse(this.exists(Wrappers.lambdaQuery().eq(OrderInfoEntity::getSn, addOrderInfoParam.getSn())), () -> Exceptions.exception("订单创建失败，订单号重复")); AddOrderCargoPlaceParam cargoPlace = addOrderInfoParam.getCargoPlace(); long cargoPlaceId = orderCargoPlaceService.add(cargoPlace); @@ -156,7 +160,6 @@ public class OrderInfoService extends ServiceImpl { + /* CompletableFuture.runAsync(() -> { OrderPagingResult detail = this.detail(orderId); HsoaResult result = hsoaService.pushProvincialSave(detail); @@ -1309,7 +1312,7 @@ public class OrderInfoService extends ServiceImpl { log.error("推送订单数据失败，数据Id：{}", entity.getId(), e); return null; - }); + }); */ // 出厂付费 if (OrderCategory.PuTong.equals(orderInfoEntity.getOrderCategory()) && MoneyWay.OUT.getVal().equals(entity.getMoneyWay())) { diff --git a/njzscloud-svr/src/main/resources/mapper/order/OrderInfoMapper.xml b/njzscloud-svr/src/main/resources/mapper/order/OrderInfoMapper.xml index 2ccf27e..0c261f7 100644 --- a/njzscloud-svr/src/main/resources/mapper/order/OrderInfoMapper.xml +++ b/njzscloud-svr/src/main/resources/mapper/order/OrderInfoMapper.xml @@ -133,6 +133,7 @@ k.phone checker_phone, l.project_name, m.station_name, + m.station_type, m.company_name station_company_name, m.address station_address, m.uscc station_uscc, From 7f9b3e3cbfa73d37dab9355d619f94c4aaa7745d Mon Sep 17 00:00:00 2001 From: lzq <2495532633@qq.com> Date: Mon, 22 Dec 2025 20:33:35 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=B7=B2=E5=AE=A1=E6=A0=B8=E5=88=97?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../njzscloud/supervisory/order/service/OrderInfoService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/service/OrderInfoService.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/service/OrderInfoService.java index 1fcbfb6..4b8a781 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/service/OrderInfoService.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/service/OrderInfoService.java @@ -530,7 +530,7 @@ public class OrderInfoService extends ServiceImpl - it.or(CollUtil.isNotEmpty(areaList), it0 -> it0.in("b.area", areaList).eq("a.audit_status", AuditStatus.ShiDaiShenHe)) + it.or(CollUtil.isNotEmpty(areaList), it0 -> it0.in("b.area", areaList).in("a.audit_status", AuditStatus.ShiDaiShenHe, AuditStatus.TongGuo)) .or(CollUtil.isNotEmpty(cityList), it1 -> it1.in("b.area", cityList).eq("a.audit_status", AuditStatus.TongGuo)) .or(CollUtil.isNotEmpty(cityAreaList), it2 -> it2.in("b.area", cityAreaList).eq("a.audit_status", AuditStatus.TongGuo)) );