Merge remote-tracking branch 'origin/dev-new-houpn' into dev

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

@@ -93,7 +93,7 @@ public class OrderXd implements Serializable {
      */
     @ApiModelProperty("订单是否超时")
     @Column(name = "is_timeout")
-    private String timeout;
+    private Integer timeout;
 
     /**
      * 订单状态

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

@@ -73,7 +73,7 @@ public class OrderServiceImpl implements OrderService {
                     list.add(cb.like(kdOrderIdField, '%' + order.getKdOrderId() + '%'));
                 }
 
-                if (StrUtil.isNotBlank(order.getTimeout())) {
+                if (order.getTimeout() != null) {
                     list.add(cb.equal(timeoutField, order.getTimeout()));
                 }
 
@@ -127,6 +127,11 @@ public class OrderServiceImpl implements OrderService {
 
                 List<Predicate> list = new ArrayList<>();
 
+                //订单工编号应该为空
+                if(StrUtil.isNotBlank(order.getOrderByWorker())){
+                    list.add(cb.equal(orderByWorkerField,order.getOrderByWorker()));
+                }
+
                 //左关联--查询扛包工
                 if (StrUtil.isNotBlank(order.getOrderByWorker())) {
                     list.add((cb.equal(joinWorker.get("workerId"),orderByWorkerField)));
@@ -149,7 +154,7 @@ public class OrderServiceImpl implements OrderService {
                 }*/
 
 
-                if (StrUtil.isNotBlank(order.getTimeout())) {
+                if (order.getTimeout() != null) {
                     list.add(cb.equal(timeoutField, order.getTimeout()));
                 }
 
@@ -167,9 +172,6 @@ public class OrderServiceImpl implements OrderService {
                     list.add(cb.like(kdOrderIdField,  order.getKdOrderId()));
                 }
 
-                if (StrUtil.isNotBlank(order.getTimeout())) {
-                    list.add(cb.equal(timeoutField, order.getTimeout()));
-                }
                 // 创建时间
                 if (StrUtil.isNotBlank(searchVo.getStartDate()) && StrUtil.isNotBlank(searchVo.getEndDate())) {
                     Date start = DateUtil.parse(searchVo.getStartDate());
@@ -219,7 +221,7 @@ public class OrderServiceImpl implements OrderService {
                     list.add(cb.or(cb.isNull(orderByWorkerField),cb.equal(orderByWorkerField,order.getOrderByWorker())));
                 }
 
-                if (StrUtil.isNotBlank(order.getTimeout())) {
+                if (order.getTimeout() != null) {
                     list.add(cb.equal(timeoutField, order.getTimeout()));
                 }
 

hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/SalesOrderController.java

@@ -126,7 +126,7 @@ public class SalesOrderController {
             order.setOrderDescribe("");
             order.setOrderNum(num);
             order.setOrderStatus(1);
-            order.setTimeout("0");
+            order.setTimeout(2);
             order.setOrderBkge(0);
             order.setMobile(salesOrder.getConsigneeMobile());
             order.setRegion(salesOrderForm.getRegion());