From e57e32fc43da31917912eebb4e47d4e50df1a9e9 Mon Sep 17 00:00:00 2001
From: shiyj1101 <1098226878@qq.com>
Date: 星期四, 05 八月 2021 22:56:15 +0800
Subject: [PATCH] 完善格式化功能
---
service-goods/src/main/java/com/java110/goods/api/GroupBuyApi.java | 32 +++++++++++++++++++++++++++++---
1 files changed, 29 insertions(+), 3 deletions(-)
diff --git a/service-goods/src/main/java/com/java110/goods/api/GroupBuyApi.java b/service-goods/src/main/java/com/java110/goods/api/GroupBuyApi.java
old mode 100644
new mode 100755
index 9e18e92..4463dd3
--- a/service-goods/src/main/java/com/java110/goods/api/GroupBuyApi.java
+++ b/service-goods/src/main/java/com/java110/goods/api/GroupBuyApi.java
@@ -172,12 +172,18 @@
*/
@RequestMapping(value = "/queryGroupBuy", method = RequestMethod.GET)
public ResponseEntity<String> queryGroupBuy(@RequestHeader(value = "store-id") String storeId,
+ @RequestParam(value = "batchId", required = false) String batchId,
+ @RequestParam(value = "groupProdName", required = false) String groupProdName,
+ @RequestParam(value = "buyId", required = false) String buyId,
@RequestParam(value = "page") int page,
@RequestParam(value = "row") int row) {
GroupBuyDto groupBuyDto = new GroupBuyDto();
groupBuyDto.setPage(page);
groupBuyDto.setRow(row);
groupBuyDto.setStoreId(storeId);
+ groupBuyDto.setBatchId(batchId);
+ groupBuyDto.setGroupProdName(groupProdName);
+ groupBuyDto.setBuyId(buyId);
return getGroupBuyBMOImpl.get(groupBuyDto);
}
@@ -217,7 +223,7 @@
}
GroupBuyProductPo groupBuyProductPo = BeanConvertUtil.covertBean(reqJson, GroupBuyProductPo.class);
groupBuyProductPo.setStoreId(storeId);
- return saveGroupBuyProductBMOImpl.save(groupBuyProductPo,groupBuyProductSpecPos);
+ return saveGroupBuyProductBMOImpl.save(groupBuyProductPo, groupBuyProductSpecPos);
}
/**
@@ -237,10 +243,26 @@
Assert.hasKeyAndValue(reqJson, "sort", "璇锋眰鎶ユ枃涓湭鍖呭惈sort");
Assert.hasKeyAndValue(reqJson, "groupId", "groupId涓嶈兘涓虹┖");
+ Assert.hasKey(reqJson, "productSpecs", "璇锋眰鎶ユ枃涓湭鍖呭惈鍟嗗搧瑙勬牸淇℃伅");
+ JSONArray productSpecs = reqJson.getJSONArray("productSpecs");
+
+ if (productSpecs.size() < 1) {
+ throw new IllegalArgumentException("璇锋眰鎶ユ枃涓晢鍝佽鏍兼暟閲忎负0");
+ }
+ List<GroupBuyProductSpecPo> groupBuyProductSpecPos = new ArrayList<>();
+ GroupBuyProductSpecPo groupBuyProductSpecPo = null;
+ for (int specIndex = 0; specIndex < productSpecs.size(); specIndex++) {
+ groupBuyProductSpecPo = BeanConvertUtil.covertBean(productSpecs.getJSONObject(specIndex), GroupBuyProductSpecPo.class);
+ groupBuyProductSpecPo.setProductId(reqJson.getString("productId"));
+ groupBuyProductSpecPo.setDefaultShow("F");
+ groupBuyProductSpecPo.setGroupSales("1");
+ groupBuyProductSpecPo.setStoreId(storeId);
+ groupBuyProductSpecPos.add(groupBuyProductSpecPo);
+ }
GroupBuyProductPo groupBuyProductPo = BeanConvertUtil.covertBean(reqJson, GroupBuyProductPo.class);
groupBuyProductPo.setStoreId(storeId);
- return updateGroupBuyProductBMOImpl.update(groupBuyProductPo);
+ return updateGroupBuyProductBMOImpl.update(groupBuyProductPo, groupBuyProductSpecPos);
}
/**
@@ -274,11 +296,13 @@
@RequestMapping(value = "/queryGroupBuyProduct", method = RequestMethod.GET)
public ResponseEntity<String> queryGroupBuyProduct(@RequestHeader(value = "store-id") String storeId,
@RequestParam(value = "page") int page,
- @RequestParam(value = "row") int row) {
+ @RequestParam(value = "row") int row,
+ @RequestParam(value = "groupId", required = false) String groupId) {
GroupBuyProductDto groupBuyProductDto = new GroupBuyProductDto();
groupBuyProductDto.setPage(page);
groupBuyProductDto.setRow(row);
groupBuyProductDto.setStoreId(storeId);
+ groupBuyProductDto.setGroupId(groupId);
return getGroupBuyProductBMOImpl.get(groupBuyProductDto);
}
@@ -522,12 +546,14 @@
*/
@RequestMapping(value = "/queryGroupBuyBatch", method = RequestMethod.GET)
public ResponseEntity<String> queryGroupBuyBatch(@RequestHeader(value = "store-id") String storeId,
+ @RequestParam(value = "batchId", required = false) String batchId,
@RequestParam(value = "page") int page,
@RequestParam(value = "row") int row) {
GroupBuyBatchDto groupBuyBatchDto = new GroupBuyBatchDto();
groupBuyBatchDto.setPage(page);
groupBuyBatchDto.setRow(row);
groupBuyBatchDto.setStoreId(storeId);
+ groupBuyBatchDto.setBatchId(batchId);
return getGroupBuyBatchBMOImpl.get(groupBuyBatchDto);
}
}
--
Gitblit v1.8.0