Skip to content

GitLab

Q
qk_backend
Commit 669a137c authored by muhong's avatar muhong
Browse files
Options

修改 价格和足迹

parent b4d6a366
Hide whitespace changes
Inline Side-by-side
Showing with 135 additions and 82 deletions
ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/FavoritesServiceImpl.java
View file @ 669a137c
...@@ -18,6 +18,7 @@ import com.wwdz.ch.wx.entity.vo.AgentTranceResponseVo; ...@@ -18,6 +18,7 @@ import com.wwdz.ch.wx.entity.vo.AgentTranceResponseVo;
import com.wwdz.ch.wx.entity.vo.FavoritesResponseVo; import com.wwdz.ch.wx.entity.vo.FavoritesResponseVo;
import com.wwdz.ch.wx.entity.vo.ItemResponseVo; import com.wwdz.ch.wx.entity.vo.ItemResponseVo;
import com.wwdz.ch.wx.service.FavoritesService; import com.wwdz.ch.wx.service.FavoritesService;
import com.wwdz.ch.wx.util.StringUtil;
import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
...@@ -276,12 +277,22 @@ public class FavoritesServiceImpl implements FavoritesService { ...@@ -276,12 +277,22 @@ public class FavoritesServiceImpl implements FavoritesService {
for (FavoritesItemsRelation relation : relationPage.getList()) { for (FavoritesItemsRelation relation : relationPage.getList()) {
ItemResponseVo vo = new ItemResponseVo(); ItemResponseVo vo = new ItemResponseVo();
Item item = itemDao.findDetails(relation.getItemId()); Item item = itemDao.findDetails(relation.getItemId());
// 设置基本信息
vo.setId(relation.getItemId()); vo.setId(relation.getItemId());
vo.setName(item.getName()); vo.setName(item.getName());
vo.setImages(item.getImages()); vo.setImages(item.getImages());
vo.setPrice(String.valueOf(item.getPrice() * 100));
vo.setDetail(item.getDetail()); vo.setDetail(item.getDetail());
// 设置价格
if (item.getPrice() % 100 == 0) {
vo.setPrice(String.valueOf(item.getPrice() / 100));
} else {
vo.setPrice(String.valueOf(item.getPrice().doubleValue() / 100));
}
vo.setPrice(StringUtil.formatAmount(vo.getPrice()));
// 设置是否收藏或是否是自己发布的
vo.setIsCollected(favoritesItemsRelationDao.isCollected(dto.getUserId(), relation.getItemId()) ? 1 : 0); vo.setIsCollected(favoritesItemsRelationDao.isCollected(dto.getUserId(), relation.getItemId()) ? 1 : 0);
vo.setIsMine(userItemsRelationDao.isExisted(dto.getUserId(), item.getId()) ? 1 : 0);
// 设置收藏数
long count = favoritesItemsRelationDao.countByItemId(item.getId()); long count = favoritesItemsRelationDao.countByItemId(item.getId());
if (item.getSourceType().equals(CommonEnum.SourceTypeEnum.USER_UPLOAD.getCode())) { if (item.getSourceType().equals(CommonEnum.SourceTypeEnum.USER_UPLOAD.getCode())) {
count --; count --;
...@@ -291,26 +302,26 @@ public class FavoritesServiceImpl implements FavoritesService { ...@@ -291,26 +302,26 @@ public class FavoritesServiceImpl implements FavoritesService {
} else { } else {
vo.setCollectCount(String.format("%.1f", (double) count / 1000) + "k"); vo.setCollectCount(String.format("%.1f", (double) count / 1000) + "k");
} }
// 设置图片或视频
Map<String, Object> homePageMap = new HashMap<>(); Map<String, Object> homePageMap = new HashMap<>();
String[] image = item.getImages().split(";");
homePageMap.put("url", image[0]);
homePageMap.put("type", 2);
homePageMap.put("width", "0");
homePageMap.put("height", "0");
if (StringUtils.isNotBlank(item.getVideos())) { if (StringUtils.isNotBlank(item.getVideos())) {
String[] vedioImage = item.getVideos().split(";"); String[] vedioImage = item.getVideos().split(";");
if (vedioImage[0].contains(",")) { if (vedioImage[0].contains(",")) {
String[] image = vedioImage[0].split(","); String[] video = vedioImage[0].split(",");
homePageMap = getImageMap(image[1]); homePageMap = getImageMap(video[1]);
homePageMap.put("url", image[1]); homePageMap.put("url", video[1]);
homePageMap.put("type", 1); homePageMap.put("type", 1);
} }
} else { } else {
String[] image = item.getImages().split(";");
if (image[0].contains("_")) { if (image[0].contains("_")) {
homePageMap = getImageMap(image[0]); homePageMap = getImageMap(image[0]);
homePageMap.put("url", image[0]); homePageMap.put("url", image[0]);
homePageMap.put("type", 2); homePageMap.put("type", 2);
} else {
homePageMap.put("type", 2);
homePageMap.put("url", image[0]);
homePageMap.put("width", "0");
homePageMap.put("height", "0");
} }
} }
vo.setHomePageImage(homePageMap); vo.setHomePageImage(homePageMap);
......
ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/FootPrintServiceImpl.java
View file @ 669a137c
...@@ -12,6 +12,7 @@ import com.wwdz.ch.wx.entity.request.FootPrintRequestDto; ...@@ -12,6 +12,7 @@ import com.wwdz.ch.wx.entity.request.FootPrintRequestDto;
import com.wwdz.ch.wx.entity.vo.FootPrintResponseVo; import com.wwdz.ch.wx.entity.vo.FootPrintResponseVo;
import com.wwdz.ch.wx.entity.vo.ItemResponseVo; import com.wwdz.ch.wx.entity.vo.ItemResponseVo;
import com.wwdz.ch.wx.service.FootPrintService; import com.wwdz.ch.wx.service.FootPrintService;
import com.wwdz.ch.wx.util.StringUtil;
import com.xxdxxs.utils.DateUtils; import com.xxdxxs.utils.DateUtils;
import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
...@@ -20,7 +21,6 @@ import org.slf4j.LoggerFactory; ...@@ -20,7 +21,6 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.*; import java.util.*;
...@@ -71,13 +71,23 @@ public class FootPrintServiceImpl implements FootPrintService { ...@@ -71,13 +71,23 @@ public class FootPrintServiceImpl implements FootPrintService {
for (Footprint footprint : list) { for (Footprint footprint : list) {
Item item = itemDao.findDetails(footprint.getItemId()); Item item = itemDao.findDetails(footprint.getItemId());
ItemResponseVo itemResponseVo = new ItemResponseVo(); ItemResponseVo itemResponseVo = new ItemResponseVo();
// 设置基本信息
itemResponseVo.setId(footprint.getId()); itemResponseVo.setId(footprint.getId());
itemResponseVo.setItemId(item.getId()); itemResponseVo.setItemId(item.getId());
itemResponseVo.setName(item.getName()); itemResponseVo.setName(item.getName());
itemResponseVo.setImages(item.getImages()); itemResponseVo.setImages(item.getImages());
itemResponseVo.setDetail(item.getDetail()); itemResponseVo.setDetail(item.getDetail());
itemResponseVo.setPrice(String.valueOf(item.getPrice() / 100)); // 设置价格
if (item.getPrice() % 100 == 0) {
itemResponseVo.setPrice(String.valueOf(item.getPrice() / 100));
} else {
itemResponseVo.setPrice(String.valueOf(item.getPrice().doubleValue() / 100));
}
itemResponseVo.setPrice(StringUtil.formatAmount(itemResponseVo.getPrice()));
// 设置是否收藏或是否是自己发布的
itemResponseVo.setIsCollected(favoritesItemsRelationDao.isCollected(dto.getUserId(), footprint.getItemId()) ? 1 : 0); itemResponseVo.setIsCollected(favoritesItemsRelationDao.isCollected(dto.getUserId(), footprint.getItemId()) ? 1 : 0);
itemResponseVo.setIsMine(userItemsRelationDao.isExisted(dto.getUserId(), item.getId()) ? 1 : 0);
// 设置收藏数
long count = favoritesItemsRelationDao.countByItemId(item.getId()); long count = favoritesItemsRelationDao.countByItemId(item.getId());
if (item.getSourceType().equals(CommonEnum.SourceTypeEnum.USER_UPLOAD.getCode())) { if (item.getSourceType().equals(CommonEnum.SourceTypeEnum.USER_UPLOAD.getCode())) {
count --; count --;
...@@ -87,26 +97,26 @@ public class FootPrintServiceImpl implements FootPrintService { ...@@ -87,26 +97,26 @@ public class FootPrintServiceImpl implements FootPrintService {
} else { } else {
itemResponseVo.setCollectCount(String.format("%.1f", (double) count / 1000) + "k"); itemResponseVo.setCollectCount(String.format("%.1f", (double) count / 1000) + "k");
} }
// 设置图片或视频
Map<String, Object> homePageMap = new HashMap<>(); Map<String, Object> homePageMap = new HashMap<>();
String[] image = item.getImages().split(";");
homePageMap.put("url", image[0]);
homePageMap.put("type", 2);
homePageMap.put("width", "0");
homePageMap.put("height", "0");
if (StringUtils.isNotBlank(item.getVideos())) { if (StringUtils.isNotBlank(item.getVideos())) {
String[] vedioImage = item.getVideos().split(";"); String[] vedioImage = item.getVideos().split(";");
if (vedioImage[0].contains(",")) { if (vedioImage[0].contains(",")) {
String[] image = vedioImage[0].split(","); String[] video = vedioImage[0].split(",");
homePageMap = getImageMap(image[1]); homePageMap = getImageMap(video[1]);
homePageMap.put("url", image[1]); homePageMap.put("url", video[1]);
homePageMap.put("type", 1); homePageMap.put("type", 1);
} }
} else { } else {
String[] image = item.getImages().split(";");
if (image[0].contains("_")) { if (image[0].contains("_")) {
homePageMap = getImageMap(image[0]); homePageMap = getImageMap(image[0]);
homePageMap.put("url", image[0]); homePageMap.put("url", image[0]);
homePageMap.put("type", 2); homePageMap.put("type", 2);
} else {
homePageMap.put("type", 2);
homePageMap.put("url", image[0]);
homePageMap.put("width", "0");
homePageMap.put("height", "0");
} }
} }
itemResponseVo.setHomePageImage(homePageMap); itemResponseVo.setHomePageImage(homePageMap);
...@@ -190,18 +200,23 @@ public class FootPrintServiceImpl implements FootPrintService { ...@@ -190,18 +200,23 @@ public class FootPrintServiceImpl implements FootPrintService {
for (Footprint footprint : list) { for (Footprint footprint : list) {
Item item = itemDao.findDetails(footprint.getItemId()); Item item = itemDao.findDetails(footprint.getItemId());
ItemResponseVo itemResponseVo = new ItemResponseVo(); ItemResponseVo itemResponseVo = new ItemResponseVo();
// 设置基本信息
itemResponseVo.setId(footprint.getId()); itemResponseVo.setId(footprint.getId());
itemResponseVo.setItemId(item.getId()); itemResponseVo.setItemId(item.getId());
itemResponseVo.setName(item.getName()); itemResponseVo.setName(item.getName());
itemResponseVo.setImages(item.getImages()); itemResponseVo.setImages(item.getImages());
itemResponseVo.setDetail(item.getDetail()); itemResponseVo.setDetail(item.getDetail());
// 设置价格
if (item.getPrice() % 100 == 0) { if (item.getPrice() % 100 == 0) {
itemResponseVo.setPrice(String.valueOf(item.getPrice() / 100)); itemResponseVo.setPrice(String.valueOf(item.getPrice() / 100));
} else { } else {
itemResponseVo.setPrice(String.valueOf(item.getPrice().doubleValue() / 100)); itemResponseVo.setPrice(String.valueOf(item.getPrice().doubleValue() / 100));
} }
itemResponseVo.setPrice(StringUtil.formatAmount(itemResponseVo.getPrice()));
// 设置是否收藏或是否是自己发布的
itemResponseVo.setIsCollected(favoritesItemsRelationDao.isCollected(dto.getUserId(), footprint.getItemId()) ? 1 : 0); itemResponseVo.setIsCollected(favoritesItemsRelationDao.isCollected(dto.getUserId(), footprint.getItemId()) ? 1 : 0);
itemResponseVo.setIsMine(userItemsRelationDao.isExisted(dto.getUserId(), item.getId()) ? 1 : 0); itemResponseVo.setIsMine(userItemsRelationDao.isExisted(dto.getUserId(), item.getId()) ? 1 : 0);
// 设置收藏数
long count = favoritesItemsRelationDao.countByItemId(item.getId()); long count = favoritesItemsRelationDao.countByItemId(item.getId());
if (item.getSourceType().equals(CommonEnum.SourceTypeEnum.USER_UPLOAD.getCode())) { if (item.getSourceType().equals(CommonEnum.SourceTypeEnum.USER_UPLOAD.getCode())) {
count --; count --;
...@@ -211,26 +226,26 @@ public class FootPrintServiceImpl implements FootPrintService { ...@@ -211,26 +226,26 @@ public class FootPrintServiceImpl implements FootPrintService {
} else { } else {
itemResponseVo.setCollectCount(String.format("%.1f", (double) count / 1000) + "k"); itemResponseVo.setCollectCount(String.format("%.1f", (double) count / 1000) + "k");
} }
// 设置图片或视频
Map<String, Object> homePageMap = new HashMap<>(); Map<String, Object> homePageMap = new HashMap<>();
String[] image = item.getImages().split(";");
homePageMap.put("url", image[0]);
homePageMap.put("type", 2);
homePageMap.put("width", "0");
homePageMap.put("height", "0");
if (StringUtils.isNotBlank(item.getVideos())) { if (StringUtils.isNotBlank(item.getVideos())) {
String[] vedioImage = item.getVideos().split(";"); String[] vedioImage = item.getVideos().split(";");
if (vedioImage[0].contains(",")) { if (vedioImage[0].contains(",")) {
String[] image = vedioImage[0].split(","); String[] video = vedioImage[0].split(",");
homePageMap = getImageMap(image[1]); homePageMap = getImageMap(video[1]);
homePageMap.put("url", image[1]); homePageMap.put("url", video[1]);
homePageMap.put("type", 1); homePageMap.put("type", 1);
} }
} else { } else {
String[] image = item.getImages().split(";");
if (image[0].contains("_")) { if (image[0].contains("_")) {
homePageMap = getImageMap(image[0]); homePageMap = getImageMap(image[0]);
homePageMap.put("url", image[0]); homePageMap.put("url", image[0]);
homePageMap.put("type", 2); homePageMap.put("type", 2);
} else {
homePageMap.put("type", 2);
homePageMap.put("url", image[0]);
homePageMap.put("width", "0");
homePageMap.put("height", "0");
} }
} }
itemResponseVo.setHomePageImage(homePageMap); itemResponseVo.setHomePageImage(homePageMap);
...@@ -287,32 +302,6 @@ public class FootPrintServiceImpl implements FootPrintService { ...@@ -287,32 +302,6 @@ public class FootPrintServiceImpl implements FootPrintService {
} }
} }
@Transactional(rollbackFor = Exception.class)
@Override
public Result add(FootPrintRequestDto dto) {
try {
Footprint footprint = footPrintDao.selectByUserIdItem(dto.getUserId(), dto.getItemId());
Date now = new Date();
if (Objects.isNull(footprint)) {
Footprint newVo = new Footprint();
newVo.setUserId(dto.getUserId());
newVo.setItemId(dto.getItemId());
newVo.setDeleted(false);
newVo.setAddTime(now);
newVo.setUpdateTime(now);
footPrintDao.insert(newVo);
} else {
footprint.setUpdateTime(now);
footPrintDao.upateTime(footprint);
}
return Result.success();
} catch (Exception e) {
logger.error("用户浏览藏品后添加或更新足迹失败", e);
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return Result.failed();
}
}
private Map<String, Object> getImageMap(String image) { private Map<String, Object> getImageMap(String image) {
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
String[] _image = image.split("_"); String[] _image = image.split("_");
......
ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/ItemServiceImpl.java
View file @ 669a137c
...@@ -16,6 +16,7 @@ import com.wwdz.ch.wx.entity.vo.AgentTranceResponseVo; ...@@ -16,6 +16,7 @@ import com.wwdz.ch.wx.entity.vo.AgentTranceResponseVo;
import com.wwdz.ch.wx.entity.vo.ItemResponseVo; import com.wwdz.ch.wx.entity.vo.ItemResponseVo;
import com.wwdz.ch.wx.service.ItemService; import com.wwdz.ch.wx.service.ItemService;
import com.wwdz.ch.wx.service.WxLoginService; import com.wwdz.ch.wx.service.WxLoginService;
import com.wwdz.ch.wx.util.StringUtil;
import com.xxdxxs.utils.CommonUtils; import com.xxdxxs.utils.CommonUtils;
import com.xxdxxs.utils.DateUtils; import com.xxdxxs.utils.DateUtils;
import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.CollectionUtils;
...@@ -95,44 +96,50 @@ public class ItemServiceImpl implements ItemService { ...@@ -95,44 +96,50 @@ public class ItemServiceImpl implements ItemService {
List<AgentTranceResponseVo> resultList = new ArrayList<>(); List<AgentTranceResponseVo> resultList = new ArrayList<>();
for (Item item : page.getList()) { for (Item item : page.getList()) {
ItemResponseVo vo = new ItemResponseVo(); ItemResponseVo vo = new ItemResponseVo();
// 设置基本信息
vo.setId(item.getId()); vo.setId(item.getId());
vo.setName(item.getName()); vo.setName(item.getName());
vo.setDetail(item.getDetail());
vo.setImages(item.getImages());
vo.setSourceType(item.getSourceType());
// 设置价格
if (item.getPrice() % 100 == 0) { if (item.getPrice() % 100 == 0) {
vo.setPrice(String.valueOf(item.getPrice() / 100)); vo.setPrice(String.valueOf(item.getPrice() / 100));
} else { } else {
vo.setPrice(String.valueOf(item.getPrice().doubleValue() / 100)); vo.setPrice(String.valueOf(item.getPrice().doubleValue() / 100));
} }
vo.setDetail(item.getDetail()); vo.setPrice(StringUtil.formatAmount(vo.getPrice()));
vo.setIsCollected(0); // 设置图片或视频
vo.setIsMine(0);
vo.setImages(item.getImages());
Map<String, Object> homePageMap = new HashMap<>(); Map<String, Object> homePageMap = new HashMap<>();
String[] image = item.getImages().split(";");
homePageMap.put("url", image[0]);
homePageMap.put("type", 2);
homePageMap.put("width", "0");
homePageMap.put("height", "0");
if (StringUtils.isNotBlank(item.getVideos())) { if (StringUtils.isNotBlank(item.getVideos())) {
String[] vedioImage = item.getVideos().split(";"); String[] vedioImage = item.getVideos().split(";");
if (vedioImage[0].contains(",")) { if (vedioImage[0].contains(",")) {
String[] image = vedioImage[0].split(","); String[] video = vedioImage[0].split(",");
homePageMap = getImageMap(image[1]); homePageMap = getImageMap(video[1]);
homePageMap.put("url", image[1]); homePageMap.put("url", video[1]);
homePageMap.put("type", 1); homePageMap.put("type", 1);
} }
} else { } else {
String[] image = item.getImages().split(";");
if (image[0].contains("_")) { if (image[0].contains("_")) {
homePageMap = getImageMap(image[0]); homePageMap = getImageMap(image[0]);
homePageMap.put("url", image[0]); homePageMap.put("url", image[0]);
homePageMap.put("type", 2); homePageMap.put("type", 2);
} else {
homePageMap.put("type", 2);
homePageMap.put("url", image[0]);
homePageMap.put("width", "0");
homePageMap.put("height", "0");
} }
} }
vo.setHomePageImage(homePageMap); vo.setHomePageImage(homePageMap);
// 设置是否收藏和是否是自己发布的
vo.setIsCollected(0);
vo.setIsMine(0);
if (!dto.getUserId().equals(0L)) { if (!dto.getUserId().equals(0L)) {
vo.setIsCollected(favoritesItemsRelationDao.isCollected(dto.getUserId(), item.getId()) ? 1 : 0); vo.setIsCollected(favoritesItemsRelationDao.isCollected(dto.getUserId(), item.getId()) ? 1 : 0);
vo.setIsMine(userItemsRelationDao.isExisted(dto.getUserId(), item.getId()) ? 1 : 0); vo.setIsMine(userItemsRelationDao.isExisted(dto.getUserId(), item.getId()) ? 1 : 0);
} }
// 设置收藏数
long count = favoritesItemsRelationDao.countByItemId(item.getId()); long count = favoritesItemsRelationDao.countByItemId(item.getId());
if (item.getSourceType().equals(CommonEnum.SourceTypeEnum.USER_UPLOAD.getCode())) { if (item.getSourceType().equals(CommonEnum.SourceTypeEnum.USER_UPLOAD.getCode())) {
count --; count --;
...@@ -142,7 +149,6 @@ public class ItemServiceImpl implements ItemService { ...@@ -142,7 +149,6 @@ public class ItemServiceImpl implements ItemService {
} else { } else {
vo.setCollectCount(String.format("%.1f", (double) count / 1000) + "k"); vo.setCollectCount(String.format("%.1f", (double) count / 1000) + "k");
} }
vo.setSourceType(item.getSourceType());
AgentTranceResponseVo agentTranceResponseVo = new AgentTranceResponseVo(); AgentTranceResponseVo agentTranceResponseVo = new AgentTranceResponseVo();
agentTranceResponseVo.setAgentTraceInfo_(""); agentTranceResponseVo.setAgentTraceInfo_("");
...@@ -221,9 +227,14 @@ public class ItemServiceImpl implements ItemService { ...@@ -221,9 +227,14 @@ public class ItemServiceImpl implements ItemService {
return Result.failed("数据异常，该藏品不存在"); return Result.failed("数据异常，该藏品不存在");
} }
ItemResponseVo itemResponseVo = new ItemResponseVo(); ItemResponseVo itemResponseVo = new ItemResponseVo();
// 设置基本信息
itemResponseVo.setId(item.getId()); itemResponseVo.setId(item.getId());
itemResponseVo.setName(item.getName()); itemResponseVo.setName(item.getName());
itemResponseVo.setImages(item.getImages()); itemResponseVo.setImages(item.getImages());
itemResponseVo.setDetail(item.getDetail());
itemResponseVo.setSourceType(item.getSourceType());
itemResponseVo.setCreateTime(DateUtils.toString(item.getUpdateTime()));
// 设置视频
itemResponseVo.setVideos(null); itemResponseVo.setVideos(null);
if (StringUtils.isNotBlank(item.getVideos())) { if (StringUtils.isNotBlank(item.getVideos())) {
StringBuilder stringBuilder = new StringBuilder(); StringBuilder stringBuilder = new StringBuilder();
...@@ -238,19 +249,20 @@ public class ItemServiceImpl implements ItemService { ...@@ -238,19 +249,20 @@ public class ItemServiceImpl implements ItemService {
} }
itemResponseVo.setVideos(stringBuilder.substring(0, stringBuilder.length() - 1)); itemResponseVo.setVideos(stringBuilder.substring(0, stringBuilder.length() - 1));
} }
itemResponseVo.setDetail(item.getDetail()); // 设置分类id和名称
itemResponseVo.setCid(item.getCid()); itemResponseVo.setCid(item.getCid());
Category category = categoryDao.findById(item.getCid()); Category category = categoryDao.findById(item.getCid());
if (Objects.nonNull(category)) { if (Objects.nonNull(category)) {
itemResponseVo.setCategoryName(category.getName()); itemResponseVo.setCategoryName(category.getName());
} }
// 设置价格
if (item.getPrice() % 100 == 0) { if (item.getPrice() % 100 == 0) {
itemResponseVo.setPrice(String.valueOf(item.getPrice() / 100)); itemResponseVo.setPrice(String.valueOf(item.getPrice() / 100));
} else { } else {
itemResponseVo.setPrice(String.valueOf(item.getPrice().doubleValue() / 100)); itemResponseVo.setPrice(String.valueOf(item.getPrice().doubleValue() / 100));
} }
itemResponseVo.setSourceType(item.getSourceType()); itemResponseVo.setPrice(StringUtil.formatAmount(itemResponseVo.getPrice()));
itemResponseVo.setCreateTime(DateUtils.toString(item.getUpdateTime())); // 设置是否收藏或是否是自己发布的
itemResponseVo.setIsCollected(0); itemResponseVo.setIsCollected(0);
itemResponseVo.setIsMine(0); itemResponseVo.setIsMine(0);
if (!dto.getUserId().equals(0L)) { if (!dto.getUserId().equals(0L)) {
...@@ -263,15 +275,21 @@ public class ItemServiceImpl implements ItemService { ...@@ -263,15 +275,21 @@ public class ItemServiceImpl implements ItemService {
} }
itemResponseVo.setIsMine(userItemsRelationDao.isExisted(dto.getUserId(), item.getId()) ? 1 : 0); itemResponseVo.setIsMine(userItemsRelationDao.isExisted(dto.getUserId(), item.getId()) ? 1 : 0);
// 添加用户足迹 // 添加或更新用户足迹
Footprint footprint = new Footprint(); Footprint footprint = footPrintDao.selectByUserIdItem(dto.getUserId(), item.getId());
footprint.setUserId(dto.getUserId());
footprint.setItemId(item.getId());
Date now = new Date(); Date now = new Date();
footprint.setAddTime(now); if (Objects.isNull(footprint)) {
footprint.setUpdateTime(now); Footprint newVo = new Footprint();
footprint.setDeleted(false); newVo.setUserId(dto.getUserId());
footPrintDao.insert(footprint); newVo.setItemId(item.getId());
newVo.setDeleted(false);
newVo.setAddTime(now);
newVo.setUpdateTime(now);
footPrintDao.insert(newVo);
} else {
footprint.setUpdateTime(now);
footPrintDao.upateTime(footprint);
}
} }
logger.info("【请求结束】查看藏品详情成功"); logger.info("【请求结束】查看藏品详情成功");
return Result.success(itemResponseVo); return Result.success(itemResponseVo);
......
ch-wx-api/src/main/java/com/wwdz/ch/wx/service/FootPrintService.java
View file @ 669a137c
...@@ -7,5 +7,4 @@ public interface FootPrintService { ...@@ -7,5 +7,4 @@ public interface FootPrintService {
Result listAll(FootPrintRequestDto dto); Result listAll(FootPrintRequestDto dto);
Result page(FootPrintRequestDto dto); Result page(FootPrintRequestDto dto);
Result delete(FootPrintRequestDto dto); Result delete(FootPrintRequestDto dto);
Result add(FootPrintRequestDto dto);
} }
ch-wx-api/src/main/java/com/wwdz/ch/wx/util/StringUtil.java
View file @ 669a137c
...@@ -5,6 +5,12 @@ import java.util.Random; ...@@ -5,6 +5,12 @@ import java.util.Random;
public class StringUtil { public class StringUtil {
private static final String ALLOWED_CHARACTERS = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"; private static final String ALLOWED_CHARACTERS = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
/**
* 获取随机任意长度的字符串
*
* @param length
* @return
*/
public static String generateRandomString(int length) { public static String generateRandomString(int length) {
Random random = new Random(); Random random = new Random();
StringBuilder sb = new StringBuilder(length); StringBuilder sb = new StringBuilder(length);
...@@ -13,4 +19,34 @@ public class StringUtil { ...@@ -13,4 +19,34 @@ public class StringUtil {
} }
return sb.toString(); return sb.toString();
} }
/**
* 格式化金额
*
* @param amount
* @return
*/
public static String formatAmount(String amount) {
String minMoney = null;
String intMoney = null;
if (amount.contains(".")) {
minMoney = amount.substring(amount.indexOf("."));
intMoney = amount.substring(0, amount.indexOf("."));
} else {
intMoney = amount;
}
StringBuilder sb = new StringBuilder();
int j = 1;
for (int i = intMoney.length() - 1; i >= 0; i--) {
sb.insert(0, intMoney.charAt(i));
if (j % 3 == 0 && i != 0) {
sb.insert(0, ",");
}
j++;
}
if (amount.contains(".")) {
return sb + minMoney;
}
return sb.toString();
}
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment