Browse Source

发货限制重复提交

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@9700 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d
hejq 8 years ago
parent
commit
51890b3a18

+ 11 - 6
src/main/java/com/uas/platform/b2b/controller/SaleNoticeController.java

@@ -5,8 +5,11 @@ import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.List;
 
+import javax.servlet.http.HttpServletRequest;
+
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Sort.Direction;
+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;
@@ -31,7 +34,6 @@ import com.uas.platform.b2b.support.UsageBufferedLogger;
 import com.uas.platform.core.exception.IllegalOperatorException;
 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.util.serializer.FlexJsonUtils;
@@ -61,6 +63,9 @@ public class SaleNoticeController {
 	@Autowired
 	private SearchService searchService;
 
+	@Autowired
+	protected HttpServletRequest request;
+
 	private final static UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
 
 	/**
@@ -290,14 +295,14 @@ public class SaleNoticeController {
 	 */
 	@RequestMapping(value = "/{noticeId}", method = RequestMethod.POST)
 	@ResponseBody
-	public ModelMap send(@PathVariable("noticeId") Long noticeId, @RequestBody String json) {
+	public ResponseEntity<ModelMap> send(@PathVariable("noticeId") Long noticeId, @RequestBody String json) {
 		ModelMap map = new ModelMap();
 		SaleSend send = FlexJsonUtils.fromJson(json, SaleSend.class);
 		send = purchaseNoticeService.send(noticeId, send);
 		if (send != null) {
 			logger.log("客户送货提醒", "给单个客户送货提醒填写数量并确认发货", send.sendDescription(), null, noticeId);
 			map.put("id", send.getId());
-			return map;
+			return new ResponseEntity<ModelMap>(map, HttpStatus.OK);
 		} else
 			throw new IllegalOperatorException("程序错误");
 	}
@@ -311,14 +316,14 @@ public class SaleNoticeController {
 	 */
 	@RequestMapping(value = "/sendByBatch", method = RequestMethod.POST)
 	@ResponseBody
-	public ModelMap sendByBatch(@RequestBody String json) {
+	public ResponseEntity<ModelMap> sendByBatch(@RequestBody String json) {
 		ModelMap map = new ModelMap();
 		SaleSend send = FlexJsonUtils.fromJson(json, SaleSend.class);
 		send = purchaseNoticeService.send(send);
 		if (send != null) {
 			logger.log("客户送货提醒", "给同一客户多个送货提醒填写数量并确认发货", send.sendDescription(), null, send.getId());
 			map.put("id", send.getId());
-			return map;
+			return new ResponseEntity<ModelMap>(map, HttpStatus.OK);
 		} else
 			throw new IllegalOperatorException("程序错误");
 	}