|
|
@@ -34,6 +34,7 @@ import shop.alien.mapper.second.SecondGoodsMapper;
|
|
|
import shop.alien.mapper.second.SecondGoodsRecordMapper;
|
|
|
import shop.alien.mapper.second.SecondTradeRecordMapper;
|
|
|
import shop.alien.second.feign.AlienStoreFeign;
|
|
|
+import shop.alien.second.service.PlatformSecondTradeService;
|
|
|
import shop.alien.second.service.SecondGoodsService;
|
|
|
import shop.alien.second.service.VideoModerationService;
|
|
|
import shop.alien.util.common.Constants;
|
|
|
@@ -146,6 +147,11 @@ public class SecondGoodsServiceImpl extends ServiceImpl<SecondGoodsMapper, Secon
|
|
|
*/
|
|
|
private final StoreDictionaryMapper storeDictionaryMapper;
|
|
|
|
|
|
+ /**
|
|
|
+ * 交易记录服务
|
|
|
+ */
|
|
|
+ private final PlatformSecondTradeService platformSecondTradeService;
|
|
|
+
|
|
|
@Override
|
|
|
public SecondGoodsRecordDetailVo getAdminGoodsRecordDetail(Integer recordId) {
|
|
|
// 1. 获取商品操作记录基本信息
|
|
|
@@ -178,7 +184,7 @@ public class SecondGoodsServiceImpl extends ServiceImpl<SecondGoodsMapper, Secon
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public SecondGoodsDetailVo getAdminGoodsDetail(Integer goodsId) {
|
|
|
+ public SecondGoodsDetailVo getAdminGoodsDetail(Integer goodsId) throws Exception {
|
|
|
SecondGoodsDetailVo detailVo = new SecondGoodsDetailVo();
|
|
|
QueryWrapper<SecondGoodsVo> goodsVoQueryWrapper = new QueryWrapper<>();
|
|
|
goodsVoQueryWrapper
|
|
|
@@ -210,10 +216,18 @@ public class SecondGoodsServiceImpl extends ServiceImpl<SecondGoodsMapper, Secon
|
|
|
tradeQueryWrapper.eq("goods_id", goodsId)
|
|
|
.orderByDesc("transaction_time");
|
|
|
List<SecondTradeRecord> tradeRecords = secondTradeRecordMapper.selectList(tradeQueryWrapper);
|
|
|
-
|
|
|
- // TODO 处理交易步骤
|
|
|
-
|
|
|
- detailVo.setTradeRecords(tradeRecords);
|
|
|
+ // 处理交易步骤 调取 PlatformSecondTradeServiceImpl.getOperationJsonList
|
|
|
+ List<SecondTradeRecordVo> secondTradeRecordVos = Lists.newArrayList();
|
|
|
+ if (CollectionUtil.isNotEmpty(tradeRecords)){
|
|
|
+ for (SecondTradeRecord tradeRecord : tradeRecords) {
|
|
|
+ SecondTradeRecordVo secondTradeRecordVo = new SecondTradeRecordVo();
|
|
|
+ BeanUtils.copyProperties(tradeRecord, secondTradeRecordVo);
|
|
|
+ secondTradeRecordVos.add(secondTradeRecordVo);
|
|
|
+ // 交易节点
|
|
|
+ secondTradeRecordVo.setOperationJsonList(platformSecondTradeService.getOperationJsonList(tradeRecord.getId()));
|
|
|
+ }
|
|
|
+ }
|
|
|
+ detailVo.setTradeRecords(secondTradeRecordVos);
|
|
|
|
|
|
// 5. 获取商品举报集合
|
|
|
QueryWrapper<LifeUserViolation> reportQueryWrapper = new QueryWrapper<>();
|