修改 查看详情

ch-dao/src/main/java/com/wwdz/ch/db/impl/ItemDaoImpl.java

@@ -328,11 +328,12 @@ public class ItemDaoImpl implements ItemDao {
         ItemExample example = new ItemExample();
         ItemExample.Criteria criteria = example.createCriteria();
         criteria.andIsDeletedEqualTo(false);
-        // 暂时去除华夏古泉和天眷堂的钱币， 对应编码2和7
+        //暂时去除华夏古泉和天眷堂的钱币， 对应编码2和7
         if (!ObjectUtils.isEmpty(coinRequestDto.getIsExcluded()) && coinRequestDto.getIsExcluded() == 1) {
             criteria.andSourceNotEqualTo(2);
             criteria.andSourceNotEqualTo(7);
         }
+        criteria.andSourceIn(CHINESE_SOURCE_LIST);
         if (StringUtils.hasLength(coinRequestDto.getName())) {
             criteria.andNameLike("%" + coinRequestDto.getName() + "%");
         }

ch-wx-api/src/main/java/com/wwdz/ch/wx/entity/vo/ItemResponseVo.java

@@ -23,4 +23,5 @@ public class ItemResponseVo implements Entity {
     private String createTime;
     private String videos;
     private Map<String, Object> homePageImage;
+    private Integer isDeleted;
 }

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/FavoritesServiceImpl.java

@@ -276,7 +276,12 @@ public class FavoritesServiceImpl implements FavoritesService {
             List<AgentTranceResponseVo> list = new ArrayList<>();
             for (FavoritesItemsRelation relation : relationPage.getList()) {
                 ItemResponseVo vo = new ItemResponseVo();
-                Item item = itemDao.findDetails(relation.getItemId());
+                Item item = itemDao.findById(relation.getItemId());
+                if (Objects.isNull(item)) {
+                    vo.setIsDeleted(1);
+                    continue;
+                }
+                vo.setIsDeleted(0);
                 // 设置基本信息
                 vo.setId(relation.getItemId());
                 vo.setName(item.getName());

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/FootPrintServiceImpl.java

@@ -69,8 +69,13 @@ public class FootPrintServiceImpl implements FootPrintService {
             List<ItemResponseVo> weekList = new ArrayList<>();
             List<ItemResponseVo> monthList = new ArrayList<>();
             for (Footprint footprint : list) {
-                Item item = itemDao.findDetails(footprint.getItemId());
                 ItemResponseVo itemResponseVo = new ItemResponseVo();
+                Item item = itemDao.findById(footprint.getItemId());
+                if (Objects.isNull(item)) {
+                    itemResponseVo.setIsDeleted(1);
+                    continue;
+                }
+                itemResponseVo.setIsDeleted(0);
                 // 设置基本信息
                 itemResponseVo.setId(footprint.getId());
                 itemResponseVo.setItemId(item.getId());
@@ -198,8 +203,13 @@ public class FootPrintServiceImpl implements FootPrintService {
             List<ItemResponseVo> weekList = new ArrayList<>();
             List<ItemResponseVo> monthList = new ArrayList<>();
             for (Footprint footprint : list) {
-                Item item = itemDao.findDetails(footprint.getItemId());
                 ItemResponseVo itemResponseVo = new ItemResponseVo();
+                Item item = itemDao.findById(footprint.getItemId());
+                if (Objects.isNull(item)) {
+                    itemResponseVo.setIsDeleted(1);
+                    continue;
+                }
+                itemResponseVo.setIsDeleted(0);
                 // 设置基本信息
                 itemResponseVo.setId(footprint.getId());
                 itemResponseVo.setItemId(item.getId());

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/ItemServiceImpl.java

@@ -222,9 +222,9 @@ public class ItemServiceImpl implements ItemService {
     @Override
     public Result info(ItemRequestDto dto) {
         try {
-            Item item = itemDao.findDetails(dto.getId());
-            if (null == item.getId()) {
-                return Result.failed("数据异常，该藏品不存在");
+            Item item = itemDao.findById(dto.getId());
+            if (Objects.isNull(item)) {
+                return Result.failed("该藏品已经被移除");
             }
             ItemResponseVo itemResponseVo = new ItemResponseVo();
             // 设置基本信息
@@ -306,7 +306,7 @@ public class ItemServiceImpl implements ItemService {
             if (dto.getUserId().equals(0L)) {
                 return Result.failed("您尚未登录，请先登录");
             }
-            Item item = itemDao.findDetails(dto.getId());
+            Item item = itemDao.findById(dto.getId());
             if (Objects.isNull(item)) {
                 return Result.failed("数据异常，藏品不存在");
             }
@@ -357,7 +357,7 @@ public class ItemServiceImpl implements ItemService {
             if (dto.getUserId().equals(0L)) {
                 return Result.failed("您尚未登录，请先登录");
             }
-            Item item = itemDao.findDetails(dto.getId());
+            Item item = itemDao.findById(dto.getId());
             if (Objects.isNull(item)) {
                 return Result.failed("数据异常，藏品不存在");
             }
@@ -392,8 +392,8 @@ public class ItemServiceImpl implements ItemService {
     @Override
     public Result update(ItemRequestDto dto) {
         try {
-            Item item = itemDao.findDetails(dto.getId());
-            if (null == item.getId()) {
+            Item item = itemDao.findById(dto.getId());
+            if (Objects.isNull(item)) {
                 return Result.failed("数据异常，该藏品不存在");
             }
 
@@ -417,6 +417,7 @@ public class ItemServiceImpl implements ItemService {
             favoritesItemsRelation.setUserId(dto.getUserId());
             favoritesItemsRelation.setFavoritesId(dto.getFavoritesId());
             favoritesItemsRelation.setItemId(item.getId());
+            favoritesItemsRelation.setAddTime(now);
             favoritesItemsRelationDao.insert(favoritesItemsRelation);
 
             Map<String, Object> map = new HashMap<>();

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/UserServiceImpl.java

@@ -179,12 +179,12 @@ public class UserServiceImpl implements UserService {
                 logger.error("请求验证码出错:{}", WxResponseCode.AUTH_CAPTCHA_UNSUPPORT.desc());
                 return Result.failed(WxResponseCode.AUTH_CAPTCHA_UNSUPPORT.desc());
             }
+            if (!RegexUtil.isMobileExact(dto.getMobile())) {
+                return Result.failed("手机号格式不正确");
+            }
             String activeProfile = applicationContext.getEnvironment().getActiveProfiles()[0];
             String code = "123456";
             if (!StringUtils.equals("dev", activeProfile)) {
-                if (!RegexUtil.isMobileExact(dto.getMobile())) {
-                    return Result.failed("手机号格式不正确");
-                }
                 code = CharUtil.getRandomNum(6);
                 SmsResult smsResult = notifyService.notifySmsTemplate(dto.getMobile(), NotifyType.CAPTCHA, new String[]{code, "1"});
                 if (smsResult != null) {