Merge remote-tracking branch 'origin/master'

alien-entity/src/main/java/shop/alien/entity/second/vo/SecondGoodsDetailVo.java

@@ -18,7 +18,7 @@ import java.util.List;
 public class SecondGoodsDetailVo {
 
     @ApiModelProperty(value = "商品基本信息")
-    private SecondGoods goodsInfo;
+    private SecondGoodsVo goodsInfo;
 
     @ApiModelProperty(value = "商品图片列表")
     private List<StoreImg> imageList;

alien-entity/src/main/java/shop/alien/mapper/second/SecondGoodsMapper.java

@@ -307,5 +307,19 @@ public interface SecondGoodsMapper extends BaseMapper<SecondGoods> {
             "on sg.category_two_id = sgc2.id " +
             "${ew.customSqlSegment}")
     IPage<SecondGoodsVo> getAdminGoodsList(IPage<SecondGoodsVo> page, @Param(Constants.WRAPPER) QueryWrapper<SecondGoodsVo> queryWrapper);
-
+    @Select("SELECT " +
+            "sg.*, " +
+            "lu.user_name as userName, " +
+            "lu.user_phone as userPhone, " +
+            "sgc1.category_name as categoryOneName, " +
+            "sgc2.category_name as categoryTwoName " +
+            "FROM second_goods sg " +
+            "left JOIN second_goods_category sgc1 " +
+            "on sg.category_one_id = sgc1.id " +
+            "left JOIN second_goods_category sgc2 " +
+            "on sg.category_two_id = sgc2.id " +
+            "left JOIN life_user lu " +
+            "on lu.id = sg.userId " +
+            "${ew.customSqlSegment}")
+    SecondGoodsVo getGoodsById(@Param(Constants.WRAPPER) QueryWrapper<SecondGoodsVo> queryWrapper);
 }

alien-second/src/main/java/shop/alien/second/service/impl/SecondGoodsServiceImpl.java

@@ -180,9 +180,11 @@ public class SecondGoodsServiceImpl extends ServiceImpl<SecondGoodsMapper, Secon
     @Override
     public SecondGoodsDetailVo getAdminGoodsDetail(Integer goodsId) {
         SecondGoodsDetailVo detailVo = new SecondGoodsDetailVo();
-        
+        QueryWrapper<SecondGoodsVo> goodsVoQueryWrapper = new QueryWrapper<>();
+        goodsVoQueryWrapper.lambda()
+                .eq(SecondGoodsVo::getId, goodsId);
         // 1. 获取商品基本信息
-        SecondGoods goodsInfo = getById(goodsId);
+        SecondGoodsVo goodsInfo = secondGoodsMapper.getGoodsById(goodsVoQueryWrapper);
         detailVo.setGoodsInfo(goodsInfo);
         
         // 2. 获取商品图片列表