zoujiajian 1 سال پیش
والد
کامیت
3dbd3a8559

+ 7 - 0
netflix-dao/src/main/java/com/cyksj/model/entity/UserMirrorShop.java

@@ -72,6 +72,13 @@ public class UserMirrorShop extends BaseEntity {
 	@TableField(exist = false)
 	private UserMirrorShopApplyInfoView applyInfoView;
 
+	/**
+	 * 加盟费状态
+	 */
+	@DbIgnore
+	@TableField(exist = false)
+	private Boolean joinFeeStatus = true;
+
 	@Getter
 	public enum Status {
 		verify("审核中"),

+ 12 - 0
netflix-web/src/main/java/com/cyksj/web/controller/mirrorshop/UserMirrorShopFrontController.java

@@ -7,6 +7,7 @@ import com.cyksj.config.zfb.ZfbProductCode;
 import com.cyksj.dto.Result;
 import com.cyksj.enums.GatewayResponse;
 import com.cyksj.mapper.mirrorshop.MirrorNoticeUserMapper;
+import com.cyksj.mapper.mirrorshop.UserMirrorShopFeeOrderDonMapper;
 import com.cyksj.mapper.mirrorshop.UserMirrorShopMapper;
 import com.cyksj.model.dto.AliPayParams;
 import com.cyksj.model.entity.UserMirrorShop;
@@ -55,6 +56,8 @@ public class UserMirrorShopFrontController {
 
 	private final UserMirrorShopMapper userMirrorShopMapper;
 
+	private final UserMirrorShopFeeOrderDonMapper userMirrorShopFeeOrderDonMapper;
+
 	/**
 	 * 镜像店铺主 个人信息
 	 */
@@ -86,6 +89,15 @@ public class UserMirrorShopFrontController {
 				.eq(UserMirrorShop::getUserId, userId)
 				.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);
+		}
 		return GatewayResponse.SUCCESS.newBuilder().toResult(userMirrorShop);
 	}