fix

netflix-service/src/main/java/com/cyksj/service/shop/impl/YhShopServiceImpl.java

@@ -88,8 +88,11 @@ public class YhShopServiceImpl implements YhShopFrontService {
 			throw BusinessRuntimeException.getInstance("您暂无申请开店记录..");
 		}
 		String db_cId = is_open.getCustomId();
-		Boolean isApprove = is_open.getIsApprove();
-		if (isApprove) {
+		YhShop.Status verifyStatus = is_open.getVerifyStatus();
+		if (verifyStatus == YhShop.Status.verify) {
+			throw BusinessRuntimeException.getInstance("您的开店申请再审核中.");
+		}
+		if (verifyStatus == YhShop.Status.success) {
 			throw BusinessRuntimeException.getInstance("您的开店申请已通过.");
 		}
 
@@ -102,7 +105,7 @@ public class YhShopServiceImpl implements YhShopFrontService {
 		}
 		//重置更新申请信息
 		yhShopMapper.update(null, Wrappers.lambdaUpdate(YhShop.class)
-				.set(YhShop::getIsApprove, false)
+				.set(YhShop::getVerifyStatus, YhShop.Status.verify)
 				.set(YhShop::getReason, null)
 				.set(YhShop::getName, name)
 				.set(YhShop::getCustomId, customId)
@@ -119,7 +122,7 @@ public class YhShopServiceImpl implements YhShopFrontService {
 		if (yhShop == null) {
 			throw BusinessRuntimeException.getInstance("该店铺不存在");
 		}
-		if (!yhShop.getIsApprove()) {
+		if (yhShop.getVerifyStatus() != YhShop.Status.success) {
 			throw BusinessRuntimeException.getInstance("该店铺异常,请联系客服");
 		}
 		if (!yhShop.getStatus()) {

netflix-web/src/main/java/com/cyksj/web/controller/cps/YhShopLoginController.java

@@ -24,8 +24,8 @@ import com.cyksj.model.dto.GzhOAuth2UserInfo;
 import com.cyksj.model.entity.GoodsDon;
 import com.cyksj.model.entity.User;
 import com.cyksj.model.entity.YhShopDistributeMoneyApply;
-import com.cyksj.model.entity.YhShopDistributeWaitingSendPoints;
 import com.cyksj.model.manage.entity.YhShop;
+import com.cyksj.model.manage.entity.YhShopDistributeWaitingSendPoints;
 import com.cyksj.model.request.LoginReq;
 import com.cyksj.model.views.*;
 import com.cyksj.redis.RedisService;
@@ -204,8 +204,8 @@ public class YhShopLoginController {
 				.field(YhShopDistributeMoneyApply::getUserId, yhShopUserId)
 				.field(YhShopDistributeMoneyApply::getVerifyStatus, YhShopDistributeMoneyApply.Status.success.name())
 				.build(), "money");
-		Number reMoneyPoints = beanSearcher.searchSum(YhShopDistributeWaitingSendPoints.class, MapUtils.builder().field(YhShopDistributeWaitingSendPoints::getSharedId, yhShopUserId).field(YhShopDistributeWaitingSendPoints::getSendStatus, YhShopDistributeWaitingSendPoints.Status.success.name()).build(), "money");
-		Number wMoneyPoints = beanSearcher.searchSum(YhShopDistributeWaitingSendPoints.class, MapUtils.builder().field(YhShopDistributeWaitingSendPoints::getSharedId, yhShopUserId).field(YhShopDistributeWaitingSendPoints::getSendStatus, YhShopDistributeWaitingSendPoints.Status.waiting.name()).build(), "money");
+		Number reMoneyPoints = beanSearcher.searchSum(YhShopDistributeWaitingSendPoints.class, MapUtils.builder().field(YhShopDistributeWaitingSendPoints::getShopUserId, yhShopUserId).field(YhShopDistributeWaitingSendPoints::getSendStatus, YhShopDistributeWaitingSendPoints.Status.success.name()).build(), "money");
+		Number wMoneyPoints = beanSearcher.searchSum(YhShopDistributeWaitingSendPoints.class, MapUtils.builder().field(YhShopDistributeWaitingSendPoints::getShopUserId, yhShopUserId).field(YhShopDistributeWaitingSendPoints::getSendStatus, YhShopDistributeWaitingSendPoints.Status.waiting.name()).build(), "money");
 
 		List<YhShopUserDistributeRateView> rateViews = beanSearcher.searchAll(YhShopUserDistributeRateView.class, MapUtils.builder()
 				.put("uid", String.format("and user_id = %s", yhShopUserId))