Merge remote-tracking branch 'origin/master'

alien-entity/src/main/java/shop/alien/entity/second/SecondGoodsRecord.java

@@ -20,6 +20,13 @@ public class SecondGoodsRecord implements Serializable {
     @ApiModelProperty(value = "主键ID")
     private Integer id;
 
+    @ApiModelProperty("一级分类名称")
+    @TableField(exist = false)
+    private String categoryOneName;
+
+    @ApiModelProperty("二级分类名称")
+    @TableField(exist = false)
+    private String categoryTwoName;
 
     @TableField("user_id")
     @ApiModelProperty(value = "用户ID")

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

@@ -26,6 +26,14 @@ public class SecondGoodsRecordDetailVo {
     @ApiModelProperty(value = "用户电话")
     private String userPhone;
 
+    @ApiModelProperty("一级分类名称")
+    @TableField(exist = false)
+    private String categoryOneName;
+
+    @ApiModelProperty("二级分类名称")
+    @TableField(exist = false)
+    private String categoryTwoName;
+
     @TableField("user_id")
     @ApiModelProperty(value = "用户ID")
     private Integer userId;
@@ -144,6 +152,11 @@ public class SecondGoodsRecordDetailVo {
         vo.setUpdatedTime(record.getUpdatedTime());
         vo.setUpdatedUserId(record.getUpdatedUserId());
         vo.setAddressText(record.getAddressText());
+        vo.setUpdatedUserId(record.getUpdatedUserId());
+        vo.setAddressText(record.getAddressText());
+        vo.setCategoryOneName(record.getCategoryOneName());
+        vo.setCategoryTwoName(record.getCategoryTwoName());
+
         return vo;
     }
 }

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

@@ -1,7 +1,38 @@
 package shop.alien.mapper.second;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import shop.alien.entity.second.SecondGoodsRecord;
+import shop.alien.entity.second.vo.SecondGoodsVo;
+
+import java.util.List;
 
 public interface SecondGoodsRecordMapper extends BaseMapper<SecondGoodsRecord> {
+    @Select("SELECT " +
+            "sg.*, " +
+            "sgc1.category_name as categoryOneName, " +
+            "sgc2.category_name as categoryTwoName " +
+            "FROM second_goods_record 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 " +
+            "${ew.customSqlSegment}")
+    List<SecondGoodsRecord> selectdminGoodsList(@Param(Constants.WRAPPER) QueryWrapper<SecondGoodsRecord> queryWrapper);
+
+    @Select("SELECT " +
+            "sg.*, " +
+            "sgc1.category_name as categoryOneName, " +
+            "sgc2.category_name as categoryTwoName " +
+            "FROM second_goods_record 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 " +
+            "${ew.customSqlSegment}")
+    SecondGoodsRecord selectGoodsRecordById(@Param(Constants.WRAPPER) QueryWrapper<SecondGoodsRecord> queryWrapper);
 }

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

@@ -153,7 +153,10 @@ public class SecondGoodsServiceImpl extends ServiceImpl<SecondGoodsMapper, Secon
     @Override
     public SecondGoodsRecordDetailVo getAdminGoodsRecordDetail(Integer recordId) {
         // 1. 获取商品操作记录基本信息
-        SecondGoodsRecord record = secondGoodsRecordMapper.selectById(recordId);
+        QueryWrapper<SecondGoodsRecord> queryWrapper = new QueryWrapper<>();
+        queryWrapper
+                .eq("sg.id", recordId);
+        SecondGoodsRecord record = secondGoodsRecordMapper.selectGoodsRecordById(queryWrapper);
         if (record == null) {
             return null;
         }
@@ -205,7 +208,7 @@ public class SecondGoodsServiceImpl extends ServiceImpl<SecondGoodsMapper, Secon
         recordQueryWrapper.lambda()
                 .eq(SecondGoodsRecord::getGoodsId, goodsId)
                 .orderByDesc(SecondGoodsRecord::getCreatedTime);
-        List<SecondGoodsRecord> operationRecords = secondGoodsRecordMapper.selectList(recordQueryWrapper);
+        List<SecondGoodsRecord> operationRecords = secondGoodsRecordMapper.selectdminGoodsList(recordQueryWrapper);
         detailVo.setOperationRecords(operationRecords);
         
         // 4. 获取商品交易记录集合