更新物流管理模块

hiver-core/src/main/java/cc/hiver/core/dao/OrderDao.java

@@ -1,7 +1,7 @@
 package cc.hiver.core.dao;
 
 import cc.hiver.core.base.HiverBaseDao;
-import cc.hiver.core.entity.Order;
+import cc.hiver.core.entity.OrderXd;
 
 
 /**
@@ -9,8 +9,8 @@ import cc.hiver.core.entity.Order;
  *
  * @author Houpn
  */
-public interface OrderDao extends HiverBaseDao<Order, String> {
+public interface OrderDao extends HiverBaseDao<OrderXd, String> {
 
-    Order findByOrderId(String orderId);
+    OrderXd findByOrderId(String orderId);
 
 }

hiver-core/src/main/java/cc/hiver/core/entity/Order.java → hiver-core/src/main/java/cc/hiver/core/entity/OrderXd.java

@@ -10,7 +10,6 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
@@ -38,7 +37,7 @@ import java.util.Date;
 @ApiModel(value = "下单")
 @EntityListeners(AuditingEntityListener.class)
 @JsonIgnoreProperties(value = {"hibernateLazyInitializer", "handler", "fieldHandler"})
-public class Order implements Serializable {
+public class OrderXd implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -158,8 +157,8 @@ public class Order implements Serializable {
      * 关联订单工
      */
     @ManyToOne(targetEntity = Worker.class)
-    @NotFound(action= NotFoundAction.IGNORE)
     @JoinColumn(name="order_by_worker",insertable=false, updatable=false)
     private Worker worker;
 
+
 }

hiver-core/src/main/java/cc/hiver/core/entity/Worker.java

@@ -9,7 +9,6 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
@@ -23,7 +22,6 @@ import org.springframework.format.annotation.DateTimeFormat;
 import javax.persistence.*;
 import java.io.Serializable;
 import java.util.Date;
-import java.util.List;
 
 @Data
 @Entity

hiver-core/src/main/java/cc/hiver/core/service/OrderService.java

@@ -2,20 +2,18 @@ package cc.hiver.core.service;
 
 import cc.hiver.core.base.HiverBaseService;
 import cc.hiver.core.common.vo.SearchVo;
-import cc.hiver.core.entity.Order;
+import cc.hiver.core.entity.OrderXd;
 import org.springframework.cache.annotation.CacheConfig;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 
-import java.util.List;
-
 /**
  * 用户接口
  *
  * @author Houpn
  */
-@CacheConfig(cacheNames = "order")
-public interface OrderService extends HiverBaseService<Order, String> {
+@CacheConfig(cacheNames = "orderxd")
+public interface OrderService extends HiverBaseService<OrderXd, String> {
 
     /**
      * 多条件分页获取用户
@@ -25,11 +23,11 @@ public interface OrderService extends HiverBaseService<Order, String> {
      * @param pageable
      * @return
      */
-    Page<Order> findByCondition(Order order, SearchVo searchVo, Pageable pageable);
+    Page<OrderXd> findByCondition(OrderXd order, SearchVo searchVo, Pageable pageable);
 
-    Order findByOrderId(String orderId);
+    OrderXd findByOrderId(String orderId);
 
-    Page<Order> findAllByCondition(Order order, SearchVo searchVo, Pageable pageable);
+    Page<OrderXd> findAllByCondition(OrderXd order, SearchVo searchVo, Pageable pageable);
 
 
 }

hiver-core/src/main/java/cc/hiver/core/service/WorkerService.java

@@ -2,7 +2,6 @@ package cc.hiver.core.service;
 
 import cc.hiver.core.base.HiverBaseService;
 import cc.hiver.core.common.vo.SearchVo;
-import cc.hiver.core.entity.Order;
 import cc.hiver.core.entity.Worker;
 import org.springframework.cache.annotation.CacheConfig;
 import org.springframework.data.domain.Page;

hiver-core/src/main/java/cc/hiver/core/serviceimpl/OrderServiceImpl.java

@@ -3,9 +3,8 @@ package cc.hiver.core.serviceimpl;
 import cc.hiver.core.common.utils.SecurityUtil;
 import cc.hiver.core.common.vo.SearchVo;
 import cc.hiver.core.dao.OrderDao;
-import cc.hiver.core.entity.Order;
 
-import cc.hiver.core.entity.User;
+import cc.hiver.core.entity.OrderXd;
 import cc.hiver.core.service.OrderService;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
@@ -45,15 +44,15 @@ public class OrderServiceImpl implements OrderService {
     }
 
     @Override
-    public Page<Order> findByCondition(Order order, SearchVo searchVo, Pageable pageable) {
-        return orderDao.findAll(new Specification<Order>() {
+    public Page<OrderXd> findByCondition(OrderXd order, SearchVo searchVo, Pageable pageable) {
+        return orderDao.findAll(new Specification<OrderXd>() {
             @Nullable
             @Override
-            public Predicate toPredicate(Root<Order> root, CriteriaQuery<?> cq, CriteriaBuilder cb) {
+            public Predicate toPredicate(Root<OrderXd> root, CriteriaQuery<?> cq, CriteriaBuilder cb) {
                 Path<String> OrderIdField = root.get("orderId");
                 Path<String> norderLogisticsField = root.get("orderLogistics");
                 Path<String> kdOrderIdField = root.get("kdOrderId");
-                Path<Boolean> timeoutField = root.get("timeout");
+                Path<String> timeoutField = root.get("timeout");
                 Path<Integer> orderStatusdField = root.get("orderStatus");
                 Path<String> orderByWorkerField = root.get("orderByWorker");
                 Path<Date> createTimeField = root.get("createTime");
@@ -72,7 +71,9 @@ public class OrderServiceImpl implements OrderService {
                     list.add(cb.like(kdOrderIdField, '%' + order.getKdOrderId() + '%'));
                 }
 
-                //list.add(cb.equal(timeoutField, order.getTimeout()));
+                if (StrUtil.isNotBlank(order.getTimeout())) {
+                    list.add(cb.equal(timeoutField, order.getTimeout()));
+                }
 
                 // 状态
                 if (order.getOrderStatus() != null) {
@@ -99,17 +100,17 @@ public class OrderServiceImpl implements OrderService {
     }
 
     @Override
-    public Order findByOrderId(String orderId) {
+    public OrderXd findByOrderId(String orderId) {
         return orderDao.findByOrderId(orderId);
     }
 
     @Override
-    public Page<Order> findAllByCondition(Order order, SearchVo searchVo, Pageable pageable) {
-        return orderDao.findAll(new Specification<Order>() {
+    public Page<OrderXd> findAllByCondition(OrderXd order, SearchVo searchVo, Pageable pageable) {
+        return orderDao.findAll(new Specification<OrderXd>() {
             @Nullable
             @Override
-            public Predicate toPredicate(Root<Order> root, CriteriaQuery<?> cq, CriteriaBuilder cb) {
-                Path<String> OrderIdField = root.get("orderId");
+            public Predicate toPredicate(Root<OrderXd> root, CriteriaQuery<?> cq, CriteriaBuilder cb) {
+                Path<String> orderIdField = root.get("orderId");
                 Path<String> norderLogisticsField = root.get("orderLogistics");
                 Path<String> kdOrderIdField = root.get("kdOrderId");
                 Path<String> timeoutField = root.get("timeout");
@@ -121,7 +122,7 @@ public class OrderServiceImpl implements OrderService {
                 List<Predicate> list = new ArrayList<>();
 
                 if (StrUtil.isNotBlank(order.getOrderId())) {
-                    list.add(cb.equal(OrderIdField, order.getOrderId()));
+                    list.add(cb.equal(orderIdField, order.getOrderId()));
                 }
 
                 // 精确搜索

hiver-modules/hiver-base/src/main/java/cc/hiver/base/controller/manage/OrderController.java

@@ -45,10 +45,10 @@ import java.util.stream.Collectors;
 @RestController
 @Api(tags = "订单接口")
 @RequestMapping("/hiver/order")
-@CacheConfig(cacheNames = "order")
+@CacheConfig(cacheNames = "orderxd")
 @Transactional
 public class OrderController {
-    public static final String ORDER = "order::";
+    public static final String ORDER = "orderxd::";
 
     @Autowired
     private OrderService orderService;
@@ -71,11 +71,11 @@ public class OrderController {
      */
     @RequestMapping(value = "/getByCondition", method = RequestMethod.GET)
     @ApiOperation(value = "多条件分页获取订单列表")
-    public Result<Page<Order>> getByCondition(Order order,
+    public Result<Page<OrderXd>> getByCondition(OrderXd order,
                                              SearchVo searchVo,
                                              PageVo pageVo) {
-        Page<Order> page = orderService.findByCondition(order, searchVo, PageUtil.initPage(pageVo));
-        return new ResultUtil<Page<Order>>().setData(page);
+        Page<OrderXd> page = orderService.findByCondition(order, searchVo, PageUtil.initPage(pageVo));
+        return new ResultUtil<Page<OrderXd>>().setData(page);
     }
 
 
@@ -91,10 +91,10 @@ public class OrderController {
 
     @RequestMapping(value = "/admin/add", method = RequestMethod.POST)
     @ApiOperation(value = "创建订单")
-    public Result add(@Valid Order u,
+    public Result add(@Valid OrderXd u,
                       @RequestParam(required = false) String[] roleIds) {
 
-        Order order = orderService.save(u);
+        OrderXd order = orderService.save(u);
 
         // 发送创建账号消息
         //addMessage.addSendMessage(user.getId());
@@ -103,7 +103,7 @@ public class OrderController {
 
     @RequestMapping(value = "/admin/edit", method = RequestMethod.POST)
     @ApiOperation(value = "修改订单", notes = "需要通过下单编号获取订单信息")
-    public Result edit(Order u,
+    public Result edit(OrderXd u,
                        @RequestParam(required = false) String[] roleIds) {
 
         orderService.update(u);
@@ -120,7 +120,7 @@ public class OrderController {
      */
     @RequestMapping(value = "/rush/order/{orderId}", method = RequestMethod.POST)
     @ApiOperation(value = "抢单接口", notes = "需要通过下单编号获取订单信息后进行绑定")
-    public Result rush(Order u,
+    public Result rush(OrderXd u,
                        @RequestParam(required = false) String[] roleIds) {
 
 
@@ -137,10 +137,10 @@ public class OrderController {
      */
     @RequestMapping(value = "/unbind/order/{orderId}", method = RequestMethod.POST)
     @ApiOperation(value = "解绑订单接口", notes = "需要通过下单编号获取订单信息后进行解绑")
-    public Result revoke(Order u,
+    public Result revoke(OrderXd u,
                          @ApiParam("订单唯一id标识") @PathVariable String orderId) {
 
-        Order o = orderService.findById(orderId);
+        OrderXd o = orderService.findById(orderId);
 
         o.setOrderByWorker("");
         o.setOrderByWorkertime(null);
@@ -156,11 +156,11 @@ public class OrderController {
      */
     @RequestMapping(value = "/ow/getAllByCondition", method = RequestMethod.GET)
     @ApiOperation(value = "多条件分页获取订单列表")
-    public Result<Page<Order>> getAllByCondition(Order order,
+    public Result<Page<OrderXd>> getAllByCondition(OrderXd order,
                                               SearchVo searchVo,
                                               PageVo pageVo) {
-        Page<Order> page = orderService.findAllByCondition(order, searchVo, PageUtil.initPage(pageVo));
-        return new ResultUtil<Page<Order>>().setData(page);
+        Page<OrderXd> page = orderService.findAllByCondition(order, searchVo, PageUtil.initPage(pageVo));
+        return new ResultUtil<Page<OrderXd>>().setData(page);
     }
 
 }