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,