From 873197abd3ae5e447f57683031cea6896f0cf2aa Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 25 十月 2022 13:01:15 +0800
Subject: [PATCH] 加入营销商品功能

---
 service-common/src/main/java/com/java110/common/api/AttrValueApi.java |   32 +++++++++++++++++++++++++++-----
 1 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/service-common/src/main/java/com/java110/common/api/AttrValueApi.java b/service-common/src/main/java/com/java110/common/api/AttrValueApi.java
old mode 100644
new mode 100755
index ad052ca..cb87162
--- a/service-common/src/main/java/com/java110/common/api/AttrValueApi.java
+++ b/service-common/src/main/java/com/java110/common/api/AttrValueApi.java
@@ -5,13 +5,17 @@
 import com.java110.common.bmo.attrValue.IGetAttrValueBMO;
 import com.java110.common.bmo.attrValue.ISaveAttrValueBMO;
 import com.java110.common.bmo.attrValue.IUpdateAttrValueBMO;
-import com.java110.dto.attrValue.AttrValueDto;
+import com.java110.dto.attrSpec.AttrValueDto;
 import com.java110.po.attrValue.AttrValuePo;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
+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.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 
 @RestController
@@ -39,7 +43,7 @@
     @RequestMapping(value = "/saveAttrValue", method = RequestMethod.POST)
     public ResponseEntity<String> saveAttrValue(@RequestBody JSONObject reqJson) {
 
-        Assert.hasKeyAndValue(reqJson, "specCd", "璇锋眰鎶ユ枃涓湭鍖呭惈specCd");
+        Assert.hasKeyAndValue(reqJson, "specId", "璇锋眰鎶ユ枃涓湭鍖呭惈specId");
         Assert.hasKeyAndValue(reqJson, "value", "璇锋眰鎶ユ枃涓湭鍖呭惈value");
         Assert.hasKeyAndValue(reqJson, "valueName", "璇锋眰鎶ユ枃涓湭鍖呭惈valueName");
         Assert.hasKeyAndValue(reqJson, "valueShow", "璇锋眰鎶ユ枃涓湭鍖呭惈valueShow");
@@ -60,7 +64,7 @@
     @RequestMapping(value = "/updateAttrValue", method = RequestMethod.POST)
     public ResponseEntity<String> updateAttrValue(@RequestBody JSONObject reqJson) {
 
-        Assert.hasKeyAndValue(reqJson, "specCd", "璇锋眰鎶ユ枃涓湭鍖呭惈specCd");
+        Assert.hasKeyAndValue(reqJson, "specId", "璇锋眰鎶ユ枃涓湭鍖呭惈specId");
         Assert.hasKeyAndValue(reqJson, "value", "璇锋眰鎶ユ枃涓湭鍖呭惈value");
         Assert.hasKeyAndValue(reqJson, "valueName", "璇锋眰鎶ユ枃涓湭鍖呭惈valueName");
         Assert.hasKeyAndValue(reqJson, "valueShow", "璇锋眰鎶ユ枃涓湭鍖呭惈valueShow");
@@ -97,11 +101,29 @@
      * @return
      * @serviceCode /attrValue/queryAttrValue
      * @path /app/attrValue/queryAttrValue
+     * value: '',
+     * valueShow: '',
+     * valueName: '',
      */
     @RequestMapping(value = "/queryAttrValue", method = RequestMethod.GET)
-    public ResponseEntity<String> queryAttrValue(@RequestParam(value = "specCd") String specCd) {
+    public ResponseEntity<String> queryAttrValue(@RequestParam(value = "specCd",required = false) String specCd,
+                                                 @RequestParam(value = "specId",required = false) String specId,
+                                                 @RequestParam(value = "page", required = false) int page,
+                                                 @RequestParam(value = "row", required = false) int row,
+                                                 @RequestParam(value = "value", required = false) String value,
+                                                 @RequestParam(value = "domain", required = false) String domain,
+                                                 @RequestParam(value = "valueShow", required = false) String valueShow,
+                                                 @RequestParam(value = "valueName", required = false) String valueName
+    ) {
         AttrValueDto attrValueDto = new AttrValueDto();
         attrValueDto.setSpecCd(specCd);
+        attrValueDto.setPage(page);
+        attrValueDto.setRow(row);
+        attrValueDto.setValue(value);
+        attrValueDto.setValueName(valueName);
+        attrValueDto.setValueShow(valueShow);
+        attrValueDto.setDomain(domain);
+        attrValueDto.setSpecId(specId);
         return getAttrValueBMOImpl.get(attrValueDto);
     }
 }
\ No newline at end of file

--
Gitblit v1.8.0