删除查询订单设置阅读状态方法

src/main/java/com/uas/platform/b2b/controller/SaleOrderController.java

@@ -954,8 +954,6 @@ public class SaleOrderController {
 	@ResponseBody
 	public SPage<PurchaseOrderAll> getAllPurcOrders(PageParams params, String searchFilter) {
 		logger.log("采购单", "查看采购订单列表（包括采购明细）（全部）");
-		purchaseOrderAllDao.setDisplayStatus(SystemSession.getUser().getUserUU(),
-				SystemSession.getUser().getEnterprise().getUu(), OrderType.purc.getPhrase());
 		purchaseOrderWaitingDao.updateStatusForSale(SystemSession.getUser().getEnterprise().getUu());
 		PageInfo pageInfo = new PageInfo(params);
 		pageInfo.filter("enUU", SystemSession.getUser().getEnterprise().getUu());

src/main/java/com/uas/platform/b2b/dao/PurchaseOrderAllDao.java

@@ -4,7 +4,6 @@ import com.uas.platform.b2b.model.PurchaseOrderAll;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.jpa.repository.query.Procedure;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
@@ -68,15 +67,5 @@ public interface PurchaseOrderAllDao extends JpaSpecificationExecutor<PurchaseOr
 	@Query("select count(o) from PurchaseOrderAll o where o.enUU = :enUU and o.userUU = :userUU and o.status = :status")
 	public int getTodoCountByEnUUAndUserUUAndStatus(@Param("enUU") Long enUU, @Param("userUU") Long userUU,
 			@Param("status") Short status);
-	
-	/**
-	 * 查询订单之前先设置状态，将未读的订单放在最上面
-	 * 
-	 * @param useruu
-	 * @param enuu
-	 * @param orderkind
-	 */
-	@Procedure(procedureName = "orders_set_status_beforeread")
-	public void setDisplayStatus(Long useruu, Long enuu, String orderkind);
 
 }

src/main/java/com/uas/platform/b2b/mobile/controller/SaleController.java

@@ -8,7 +8,15 @@ import com.uas.platform.b2b.dao.PurchaseOrderWaitingDao;
 import com.uas.platform.b2b.mobile.model.OrderReply;
 import com.uas.platform.b2b.mobile.model.Purchase;
 import com.uas.platform.b2b.mobile.service.PurchaseService;
-import com.uas.platform.b2b.model.*;
+import com.uas.platform.b2b.model.PurchaseOrderAll;
+import com.uas.platform.b2b.model.PurchaseOrderDone;
+import com.uas.platform.b2b.model.PurchaseOrderEnd;
+import com.uas.platform.b2b.model.PurchaseOrderItem;
+import com.uas.platform.b2b.model.PurchaseOrderReceived;
+import com.uas.platform.b2b.model.PurchaseOrderReply;
+import com.uas.platform.b2b.model.PurchaseOrderTodo;
+import com.uas.platform.b2b.model.PurchaseOrderWaiting;
+import com.uas.platform.b2b.model.SearchFilter;
 import com.uas.platform.b2b.search.SearchService;
 import com.uas.platform.b2b.service.PurchaseOrderService;
 import com.uas.platform.b2b.service.UserService;
@@ -32,10 +40,14 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.*;
-
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.io.*;
+import java.net.*;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -170,8 +182,6 @@ public class SaleController {
 			return searchService.searchPurchaseOrderIdsForApp(keyword, pageParams);
 		} else {
 			logger.log("客户采购单", "app查看收到的客户采购订单列表（包括采购明细）（全部）");
-			purchaseOrderAllDao.setDisplayStatus(SystemSession.getUser().getUserUU(),
-					SystemSession.getUser().getEnterprise().getUu(), OrderType.sale.name());
 			PageInfo pageInfo = new PageInfo(page, size);
 			pageInfo.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
 			org.springframework.data.domain.Sort.Order statusOrder = new org.springframework.data.domain.Sort.Order(org.springframework.data.domain.Sort.Direction.ASC, "status");
@@ -225,8 +235,6 @@ public class SaleController {
 			return searchService.searchPurchaseTodoOrderIdsForApp(keyword, pageParams);
 		} else {
 			logger.log("客户采购单", "App查看收到的客户采购单列表（待回复）");
-			purchaseOrderAllDao.setDisplayStatus(SystemSession.getUser().getUserUU(),
-					SystemSession.getUser().getEnterprise().getUu(), OrderType.sale.name());
 			purchaseOrderTodoDao.updateStatusForSale(SystemSession.getUser().getEnterprise().getUu());
 			PageInfo pageInfo = new PageInfo(page, size);
 			pageInfo.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
@@ -279,8 +287,6 @@ public class SaleController {
 			return searchService.searchPurchaseDoneOrderIdsForApp(keyword, pageParams);
 		} else {
 			logger.log("客户采购单", "App查看收到的客户采购单列表（已回复）");
-			purchaseOrderAllDao.setDisplayStatus(SystemSession.getUser().getUserUU(),
-					SystemSession.getUser().getEnterprise().getUu(), OrderType.sale.name());
 			purchaseOrderDoneDao.updateStatusForSaleDone(SystemSession.getUser().getEnterprise().getUu());
 			PageInfo pageInfo = new PageInfo(page, size);
 			pageInfo.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
@@ -331,8 +337,6 @@ public class SaleController {
 			return searchService.searchPurchaseOrderIdsForApp(keyword, pageParams);
 		} else {
 			logger.log("客户采购单", "App查看收到的客户采购单列表（已结案）");
-			purchaseOrderAllDao.setDisplayStatus(SystemSession.getUser().getUserUU(),
-					SystemSession.getUser().getEnterprise().getUu(), OrderType.sale.name());
 			PageInfo pageInfo = new PageInfo(page, size);
 			pageInfo.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
 			pageInfo.filter("status", Status.WAITSELLERCOMFIRM.value());
@@ -384,8 +388,6 @@ public class SaleController {
 			return searchService.searchPurchaseEndOrderIdsForApp(keyword, pageParams);
 		} else {
 			logger.log("客户采购单", "App查看收到的客户采购单列表（已结案）");
-			purchaseOrderAllDao.setDisplayStatus(SystemSession.getUser().getUserUU(),
-					SystemSession.getUser().getEnterprise().getUu(), OrderType.sale.name());
 			PageInfo pageInfo = new PageInfo(page, size);
 			pageInfo.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
 			SearchFilter filter = new SearchFilter();
@@ -432,8 +434,6 @@ public class SaleController {
 			return searchService.searchPurchaseReceivedOrderIdsForApp(keyword, pageParams);
 		} else {
 			logger.log("客户采购单", "App查看收到的客户采购订单列表（包括采购明细）（待交货）");
-			purchaseOrderAllDao.setDisplayStatus(SystemSession.getUser().getUserUU(),
-					SystemSession.getUser().getEnterprise().getUu(), OrderType.sale.name());
 			purchaseOrderWaitingDao.updateStatusForSale(SystemSession.getUser().getEnterprise().getUu());
 			PageInfo pageInfo = new PageInfo(page, size);
 			pageInfo.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
@@ -487,8 +487,6 @@ public class SaleController {
 			return searchService.searchPurchaseWaitingOrderIdsForApp(keyword, pageParams);
 		} else {
 			logger.log("客户采购单", "App查看收到的客户采购订单列表（包括采购明细）（待交货）");
-			purchaseOrderAllDao.setDisplayStatus(SystemSession.getUser().getUserUU(),
-					SystemSession.getUser().getEnterprise().getUu(), OrderType.sale.name());
 			purchaseOrderWaitingDao.updateStatusForSale(SystemSession.getUser().getEnterprise().getUu());
 			PageInfo pageInfo = new PageInfo(page, size);
 			pageInfo.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
@@ -567,8 +565,6 @@ public class SaleController {
 			return searchService.searchPurchaseOrderIdsForApp(keyword, pageParams);
 		} else {
 			logger.log("采购单", "app查看采购订单列表（包括采购明细）（全部）");
-			purchaseOrderAllDao.setDisplayStatus(SystemSession.getUser().getUserUU(),
-					SystemSession.getUser().getEnterprise().getUu(), OrderType.purc.getPhrase());
 			purchaseOrderWaitingDao.updateStatusForSale(SystemSession.getUser().getEnterprise().getUu());
 			PageInfo pageInfo = new PageInfo(page, size);
 			pageInfo.filter("enUU", SystemSession.getUser().getEnterprise().getUu());
@@ -599,8 +595,6 @@ public class SaleController {
 			return searchService.searchPurchaseTodoOrderIdsForApp(keyword, pageParams);
 		} else {
 			logger.log("采购单", "app查看采购订单列表（包括采购明细）（待回复）");
-			purchaseOrderAllDao.setDisplayStatus(SystemSession.getUser().getUserUU(),
-					SystemSession.getUser().getEnterprise().getUu(), OrderType.purc.getPhrase());
 			purchaseOrderTodoDao.updateStatusForPurc(SystemSession.getUser().getEnterprise().getUu());
 			PageInfo pageInfo = new PageInfo(page, size);
 			pageInfo.filter("enUU", SystemSession.getUser().getEnterprise().getUu());
@@ -632,8 +626,6 @@ public class SaleController {
 			return searchService.searchPurchaseDoneOrderIdsForApp(keyword, pageParams);
 		} else {
 			logger.log("采购单", "app查看采购订单列表（包括采购明细）（已回复）");
-			purchaseOrderAllDao.setDisplayStatus(SystemSession.getUser().getUserUU(),
-					SystemSession.getUser().getEnterprise().getUu(), OrderType.purc.getPhrase());
 			purchaseOrderDoneDao.updateStatusForPurcDone(SystemSession.getUser().getEnterprise().getUu());
 			PageInfo pageInfo = new PageInfo(page, size);
 			pageInfo.filter("enUU", SystemSession.getUser().getEnterprise().getUu());
@@ -664,8 +656,6 @@ public class SaleController {
 			return searchService.searchPurchaseEndOrderIdsForApp(keyword, pageParams);
 		} else {
 			logger.log("采购单", "app查看采购订单列表（包括采购明细）（已结案）");
-			purchaseOrderAllDao.setDisplayStatus(SystemSession.getUser().getUserUU(),
-					SystemSession.getUser().getEnterprise().getUu(), OrderType.purc.getPhrase());
 			PageInfo pageInfo = new PageInfo(page, size);
 			pageInfo.filter("enUU", SystemSession.getUser().getEnterprise().getUu());
 			pageInfo.filter("end", Constant.YES);
@@ -698,8 +688,6 @@ public class SaleController {
 			return searchService.searchPurchaseWaitingOrderIdsForApp(keyword, pageParams);
 		} else {
 			logger.log("采购单", "app查看采购订单列表（包括采购明细）（待交货）");
-			purchaseOrderAllDao.setDisplayStatus(SystemSession.getUser().getUserUU(),
-					SystemSession.getUser().getEnterprise().getUu(), OrderType.purc.getPhrase());
 			purchaseOrderWaitingDao.updateStatusForPurc(SystemSession.getUser().getEnterprise().getUu());
 			PageInfo pageInfo = new PageInfo(page, size);
 			pageInfo.filter("enUU", SystemSession.getUser().getEnterprise().getUu());