增加ERP非标物料品牌申请接口

src/main/java/com/uas/platform/b2c/prod/product/brand/controller/BrandSubmitController.java

@@ -15,6 +15,7 @@ import com.uas.platform.core.model.ServiceCode;
 import com.uas.platform.core.model.Status;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
+import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.*;
 
 /**
@@ -172,4 +173,25 @@ public class BrandSubmitController {
 		logger.log("品牌维护", "审核通过冲突品牌申请", "审核通过与现版本信息冲突的品牌申请", brandSubmit.getNameCn(), brandSubmit.getId());
 		return brandSubmitService.audituUpdate(brandSubmit);
 	}
+
+	/**
+	 * 通过非标物料申请品牌
+	 * @param json
+	 * @return
+	 */
+	@RequestMapping(value = "/fromunstandard", method = RequestMethod.POST)
+	public ModelMap saveFromUnstandard(@RequestBody String json) {
+		ModelMap map = new ModelMap();
+		logger.log("品牌维护", "通过非标器件申请品牌", "通过非标器件申请品牌");
+		BrandSubmit brandSubmit = brandSubmitService.saveFromUnstandard(json);
+		if (brandSubmit == null) {
+			map.put("code", 400);
+			map.put("message", "商城已存在相同品牌");
+		} else {
+			map.put("code", 200);
+			map.put("message", "品牌申请提交成功，请等待审核");
+			map.put("brandsubmit", brandSubmit);
+		}
+		return map;
+	}
 }

src/main/java/com/uas/platform/b2c/prod/product/brand/service/BrandSubmitService.java

@@ -1,10 +1,9 @@
 package com.uas.platform.b2c.prod.product.brand.service;
 
-import org.springframework.data.domain.Page;
-
 import com.uas.platform.b2c.prod.product.brand.modal.Brand;
 import com.uas.platform.b2c.prod.product.brand.modal.BrandSubmit;
 import com.uas.platform.core.model.PageInfo;
+import org.springframework.data.domain.Page;
 
 public interface BrandSubmitService {
 
@@ -64,4 +63,11 @@ public interface BrandSubmitService {
 	 */
 	public Brand audituUpdate(BrandSubmit brandSubmit);
 
+	/**
+	 * 通过非标物料申请品牌
+	 * @param json
+	 * @return
+	 */
+	public BrandSubmit saveFromUnstandard(String json);
+
 }

src/main/java/com/uas/platform/b2c/prod/product/brand/service/impl/BrandSubmitServiceImpl.java

@@ -1,6 +1,8 @@
 package com.uas.platform.b2c.prod.product.brand.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
 import com.uas.platform.b2c.core.support.SystemSession;
+import com.uas.platform.b2c.core.utils.FastjsonUtils;
 import com.uas.platform.b2c.external.erp.product.service.OperationInfoService;
 import com.uas.platform.b2c.prod.product.brand.dao.BrandDao;
 import com.uas.platform.b2c.prod.product.brand.dao.BrandSubmitDao;
@@ -331,4 +333,12 @@ public class BrandSubmitServiceImpl implements BrandSubmitService {
 		return brandVersionService.saveBrandVersion(brandSubmit);
 	}
 
+	@Override
+	public BrandSubmit saveFromUnstandard(String json) {
+		JSONObject jsonObject = FastjsonUtils.parseObject(json);
+//		jsonObject.getObject();
+
+		return null;
+	}
+
 }