个人主页判断开店是否过期

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

@@ -90,4 +90,9 @@ public class SelfPageInfoVo implements Entity {
      */
     private Integer isPayGuaranteeMoney;
 
+    /**
+     * 是否是藏家
+     */
+    private Boolean isCollector;
+
 }

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

@@ -12,6 +12,7 @@ import com.wwdz.ch.db.dao.distribution.*;
 import com.wwdz.ch.db.dao.exchange.ExchangeApplyOrderDao;
 import com.wwdz.ch.db.dao.openShop.GuaranteeMoneyRecordDao;
 import com.wwdz.ch.db.dao.openShop.OpenShopApplyOrderDao;
+import com.wwdz.ch.db.domain.CollectorWhiteList;
 import com.wwdz.ch.db.domain.User;
 import com.wwdz.ch.db.domain.distribution.AuctionConfig;
 import com.wwdz.ch.db.domain.distribution.AuctionRecord;
@@ -205,6 +206,12 @@ public class SelfPageServiceImpl implements SelfPageService {
             } else {
                 selfPageInfoVo.setIsPayGuaranteeMoney(CommonEnum.StateEnum.INVALID.getCode());
             }
+            CollectorWhiteList collectorWhiteList = collectorWhiteListDao.findById(dto.getUserId());
+            if (collectorWhiteList != null && collectorWhiteList.getEndValidTime().after(now)) {
+                selfPageInfoVo.setIsCollector(true);
+            } else {
+                selfPageInfoVo.setIsCollector(false);
+            }
             return Result.success(selfPageInfoVo);
         } catch (Exception e) {
             logger.error("查询用户个人主页失败 error : {}", e);
@@ -290,8 +297,13 @@ public class SelfPageServiceImpl implements SelfPageService {
             } else {
                 selfPageInfoVo.setIsPayGuaranteeMoney(CommonEnum.StateEnum.INVALID.getCode());
             }
-
-
+            //判断开店是否过期
+            CollectorWhiteList collectorWhiteList = collectorWhiteListDao.findById(dto.getUserId());
+            if (collectorWhiteList != null && collectorWhiteList.getEndValidTime().after(now)) {
+                selfPageInfoVo.setIsCollector(true);
+            } else {
+                selfPageInfoVo.setIsCollector(false);
+            }
             return Result.success(selfPageInfoVo);
         } catch (Exception e) {
             logger.error("查询藏家个人主页失败 error : {}", e);

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

@@ -98,6 +98,11 @@ public class OpenShopServiceImpl implements OpenShopService {
     @Override
     public Result createOpenShopApplyOrder(OpenShopInfoRequestDto dto) {
         try {
+            //查询该用户是否申请过开店
+            OpenShopApplyOrder applyOrder = openShopApplyOrderDao.findByUserId(dto.getUserId());
+            if (applyOrder != null && applyOrder.getState() != OpenShopApplyOrderEnum.StateEnum.NOT_PASSED.getCode()) {
+                return Result.failed("请勿重复申请");
+            }
             Date now = new Date();
             OpenShopCostConfig openShopCostConfig = openShopCostConfigDao.findOne();
             //月底修改为300