Merge branch 'feature-201914-suntg'

src/main/java/com/uas/platform/b2b/mall2/controller/MakeOrderController.java

@@ -0,0 +1,72 @@
+package com.uas.platform.b2b.mall2.controller;
+
+import com.alibaba.fastjson.JSONObject;
+import com.uas.platform.b2b.core.util.DateFormatUtils;
+import com.uas.platform.b2b.model.*;
+import com.uas.platform.b2b.search.SearchService;
+import com.uas.platform.b2b.service.MakeOrderService;
+import com.uas.platform.b2b.service.OrderRedDotService;
+import com.uas.platform.b2b.service.UserService;
+import com.uas.platform.b2b.support.JxlsExcelView;
+import com.uas.platform.b2b.support.SPageUtils;
+import com.uas.platform.b2b.support.SystemSession;
+import com.uas.platform.b2b.support.UsageBufferedLogger;
+import com.uas.platform.core.logging.BufferedLoggerManager;
+import com.uas.platform.core.model.Constant;
+import com.uas.platform.core.model.PageInfo;
+import com.uas.platform.core.model.PageParams;
+import com.uas.platform.core.model.Status;
+import com.uas.platform.core.persistence.criteria.PredicateUtils;
+import com.uas.platform.core.util.serializer.FlexJsonUtils;
+import com.uas.platform.core.web.bind.RequestState;
+import com.uas.search.b2b.model.MultiValue;
+import com.uas.search.b2b.model.SPage;
+import com.uas.search.b2b.model.Sort;
+import com.uas.search.b2b.model.Sort.Type;
+import com.uas.search.b2b.util.SearchConstants;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 卖家对委外加工单的操作
+ * 
+ * @author suntg
+ * 
+ */
+@SuppressWarnings("deprecation")
+@Controller("mall2.MakeOrderController")
+@RequestMapping("/mall2/make/orders")
+public class MakeOrderController {
+
+	@Autowired
+	private MakeOrderService makeOrderService;
+
+	/**
+	 * 作为卖家，查看我的委外加工单回复
+	 * 
+	 * @param orderId
+	 *            加工单ID
+	 * @return
+	 */
+	@RequestMapping(value = "/{orderId}/reply", method = RequestMethod.GET)
+	@ResponseBody
+	public ModelMap getPurchaseReply(@PathVariable("orderId") Long orderId) {
+		ModelMap modelMap = new ModelMap();
+		List<MakeOrderReply> replies = makeOrderService.findReplyByOrderId(orderId);
+		modelMap.put("replies", replies);
+		modelMap.put("success", true);
+		return modelMap;
+	}
+
+}

src/main/java/com/uas/platform/b2b/mall2/controller/PurchaseInquiryController.java

@@ -39,7 +39,7 @@ import java.util.List;
  * @time 创建时间：2017年4月17日
  */
 @RestController("mall2.PurchaseInquiry")
-@RequestMapping("/mall2/purchase/inquiry")
+@RequestMapping("/purc/inquiry")
 public class PurchaseInquiryController {
 
 	private final static UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
@@ -61,7 +61,7 @@ public class PurchaseInquiryController {
 	 *
 	 * @return
 	 */
-	@RequestMapping(value = "/info/search", method = RequestMethod.GET)
+	@RequestMapping(value = "/info/mall2_search", method = RequestMethod.GET)
 	public SPage<PurchaseInquiryDetail> getReceivedPurchaseInquiries(PageParams params, String searchFilter) {
 		logger.log("采购询价单", "查看发出的采购询价单列表（全部）");
 		JSONObject jsonObject = JSON.parseObject(searchFilter);
@@ -100,7 +100,7 @@ public class PurchaseInquiryController {
 	 *
 	 * @return
 	 */
-	@RequestMapping(value = "/info/search", params = RequestState.TODO, method = RequestMethod.GET)
+	@RequestMapping(value = "/info/mall2_search", params = RequestState.TODO, method = RequestMethod.GET)
 	public SPage<PurchaseInquiryDetail> getTodoInquiries(PageParams params, String searchFilter, String type) {
 		logger.log("客户询价单", "查看收到的客户询价单列表（待回复）");
 		JSONObject jsonObject = JSON.parseObject(searchFilter);
@@ -144,7 +144,7 @@ public class PurchaseInquiryController {
 	 *
 	 * @return
 	 */
-	@RequestMapping(value = "/info/search", params = RequestState.END, method = RequestMethod.GET)
+	@RequestMapping(value = "/info/mall2_search", params = RequestState.END, method = RequestMethod.GET)
 	public SPage<PurchaseInquiryDetail> getEndInquiries(PageParams params, String searchFilter) {
 		logger.log("客户询价单", "查看收到的客户询价单列表（已失效）");
 		JSONObject jsonObject = JSON.parseObject(searchFilter);
@@ -184,7 +184,7 @@ public class PurchaseInquiryController {
 	 *
 	 * @return
 	 */
-	@RequestMapping(value = "/info/search", params = RequestState.DONE, method = RequestMethod.GET)
+	@RequestMapping(value = "/info/mall2_search", params = RequestState.DONE, method = RequestMethod.GET)
 	public SPage<PurchaseInquiryDetail> getDoneInquiries(PageParams params, String searchFilter, String type) {
 		logger.log("客户询价单", "查看收到的客户询价单列表（已回复）");
 		JSONObject jsonObject = JSON.parseObject(searchFilter);
@@ -227,7 +227,7 @@ public class PurchaseInquiryController {
 	 *
 	 * @return
 	 */
-	@RequestMapping(value = "/info/search", params = RequestState.AGREED, method = RequestMethod.GET)
+	@RequestMapping(value = "/info/mall2_search", params = RequestState.AGREED, method = RequestMethod.GET)
 	public SPage<PurchaseInquiryDetail> getAgreedInquiries(PageParams params, String searchFilter) {
 		logger.log("客户询价单", "查看收到的客户询价单列表（已采纳）");
 		JSONObject jsonObject = JSON.parseObject(searchFilter);
@@ -271,7 +271,7 @@ public class PurchaseInquiryController {
 	 *
 	 * @return
 	 */
-	@RequestMapping(value = "/info/search", params = RequestState.REFUSED, method = RequestMethod.GET)
+	@RequestMapping(value = "/info/mall2_search", params = RequestState.REFUSED, method = RequestMethod.GET)
 	public SPage<PurchaseInquiryDetail> getRefusedInquiries(PageParams params, String searchFilter) {
 		logger.log("客户询价单", "查看收到的客户询价单列表（未采纳）");
 		JSONObject jsonObject = JSON.parseObject(searchFilter);

src/main/java/com/uas/platform/b2b/mall2/controller/PurchaseOrderController.java

@@ -44,7 +44,7 @@ import java.util.*;
  * @date 2019-3-26 17:08:03
  */
 @Controller("mall2.PurchaseOrderController")
-@RequestMapping("/mall2/purchase/orders")
+@RequestMapping("/sale/orders")
 public class PurchaseOrderController {
 	private final static UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
 
@@ -60,7 +60,7 @@ public class PurchaseOrderController {
 	 * @param params
 	 * @return
 	 */
-	@RequestMapping(value = "/info/search", method = RequestMethod.GET)
+	@RequestMapping(value = "/purc/info/mall2_search", method = RequestMethod.GET)
 	@ResponseBody
 	public SPage<PurchaseOrderAll> getAllPurcOrderItems(PageParams params, String searchFilter) {
 		logger.log("采购单", "查看收到的采购订单列表（包括采购明细）（全部）");
@@ -89,7 +89,7 @@ public class PurchaseOrderController {
 	 * @param params
 	 * @return
 	 */
-	@RequestMapping(value = "/info/search", params = RequestState.END, method = RequestMethod.GET)
+	@RequestMapping(value = "/purc/info/mall2_search", params = RequestState.END, method = RequestMethod.GET)
 	@ResponseBody
 	public SPage<PurchaseOrderEnd> getEndPurcOrderItems(PageParams params, String searchFilter) {
 		logger.log("采购单", "查看收到的采购订单列表（包括采购明细）（已结案）");
@@ -115,7 +115,7 @@ public class PurchaseOrderController {
 	 * @param searchFilter
 	 *            获取待发货的订单
 	 */
-	@RequestMapping(value = "/info/search", params = RequestState.WAITING, method = RequestMethod.GET)
+	@RequestMapping(value = "/purc/info/mall2_search", params = RequestState.WAITING, method = RequestMethod.GET)
 	@ResponseBody
 	public SPage<PurchaseOrderWaiting> getWaitingPurcOrderItems(PageParams params, String searchFilter) {
 		logger.log("采购单", "查看收到的采购订单列表（包括采购明细）（待交货）");
@@ -149,7 +149,7 @@ public class PurchaseOrderController {
 	 * @param params
 	 * @return
 	 */
-	@RequestMapping(value = "/info/nosearch", method = RequestMethod.GET)
+	@RequestMapping(value = "/purc/info/mall2_nosearch", method = RequestMethod.GET)
 	@ResponseBody
 	public SPage<PurchaseOrderAll> getAllPurcOrders(PageParams params, String searchFilter) {
 		logger.log("采购单", "查看采购订单列表（包括采购明细）（全部）");
@@ -171,7 +171,7 @@ public class PurchaseOrderController {
 	 * @param params
 	 * @return
 	 */
-	@RequestMapping(value = "/info/nosearch", params = RequestState.END, method = RequestMethod.GET)
+	@RequestMapping(value = "/purc/info/mall2_nosearch", params = RequestState.END, method = RequestMethod.GET)
 	@ResponseBody
 	public SPage<PurchaseOrderEnd> getEndPurcOrders(PageParams params, String searchFilter) {
 		logger.log("采购单", "查看采购订单列表（包括采购明细）（已结案）");
@@ -193,7 +193,7 @@ public class PurchaseOrderController {
 	 * @param searchFilter
 	 *            获取待发货的订单
 	 */
-	@RequestMapping(value = "/info/nosearch", params = RequestState.WAITING, method = RequestMethod.GET)
+	@RequestMapping(value = "/purc/info/mall2_nosearch", params = RequestState.WAITING, method = RequestMethod.GET)
 	@ResponseBody
 	public SPage<PurchaseOrderWaiting> getWaitingPurcOrders(PageParams params, String searchFilter) {
 		logger.log("采购单", "查看采购订单列表（包括采购明细）（待交货）");
@@ -213,7 +213,7 @@ public class PurchaseOrderController {
 	 * 获取单据数据统计
 	 * @return
 	 */
-	@RequestMapping(value = "/counts", method = RequestMethod.GET)
+	@RequestMapping(value = "/purc/counts", method = RequestMethod.GET)
 	@ResponseBody
 	public ModelMap getCounts() {
 		ModelMap modelMap = new ModelMap();

src/main/java/com/uas/platform/b2b/mall2/controller/SaleInquiryController.java

@@ -51,7 +51,7 @@ import java.util.Map;
  */
 @SuppressWarnings("deprecation")
 @Controller("mall2.SaleInquiryController")
-@RequestMapping("/mall2/sale/inquiry")
+@RequestMapping("/sale/inquiry")
 public class SaleInquiryController {
 
 	@Autowired
@@ -77,7 +77,7 @@ public class SaleInquiryController {
 	 * @param params
 	 * @return
 	 */
-	@RequestMapping(value = "/info/search", method = RequestMethod.GET)
+	@RequestMapping(value = "/info/mall2_search", method = RequestMethod.GET)
 	@ResponseBody
 	public SPage<PurchaseInquiryDetail> getReceivedPurchaseInquiries(PageParams params, String searchFilter) {
 		logger.log("客户询价单", "搜索查看收到的客户询价单列表（全部）");
@@ -115,7 +115,7 @@ public class SaleInquiryController {
 	 * @param params
 	 * @return
 	 */
-	@RequestMapping(value = "/info/search", params = RequestState.TODO, method = RequestMethod.GET)
+	@RequestMapping(value = "/info/mall2_search", params = RequestState.TODO, method = RequestMethod.GET)
 	@ResponseBody
 	public SPage<PurchaseInquiryDetail> getTodoInquiries(PageParams params, String searchFilter) {
 		logger.log("客户询价单", "搜索查看收到的客户询价单（待报价）");
@@ -154,7 +154,7 @@ public class SaleInquiryController {
 	 *
 	 * @param params
 	 */
-	@RequestMapping(value = "/info/search", params = RequestState.END, method = RequestMethod.GET)
+	@RequestMapping(value = "/info/mall2_search", params = RequestState.END, method = RequestMethod.GET)
 	@ResponseBody
 	public SPage<PurchaseInquiryDetail> getEndInquiries(PageParams params, String searchFilter) {
 		logger.log("客户询价单", "搜索查看收到的客户询价单（已过期）");
@@ -197,7 +197,7 @@ public class SaleInquiryController {
 	 * @param params
 	 * @return
 	 */
-	@RequestMapping(value = "/info/search", params = RequestState.DONE, method = RequestMethod.GET)
+	@RequestMapping(value = "/info/mall2_search", params = RequestState.DONE, method = RequestMethod.GET)
 	@ResponseBody
 	public SPage<PurchaseInquiryDetail> getDoneInquiries(PageParams params, String searchFilter) {
 		logger.log("客户询价单", "搜索查看收到的客户询价单（已报价）");
@@ -237,7 +237,7 @@ public class SaleInquiryController {
 	 *
 	 * @param params
 	 */
-	@RequestMapping(value = "/info/search", params = RequestState.INVALID, method = RequestMethod.GET)
+	@RequestMapping(value = "/info/mall2_search", params = RequestState.INVALID, method = RequestMethod.GET)
 	@ResponseBody
 	public SPage<PurchaseInquiryDetail> getInvalidInquiries(PageParams params, String searchFilter) {
 		logger.log("客户询价单", "搜索查看收到的客户询价单（已失效）");
@@ -274,7 +274,7 @@ public class SaleInquiryController {
 	 * @param params
 	 * @return
 	 */
-	@RequestMapping(value = "/info/search", params = RequestState.AGREED, method = RequestMethod.GET)
+	@RequestMapping(value = "/info/mall2_search", params = RequestState.AGREED, method = RequestMethod.GET)
 	@ResponseBody
 	public SPage<PurchaseInquiryDetail> getAgreedInquiries(PageParams params, String searchFilter) {
 		logger.log("客户询价单", "搜索查看收到的客户询价单（已采纳）");
@@ -317,7 +317,7 @@ public class SaleInquiryController {
 	 * @param params
 	 * @return
 	 */
-	@RequestMapping(value = "/info/search", params = RequestState.REFUSED, method = RequestMethod.GET)
+	@RequestMapping(value = "/info/mall2_search", params = RequestState.REFUSED, method = RequestMethod.GET)
 	@ResponseBody
 	public SPage<PurchaseInquiryDetail> getRefusedInquiries(PageParams params, String searchFilter) {
 		logger.log("客户询价单", "搜索查看收到的客户询价单（未采纳）");
@@ -357,7 +357,7 @@ public class SaleInquiryController {
 	 * @param inquiryId
 	 * @return
 	 */
-	@RequestMapping(value = "/{inquiryId}/info", method = RequestMethod.GET)
+	@RequestMapping(value = "/{inquiryId}/info/mall2", method = RequestMethod.GET)
 	@ResponseBody
 	public ModelMap getReceivedPurchaseOrderItemById(@PathVariable("inquiryId") Long inquiryId) {
 		ModelMap modelMap = new ModelMap();
@@ -377,7 +377,7 @@ public class SaleInquiryController {
 	 * @param inquiryItemId
 	 * @return
 	 */
-	@RequestMapping(value = "/items/{inquiryItemId}/reply", method = RequestMethod.POST)
+	@RequestMapping(value = "/items/{inquiryItemId}/reply/mall2", method = RequestMethod.POST)
 	@ResponseBody
 	public ModelMap replyInquiryItem(@RequestBody String json,
 			@PathVariable("inquiryItemId") Long inquiryItemId, String token) {

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

@@ -47,7 +47,7 @@ import java.util.*;
  */
 @SuppressWarnings("deprecation")
 @Controller("mall2.SaleOrderController")
-@RequestMapping("/mall2/sale/orders")
+@RequestMapping("/sale/orders")
 public class SaleOrderController {
 
 	@Autowired
@@ -67,7 +67,7 @@ public class SaleOrderController {
 	 * @param params
 	 * @return
 	 */
-	@RequestMapping(value = "/info/search", method = RequestMethod.GET)
+	@RequestMapping(value = "/info/mall2_search", method = RequestMethod.GET)
 	@ResponseBody
 	public SPage<PurchaseOrderAll> getPurchaseOrderItems(PageParams params, String searchFilter) {
 		logger.log("客户采购单", "查看收到的客户采购订单列表（包括采购明细）（全部）");
@@ -106,7 +106,7 @@ public class SaleOrderController {
 	 * @param params
 	 * @return
 	 */
-	@RequestMapping(value = "/info/search", params = RequestState.END, method = RequestMethod.GET)
+	@RequestMapping(value = "/info/mall2_search", params = RequestState.END, method = RequestMethod.GET)
 	@ResponseBody
 	public SPage<PurchaseOrderEnd> getEndPurchaseOrderItems(PageParams params, String searchFilter) {
 		logger.log("客户采购单", "查看收到的客户采购订单列表（包括采购明细）（已结案）");
@@ -144,7 +144,7 @@ public class SaleOrderController {
 	 * @param searchFilter
 	 * @author wangmh 获取已收货的订单 - 搜索
 	 */
-	@RequestMapping(value = "/info/search", params = RequestState.RECEIVED, method = RequestMethod.GET)
+	@RequestMapping(value = "/info/mall2_search", params = RequestState.RECEIVED, method = RequestMethod.GET)
 	@ResponseBody
 	public SPage<PurchaseOrderReceived> getReceivedPurchaseOrderItems(PageParams params, String searchFilter) {
 		logger.log("客户采购单", "查看收到的客户采购订单列表（包括采购明细）（已收货）");
@@ -182,7 +182,7 @@ public class SaleOrderController {
 	 * @param searchFilter
 	 * @author yujia 获取待发货的订单 - 搜索
 	 */
-	@RequestMapping(value = "/info/search", params = RequestState.WAITING, method = RequestMethod.GET)
+	@RequestMapping(value = "/info/mall2_search", params = RequestState.WAITING, method = RequestMethod.GET)
 	@ResponseBody
 	public SPage<PurchaseOrderWaiting> getWaitingPurchaseOrderItems(PageParams params, String searchFilter) {
 		logger.log("客户采购单", "查看收到的客户采购订单列表（包括采购明细）（待交货）");
@@ -228,7 +228,7 @@ public class SaleOrderController {
 	 * @param params
 	 * @return
 	 */
-	@RequestMapping(value = "/info/nosearch", method = RequestMethod.GET)
+	@RequestMapping(value = "/info/mall2_nosearch", method = RequestMethod.GET)
 	@ResponseBody
 	public SPage<PurchaseOrderAll> getSaleOrders(PageParams params, String searchFilter) {
 		logger.log("客户采购单", "查看收到的客户采购订单列表（包括采购明细）（全部）");
@@ -262,7 +262,7 @@ public class SaleOrderController {
 	 * @param params
 	 * @return
 	 */
-	@RequestMapping(value = "/info/nosearch", params = RequestState.END, method = RequestMethod.GET)
+	@RequestMapping(value = "/info/mall2_nosearch", params = RequestState.END, method = RequestMethod.GET)
 	@ResponseBody
 	public SPage<PurchaseOrderEnd> getEndSaleOrders(PageParams params, String searchFilter) {
 		logger.log("客户采购单", "查看收到的客户采购单列表（已结案）");
@@ -295,7 +295,7 @@ public class SaleOrderController {
 	 * @param searchFilter
 	 * @author wangmh 获取已发货的订单
 	 */
-	@RequestMapping(value = "/info/nosearch", params = RequestState.RECEIVED, method = RequestMethod.GET)
+	@RequestMapping(value = "/info/mall2_nosearch", params = RequestState.RECEIVED, method = RequestMethod.GET)
 	@ResponseBody
 	public SPage<PurchaseOrderReceived> getReceivedOrders(PageParams params, String searchFilter) {
 		logger.log("客户采购单", "查看收到的客户采购订单列表（包括采购明细）（待交货）");
@@ -328,7 +328,7 @@ public class SaleOrderController {
 	 * @param searchFilter
 	 * @author yujia 获取待发货的订单
 	 */
-	@RequestMapping(value = "/info/nosearch", params = RequestState.WAITING, method = RequestMethod.GET)
+	@RequestMapping(value = "/info/mall2_nosearch", params = RequestState.WAITING, method = RequestMethod.GET)
 	@ResponseBody
 	public SPage<PurchaseOrderWaiting> getWaitingOrders(PageParams params, String searchFilter) {
 		logger.log("客户采购单", "查看收到的客户采购订单列表（包括采购明细）（待交货）");
@@ -360,7 +360,7 @@ public class SaleOrderController {
 	 * 获取单据数据统计
 	 * @return
 	 */
-	@RequestMapping(value = "/counts", method = RequestMethod.GET)
+	@RequestMapping(value = "/mall2_counts", method = RequestMethod.GET)
 	@ResponseBody
 	public ModelMap getCounts() {
 		ModelMap modelMap = new ModelMap();

src/main/java/com/uas/platform/b2b/model/UserInfo.java

@@ -34,20 +34,7 @@ public class UserInfo {
 			}
 			this.role = sb.toString();
 		}
-		this.sys = false;
-		if (!CollectionUtils.isEmpty(user.getRoles())) { // 获取用户在该企业的权限
-			for (Role role: user.getRoles()) {
-				if (!CollectionUtils.isEmpty(user.getEnterprises())) {
-					if (null != user.getEnterprise()) {
-						if (role.getEnUU().equals(user.getEnterprise().getUu())) {
-							if (role.isSys()) {
-								this.sys = true;
-							}
-						}
-					}
-				}
-			}
-		} 
+		this.sys = user.isSys();
 		if (!CollectionUtils.isEmpty(user.getEnterprises())) {
 			Enterprise current = user.getEnterprise();
 			List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();