zoujiajian hace 1 año
padre
commit
4cc75e9e78

+ 6 - 7
netflix-web/src/main/java/com/cyksj/web/controller/mirrorshop/UserMirrorShopFrontController.java

@@ -84,13 +84,12 @@ public class UserMirrorShopFrontController {
 				.last("limit 1")
 				.select(UserMirrorShop::getCustomId, UserMirrorShop::getName, UserMirrorShop::getContact, UserMirrorShop::getLogo, UserMirrorShop::getStatus));
 
-		UserMirrorShopFeeOrderDon userMirrorShopFeeOrderDon = userMirrorShopFeeOrderDonMapper.selectOne(Wrappers.lambdaQuery(UserMirrorShopFeeOrderDon.class)
-				.eq(UserMirrorShopFeeOrderDon::getUserId, userId)
-				.ne(UserMirrorShopFeeOrderDon::getStatus, UserMirrorShopFeeOrderDon.Status.noPayment)
-				.orderByDesc(UserMirrorShopFeeOrderDon::getId)
-				.last("limit 1"));
-		if (userMirrorShopFeeOrderDon != null) {
-			userMirrorShop.setJoinFeeStatus(userMirrorShopFeeOrderDon.getStatus() == UserMirrorShopFeeOrderDon.Status.hasPayment ? true : false);
+		if (userMirrorShop != null) {
+			UserMirrorShopFeeOrderDon userMirrorShopFeeOrderDon = userMirrorShopFeeOrderDonMapper.selectOne(Wrappers.lambdaQuery(UserMirrorShopFeeOrderDon.class)
+					.eq(UserMirrorShopFeeOrderDon::getUserId, userId)
+					.eq(UserMirrorShopFeeOrderDon::getStatus, UserMirrorShopFeeOrderDon.Status.hasPayment)
+					.last("limit 1"));
+			userMirrorShop.setJoinFeeStatus(userMirrorShopFeeOrderDon != null ? true : false);
 		}
 		return GatewayResponse.SUCCESS.newBuilder().toResult(userMirrorShop);
 	}