From 56d68ac72380e3047df37adb6f6cbf3a52655eed Mon Sep 17 00:00:00 2001 From: ljw Date: Fri, 19 Dec 2025 17:14:28 +0800 Subject: [PATCH] 1 --- .../OrderExpenseDetailController.java | 70 --------- .../mapper/OrderExpenseDetailMapper.java | 15 -- .../pojo/entity/OrderCargoPlaceEntity.java | 4 +- .../pojo/entity/OrderExpenseDetailEntity.java | 99 ------------- .../pojo/param/CreateOrderParamEntity.java | 137 ++++++++++++++++++ .../service/OrderExpenseDetailService.java | 27 ---- .../impl/OrderExpenseDetailServiceImpl.java | 55 ------- .../cst/order/OrderCargoPlaceMapper.xml | 4 +- .../cst/order/OrderExpenseDetailMapper.xml | 31 ---- 9 files changed, 141 insertions(+), 301 deletions(-) delete mode 100644 njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/controller/OrderExpenseDetailController.java delete mode 100644 njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/mapper/OrderExpenseDetailMapper.java delete mode 100644 njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/pojo/entity/OrderExpenseDetailEntity.java create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/pojo/param/CreateOrderParamEntity.java delete mode 100644 njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/service/OrderExpenseDetailService.java delete mode 100644 njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/service/impl/OrderExpenseDetailServiceImpl.java delete mode 100644 njzscloud-svr/src/main/resources/mapper/cst/order/OrderExpenseDetailMapper.xml diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/controller/OrderExpenseDetailController.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/controller/OrderExpenseDetailController.java deleted file mode 100644 index 06127d8..0000000 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/controller/OrderExpenseDetailController.java +++ /dev/null @@ -1,70 +0,0 @@ -package com.njzscloud.dispose.cst.order.controller; - -import com.njzscloud.common.core.utils.R; -import com.njzscloud.common.mp.support.PageParam; -import com.njzscloud.common.mp.support.PageResult; -import com.njzscloud.dispose.cst.order.pojo.entity.OrderExpenseDetailEntity; -import com.njzscloud.dispose.cst.order.service.OrderExpenseDetailService; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -/** - * 收费明细 - * @author ljw - */ -@Slf4j -@RestController -@RequestMapping("/order_expense_detail") -@RequiredArgsConstructor -public class OrderExpenseDetailController { - - private final OrderExpenseDetailService orderExpenseDetailService; - - /** - * 新增 - */ - @PostMapping("/add") - public R add(@RequestBody OrderExpenseDetailEntity orderExpenseDetailEntity) { - orderExpenseDetailService.add(orderExpenseDetailEntity); - return R.success(); - } - - /** - * 修改 - */ - @PostMapping("/modify") - public R modify(@RequestBody OrderExpenseDetailEntity orderExpenseDetailEntity) { - orderExpenseDetailService.modify(orderExpenseDetailEntity); - return R.success(); - } - - /** - * 删除 - */ - @PostMapping("/del") - public R del(@RequestBody List ids) { - orderExpenseDetailService.del(ids); - return R.success(); - } - - /** - * 详情 - */ - @GetMapping("/detail") - public R detail(@RequestParam("id") Long id) { - return R.success(orderExpenseDetailService.detail(id)); - } - - /** - * 分页查询 - */ - @GetMapping("/paging") - public R> paging(PageParam pageParam, OrderExpenseDetailEntity orderExpenseDetailEntity) { - return R.success(orderExpenseDetailService.paging(pageParam, orderExpenseDetailEntity)); - } -} - - diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/mapper/OrderExpenseDetailMapper.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/mapper/OrderExpenseDetailMapper.java deleted file mode 100644 index 057611e..0000000 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/mapper/OrderExpenseDetailMapper.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.njzscloud.dispose.cst.order.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.njzscloud.dispose.cst.order.pojo.entity.OrderExpenseDetailEntity; -import org.apache.ibatis.annotations.Mapper; - -/** - * 收费明细 - * @author ljw - */ -@Mapper -public interface OrderExpenseDetailMapper extends BaseMapper { -} - - diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/pojo/entity/OrderCargoPlaceEntity.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/pojo/entity/OrderCargoPlaceEntity.java index ef93dfe..c1e1304 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/pojo/entity/OrderCargoPlaceEntity.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/pojo/entity/OrderCargoPlaceEntity.java @@ -24,9 +24,9 @@ public class OrderCargoPlaceEntity extends BaseEntity { private Long orderId; /** - * 装/卸货地址 + * 装/卸货，ZhuangHuo-->装货地址、XieHuo-->卸货地址 */ - private String cargoPlace; + private String zx; /** * 省；代码 diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/pojo/entity/OrderExpenseDetailEntity.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/pojo/entity/OrderExpenseDetailEntity.java deleted file mode 100644 index 277a835..0000000 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/pojo/entity/OrderExpenseDetailEntity.java +++ /dev/null @@ -1,99 +0,0 @@ -package com.njzscloud.dispose.cst.order.pojo.entity; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.njzscloud.dispose.common.pojo.entity.BaseEntity; -import lombok.Getter; -import lombok.Setter; -import lombok.ToString; -import lombok.experimental.Accessors; - -import java.math.BigDecimal; - -/** - * 收费明细 - * @author ljw - */ -@Getter -@Setter -@ToString -@Accessors(chain = true) -@TableName(value = "cst_order_expense_detail", autoResultMap = true) -public class OrderExpenseDetailEntity extends BaseEntity { - - /** - * 运输明细 Id - */ - private Long transId; - - /** - * 车次 - */ - private Integer trainNum; - - /** - * 量 - */ - private Integer quantity; - - /** - * 费用明细 Id - */ - private Long expenseItemId; - - /** - * 支付状态，MianFei-->免费、WeiZhiFu-->未支付、YiZhiFu-->已支付、YiTuiKuan-->已退款 - */ - private String paymentStatus; - - /** - * 支付时间 - */ - private BigDecimal payTime; - - /** - * 退款时间 - */ - private BigDecimal refundTime; - - /** - * 总金额；单位：元 - */ - private BigDecimal totalMoney; - - /** - * 优惠金额；单位：元，有正负 - */ - private BigDecimal discountMoney; - - /** - * 手动修正金额；单位：元，有正负 - */ - private BigDecimal reviseMoney; - - /** - * 结算金额；单位：元 - */ - private BigDecimal settleMoney; - - /** - * 结算方式，YueJie-->月结、YuE-->余额、XianFu-->现付 - */ - private String settlementWay; - - /** - * 付款人 Id；sys_user.id - */ - private Long payerUserId; - - /** - * 付款人客户 Id；cst_customer.id - */ - private Long payerCustomerId; - - /** - * 付款方资金账户 Id - */ - private Long payerMoneyAccount; -} - - diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/pojo/param/CreateOrderParamEntity.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/pojo/param/CreateOrderParamEntity.java new file mode 100644 index 0000000..353a5b9 --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/pojo/param/CreateOrderParamEntity.java @@ -0,0 +1,137 @@ +package com.njzscloud.dispose.cst.order.pojo.param; + +import com.njzscloud.dispose.common.pojo.entity.BaseEntity; +import com.njzscloud.dispose.cst.project.pojo.entity.ProjectEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.math.BigDecimal; +import java.time.LocalDateTime; + +/** + * 新建订单参数 + * + * @author ljw + */ + +@Data +@EqualsAndHashCode(callSuper = true) +public class CreateOrderParamEntity extends BaseEntity { + + /** + * 订单编号 + */ + private String sn; + + /** + * 项目 Id + */ + private Long projectId; + + /** + * 下单人 Id；sys_user.id + */ + private Long userId; + + /** + * 下单人客户 Id；cst_customer.id + */ + private Long customerId; + + /** + * 下单人姓名 + */ + private String contacts; + + /** + * 下单人联系方式 + */ + private String phone; + + /** + * 下单时间 + */ + private LocalDateTime orderTime; + + /** + * 订单类型；字典代码：order_category，HuiShouYuYue-->回收预约单、XiaoShouYuYue-->销售预约单、DuanBoRu-->短驳入、DuanBoChu-->短驳出 + */ + private String orderCategory; + + /** + * 订单状态；字典代码：order_status，YiYuYue-->已预约、JinXingZhong-->进行中、YiWanCheng-->已完成、YiQuXiao-->已取消 + */ + private String orderStatus; + + /** + * 完结时间 + */ + private LocalDateTime finishTime; + + /** + * 运输组织 Id；cst_org.id + */ + private Long transOrgId; + + /** + * 运输方客户 Id + */ + private Long transCustomerId; + + /** + * 指派清运公司时间 + */ + private BigDecimal assignmentTransTime; + + /** + * 站点 Id；cst_station.id + */ + private Long stationId; + + /** + * 站点名称；cst_station.station.name + */ + private String stationName; + + /** + * 运距；单位：米 + */ + private Integer transDistance; + + /** + * 预估量 + */ + private Integer estimatedQuantity; + + /** + * 预估车数 + */ + private Integer estimatedTrainNum; + + /** + * 产品 Id + */ + private Long goodsId; + + /** + * 产品名称 + */ + private String goodsName; + + /** + * 计量单位；字典代码：unit + */ + private String unit; + + /** + * 客户备注 + */ + private String customerMemo; + + /** + * 项目信息 + */ + private ProjectEntity projectInfo; +} + + diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/service/OrderExpenseDetailService.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/service/OrderExpenseDetailService.java deleted file mode 100644 index 27aa790..0000000 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/service/OrderExpenseDetailService.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.njzscloud.dispose.cst.order.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.njzscloud.common.mp.support.PageParam; -import com.njzscloud.common.mp.support.PageResult; -import com.njzscloud.dispose.cst.order.pojo.entity.OrderExpenseDetailEntity; - -import java.util.List; - -/** - * 收费明细 - * @author ljw - */ -public interface OrderExpenseDetailService extends IService { - - void add(OrderExpenseDetailEntity orderExpenseDetailEntity); - - void modify(OrderExpenseDetailEntity orderExpenseDetailEntity); - - void del(List ids); - - OrderExpenseDetailEntity detail(Long id); - - PageResult paging(PageParam pageParam, OrderExpenseDetailEntity orderExpenseDetailEntity); -} - - diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/service/impl/OrderExpenseDetailServiceImpl.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/service/impl/OrderExpenseDetailServiceImpl.java deleted file mode 100644 index 791c150..0000000 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/service/impl/OrderExpenseDetailServiceImpl.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.njzscloud.dispose.cst.order.service.impl; - -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.njzscloud.common.mp.support.PageParam; -import com.njzscloud.common.mp.support.PageResult; -import com.njzscloud.dispose.cst.order.mapper.OrderExpenseDetailMapper; -import com.njzscloud.dispose.cst.order.pojo.entity.OrderExpenseDetailEntity; -import com.njzscloud.dispose.cst.order.service.OrderExpenseDetailService; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.List; - -/** - * 收费明细 - * @author ljw - */ -@Slf4j -@Service -@RequiredArgsConstructor -public class OrderExpenseDetailServiceImpl extends ServiceImpl implements OrderExpenseDetailService { - - @Override - @Transactional(rollbackFor = Exception.class) - public void add(OrderExpenseDetailEntity orderExpenseDetailEntity) { - this.save(orderExpenseDetailEntity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void modify(OrderExpenseDetailEntity orderExpenseDetailEntity) { - this.updateById(orderExpenseDetailEntity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void del(List ids) { - this.removeBatchByIds(ids); - } - - @Override - public OrderExpenseDetailEntity detail(Long id) { - return this.getById(id); - } - - @Override - public PageResult paging(PageParam pageParam, OrderExpenseDetailEntity orderExpenseDetailEntity) { - return PageResult.of(this.page(pageParam.toPage(), Wrappers.query(orderExpenseDetailEntity))); - } -} - - diff --git a/njzscloud-svr/src/main/resources/mapper/cst/order/OrderCargoPlaceMapper.xml b/njzscloud-svr/src/main/resources/mapper/cst/order/OrderCargoPlaceMapper.xml index 636a261..b8dc9e9 100644 --- a/njzscloud-svr/src/main/resources/mapper/cst/order/OrderCargoPlaceMapper.xml +++ b/njzscloud-svr/src/main/resources/mapper/cst/order/OrderCargoPlaceMapper.xml @@ -5,7 +5,7 @@ - + @@ -25,7 +25,7 @@ - id, order_id, cargo_place, province, city, area, town, + id, order_id, zx, province, city, area, town, province_name, city_name, area_name, town_name, address, lng, lat, creator_id, modifier_id, create_time, modify_time, deleted diff --git a/njzscloud-svr/src/main/resources/mapper/cst/order/OrderExpenseDetailMapper.xml b/njzscloud-svr/src/main/resources/mapper/cst/order/OrderExpenseDetailMapper.xml deleted file mode 100644 index 713a043..0000000 --- a/njzscloud-svr/src/main/resources/mapper/cst/order/OrderExpenseDetailMapper.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -