代码调整

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/controller/HomepageApiController.java

@@ -14,7 +14,9 @@ import com.xingxi.common.enums.EDelFlag;
 import com.xingxi.master.ipInfo.domain.IpInfo;
 import com.xingxi.master.ipInfo.service.IIpInfoService;
 import com.xingxi.master.product.domain.ProdClass;
+import com.xingxi.master.product.domain.ProdPic;
 import com.xingxi.master.product.service.IProdClassService;
+import com.xingxi.master.product.service.impl.ProdPicServiceImpl;
 import com.xingxi.system.service.ISysConfigService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -47,6 +49,8 @@ public class HomepageApiController extends BaseApiController {
     private ISuggestProdService middleProdService;
     @Autowired
     private INewProdService rightProdService;
+    @Autowired
+    private ProdPicServiceImpl prodPicServiceImpl;
 
     @GetMapping("/banners")
     public BannerResponse getBanners(){
@@ -79,30 +83,90 @@ public class HomepageApiController extends BaseApiController {
     }
 
     @GetMapping("/leftProds")
-    public LeftProdResponse getLeftProds(){
+    public LeftProdListResponse getLeftProds(){
 
         PopularProd cond = new PopularProd();
         cond.setDelFlag(EDelFlag.NO.getVal());
 
-        return new LeftProdResponse(leftProdService.selectPopularProdList(cond));
+        List<PopularProd> leftprodList = leftProdService.selectPopularProdList(cond);
+
+        List<HomeProdResponse> prodList = new ArrayList<>();
+
+        for (PopularProd leftProd : leftprodList) {
+            HomeProdResponse prodResponse = new HomeProdResponse();
+            prodResponse.setId(leftProd.getId());
+            prodResponse.setProdId(leftProd.getProdId());
+            prodResponse.setSort(leftProd.getSort());
+
+            ProdPic condPic = new ProdPic();
+            condPic.setProdId(leftProd.getProdId());
+            condPic.setDelFlag(EDelFlag.NO.getVal());
+
+            List<ProdPic> picList = prodPicServiceImpl.selectProdPicList(condPic);
+            prodResponse.setProdPicList(picList);
+
+            prodList.add(prodResponse);
+        }
+
+        return new LeftProdListResponse(prodList);
     }
 
     @GetMapping("/middleProds")
-    public MiddleProdResponse getMiddleProds(){
+    public MiddleProdListResponse getMiddleProds(){
 
         SuggestProd cond = new SuggestProd();
         cond.setDelFlag(EDelFlag.NO.getVal());
 
-        return new MiddleProdResponse(middleProdService.selectSuggestProdList(cond));
+        List<SuggestProd> leftprodList = middleProdService.selectSuggestProdList(cond);
+
+        List<HomeProdResponse> prodList = new ArrayList<>();
+
+        for (SuggestProd leftProd : leftprodList) {
+            HomeProdResponse prodResponse = new HomeProdResponse();
+            prodResponse.setId(leftProd.getId());
+            prodResponse.setProdId(leftProd.getProdId());
+            prodResponse.setSort(leftProd.getSort());
+
+            ProdPic condPic = new ProdPic();
+            condPic.setProdId(leftProd.getProdId());
+            condPic.setDelFlag(EDelFlag.NO.getVal());
+
+            List<ProdPic> picList = prodPicServiceImpl.selectProdPicList(condPic);
+            prodResponse.setProdPicList(picList);
+
+            prodList.add(prodResponse);
+        }
+
+        return new MiddleProdListResponse(prodList);
     }
 
     @GetMapping("/rightProds")
-    public RightProdResponse getRightProds(){
+    public RightProdListResponse getRightProds(){
 
         NewProd cond = new NewProd();
         cond.setDelFlag(EDelFlag.NO.getVal());
 
-        return new RightProdResponse(rightProdService.selectNewProdList(cond));
+        List<NewProd> leftprodList = rightProdService.selectNewProdList(cond);
+
+        List<HomeProdResponse> prodList = new ArrayList<>();
+
+        for (NewProd leftProd : leftprodList) {
+            HomeProdResponse prodResponse = new HomeProdResponse();
+            prodResponse.setId(leftProd.getId());
+            prodResponse.setProdId(leftProd.getProdId());
+            prodResponse.setSort(leftProd.getSort());
+
+            ProdPic condPic = new ProdPic();
+            condPic.setProdId(leftProd.getProdId());
+            condPic.setDelFlag(EDelFlag.NO.getVal());
+
+            List<ProdPic> picList = prodPicServiceImpl.selectProdPicList(condPic);
+            prodResponse.setProdPicList(picList);
+
+            prodList.add(prodResponse);
+        }
+
+        return new RightProdListResponse(prodList);
     }
 
     @GetMapping("/prodClasses")

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/model/HomeProdResponse.java

@@ -0,0 +1,21 @@
+package com.xingxi.api.model;
+
+import com.xingxi.master.product.domain.ProdPic;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class HomeProdResponse {
+
+    private Long id;
+
+    // 商品ID
+    private Long prodId;
+
+    // 顺序
+    private Long sort;
+
+    List<ProdPic> prodPicList;
+
+}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/model/RightProdResponse.java → 08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/model/LeftProdListResponse.java

@@ -1,6 +1,5 @@
 package com.xingxi.api.model;
 
-import com.xingxi.business.NewProd.domain.NewProd;
 import lombok.Data;
 import lombok.Value;
 
@@ -8,8 +7,8 @@ import java.util.List;
 
 @Data
 @Value
-public class RightProdResponse {
+public class LeftProdListResponse {
 
-    List<NewProd> prodList;
+    List<HomeProdResponse> prodList;
 
 }

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/model/LeftProdResponse.java

@@ -1,15 +0,0 @@
-package com.xingxi.api.model;
-
-import com.xingxi.business.PopularProd.domain.PopularProd;
-import lombok.Data;
-import lombok.Value;
-
-import java.util.List;
-
-@Data
-@Value
-public class LeftProdResponse {
-
-    List<PopularProd> prodList;
-
-}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/model/MiddleProdListResponse.java

@@ -0,0 +1,14 @@
+package com.xingxi.api.model;
+
+import lombok.Data;
+import lombok.Value;
+
+import java.util.List;
+
+@Data
+@Value
+public class MiddleProdListResponse {
+
+    List<HomeProdResponse> prodList;
+
+}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/model/MiddleProdResponse.java

@@ -1,15 +0,0 @@
-package com.xingxi.api.model;
-
-import com.xingxi.business.SuggestProd.domain.SuggestProd;
-import lombok.Data;
-import lombok.Value;
-
-import java.util.List;
-
-@Data
-@Value
-public class MiddleProdResponse {
-
-    List<SuggestProd> prodList;
-
-}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/model/RightProdListResponse.java

@@ -0,0 +1,14 @@
+package com.xingxi.api.model;
+
+import lombok.Data;
+import lombok.Value;
+
+import java.util.List;
+
+@Data
+@Value
+public class RightProdListResponse {
+
+    List<HomeProdResponse> prodList;
+
+}

08.src/Xingxi/xingxi-system/src/main/java/com/xingxi/business/PopularProd/service/impl/PopularProdServiceImpl.java

@@ -40,6 +40,8 @@ public class PopularProdServiceImpl implements IPopularProdService {
      */
     @Override
     public List<PopularProd> selectPopularProdList(PopularProd popularProd) {
+
+
         return popularProdMapper.selectPopularProdList(popularProd);
     }
 

08.src/Xingxi/xingxi-system/src/main/resources/mapper/business/NewProdMapper.xml

@@ -40,6 +40,7 @@
             <if test="updateUser != null  and updateUser != ''"> and updateUser = #{updateUser}</if>
             <if test="updateTime != null "> and updateTime = #{updateTime}</if>
         </where>
+        order by sort
     </select>
 
     <select id="selectNewProdById" parameterType="Long" resultMap="NewProdResult">

08.src/Xingxi/xingxi-system/src/main/resources/mapper/business/PopularProdMapper.xml

@@ -40,6 +40,7 @@
             <if test="updateUser != null  and updateUser != ''"> and updateUser = #{updateUser}</if>
             <if test="updateTime != null "> and updateTime = #{updateTime}</if>
         </where>
+        order by sort
     </select>
     
     <select id="selectPopularProdById" parameterType="Long" resultMap="PopularProdResult">

08.src/Xingxi/xingxi-system/src/main/resources/mapper/business/SuggestProdMapper.xml

@@ -16,19 +16,6 @@
         select id, prodId, sort, delFlag, createUser, createTime, updateUser, updateTime from t_suggest_prod
     </sql>
 
-    <sql id="selectSuggestProdExt">
-        select
-            ${tableAlias}.id,
-            ${tableAlias}.prodId,
-            ${tableAlias}.sort,
-            ${tableAlias}.delFlag,
-            ${tableAlias}.createUser,
-            ${tableAlias}.createTime,
-            ${tableAlias}.updateUser,
-            ${tableAlias}.updateTime
-        from t_suggest_prod ${tableAlias}
-    </sql>
-
     <select id="selectSuggestProdList" parameterType="SuggestProd" resultMap="SuggestProdResult">
         <include refid="selectSuggestProd"/>
         <where>  
@@ -40,6 +27,7 @@
             <if test="updateUser != null  and updateUser != ''"> and updateUser = #{updateUser}</if>
             <if test="updateTime != null "> and updateTime = #{updateTime}</if>
         </where>
+        order by sort
     </select>
     
     <select id="selectSuggestProdById" parameterType="Long" resultMap="SuggestProdResult">