|
|
@@ -3,6 +3,7 @@ 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;
|
|
|
@@ -16,6 +17,7 @@ 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;
|
|
|
@@ -93,8 +95,13 @@ 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("平台已受理，感谢您的反馈！");
|
|
|
secondReportingVo.setReportingTime(lifeNotice.getCreatedTime());
|
|
|
secondReportingVo.setFeedbackTime(lifeNotice.getCreatedTime());
|
zjy