PC端商品分类修改

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

@@ -45,6 +45,10 @@ public class SecondGoodsRecord implements Serializable {
     @ApiModelProperty(value = "商品价格（元，保留小数后两位）")
     private BigDecimal price;
 
+    @TableField("price")
+    @ApiModelProperty(value = "商品价格（元，保留小数后两位）")
+    private BigDecimal amount;
+
     @TableField("position")
     @ApiModelProperty(value = "商品位置")
     private String position;

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

@@ -3,10 +3,10 @@ package shop.alien.second.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import shop.alien.entity.second.SecondGoods;
+import shop.alien.entity.second.SecondGoodsRecord;
 import shop.alien.entity.second.vo.SecondReportingVo;
 import shop.alien.entity.store.*;
 import shop.alien.mapper.LifeNoticeMapper;
@@ -14,8 +14,8 @@ import shop.alien.mapper.LifeUserMapper;
 import shop.alien.mapper.LifeUserViolationMapper;
 import shop.alien.mapper.StoreDictionaryMapper;
 import shop.alien.mapper.second.SecondGoodsMapper;
+import shop.alien.mapper.second.SecondGoodsRecordMapper;
 import shop.alien.second.service.SecondGoodsReportingService;
-import shop.alien.second.util.JsonUtils;
 
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
@@ -46,7 +46,7 @@ public class SecondGoodsReportingServiceImpl implements SecondGoodsReportingServ
     private final LifeUserMapper lifeUserMapper;
 
     @Autowired
-    private final SecondGoodsMapper secondGoodsMapper;
+    private final SecondGoodsRecordMapper secondGoodsRecordMapper;
 
     @Override
     public SecondReportingVo queryReportingDetail (Integer id) {
@@ -79,7 +79,7 @@ public class SecondGoodsReportingServiceImpl implements SecondGoodsReportingServ
 
         if (lifeUserViolation.getReportContextType().equals("4")) {
             // 获取商品信息
-            SecondGoods secondGoods = secondGoodsMapper.selectById(lifeUserViolation.getBusinessId());
+            SecondGoodsRecord secondGoods = secondGoodsRecordMapper.selectById(lifeUserViolation.getBusinessId());
             secondReportingVo.setPrice(secondGoods.getPrice() != null ? secondGoods.getAmount().setScale(2, BigDecimal.ROUND_HALF_UP).toString() : null);
             secondReportingVo.setHomeImage(secondGoods.getHomeImage());
             secondReportingVo.setTitle(secondGoods.getTitle());
@@ -93,12 +93,6 @@ public class SecondGoodsReportingServiceImpl implements SecondGoodsReportingServ
             String context = "您于" + dateTime.format(targetFormatter) + "举报“" + lifeUser.getUserName() + "”“" + storeDictionary.getDictDetail() + "”举报内容为“"
                     + lifeUserViolation.getOtherReasonContent()  + "”";
             secondReportingVo.setReportingContext(context);
-        } else if (lifeUserViolation.getReportContextType().equals("1") || lifeUserViolation.getReportContextType().equals("2") || lifeUserViolation.getReportContextType().equals("3")) {
-            // 用户信息
-           if(StringUtils.isNotBlank(lifeNotice.getContext())){
-               String context = JsonUtils.getJsonValue(lifeNotice.getContext(), "message");
-               secondReportingVo.setReportingContext(context);
-           }
         }
 
         secondReportingVo.setFeedbackContext("平台已受理，感谢您的反馈！");