goods for mini app, simple add goods spec

src/main/java/com.huiju.welcome/controller/TaGoodsController.java

@@ -11,7 +11,6 @@ import com.huiju.welcome.model.TaGoodsSpec;
 import com.huiju.welcome.service.ITaGoodsService;
 import com.huiju.welcome.service.ITaGoodsSpecService;
 import com.huiju.welcome.utils.StatusUtils;
-import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
@@ -51,16 +50,13 @@ public class TaGoodsController extends BaseController {
     @RequestMapping(value="/taGoods/add",method= RequestMethod.POST)
     public ResponseBean tpShopImgAdd(@RequestBody String paramStr){
         JSONObject jsonObject = JSONObject.parseObject(paramStr);
-
         TaGoods taGoods = jsonObject.getObject("goods", TaGoods.class);
-        JSONArray spec = jsonObject.getJSONArray("spec");
-
         ResponseBean responseBean = new ResponseBean();
         try {
             taGoods.setCreateDate(LocalDateTime.now());
             taGoods.setStatus(StatusUtils.Normal);
             Boolean flag = iTaGoodsService.save(taGoods);
-            List<TaGoodsSpec> specList = spec.toJavaList(TaGoodsSpec.class);
+            List<TaGoodsSpec> specList = taGoods.getSpecList();
             specList.stream().forEach(e -> {
                 e.setGoodsId(taGoods.getGoodsId());
             });
@@ -153,10 +149,9 @@ public class TaGoodsController extends BaseController {
 
     @ApiOperation(value = "商品列表", notes = "商品列表")
     @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "body", dataType = "String", name = "typeName", value = "商品名称")
     })
     @RequestMapping(value = "/taGoods", method = RequestMethod.GET)
-    public ResponseBean typeList(@RequestParam(defaultValue = "1") int pageNum,
+    public ResponseBean goodsList(@RequestParam(defaultValue = "1") int pageNum,
                                  @RequestParam(defaultValue = "10") int pageSize,
                                  @RequestParam(value = "goodsName",required = false) String goodsName,
                                  @RequestParam(value = "typeId",required = false) Integer typeId) {
@@ -167,6 +162,21 @@ public class TaGoodsController extends BaseController {
         return userManagement;
     }
 
+    @ApiOperation(value = "商品列表", notes = "商品列表")
+    @ApiImplicitParams({
+    })
+    @RequestMapping(value = "/miniapp/taGoods", method = RequestMethod.GET)
+    public ResponseBean goodsListForMiniApp(@RequestParam(defaultValue = "1") int pageNum,
+                                 @RequestParam(defaultValue = "10") int pageSize,
+                                 @RequestParam(value = "goodsName",required = false) String goodsName,
+                                 @RequestParam(value = "typeId",required = true) Integer typeId) {
+        IPage<TaGoods> pg = new Page<>(pageNum, pageSize);
+
+        ResponseBean userManagement= iTaGoodsService.goodsList(pg,goodsName,typeId);
+
+        return userManagement;
+    }
+
 
 
 

src/main/java/com.huiju.welcome/controller/TdGoodsTypeController.java

@@ -134,4 +134,18 @@ public class TdGoodsTypeController extends BaseController {
 
         return userManagement;
     }
+
+    @ApiOperation(value = "商品类型列表", notes = "商品类型列表")
+    @ApiImplicitParams({
+    })
+    @RequestMapping(value = "/miniapp/tdGoodsType", method = RequestMethod.GET)
+    public ResponseBean typeListForMiniApp(@RequestParam(defaultValue = "1") int pageNum,
+                                 @RequestParam(defaultValue = "10") int pageSize,
+                                 @RequestParam(value = "typeName",required = false) String typeName) {
+        IPage<TdGoodsType> pg = new Page<>(pageNum, pageSize);
+
+        ResponseBean userManagement= iTdGoodsTypeService.typeList(pg,typeName);
+
+        return userManagement;
+    }
 }