From bad2f4dc055c8a703b82dfa2db85436a1ddb9f7d Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期日, 25 十月 2020 11:22:48 +0800
Subject: [PATCH] 优化代码
---
service-goods/src/main/java/com/java110/goods/api/ProductApi.java | 195 ++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 186 insertions(+), 9 deletions(-)
diff --git a/service-goods/src/main/java/com/java110/goods/api/ProductApi.java b/service-goods/src/main/java/com/java110/goods/api/ProductApi.java
index c8061f0..09275e7 100644
--- a/service-goods/src/main/java/com/java110/goods/api/ProductApi.java
+++ b/service-goods/src/main/java/com/java110/goods/api/ProductApi.java
@@ -6,6 +6,7 @@
import com.java110.dto.product.ProductSpecDetailDto;
import com.java110.dto.product.ProductSpecDto;
import com.java110.dto.productAttr.ProductAttrDto;
+import com.java110.dto.productDetail.ProductDetailDto;
import com.java110.dto.productSpecValue.ProductSpecValueDto;
import com.java110.goods.bmo.product.IDeleteProductBMO;
import com.java110.goods.bmo.product.IGetProductBMO;
@@ -15,6 +16,10 @@
import com.java110.goods.bmo.productAttr.IGetProductAttrBMO;
import com.java110.goods.bmo.productAttr.ISaveProductAttrBMO;
import com.java110.goods.bmo.productAttr.IUpdateProductAttrBMO;
+import com.java110.goods.bmo.productDetail.IDeleteProductDetailBMO;
+import com.java110.goods.bmo.productDetail.IGetProductDetailBMO;
+import com.java110.goods.bmo.productDetail.ISaveProductDetailBMO;
+import com.java110.goods.bmo.productDetail.IUpdateProductDetailBMO;
import com.java110.goods.bmo.productSpec.IDeleteProductSpecBMO;
import com.java110.goods.bmo.productSpec.IGetProductSpecBMO;
import com.java110.goods.bmo.productSpec.ISaveProductSpecBMO;
@@ -31,6 +36,7 @@
import com.java110.po.product.ProductSpecDetailPo;
import com.java110.po.product.ProductSpecPo;
import com.java110.po.productAttr.ProductAttrPo;
+import com.java110.po.productDetail.ProductDetailPo;
import com.java110.po.productSpecValue.ProductSpecValuePo;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
@@ -102,6 +108,17 @@
private IGetProductAttrBMO getProductAttrBMOImpl;
+ @Autowired
+ private ISaveProductDetailBMO saveProductDetailBMOImpl;
+ @Autowired
+ private IUpdateProductDetailBMO updateProductDetailBMOImpl;
+ @Autowired
+ private IDeleteProductDetailBMO deleteProductDetailBMOImpl;
+
+ @Autowired
+ private IGetProductDetailBMO getProductDetailBMOImpl;
+
+
/**
* 寰俊淇濆瓨娑堟伅妯℃澘
*
@@ -120,11 +137,39 @@
Assert.hasKeyAndValue(reqJson, "unitName", "璇锋眰鎶ユ枃涓湭鍖呭惈unitName");
Assert.hasKeyAndValue(reqJson, "sort", "璇锋眰鎶ユ枃涓湭鍖呭惈sort");
Assert.hasKeyAndValue(reqJson, "isPostage", "璇锋眰鎶ユ枃涓湭鍖呭惈isPostage");
+ Assert.hasKeyAndValue(reqJson, "coverPhoto", "璇锋眰鎶ユ枃涓湭鍖呭惈鍟嗗搧灏侀潰");
+ Assert.hasKeyAndValue(reqJson, "content", "璇锋眰鎶ユ枃涓湭鍖呭惈鍟嗗搧鎻忚堪");
+ Assert.hasKey(reqJson, "carouselFigurePhoto", "璇锋眰鎶ユ枃涓湭鍖呭惈杞挱鍥�");
+ Assert.hasKey(reqJson, "productSpecs", "璇锋眰鎶ユ枃涓湭鍖呭惈瑙勬牸淇℃伅");
+
+
+ String coverPhoto = reqJson.getString("coverPhoto");
+ JSONArray carouselFigurePhoto = reqJson.getJSONArray("carouselFigurePhoto");
+
+ JSONArray productSpecs = reqJson.getJSONArray("productSpecs");
+
+ if (carouselFigurePhoto.size() < 1) {
+ throw new IllegalArgumentException("璇锋眰鎶ユ枃涓湭鍖呭惈杞挱鍥�");
+ }
+ if (productSpecs.size() < 1) {
+ throw new IllegalArgumentException("璇锋眰鎶ユ枃涓湭鍖呭惈瑙勬牸淇℃伅");
+ }
+
+ JSONObject spec = null;
+ List<ProductSpecValuePo> productSpecValuePos = new ArrayList<>();
+ for (int specIndex = 0; specIndex < productSpecs.size(); specIndex++) {
+ spec = productSpecs.getJSONObject(specIndex);
+ productSpecValuePos.add(BeanConvertUtil.covertBean(spec, ProductSpecValuePo.class));
+ }
ProductPo productPo = BeanConvertUtil.covertBean(reqJson, ProductPo.class);
productPo.setStoreId(storeId);
- return saveProductBMOImpl.save(productPo);
+
+ ProductDetailPo productDetailPo = new ProductDetailPo();
+ productDetailPo.setStoreId(storeId);
+ productDetailPo.setContent(reqJson.getString("content"));
+ return saveProductBMOImpl.save(productPo, coverPhoto, carouselFigurePhoto, productSpecValuePos, productDetailPo);
}
/**
@@ -146,10 +191,33 @@
Assert.hasKeyAndValue(reqJson, "isPostage", "璇锋眰鎶ユ枃涓湭鍖呭惈isPostage");
Assert.hasKeyAndValue(reqJson, "productId", "productId涓嶈兘涓虹┖");
+ String coverPhoto = reqJson.containsKey("coverPhoto") ? reqJson.getString("coverPhoto") : "";
+ JSONArray carouselFigurePhoto = reqJson.containsKey("carouselFigurePhoto") ? reqJson.getJSONArray("carouselFigurePhoto") : null;
+
+ JSONArray productSpecs = reqJson.containsKey("productSpecs") ? reqJson.getJSONArray("productSpecs") : null;
+
+ JSONObject spec = null;
+ List<ProductSpecValuePo> productSpecValuePos = null;;
+ if (productSpecs != null) {
+ productSpecValuePos = new ArrayList<>();
+ for (int specIndex = 0; specIndex < productSpecs.size(); specIndex++) {
+ spec = productSpecs.getJSONObject(specIndex);
+ productSpecValuePos.add(BeanConvertUtil.covertBean(spec, ProductSpecValuePo.class));
+ }
+ }
ProductPo productPo = BeanConvertUtil.covertBean(reqJson, ProductPo.class);
productPo.setStoreId(storeId);
- return updateProductBMOImpl.update(productPo);
+
+
+ ProductDetailPo productDetailPo = null;
+ if(reqJson.containsKey("content")) {
+ productDetailPo = new ProductDetailPo();
+ productDetailPo.setStoreId(storeId);
+ productDetailPo.setContent(reqJson.getString("content"));
+ }
+
+ return updateProductBMOImpl.update(productPo, coverPhoto, carouselFigurePhoto, productSpecValuePos, productDetailPo);
}
/**
@@ -183,12 +251,14 @@
*/
@RequestMapping(value = "/queryProduct", method = RequestMethod.GET)
public ResponseEntity<String> queryProduct(@RequestHeader(value = "store-id") String storeId,
+ @RequestParam(value = "productId", required = false) String productId,
@RequestParam(value = "page") int page,
@RequestParam(value = "row") int row) {
ProductDto productDto = new ProductDto();
productDto.setPage(page);
productDto.setRow(row);
productDto.setStoreId(storeId);
+ productDto.setProductId(productId);
return getProductBMOImpl.get(productDto);
}
@@ -212,24 +282,24 @@
JSONArray specDetails = reqJson.getJSONArray("specDetails");
- if(specDetails.size() < 1){
+ if (specDetails.size() < 1) {
throw new IllegalArgumentException("鏈寘鍚鏍间俊鎭�");
}
ProductSpecDetailPo productSpecDetailPo = null;
JSONObject specDetail = null;
List<ProductSpecDetailPo> productSpecDetailPos = new ArrayList<>();
- for(int detailIndex = 0 ; detailIndex < specDetails.size(); detailIndex ++){
+ for (int detailIndex = 0; detailIndex < specDetails.size(); detailIndex++) {
specDetail = specDetails.getJSONObject(detailIndex);
- Assert.hasKeyAndValue(specDetail,"detailName","鏈寘鍚鏍�");
- Assert.hasKeyAndValue(specDetail,"detailValue","鏈寘鍚鏍煎��");
- productSpecDetailPo = BeanConvertUtil.covertBean(specDetail,ProductSpecDetailPo.class);
+ Assert.hasKeyAndValue(specDetail, "detailName", "鏈寘鍚鏍�");
+ Assert.hasKeyAndValue(specDetail, "detailValue", "鏈寘鍚鏍煎��");
+ productSpecDetailPo = BeanConvertUtil.covertBean(specDetail, ProductSpecDetailPo.class);
productSpecDetailPos.add(productSpecDetailPo);
}
ProductSpecPo productSpecPo = BeanConvertUtil.covertBean(reqJson, ProductSpecPo.class);
productSpecPo.setStoreId(storeId);
- return saveProductSpecBMOImpl.save(productSpecPo,productSpecDetailPos);
+ return saveProductSpecBMOImpl.save(productSpecPo, productSpecDetailPos);
}
/**
@@ -248,9 +318,29 @@
Assert.hasKeyAndValue(reqJson, "specId", "specId涓嶈兘涓虹┖");
+ if (!reqJson.containsKey("specDetails")) {
+ throw new IllegalArgumentException("鏈寘鍚鏍间俊鎭�");
+ }
+
+ JSONArray specDetails = reqJson.getJSONArray("specDetails");
+
+ if (specDetails.size() < 1) {
+ throw new IllegalArgumentException("鏈寘鍚鏍间俊鎭�");
+ }
+ ProductSpecDetailPo productSpecDetailPo = null;
+ JSONObject specDetail = null;
+ List<ProductSpecDetailPo> productSpecDetailPos = new ArrayList<>();
+ for (int detailIndex = 0; detailIndex < specDetails.size(); detailIndex++) {
+ specDetail = specDetails.getJSONObject(detailIndex);
+ Assert.hasKeyAndValue(specDetail, "detailName", "鏈寘鍚鏍�");
+ Assert.hasKeyAndValue(specDetail, "detailValue", "鏈寘鍚鏍煎��");
+ productSpecDetailPo = BeanConvertUtil.covertBean(specDetail, ProductSpecDetailPo.class);
+ productSpecDetailPos.add(productSpecDetailPo);
+ }
+
ProductSpecPo productSpecPo = BeanConvertUtil.covertBean(reqJson, ProductSpecPo.class);
productSpecPo.setStoreId(storeId);
- return updateProductSpecBMOImpl.update(productSpecPo);
+ return updateProductSpecBMOImpl.update(productSpecPo, productSpecDetailPos);
}
/**
@@ -560,4 +650,91 @@
productAttrDto.setProductId(productId);
return getProductAttrBMOImpl.get(productAttrDto);
}
+
+
+ /**
+ * 寰俊淇濆瓨娑堟伅妯℃澘
+ *
+ * @param reqJson
+ * @return
+ * @serviceCode /productDetail/saveProductDetail
+ * @path /app/productDetail/saveProductDetail
+ */
+ @RequestMapping(value = "/saveProductDetail", method = RequestMethod.POST)
+ public ResponseEntity<String> saveProductDetail(@RequestBody JSONObject reqJson,
+ @RequestHeader(value = "store-id") String storeId) {
+
+ Assert.hasKeyAndValue(reqJson, "productId", "璇锋眰鎶ユ枃涓湭鍖呭惈productId");
+ Assert.hasKeyAndValue(reqJson, "storeId", "璇锋眰鎶ユ枃涓湭鍖呭惈storeId");
+ Assert.hasKeyAndValue(reqJson, "content", "璇锋眰鎶ユ枃涓湭鍖呭惈content");
+
+
+ ProductDetailPo productDetailPo = BeanConvertUtil.covertBean(reqJson, ProductDetailPo.class);
+ productDetailPo.setStoreId(storeId);
+ return saveProductDetailBMOImpl.save(productDetailPo);
+ }
+
+ /**
+ * 寰俊淇敼娑堟伅妯℃澘
+ *
+ * @param reqJson
+ * @return
+ * @serviceCode /productDetail/updateProductDetail
+ * @path /app/productDetail/updateProductDetail
+ */
+ @RequestMapping(value = "/updateProductDetail", method = RequestMethod.POST)
+ public ResponseEntity<String> updateProductDetail(@RequestBody JSONObject reqJson,
+ @RequestHeader(value = "store-id") String storeId) {
+
+ Assert.hasKeyAndValue(reqJson, "productId", "璇锋眰鎶ユ枃涓湭鍖呭惈productId");
+ Assert.hasKeyAndValue(reqJson, "storeId", "璇锋眰鎶ユ枃涓湭鍖呭惈storeId");
+ Assert.hasKeyAndValue(reqJson, "content", "璇锋眰鎶ユ枃涓湭鍖呭惈content");
+ Assert.hasKeyAndValue(reqJson, "detailId", "detailId涓嶈兘涓虹┖");
+
+
+ ProductDetailPo productDetailPo = BeanConvertUtil.covertBean(reqJson, ProductDetailPo.class);
+ productDetailPo.setStoreId(storeId);
+ return updateProductDetailBMOImpl.update(productDetailPo);
+ }
+
+ /**
+ * 寰俊鍒犻櫎娑堟伅妯℃澘
+ *
+ * @param reqJson
+ * @return
+ * @serviceCode /productDetail/deleteProductDetail
+ * @path /app/productDetail/deleteProductDetail
+ */
+ @RequestMapping(value = "/deleteProductDetail", method = RequestMethod.POST)
+ public ResponseEntity<String> deleteProductDetail(@RequestBody JSONObject reqJson, @RequestHeader(value = "store-id") String storeId) {
+ Assert.hasKeyAndValue(reqJson, "communityId", "灏忓尯ID涓嶈兘涓虹┖");
+
+ Assert.hasKeyAndValue(reqJson, "detailId", "detailId涓嶈兘涓虹┖");
+
+
+ ProductDetailPo productDetailPo = BeanConvertUtil.covertBean(reqJson, ProductDetailPo.class);
+ productDetailPo.setStoreId(storeId);
+ return deleteProductDetailBMOImpl.delete(productDetailPo);
+ }
+
+ /**
+ * 寰俊鍒犻櫎娑堟伅妯℃澘
+ *
+ * @param storeId 灏忓尯ID
+ * @return
+ * @serviceCode /productDetail/queryProductDetail
+ * @path /app/productDetail/queryProductDetail
+ */
+ @RequestMapping(value = "/queryProductDetail", method = RequestMethod.GET)
+ public ResponseEntity<String> queryProductDetail(@RequestHeader(value = "store-id") String storeId,
+ @RequestParam(value = "productId") String productId,
+ @RequestParam(value = "page") int page,
+ @RequestParam(value = "row") int row) {
+ ProductDetailDto productDetailDto = new ProductDetailDto();
+ productDetailDto.setPage(page);
+ productDetailDto.setRow(row);
+ productDetailDto.setStoreId(storeId);
+ productDetailDto.setProductId(productId);
+ return getProductDetailBMOImpl.get(productDetailDto);
+ }
}
--
Gitblit v1.8.0