diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/constant/OrderCategory.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/constant/OrderCategory.java new file mode 100644 index 0000000..198a077 --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/constant/OrderCategory.java @@ -0,0 +1,26 @@ +package com.njzscloud.dispose.cst.order.constant; + +import lombok.Getter; +import lombok.RequiredArgsConstructor; +import com.njzscloud.common.core.ienum.DictStr; +/** + * 字典代码：order_category + * 字典名称：订单类型 + * @author ljw + */ +@Getter +@RequiredArgsConstructor +public enum OrderCategory implements DictStr { + HuiShouYuYue("HuiShouYuYue", "回收预约单"), + + XiaoShouYuYue("XiaoShouYuYue", "销售预约单"), + + DuanBoRu("DuanBoRu", "短驳入"), + + DuanBoChu("DuanBoChu", "短驳出"), + + ; + private final String val; + + private final String txt; +} diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/constant/OrderStatus.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/constant/OrderStatus.java new file mode 100644 index 0000000..98a5ca5 --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/constant/OrderStatus.java @@ -0,0 +1,35 @@ +package com.njzscloud.dispose.cst.order.constant; + +import lombok.Getter; +import lombok.RequiredArgsConstructor; +import com.njzscloud.common.core.ienum.DictStr; +/** + * 字典代码：order_status + * 字典名称：订单状态 + * @author ljw + */ +@Getter +@RequiredArgsConstructor +public enum OrderStatus implements DictStr { + /** + * 未指派清运公司 + */ + YiYuYue("YiYuYue", "已预约"), + + JinXingZhong("JinXingZhong", "进行中"), + + /** + * 最终态，完成前要支付 + */ + YiWanCheng("YiWanCheng", "已完成"), + + /** + * 最终态，取消前要退款 + */ + YiQuXiao("YiQuXiao", "已取消"), + + ; + private final String val; + + private final String txt; +} diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/controller/OrderController.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/controller/OrderController.java new file mode 100644 index 0000000..3da4a86 --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/controller/OrderController.java @@ -0,0 +1,69 @@ +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.OrderEntity; +import com.njzscloud.dispose.cst.order.service.OrderService; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 收/销订单 + * @author ljw + */ +@Slf4j +@RestController +@RequestMapping("/order") +@RequiredArgsConstructor +public class OrderController { + + private final OrderService orderService; + + /** + * 新增 + */ + @PostMapping("/add") + public R add(@RequestBody OrderEntity orderEntity) { + orderService.add(orderEntity); + return R.success(); + } + + /** + * 修改 + */ + @PostMapping("/modify") + public R modify(@RequestBody OrderEntity orderEntity) { + orderService.modify(orderEntity); + return R.success(); + } + + /** + * 删除 + */ + @PostMapping("/del") + public R del(@RequestBody List ids) { + orderService.del(ids); + return R.success(); + } + + /** + * 详情 + */ + @GetMapping("/detail") + public R detail(@RequestParam("id") Long id) { + return R.success(orderService.detail(id)); + } + + /** + * 分页查询 + */ + @GetMapping("/paging") + public R> paging(PageParam pageParam, OrderEntity orderEntity) { + return R.success(orderService.paging(pageParam, orderEntity)); + } +} + diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/mapper/OrderMapper.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/mapper/OrderMapper.java new file mode 100644 index 0000000..8fd2e60 --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/mapper/OrderMapper.java @@ -0,0 +1,14 @@ +package com.njzscloud.dispose.cst.order.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.njzscloud.dispose.cst.order.pojo.entity.OrderEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 收/销订单 + * @author ljw + */ +@Mapper +public interface OrderMapper extends BaseMapper { +} + diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/pojo/entity/OrderEntity.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/pojo/entity/OrderEntity.java new file mode 100644 index 0000000..8abc8e6 --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/pojo/entity/OrderEntity.java @@ -0,0 +1,134 @@ +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; +import java.time.LocalDateTime; + +/** + * 收/销订单 + * @author ljw + */ +@Getter +@Setter +@ToString +@Accessors(chain = true) +@TableName("cst_order") +public class OrderEntity 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; +} + diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/service/OrderService.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/service/OrderService.java new file mode 100644 index 0000000..6b7390a --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/service/OrderService.java @@ -0,0 +1,26 @@ +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.OrderEntity; + +import java.util.List; + +/** + * 收/销订单 + * @author ljw + */ +public interface OrderService extends IService { + + void add(OrderEntity orderEntity); + + void modify(OrderEntity orderEntity); + + void del(List ids); + + OrderEntity detail(Long id); + + PageResult paging(PageParam pageParam, OrderEntity orderEntity); +} + diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/service/impl/OrderServiceImpl.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/service/impl/OrderServiceImpl.java new file mode 100644 index 0000000..8eab6ca --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/service/impl/OrderServiceImpl.java @@ -0,0 +1,54 @@ +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.OrderMapper; +import com.njzscloud.dispose.cst.order.pojo.entity.OrderEntity; +import com.njzscloud.dispose.cst.order.service.OrderService; +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 OrderServiceImpl extends ServiceImpl implements OrderService { + + @Override + @Transactional(rollbackFor = Exception.class) + public void add(OrderEntity orderEntity) { + this.save(orderEntity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void modify(OrderEntity orderEntity) { + this.updateById(orderEntity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void del(List ids) { + this.removeBatchByIds(ids); + } + + @Override + public OrderEntity detail(Long id) { + return this.getById(id); + } + + @Override + public PageResult paging(PageParam pageParam, OrderEntity orderEntity) { + return PageResult.of(this.page(pageParam.toPage(), Wrappers.query(orderEntity))); + } +} + diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/orderCargoPlace/controller/OrderCargoPlaceController.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/orderCargoPlace/controller/OrderCargoPlaceController.java new file mode 100644 index 0000000..a436f7e --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/orderCargoPlace/controller/OrderCargoPlaceController.java @@ -0,0 +1,69 @@ +package com.njzscloud.dispose.cst.orderCargoPlace.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.orderCargoPlace.pojo.entity.OrderCargoPlaceEntity; +import com.njzscloud.dispose.cst.orderCargoPlace.service.OrderCargoPlaceService; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 装/卸货地信息 + * @author ljw + */ +@Slf4j +@RestController +@RequestMapping("/order_cargo_place") +@RequiredArgsConstructor +public class OrderCargoPlaceController { + + private final OrderCargoPlaceService orderCargoPlaceService; + + /** + * 新增 + */ + @PostMapping("/add") + public R add(@RequestBody OrderCargoPlaceEntity orderCargoPlaceEntity) { + orderCargoPlaceService.add(orderCargoPlaceEntity); + return R.success(); + } + + /** + * 修改 + */ + @PostMapping("/modify") + public R modify(@RequestBody OrderCargoPlaceEntity orderCargoPlaceEntity) { + orderCargoPlaceService.modify(orderCargoPlaceEntity); + return R.success(); + } + + /** + * 删除 + */ + @PostMapping("/del") + public R del(@RequestBody List ids) { + orderCargoPlaceService.del(ids); + return R.success(); + } + + /** + * 详情 + */ + @GetMapping("/detail") + public R detail(@RequestParam("id") Long id) { + return R.success(orderCargoPlaceService.detail(id)); + } + + /** + * 分页查询 + */ + @GetMapping("/paging") + public R> paging(PageParam pageParam, OrderCargoPlaceEntity orderCargoPlaceEntity) { + return R.success(orderCargoPlaceService.paging(pageParam, orderCargoPlaceEntity)); + } +} + diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/orderCargoPlace/mapper/OrderCargoPlaceMapper.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/orderCargoPlace/mapper/OrderCargoPlaceMapper.java new file mode 100644 index 0000000..3940608 --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/orderCargoPlace/mapper/OrderCargoPlaceMapper.java @@ -0,0 +1,14 @@ +package com.njzscloud.dispose.cst.orderCargoPlace.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.njzscloud.dispose.cst.orderCargoPlace.pojo.entity.OrderCargoPlaceEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 装/卸货地信息 + * @author ljw + */ +@Mapper +public interface OrderCargoPlaceMapper extends BaseMapper { +} + diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/orderCargoPlace/pojo/entity/OrderCargoPlaceEntity.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/orderCargoPlace/pojo/entity/OrderCargoPlaceEntity.java new file mode 100644 index 0000000..d19d130 --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/orderCargoPlace/pojo/entity/OrderCargoPlaceEntity.java @@ -0,0 +1,86 @@ +package com.njzscloud.dispose.cst.orderCargoPlace.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; + +/** + * 装/卸货地信息 + * @author ljw + */ +@Getter +@Setter +@ToString +@Accessors(chain = true) +@TableName("cst_order_cargo_place") +public class OrderCargoPlaceEntity extends BaseEntity { + + /** + * 订单 Id + */ + private Long orderId; + + /** + * 装/卸货地址 + */ + private String cargoPlace; + + /** + * 省；代码 + */ + private String province; + + /** + * 市；代码 + */ + private String city; + + /** + * 区县；代码 + */ + private String area; + + /** + * 乡镇街道；代码 + */ + private String town; + + /** + * 省；名称 + */ + private String provinceName; + + /** + * 市；名称 + */ + private String cityName; + + /** + * 区县；名称 + */ + private String areaName; + + /** + * 乡镇街道；名称 + */ + private String townName; + + /** + * 详细地址 + */ + private String address; + + /** + * 经度 + */ + private Double lng; + + /** + * 纬度 + */ + private Double lat; +} + diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/orderCargoPlace/service/OrderCargoPlaceService.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/orderCargoPlace/service/OrderCargoPlaceService.java new file mode 100644 index 0000000..ed49c0d --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/orderCargoPlace/service/OrderCargoPlaceService.java @@ -0,0 +1,26 @@ +package com.njzscloud.dispose.cst.orderCargoPlace.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.orderCargoPlace.pojo.entity.OrderCargoPlaceEntity; + +import java.util.List; + +/** + * 装/卸货地信息 + * @author ljw + */ +public interface OrderCargoPlaceService extends IService { + + void add(OrderCargoPlaceEntity orderCargoPlaceEntity); + + void modify(OrderCargoPlaceEntity orderCargoPlaceEntity); + + void del(List ids); + + OrderCargoPlaceEntity detail(Long id); + + PageResult paging(PageParam pageParam, OrderCargoPlaceEntity orderCargoPlaceEntity); +} + diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/orderCargoPlace/service/impl/OrderCargoPlaceServiceImpl.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/orderCargoPlace/service/impl/OrderCargoPlaceServiceImpl.java new file mode 100644 index 0000000..c3f55f8 --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/orderCargoPlace/service/impl/OrderCargoPlaceServiceImpl.java @@ -0,0 +1,54 @@ +package com.njzscloud.dispose.cst.orderCargoPlace.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.orderCargoPlace.mapper.OrderCargoPlaceMapper; +import com.njzscloud.dispose.cst.orderCargoPlace.pojo.entity.OrderCargoPlaceEntity; +import com.njzscloud.dispose.cst.orderCargoPlace.service.OrderCargoPlaceService; +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 OrderCargoPlaceServiceImpl extends ServiceImpl implements OrderCargoPlaceService { + + @Override + @Transactional(rollbackFor = Exception.class) + public void add(OrderCargoPlaceEntity orderCargoPlaceEntity) { + this.save(orderCargoPlaceEntity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void modify(OrderCargoPlaceEntity orderCargoPlaceEntity) { + this.updateById(orderCargoPlaceEntity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void del(List ids) { + this.removeBatchByIds(ids); + } + + @Override + public OrderCargoPlaceEntity detail(Long id) { + return this.getById(id); + } + + @Override + public PageResult paging(PageParam pageParam, OrderCargoPlaceEntity orderCargoPlaceEntity) { + return PageResult.of(this.page(pageParam.toPage(), Wrappers.query(orderCargoPlaceEntity))); + } +} + diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/orderExpenseDetail/controller/OrderExpenseDetailController.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/orderExpenseDetail/controller/OrderExpenseDetailController.java new file mode 100644 index 0000000..96a7b23 --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/orderExpenseDetail/controller/OrderExpenseDetailController.java @@ -0,0 +1,69 @@ +package com.njzscloud.dispose.cst.orderExpenseDetail.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.orderExpenseDetail.pojo.entity.OrderExpenseDetailEntity; +import com.njzscloud.dispose.cst.orderExpenseDetail.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/orderExpenseDetail/mapper/OrderExpenseDetailMapper.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/orderExpenseDetail/mapper/OrderExpenseDetailMapper.java new file mode 100644 index 0000000..cdd74ad --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/orderExpenseDetail/mapper/OrderExpenseDetailMapper.java @@ -0,0 +1,14 @@ +package com.njzscloud.dispose.cst.orderExpenseDetail.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.njzscloud.dispose.cst.orderExpenseDetail.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/orderExpenseDetail/pojo/entity/OrderExpenseDetailEntity.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/orderExpenseDetail/pojo/entity/OrderExpenseDetailEntity.java new file mode 100644 index 0000000..14c6f01 --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/orderExpenseDetail/pojo/entity/OrderExpenseDetailEntity.java @@ -0,0 +1,98 @@ +package com.njzscloud.dispose.cst.orderExpenseDetail.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("cst_order_expense_detail") +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/orderExpenseDetail/service/OrderExpenseDetailService.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/orderExpenseDetail/service/OrderExpenseDetailService.java new file mode 100644 index 0000000..588a43c --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/orderExpenseDetail/service/OrderExpenseDetailService.java @@ -0,0 +1,26 @@ +package com.njzscloud.dispose.cst.orderExpenseDetail.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.orderExpenseDetail.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/orderExpenseDetail/service/impl/OrderExpenseDetailServiceImpl.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/orderExpenseDetail/service/impl/OrderExpenseDetailServiceImpl.java new file mode 100644 index 0000000..3305602 --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/orderExpenseDetail/service/impl/OrderExpenseDetailServiceImpl.java @@ -0,0 +1,54 @@ +package com.njzscloud.dispose.cst.orderExpenseDetail.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.orderExpenseDetail.mapper.OrderExpenseDetailMapper; +import com.njzscloud.dispose.cst.orderExpenseDetail.pojo.entity.OrderExpenseDetailEntity; +import com.njzscloud.dispose.cst.orderExpenseDetail.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/java/com/njzscloud/dispose/cst/orderExpenseItems/controller/OrderExpenseItemsController.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/orderExpenseItems/controller/OrderExpenseItemsController.java new file mode 100644 index 0000000..b2a30a4 --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/orderExpenseItems/controller/OrderExpenseItemsController.java @@ -0,0 +1,69 @@ +package com.njzscloud.dispose.cst.orderExpenseItems.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.orderExpenseItems.pojo.entity.OrderExpenseItemsEntity; +import com.njzscloud.dispose.cst.orderExpenseItems.service.OrderExpenseItemsService; +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_items") +@RequiredArgsConstructor +public class OrderExpenseItemsController { + + private final OrderExpenseItemsService orderExpenseItemsService; + + /** + * 新增 + */ + @PostMapping("/add") + public R add(@RequestBody OrderExpenseItemsEntity orderExpenseItemsEntity) { + orderExpenseItemsService.add(orderExpenseItemsEntity); + return R.success(); + } + + /** + * 修改 + */ + @PostMapping("/modify") + public R modify(@RequestBody OrderExpenseItemsEntity orderExpenseItemsEntity) { + orderExpenseItemsService.modify(orderExpenseItemsEntity); + return R.success(); + } + + /** + * 删除 + */ + @PostMapping("/del") + public R del(@RequestBody List ids) { + orderExpenseItemsService.del(ids); + return R.success(); + } + + /** + * 详情 + */ + @GetMapping("/detail") + public R detail(@RequestParam("id") Long id) { + return R.success(orderExpenseItemsService.detail(id)); + } + + /** + * 分页查询 + */ + @GetMapping("/paging") + public R> paging(PageParam pageParam, OrderExpenseItemsEntity orderExpenseItemsEntity) { + return R.success(orderExpenseItemsService.paging(pageParam, orderExpenseItemsEntity)); + } +} + diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/orderExpenseItems/mapper/OrderExpenseItemsMapper.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/orderExpenseItems/mapper/OrderExpenseItemsMapper.java new file mode 100644 index 0000000..ee55a2c --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/orderExpenseItems/mapper/OrderExpenseItemsMapper.java @@ -0,0 +1,14 @@ +package com.njzscloud.dispose.cst.orderExpenseItems.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.njzscloud.dispose.cst.orderExpenseItems.pojo.entity.OrderExpenseItemsEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 付费项 + * @author ljw + */ +@Mapper +public interface OrderExpenseItemsMapper extends BaseMapper { +} + diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/orderExpenseItems/pojo/entity/OrderExpenseItemsEntity.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/orderExpenseItems/pojo/entity/OrderExpenseItemsEntity.java new file mode 100644 index 0000000..f7b83c0 --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/orderExpenseItems/pojo/entity/OrderExpenseItemsEntity.java @@ -0,0 +1,102 @@ +package com.njzscloud.dispose.cst.orderExpenseItems.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("cst_order_expense_items") +public class OrderExpenseItemsEntity extends BaseEntity { + + /** + * 订单 Id + */ + private Long orderId; + + /** + * 收费项目类型，QiTa-->其他、ChanPin-->产品、YunFei-->运费 + */ + private String expenseItemCategory; + + /** + * 付费项名称 + */ + private String expenseItemName; + + /** + * 计费策略；字典代码：expense_strategy，MianFei-->免费、TanXing-->弹性、GuDing-->固定、Che-->车、Fang-->方、JuLi-->距离 + */ + private String expenseStrategy; + + /** + * 税率 + */ + private BigDecimal taxRate; + + /** + * 付费方；字典代码：payer，PingTai-->平台、ChanFei-->产废方、QingYun-->清运方、XiaoNa-->消纳方、CaiGou-->采购方 + */ + private String payer; + + /** + * 计量单位；字典代码：unit + */ + private String unit; + + /** + * 单价；单位：元，弹性模式-->每档价格 + */ + private BigDecimal unitPrice; + + /** + * 起步价；单位：元，<= 起步量 固定费用 + */ + private BigDecimal initialPrice; + + /** + * 起步量 + */ + private Integer initialQuantity; + + /** + * 每档的量 + */ + private Integer everyQuantity; + + /** + * 适用用户；结构类型：{ + * strategy: None | All | Specify, + * objs: long[] + * }，Wu-->无、ZhiDing-->指定、SuoYou-->所有 + */ + private String userScope; + + /** + * 适用站点；结构类型：{ + * strategy: None | All | Specify, + * objs: long[] + * }，Wu-->无、ZhiDing-->指定、SuoYou-->所有 + */ + private String stationScope; + + /** + * 适用产品；结构类型：{ + * strategy: None | All | Specify, + * objs: long[] + * }，Wu-->无、ZhiDing-->指定、SuoYou-->所有 + */ + private String goodsScope; +} + diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/orderExpenseItems/service/OrderExpenseItemsService.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/orderExpenseItems/service/OrderExpenseItemsService.java new file mode 100644 index 0000000..c0b5fea --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/orderExpenseItems/service/OrderExpenseItemsService.java @@ -0,0 +1,26 @@ +package com.njzscloud.dispose.cst.orderExpenseItems.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.orderExpenseItems.pojo.entity.OrderExpenseItemsEntity; + +import java.util.List; + +/** + * 付费项 + * @author ljw + */ +public interface OrderExpenseItemsService extends IService { + + void add(OrderExpenseItemsEntity orderExpenseItemsEntity); + + void modify(OrderExpenseItemsEntity orderExpenseItemsEntity); + + void del(List ids); + + OrderExpenseItemsEntity detail(Long id); + + PageResult paging(PageParam pageParam, OrderExpenseItemsEntity orderExpenseItemsEntity); +} + diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/orderExpenseItems/service/impl/OrderExpenseItemsServiceImpl.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/orderExpenseItems/service/impl/OrderExpenseItemsServiceImpl.java new file mode 100644 index 0000000..1d9a888 --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/orderExpenseItems/service/impl/OrderExpenseItemsServiceImpl.java @@ -0,0 +1,54 @@ +package com.njzscloud.dispose.cst.orderExpenseItems.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.orderExpenseItems.mapper.OrderExpenseItemsMapper; +import com.njzscloud.dispose.cst.orderExpenseItems.pojo.entity.OrderExpenseItemsEntity; +import com.njzscloud.dispose.cst.orderExpenseItems.service.OrderExpenseItemsService; +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 OrderExpenseItemsServiceImpl extends ServiceImpl implements OrderExpenseItemsService { + + @Override + @Transactional(rollbackFor = Exception.class) + public void add(OrderExpenseItemsEntity orderExpenseItemsEntity) { + this.save(orderExpenseItemsEntity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void modify(OrderExpenseItemsEntity orderExpenseItemsEntity) { + this.updateById(orderExpenseItemsEntity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void del(List ids) { + this.removeBatchByIds(ids); + } + + @Override + public OrderExpenseItemsEntity detail(Long id) { + return this.getById(id); + } + + @Override + public PageResult paging(PageParam pageParam, OrderExpenseItemsEntity orderExpenseItemsEntity) { + return PageResult.of(this.page(pageParam.toPage(), Wrappers.query(orderExpenseItemsEntity))); + } +} + diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/orderTrans/controller/OrderTransController.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/orderTrans/controller/OrderTransController.java new file mode 100644 index 0000000..17d4b13 --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/orderTrans/controller/OrderTransController.java @@ -0,0 +1,69 @@ +package com.njzscloud.dispose.cst.orderTrans.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.orderTrans.pojo.entity.OrderTransEntity; +import com.njzscloud.dispose.cst.orderTrans.service.OrderTransService; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 运输信息 + * @author ljw + */ +@Slf4j +@RestController +@RequestMapping("/order_trans") +@RequiredArgsConstructor +public class OrderTransController { + + private final OrderTransService orderTransService; + + /** + * 新增 + */ + @PostMapping("/add") + public R add(@RequestBody OrderTransEntity orderTransEntity) { + orderTransService.add(orderTransEntity); + return R.success(); + } + + /** + * 修改 + */ + @PostMapping("/modify") + public R modify(@RequestBody OrderTransEntity orderTransEntity) { + orderTransService.modify(orderTransEntity); + return R.success(); + } + + /** + * 删除 + */ + @PostMapping("/del") + public R del(@RequestBody List ids) { + orderTransService.del(ids); + return R.success(); + } + + /** + * 详情 + */ + @GetMapping("/detail") + public R detail(@RequestParam("id") Long id) { + return R.success(orderTransService.detail(id)); + } + + /** + * 分页查询 + */ + @GetMapping("/paging") + public R> paging(PageParam pageParam, OrderTransEntity orderTransEntity) { + return R.success(orderTransService.paging(pageParam, orderTransEntity)); + } +} + diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/orderTrans/mapper/OrderTransMapper.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/orderTrans/mapper/OrderTransMapper.java new file mode 100644 index 0000000..ba0731c --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/orderTrans/mapper/OrderTransMapper.java @@ -0,0 +1,14 @@ +package com.njzscloud.dispose.cst.orderTrans.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.njzscloud.dispose.cst.orderTrans.pojo.entity.OrderTransEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 运输信息 + * @author ljw + */ +@Mapper +public interface OrderTransMapper extends BaseMapper { +} + diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/orderTrans/pojo/entity/OrderTransEntity.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/orderTrans/pojo/entity/OrderTransEntity.java new file mode 100644 index 0000000..736feee --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/orderTrans/pojo/entity/OrderTransEntity.java @@ -0,0 +1,183 @@ +package com.njzscloud.dispose.cst.orderTrans.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.time.LocalDateTime; + +/** + * 运输信息 + * @author ljw + */ +@Getter +@Setter +@ToString +@Accessors(chain = true) +@TableName("cst_order_trans") +public class OrderTransEntity extends BaseEntity { + + /** + * 车次 + */ + private Integer trainNum; + + /** + * 订单 Id + */ + private Long orderId; + + /** + * 站点 Id + */ + private Long stationId; + + /** + * 运输状态；字典代码：trans_status，DaiPaiDan-->待派单、DaiJieDan-->待接单、YiJieDan-->已接单、YunShuZhong-->运输中、YiJinChang-->已进场、YiChuChang-->已出场、YiWanCheng-->已完成、YiQuXiao-->已取消 + */ + private String transStatus; + + /** + * 车道名称 + */ + private String lane; + + /** + * 指派司机时间 + */ + private LocalDateTime assignmentDriverTime; + + /** + * 司机确认接单时间 + */ + private LocalDateTime driverConfirmTime; + + /** + * 开始运输时间 + */ + private LocalDateTime transTime; + + /** + * 完结时间 + */ + private LocalDateTime finishTime; + + /** + * 看料员 Id；sys_user.id + */ + private Long checkerId; + + /** + * 勘料状态；字典代码：check_status，Wu-->无需勘料、YiKanLiao-->已勘料、WeiKanLiao-->未勘料 + */ + private String checkStatus; + + /** + * 勘料时间 + */ + private LocalDateTime checkTime; + + /** + * 勘料照片 + */ + private String checkPhoto; + + /** + * 勘料员备注 + */ + private String checkerMemo; + + /** + * 司机 Id + */ + private Long driverId; + + /** + * 司机所属客户 Id；cst_customer.id + */ + private Long driverCustomerId; + + /** + * 司机所属用户 Id + */ + private Long driverUserId; + + /** + * 归属客户 Id；cst_customer.id + */ + private Long truckCustomerId; + + /** + * 归属组织 + */ + private Long truckOrgId; + + /** + * 车辆 Id + */ + private Long truckId; + + /** + * 车牌号 + */ + private String truckLicensePlate; + + /** + * 历史皮重 + */ + private Integer historyTareWeight; + + /** + * 毛重；单位：千克 + */ + private Integer roughWeight; + + /** + * 皮重；单位：千克 + */ + private Integer tareWeight; + + /** + * 净重；单位：千克 + */ + private Integer settleWeight; + + /** + * 运距；单位：米 + */ + private Integer transDistance; + + /** + * 进场车头照片 + */ + private String inFrontPhoto; + + /** + * 进场车斗照片 + */ + private String inBodyPhoto; + + /** + * 出场车头照片 + */ + private String outFrontPhoto; + + /** + * 出场车斗照片 + */ + private String outBodyPhoto; + + /** + * 进场时间 + */ + private LocalDateTime inTime; + + /** + * 出场时间 + */ + private LocalDateTime outTime; +} + diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/orderTrans/service/OrderTransService.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/orderTrans/service/OrderTransService.java new file mode 100644 index 0000000..7a6dedf --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/orderTrans/service/OrderTransService.java @@ -0,0 +1,26 @@ +package com.njzscloud.dispose.cst.orderTrans.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.orderTrans.pojo.entity.OrderTransEntity; + +import java.util.List; + +/** + * 运输信息 + * @author ljw + */ +public interface OrderTransService extends IService { + + void add(OrderTransEntity orderTransEntity); + + void modify(OrderTransEntity orderTransEntity); + + void del(List ids); + + OrderTransEntity detail(Long id); + + PageResult paging(PageParam pageParam, OrderTransEntity orderTransEntity); +} + diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/orderTrans/service/impl/OrderTransServiceImpl.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/orderTrans/service/impl/OrderTransServiceImpl.java new file mode 100644 index 0000000..1cd11a9 --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/orderTrans/service/impl/OrderTransServiceImpl.java @@ -0,0 +1,54 @@ +package com.njzscloud.dispose.cst.orderTrans.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.orderTrans.mapper.OrderTransMapper; +import com.njzscloud.dispose.cst.orderTrans.pojo.entity.OrderTransEntity; +import com.njzscloud.dispose.cst.orderTrans.service.OrderTransService; +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 OrderTransServiceImpl extends ServiceImpl implements OrderTransService { + + @Override + @Transactional(rollbackFor = Exception.class) + public void add(OrderTransEntity orderTransEntity) { + this.save(orderTransEntity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void modify(OrderTransEntity orderTransEntity) { + this.updateById(orderTransEntity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void del(List ids) { + this.removeBatchByIds(ids); + } + + @Override + public OrderTransEntity detail(Long id) { + return this.getById(id); + } + + @Override + public PageResult paging(PageParam pageParam, OrderTransEntity orderTransEntity) { + return PageResult.of(this.page(pageParam.toPage(), Wrappers.query(orderTransEntity))); + } +} + diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/truck/controller/TruckController.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/truck/controller/TruckController.java index cf4bd50..7dafe2c 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/truck/controller/TruckController.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/truck/controller/TruckController.java @@ -46,7 +46,7 @@ public class TruckController { */ @PostMapping("/del") public R del(@RequestBody DelTruckParam param) { - truckService.del(param.getIds(), param.getManager(), param.getCustomerId()); + truckService.del(param.getIds(), param.getManager()); return R.success(); } diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/truck/pojo/param/DelTruckParam.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/truck/pojo/param/DelTruckParam.java index acd436b..ff64540 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/truck/pojo/param/DelTruckParam.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/truck/pojo/param/DelTruckParam.java @@ -24,10 +24,6 @@ public class DelTruckParam { */ private Boolean manager; - /** - * 客户ID - */ - private Long customerId; } diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/truck/service/TruckService.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/truck/service/TruckService.java index 3935196..c78afd0 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/truck/service/TruckService.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/truck/service/TruckService.java @@ -17,7 +17,7 @@ public interface TruckService extends IService { void modify(TruckEntity truckEntity); - void del(List ids, Boolean manager, Long customerId); + void del(List ids, Boolean manager); TruckEntity detail(Long id); diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/truck/service/impl/TruckServiceImpl.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/truck/service/impl/TruckServiceImpl.java index 15aa419..93eed1b 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/truck/service/impl/TruckServiceImpl.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/truck/service/impl/TruckServiceImpl.java @@ -8,6 +8,7 @@ import com.njzscloud.common.security.util.SecurityUtil; import com.njzscloud.dispose.cst.truck.mapper.TruckMapper; import com.njzscloud.dispose.cst.truck.pojo.entity.TruckEntity; import com.njzscloud.dispose.cst.truck.service.TruckService; +import com.njzscloud.dispose.sys.auth.pojo.result.MyResult; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -33,12 +34,10 @@ public class TruckServiceImpl extends ServiceImpl impl @Override public void modify(TruckEntity truckEntity) { if (!SecurityUtil.isAdmin()) { - // id和customerId必传 - if (truckEntity.getId() == null || truckEntity.getCustomerId() == null) { - throw new RuntimeException("id和customerId必传"); - } TruckEntity old = this.getById(truckEntity.getId()); - if (truckEntity.getCustomerId().equals(old.getCustomerId())) { + MyResult userDetail = SecurityUtil.loginUser(); + Long customerId = userDetail.getCurrentCustomerId(); + if (customerId.equals(old.getCustomerId())) { // 传参customerId与旧数据customerId一致，说明是修改自己名下的车辆，允许修改 this.updateById(truckEntity); } else { @@ -51,11 +50,13 @@ public class TruckServiceImpl extends ServiceImpl impl @Override @Transactional(rollbackFor = Exception.class) - public void del(List ids, Boolean manager, Long customerId) { + public void del(List ids, Boolean manager) { if (!SecurityUtil.isAdmin()) { + MyResult userDetail = SecurityUtil.loginUser(); + Long customerId = userDetail.getCurrentCustomerId(); // id和customerId必传 - if (manager == null || customerId == null) { - throw new RuntimeException("manager和customerId必传"); + if (manager == null) { + throw new RuntimeException("manager必传"); } // 只能删除自己名下车辆 List trucks = this.listByIds(ids); diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/goods/service/impl/GoodsServiceImpl.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/goods/service/impl/GoodsServiceImpl.java index b6e2902..4d2aa61 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/goods/service/impl/GoodsServiceImpl.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/goods/service/impl/GoodsServiceImpl.java @@ -1,6 +1,7 @@ package com.njzscloud.dispose.goods.goods.service.impl; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njzscloud.common.mp.support.PageParam; import com.njzscloud.common.mp.support.PageResult; @@ -19,6 +20,7 @@ import java.util.List; /** * 产品 + * * @author ljw */ @Slf4j @@ -60,12 +62,20 @@ public class GoodsServiceImpl extends ServiceImpl impl @Override public GoodsEntity detail(Long id) { + GoodsEntity goodsEntity = this.getById(id); + goodsEntity.setExpenseItem(expenseItemService.getOne(Wrappers.lambdaQuery() + .eq(ExpenseItemEntity::getGoodsId, id))); return this.getById(id); } @Override public PageResult paging(PageParam pageParam, GoodsEntity goodsEntity) { - return PageResult.of(this.page(pageParam.toPage(), Wrappers.query(goodsEntity))); + Page page = this.page(pageParam.toPage(), Wrappers.query(goodsEntity)); + for (GoodsEntity goods : page.getRecords()) { + goods.setExpenseItem(expenseItemService.getOne(Wrappers.lambdaQuery() + .eq(ExpenseItemEntity::getGoodsId, goods.getId()))); + } + return PageResult.of(page); } } diff --git a/njzscloud-svr/src/main/resources/mapper/cst/order/OrderMapper.xml b/njzscloud-svr/src/main/resources/mapper/cst/order/OrderMapper.xml new file mode 100644 index 0000000..04ec4fb --- /dev/null +++ b/njzscloud-svr/src/main/resources/mapper/cst/order/OrderMapper.xml @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, sn, project_id, user_id, customer_id, contacts, phone, order_time, + order_category, order_status, finish_time, trans_org_id, trans_customer_id, + assignment_trans_time, station_id, station_name, trans_distance, + estimated_quantity, estimated_train_num, goods_id, goods_name, unit, + customer_memo, creator_id, modifier_id, create_time, modify_time, deleted + + + + + + + + diff --git a/njzscloud-svr/src/main/resources/mapper/cst/orderCargoPlace/OrderCargoPlaceMapper.xml b/njzscloud-svr/src/main/resources/mapper/cst/orderCargoPlace/OrderCargoPlaceMapper.xml new file mode 100644 index 0000000..75560d7 --- /dev/null +++ b/njzscloud-svr/src/main/resources/mapper/cst/orderCargoPlace/OrderCargoPlaceMapper.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_id, cargo_place, 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/orderExpenseDetail/OrderExpenseDetailMapper.xml b/njzscloud-svr/src/main/resources/mapper/cst/orderExpenseDetail/OrderExpenseDetailMapper.xml new file mode 100644 index 0000000..ab61bba --- /dev/null +++ b/njzscloud-svr/src/main/resources/mapper/cst/orderExpenseDetail/OrderExpenseDetailMapper.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/njzscloud-svr/src/main/resources/mapper/cst/orderExpenseItems/OrderExpenseItemsMapper.xml b/njzscloud-svr/src/main/resources/mapper/cst/orderExpenseItems/OrderExpenseItemsMapper.xml new file mode 100644 index 0000000..ee831a6 --- /dev/null +++ b/njzscloud-svr/src/main/resources/mapper/cst/orderExpenseItems/OrderExpenseItemsMapper.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_id, expense_item_category, expense_item_name, expense_strategy, + tax_rate, payer, unit, unit_price, initial_price, initial_quantity, + every_quantity, user_scope, station_scope, goods_scope, + creator_id, modifier_id, create_time, modify_time, deleted + + + + diff --git a/njzscloud-svr/src/main/resources/mapper/cst/orderTrans/OrderTransMapper.xml b/njzscloud-svr/src/main/resources/mapper/cst/orderTrans/OrderTransMapper.xml new file mode 100644 index 0000000..f7dde3e --- /dev/null +++ b/njzscloud-svr/src/main/resources/mapper/cst/orderTrans/OrderTransMapper.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, train_num, order_id, station_id, trans_status, lane, + assignment_driver_time, driver_confirm_time, trans_time, finish_time, + checker_id, check_status, check_time, check_photo, checker_memo, + driver_id, driver_customer_id, driver_user_id, truck_customer_id, + truck_org_id, truck_id, truck_license_plate, history_tare_weight, + rough_weight, tare_weight, settle_weight, trans_distance, + in_front_photo, in_body_photo, out_front_photo, out_body_photo, + in_time, out_time, creator_id, modifier_id, create_time, modify_time, deleted + + + +