diff --git a/ils-sales-api/src/main/java/com/unlcn/ils/sales/api/query/OrderQuery.java b/ils-sales-api/src/main/java/com/unlcn/ils/sales/api/query/OrderQuery.java
index 3352b8d7e6d8a365c6d6fbe70b7b352daa42dabe..2fa840f4629cbc37b0ce79791ce50a1f8752fa64 100644
--- a/ils-sales-api/src/main/java/com/unlcn/ils/sales/api/query/OrderQuery.java
+++ b/ils-sales-api/src/main/java/com/unlcn/ils/sales/api/query/OrderQuery.java
@@ -37,6 +37,9 @@ public class OrderQuery {
// 支付状态
@ApiModelProperty(value = "支付状态")
private Integer payStatus;
+ // 附件审核状态
+ @ApiModelProperty(value = "附件审核状态")
+ private Integer attachAuditStatus;
public String getCode() {
return code;
@@ -110,6 +113,14 @@ public class OrderQuery {
this.payStatus = payStatus;
}
+ public Integer getAttachAuditStatus() {
+ return attachAuditStatus;
+ }
+
+ public void setAttachAuditStatus(Integer attachAuditStatus) {
+ this.attachAuditStatus = attachAuditStatus;
+ }
+
@Override
public String toString() {
return "OrderQuery{" +
@@ -121,7 +132,8 @@ public class OrderQuery {
", pickDateBegin=" + pickDateBegin +
", pickDateEnd=" + pickDateEnd +
", auditStatus='" + auditStatus + '\'' +
- ", payStatus='" + payStatus + '\'' +
+ ", payStatus=" + payStatus +
+ ", attachAuditStatus=" + attachAuditStatus +
'}';
}
}
diff --git a/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/bo/OrderQueryBO.java b/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/bo/OrderQueryBO.java
index 0d0b46e003dbd0cd4c157fd29e7d116ec6161075..73d7d1aebcc8ad2a691740d8ac7332870aae67ae 100644
--- a/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/bo/OrderQueryBO.java
+++ b/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/bo/OrderQueryBO.java
@@ -26,6 +26,8 @@ public class OrderQueryBO {
private String auditStatus;
// 支付状态
private Integer payStatus;
+ // 附件审核状态
+ private Integer attachAuditStatus;
public String getCode() {
return code;
@@ -99,6 +101,14 @@ public class OrderQueryBO {
this.payStatus = payStatus;
}
+ public Integer getAttachAuditStatus() {
+ return attachAuditStatus;
+ }
+
+ public void setAttachAuditStatus(Integer attachAuditStatus) {
+ this.attachAuditStatus = attachAuditStatus;
+ }
+
@Override
public String toString() {
return "OrderQueryBO{" +
@@ -111,6 +121,7 @@ public class OrderQueryBO {
", pickDateEnd=" + pickDateEnd +
", auditStatus='" + auditStatus + '\'' +
", payStatus=" + payStatus +
+ ", attachAuditStatus=" + attachAuditStatus +
'}';
}
}
diff --git a/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderServiceImpl.java b/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderServiceImpl.java
index 406bd8dea492530fbce45e8141c61bd00312b1b1..9710d82f1d48dbaa4a9065aa6f36b680cea811a6 100644
--- a/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderServiceImpl.java
+++ b/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderServiceImpl.java
@@ -10,7 +10,6 @@ import com.google.common.collect.Lists;
import com.unlcn.ils.sales.backend.bo.*;
import com.unlcn.ils.sales.backend.constant.AutoConfConstant;
import com.unlcn.ils.sales.backend.enums.AttachAuditStatusEnum;
-import com.unlcn.ils.sales.backend.enums.OrderAuditStatusEnum;
import com.unlcn.ils.sales.backend.enums.OrderPayStatusEnum;
import com.unlcn.ils.sales.backend.enums.OrderStatusEnum;
import com.unlcn.ils.sales.backend.util.UniquenessUtil;
@@ -221,6 +220,7 @@ public class OrderServiceImpl implements OrderService {
queryMap.put("pickDateBegin", queryBO.getPickDateBegin());
queryMap.put("pickDateEnd", queryBO.getPickDateEnd());
queryMap.put("payStatus", queryBO.getPayStatus());
+ queryMap.put("attachAuditStatus", queryBO.getAttachAuditStatus());
return buildListSaleOrder(queryMap, pageVo);
}
@@ -237,6 +237,8 @@ public class OrderServiceImpl implements OrderService {
queryMap.put("auditStatus", queryBO.getAuditStatus());
queryMap.put("pickDateBegin", queryBO.getPickDateBegin());
queryMap.put("pickDateEnd", queryBO.getPickDateEnd());
+ queryMap.put("payStatus", queryBO.getPayStatus());
+ queryMap.put("attachAuditStatus", queryBO.getAttachAuditStatus());
return buildListSaleOrder(queryMap, pageVo);
}
@@ -284,7 +286,7 @@ public class OrderServiceImpl implements OrderService {
item.setPayStatus(OrderPayStatusEnum.ORDER_TOUCH.getValue());
orderMapper.updateByPrimaryKeySelective(item);
// 更新审核表中状态
- orderAuditService.updateAuditStatusByOrderId(item.getId(), OrderAuditStatusEnum.ORDER_AWAIT.getValue());
+ //orderAuditService.updateAuditStatusByOrderId(item.getId(), OrderAuditStatusEnum.ORDER_AWAIT.getValue());
});
}
return 0;
diff --git a/ils-sales-base/src/main/resources/mappers/SaleOrderViewMapper.xml b/ils-sales-base/src/main/resources/mappers/SaleOrderViewMapper.xml
index deb6ee5b26472c5b1a7b1885a5b9a5a484cfb89d..368ad863f016cceb67f2e6203b2e8d26541ed9ef 100644
--- a/ils-sales-base/src/main/resources/mappers/SaleOrderViewMapper.xml
+++ b/ils-sales-base/src/main/resources/mappers/SaleOrderViewMapper.xml
@@ -109,6 +109,9 @@
AND so.order_status = #{orderStatus, jdbcType=INTEGER}
+
+ AND so.attach_audit_status = #{attachAuditStatus, jdbcType=INTEGER}
+
AND soa.depart_region_code = #{departRegionCode, jdbcType=VARCHAR}
@@ -160,6 +163,9 @@
AND so.order_status = #{orderStatus, jdbcType=INTEGER}
+
+ AND so.attach_audit_status = #{attachAuditStatus, jdbcType=INTEGER}
+
AND soa.depart_region_code = #{departRegionCode, jdbcType=VARCHAR}