java110 лет назад: 5
Родитель
Сommit
f1e7c24415

+ 67 - 34
java110-bean/src/main/java/com/java110/dto/groupBuy/GroupBuyDto.java

@@ -1,6 +1,7 @@
 package com.java110.dto.groupBuy;
 
 import com.java110.dto.PageDto;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -15,17 +16,18 @@ import java.util.Date;
 public class GroupBuyDto extends PageDto implements Serializable {
 
     private String specId;
-private String buyCount;
-private String amount;
-private String productId;
-private String groupId;
-private String persionId;
-private String batchId;
-private String storeId;
-private String persionName;
-private String groupPrice;
-private String buyId;
-private String state;
+    private String buyCount;
+    private String amount;
+    private String productId;
+    private String groupId;
+    private String groupProdName;
+    private String persionId;
+    private String batchId;
+    private String storeId;
+    private String persionName;
+    private String groupPrice;
+    private String buyId;
+    private String state;
 
 
     private Date createTime;
@@ -36,73 +38,96 @@ private String state;
     public String getSpecId() {
         return specId;
     }
-public void setSpecId(String specId) {
+
+    public void setSpecId(String specId) {
         this.specId = specId;
     }
-public String getBuyCount() {
+
+    public String getBuyCount() {
         return buyCount;
     }
-public void setBuyCount(String buyCount) {
+
+    public void setBuyCount(String buyCount) {
         this.buyCount = buyCount;
     }
-public String getAmount() {
+
+    public String getAmount() {
         return amount;
     }
-public void setAmount(String amount) {
+
+    public void setAmount(String amount) {
         this.amount = amount;
     }
-public String getProductId() {
+
+    public String getProductId() {
         return productId;
     }
-public void setProductId(String productId) {
+
+    public void setProductId(String productId) {
         this.productId = productId;
     }
-public String getGroupId() {
+
+    public String getGroupId() {
         return groupId;
     }
-public void setGroupId(String groupId) {
+
+    public void setGroupId(String groupId) {
         this.groupId = groupId;
     }
-public String getPersionId() {
+
+    public String getPersionId() {
         return persionId;
     }
-public void setPersionId(String persionId) {
+
+    public void setPersionId(String persionId) {
         this.persionId = persionId;
     }
-public String getBatchId() {
+
+    public String getBatchId() {
         return batchId;
     }
-public void setBatchId(String batchId) {
+
+    public void setBatchId(String batchId) {
         this.batchId = batchId;
     }
-public String getStoreId() {
+
+    public String getStoreId() {
         return storeId;
     }
-public void setStoreId(String storeId) {
+
+    public void setStoreId(String storeId) {
         this.storeId = storeId;
     }
-public String getPersionName() {
+
+    public String getPersionName() {
         return persionName;
     }
-public void setPersionName(String persionName) {
+
+    public void setPersionName(String persionName) {
         this.persionName = persionName;
     }
-public String getGroupPrice() {
+
+    public String getGroupPrice() {
         return groupPrice;
     }
-public void setGroupPrice(String groupPrice) {
+
+    public void setGroupPrice(String groupPrice) {
         this.groupPrice = groupPrice;
     }
-public String getBuyId() {
+
+    public String getBuyId() {
         return buyId;
     }
-public void setBuyId(String buyId) {
+
+    public void setBuyId(String buyId) {
         this.buyId = buyId;
     }
-public String getState() {
+
+    public String getState() {
         return state;
     }
-public void setState(String state) {
+
+    public void setState(String state) {
         this.state = state;
     }
 
@@ -122,4 +147,12 @@ public void setState(String state) {
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public String getGroupProdName() {
+        return groupProdName;
+    }
+
+    public void setGroupProdName(String groupProdName) {
+        this.groupProdName = groupProdName;
+    }
 }

+ 7 - 1
service-goods/src/main/java/com/java110/goods/api/GroupBuyApi.java

@@ -172,12 +172,18 @@ public class GroupBuyApi {
      */
     @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);
     }
 
@@ -540,7 +546,7 @@ public class GroupBuyApi {
      */
     @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 = "batchId", required = false) String batchId,
                                                      @RequestParam(value = "page") int page,
                                                      @RequestParam(value = "row") int row) {
         GroupBuyBatchDto groupBuyBatchDto = new GroupBuyBatchDto();