lzq
/
njzscloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://git.njzscloud.com/lzq/njzscloud into dev

master
ljw 2025-12-23 11:48:09 +08:00
parent 9285618aa3 7f9b3e3cbf
commit badc3786ba
6 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/pojo/entity/BizCompanyEntity.java
View File

@ -25,6 +25,7 @@ public class BizCompanyEntity {
@TableId(type = IdType.ASSIGN_ID)
private Long id;
private Integer stationType;
/**
* 归属用户
*/

1
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/pojo/param/ModifyBizCompanyParam.java
View File

@ -41,6 +41,7 @@ public class ModifyBizCompanyParam {
*/
private Long userId;
private Integer stationType;
/**
* 业务对象; 字典代码：biz_obj
*/

1
njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/pojo/result/OrderPagingResult.java
View File

@ -24,6 +24,7 @@ public class OrderPagingResult {
* 昵称
*/
private String nickname;
private Integer stationType;
/**
* 手机号

1
njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/pojo/result/TrainBillResult.java
View File

@ -25,6 +25,7 @@ public class TrainBillResult {
*/
private String nickname;
private BizObj bizObj;
private Integer stationType;
/**
* 手机号

11
njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/service/OrderInfoService.java
View File

@ -126,6 +126,10 @@ public class OrderInfoService extends ServiceImpl<OrderInfoMapper, OrderInfoEnti
* 新增
*/
public void add(AddOrderInfoParam addOrderInfoParam, String orderSn) {
Long stationId = addOrderInfoParam.getStationId();
BizCompanyEntity stationInfo = bizCompanyService.getById(stationId);
Assert.notNull(stationInfo, () -> Exceptions.clierr("站点信息错误"));
Assert.isTrue(Integer.valueOf(1).equals(stationInfo.getStationType()), () -> Exceptions.clierr("系统暂未对接，预约失败"));
Assert.isFalse(this.exists(Wrappers.<OrderInfoEntity>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<OrderInfoMapper, OrderInfoEnti
Long orderId = orderInfoEntity.getId();
if (orderCategory == OrderCategory.DuanBoChu) {
Long stationId = addOrderInfoParam.getStationId();
Long targetStationId = addOrderInfoParam.getTargetStationId();
this.add(addOrderInfoParam.setOrderCategory(OrderCategory.DuanBoRu)
.setTargetOrderId(orderId)
@ -527,7 +530,7 @@ public class OrderInfoService extends ServiceImpl<OrderInfoMapper, OrderInfoEnti
ew
.in("a.order_status", OrderStatus.YiJieDan, OrderStatus.QingYunZhong, OrderStatus.YiJinChang, OrderStatus.YiChuChang, OrderStatus.YiWanCheng)
.and(it ->
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))
);
@ -1298,7 +1301,7 @@ public class OrderInfoService extends ServiceImpl<OrderInfoMapper, OrderInfoEnti
log.error("订单状态改变事件发布失败，订单{}，状态{}", orderInfoEntity_.getSn(), newOrderStatus, e);
return null;
});
CompletableFuture.runAsync(() -> {
/* CompletableFuture.runAsync(() -> {
OrderPagingResult detail = this.detail(orderId);
HsoaResult<?> result = hsoaService.pushProvincialSave(detail);
@ -1309,7 +1312,7 @@ public class OrderInfoService extends ServiceImpl<OrderInfoMapper, OrderInfoEnti
}).exceptionally(e -> {
log.error("推送订单数据失败，数据Id：{}", entity.getId(), e);
return null;
});
}); */
// 出厂付费
if (OrderCategory.PuTong.equals(orderInfoEntity.getOrderCategory()) && MoneyWay.OUT.getVal().equals(entity.getMoneyWay())) {

1
njzscloud-svr/src/main/resources/mapper/order/OrderInfoMapper.xml
View File

@ -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,