|
|
@@ -1,7 +1,6 @@
|
|
|
package com.uas.platform.b2b.controller;
|
|
|
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
-import com.uas.sso.util.AccountUtils;
|
|
|
import com.uas.platform.b2b.model.Enterprise;
|
|
|
import com.uas.platform.b2b.model.FileUpload;
|
|
|
import com.uas.platform.b2b.model.Product;
|
|
|
@@ -9,11 +8,7 @@ import com.uas.platform.b2b.model.Vendor;
|
|
|
import com.uas.platform.b2b.search.SearchService;
|
|
|
import com.uas.platform.b2b.service.BaseInfoService;
|
|
|
import com.uas.platform.b2b.service.ProductService;
|
|
|
-import com.uas.platform.b2b.support.JxlsExcelView;
|
|
|
-import com.uas.platform.b2b.support.SysConf;
|
|
|
-import com.uas.platform.b2b.support.SystemSession;
|
|
|
-import com.uas.platform.b2b.support.TokenService;
|
|
|
-import com.uas.platform.b2b.support.UsageBufferedLogger;
|
|
|
+import com.uas.platform.b2b.support.*;
|
|
|
import com.uas.platform.b2b.temporary.model.BasePartnersInfo;
|
|
|
import com.uas.platform.b2b.temporary.model.NewPurcOrder;
|
|
|
import com.uas.platform.b2b.temporary.model.ProdInfo;
|
|
|
@@ -30,6 +25,7 @@ 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 com.uas.sso.util.AccountUtils;
|
|
|
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
|
|
|
import org.apache.poi.ss.usermodel.Workbook;
|
|
|
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
|
|
|
@@ -37,12 +33,7 @@ import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.http.HttpStatus;
|
|
|
import org.springframework.http.ResponseEntity;
|
|
|
import org.springframework.ui.ModelMap;
|
|
|
-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 org.springframework.web.bind.annotation.RestController;
|
|
|
+import org.springframework.web.bind.annotation.*;
|
|
|
import org.springframework.web.servlet.ModelAndView;
|
|
|
|
|
|
import java.io.IOException;
|
|
|
@@ -414,7 +405,8 @@ public class BaseInfoController {
|
|
|
* @modify-desc 增加操作日志
|
|
|
*/
|
|
|
@RequestMapping(value = "/addtoCart", method = RequestMethod.POST)
|
|
|
- public ResponseEntity<ModelMap> save(String token, @RequestBody NewPurcOrder neworder) {
|
|
|
+ public ResponseEntity<ModelMap> save(String token, @RequestBody String json) {
|
|
|
+ NewPurcOrder neworder = JSONObject.parseObject(json, NewPurcOrder.class);
|
|
|
ModelMap map = new ModelMap();
|
|
|
boolean flag = tokenService.enabled(token);
|
|
|
if (flag) {
|
hejq