PC端商品列表

common/src/main/java/com/jpsoft/machinery/modules/base/dao/CataloguesDAO.java

@@ -15,4 +15,5 @@ public interface CataloguesDAO {
 	int delete(String id);
 	List<Catalogues> list();
 	List<Catalogues> search(Map<String,Object> searchParams,List<Sort> sortList);
+	List<String> findListBySortAll(String sort);
 }

common/src/main/java/com/jpsoft/machinery/modules/base/service/CataloguesService.java

@@ -16,4 +16,5 @@ public interface CataloguesService {
 	List<Catalogues> list();
 	Page<Catalogues> pageSearch(Map<String, Object> searchParams,int pageNum,int pageSize,boolean count,List<Sort> sortList);
 	List<Catalogues> query(Map<String, Object> searchParams, int limit, List<Sort> sortList);
+	List<String> findListBySortAll(String sort);
 }

common/src/main/java/com/jpsoft/machinery/modules/base/service/impl/CataloguesServiceImpl.java

@@ -78,4 +78,10 @@ public class CataloguesServiceImpl implements CataloguesService {
 
 		return page.getResult();
 	}
+
+	@Override
+	public List<String> findListBySortAll(String sort) {
+		// TODO Auto-generated method stub
+		return cataloguesDAO.findListBySortAll(sort);
+	}
 }

common/src/main/resources/mapper/base/Catalogues.xml

@@ -107,4 +107,8 @@ id_,title_,content_,icon_url,parent_id,sort_,del_flag,create_time,create_by,upda
 	        ${sort.name} ${sort.order}
 	 	</foreach>
 	</select>
+	<select id="findListBySortAll" parameterType="string" resultType="string">
+		SELECT * FROM base_catalogues
+		WHERE del_flag=0 AND sort_ LIKE #{0}
+	</select>
 </mapper>

common/src/main/resources/mapper/base/Commodity.xml

@@ -106,6 +106,11 @@ id_,catalogues_id,product_model,product_icon,product_content,product_picture,pro
 			<if test="searchParams.productModel != null">
 				and product_model like #{searchParams.productModel}
 			</if>
+			<if test="searchParams.cataloguesIds != null">
+				<foreach collection="searchParams.cataloguesIds" item="cataloguesId" open="and catalogues_id in (" separator="," close=")">
+					#{cataloguesId}
+				</foreach>
+			</if>
 		</where>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">
 	        ${sort.name} ${sort.order}

web/src/main/java/com/jpsoft/machinery/config/WebMvcConfig.java

@@ -51,15 +51,15 @@ public class WebMvcConfig implements WebMvcConfigurer {
                         "/webjars/**",
                         "/swagger-ui.html",
                         "/v2/**")
-				.excludePathPatterns("/mobile/personInfoApi/getVerifyCode")
-				.excludePathPatterns("/mobile/personInfoApi/findByOpenId")
-				.excludePathPatterns("/mobile/personInfoApi/register")
-				.excludePathPatterns("/mobile/personInfoApi/login")
-				.excludePathPatterns("/wechat/**")
-				.excludePathPatterns("/static/**")
-				.excludePathPatterns("/mobile/schoolInfoApi/typeList")
-				.excludePathPatterns("/mobile/schoolInfoApi/detail")
-				.excludePathPatterns("/mobile/newsApi/**")
+//				.excludePathPatterns("/mobile/personInfoApi/getVerifyCode")
+//				.excludePathPatterns("/mobile/personInfoApi/findByOpenId")
+//				.excludePathPatterns("/mobile/personInfoApi/register")
+//				.excludePathPatterns("/mobile/personInfoApi/login")
+				.excludePathPatterns("/open/**")
+//				.excludePathPatterns("/static/**")
+//				.excludePathPatterns("/mobile/schoolInfoApi/typeList")
+//				.excludePathPatterns("/mobile/schoolInfoApi/detail")
+//				.excludePathPatterns("/mobile/newsApi/**")
 
 		;
 	}

web/src/main/java/com/jpsoft/machinery/modules/open/CommodityApiController.java

@@ -0,0 +1,64 @@
+package com.jpsoft.machinery.modules.open;
+
+import com.github.pagehelper.Page;
+import com.jpsoft.machinery.modules.base.entity.Catalogues;
+import com.jpsoft.machinery.modules.base.entity.Commodity;
+import com.jpsoft.machinery.modules.base.service.CataloguesService;
+import com.jpsoft.machinery.modules.base.service.CommodityService;
+import com.jpsoft.machinery.modules.common.dto.MessageResult;
+import com.jpsoft.machinery.modules.common.dto.Sort;
+import com.jpsoft.machinery.modules.common.utils.PojoUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.*;
+
+@RestController
+@RequestMapping("/open/commodityApi")
+@Api(description = "商品接口")
+public class CommodityApiController {
+    private Logger logger = LoggerFactory.getLogger(getClass());
+
+    @Autowired
+    private CommodityService commodityService;
+    @Autowired
+    private CataloguesService cataloguesService;
+
+    @ApiOperation(value="商品列表")
+    @RequestMapping(value = "commodityList",method = RequestMethod.POST)
+    public List<Map> commodityList(){
+        List<Map> listResult = new ArrayList<>();
+
+        Map<String,Object> searchParams = new HashMap<>();
+        searchParams.put("parentId", "6b91395e-d5f5-47c2-bca2-1a79b1f1e646");
+
+        List<Sort> sortList = new ArrayList<>();
+        sortList.add(new Sort("sort_","asc"));
+
+        Page<Catalogues> page = cataloguesService.pageSearch(searchParams,1,1000,false,sortList);
+        for(Catalogues catalogues : page.getResult()){
+            List<String> cataloguesIds = cataloguesService.findListBySortAll(catalogues.getSort() + "%");
+
+            List<Sort> sortListEx = new ArrayList<>();
+            sortList.add(new Sort("create_time","asc"));
+            Map<String,Object> searchParamsEx = new HashMap<>();
+            if(cataloguesIds.size() > 0) {
+                searchParamsEx.put("cataloguesIds", cataloguesIds);
+            }
+
+            Page<Commodity> commodityPage = commodityService.pageSearch(searchParamsEx,1,1000,false,sortListEx);
+
+            Map map = new HashMap();
+            map.put("name", catalogues.getTitle());
+            map.put("list", commodityPage.getResult());
+            listResult.add(map);
+        }
+
+        return listResult;
+    }
+}