fix

netflix-service/src/main/java/com/cyksj/common/I18nValueEnum.java → netflix-service/src/main/java/com/cyksj/common/I18nValueEnumUtil.java

@@ -7,18 +7,33 @@ import java.util.Locale;
 
 /*
  *项目名: netflix
- *文件名: I18nValueEnum
+ *文件名: I18nValueEnumUtil
  *创建者: JavaZou
  *创建时间:2022/12/12 13:57
  */
 @Getter
-public enum I18nValueEnum {
+public enum I18nValueEnumUtil {
 
 
 	PARKING_SPACE_NOT_EXIST("该车位不存在", "The parking space does not exist"),
 
 	PARKING_SPACE_IS_OCCUPIED("该车位已有人", "The parking space is occupied"),
 
+	//兑换码
+	EX_CODE_ERROR("该兑换码错误", "The redemption code is wrong"),
+
+	EX_CODE_SUCCESS("兑换成功", "Successful exchange"),
+
+	//优惠券
+	COUPON_EXPIRED_ERROR("该优惠券已过期", "The coupon has expired"),
+
+	COUPON_INVALID_ERROR("该优惠券已失效", "The coupon has invalid"),
+
+	COUPON_NOTEFFECTIVE_ERROR("该优惠券未生效", "The coupon not valid"),
+
+	COUPON_UNAVAILABLE_RENEW("该优惠券续费时不可使用", "The coupon unavailable for renewal"),
+
+	RECEIVE_SUCCESS("领取成功", "Receive success"),
 
 	SYS_ERROR("系统错误", "Please refresh and try again"),
 
@@ -29,12 +44,12 @@ public enum I18nValueEnum {
 
 	private String en_US_value;
 
-	public I18nValueEnum(String zh_CN_value, String en_US_value) {
+	I18nValueEnumUtil(String zh_CN_value, String en_US_value) {
 		this.zh_CN_value = zh_CN_value;
 		this.en_US_value = en_US_value;
 	}
 
-	public static String getI18nValue(I18nValueEnum i18nValueEnum) {
+	public static String getI18nValue(I18nValueEnumUtil i18nValueEnum) {
 		Locale locale = Locale.getDefault();
 		UserPageLanguage.Language language = UserPageLanguage.Language.valueOf(locale.getLanguage());
 		if (language == UserPageLanguage.Language.en_US) {

netflix-service/src/main/java/com/cyksj/service/coupon/impl/CouponFontServiceImpl.java

@@ -4,6 +4,7 @@ import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.cyksj.common.I18nValueEnumUtil;
 import com.cyksj.common.exception.BusinessRuntimeException;
 import com.cyksj.common.task.GlobalThreadPoolTaskExecutor;
 import com.cyksj.mapper.manage.coupon.*;
@@ -161,7 +162,7 @@ public class CouponFontServiceImpl implements CouponFontService {
 					}
 				}
 				if (isRenew != null && isRenew && !data.getIsRenew()) {
-					data.setReason(String.format("续费时,不可使用"));
+					data.setReason(I18nValueEnumUtil.getI18nValue(I18nValueEnumUtil.COUPON_UNAVAILABLE_RENEW));
 				}
 				//为了重新校验
 				data.setCouponUserStatus(CouponUser.Status.unused);
@@ -181,17 +182,17 @@ public class CouponFontServiceImpl implements CouponFontService {
 			if (data.getExpiryStatus() != null && !data.getExpiryStatus()) {
 				data.setCouponUserStatus(CouponUser.Status.invalid);
 				data.setIsAvailable(false);
-				data.setReason("该优惠券已失效");
+				data.setReason(I18nValueEnumUtil.getI18nValue(I18nValueEnumUtil.COUPON_INVALID_ERROR));
 				isFlag = true;
 			} else if (now.isAfter(data.getValidEndTime())) {
 				data.setCouponUserStatus(CouponUser.Status.expired);
 				data.setIsAvailable(false);
-				data.setReason("该优惠券已过期");
+				data.setReason(I18nValueEnumUtil.getI18nValue(I18nValueEnumUtil.COUPON_EXPIRED_ERROR));
 				isFlag = true;
 			} else if (now.isBefore(data.getValidStartTime())) {
 				data.setCouponUserStatus(CouponUser.Status.notEffective);
 				data.setIsAvailable(false);
-				data.setReason("该优惠券未生效");
+				data.setReason(I18nValueEnumUtil.getI18nValue(I18nValueEnumUtil.COUPON_NOTEFFECTIVE_ERROR));
 				isFlag = true;
 			}
 		}

netflix-web/src/main/java/com/cyksj/web/controller/coupon/CouponFrontController.java

@@ -3,6 +3,7 @@ package com.cyksj.web.controller.coupon;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.cyksj.common.I18nValueEnumUtil;
 import com.cyksj.common.annotation.NoSubmit;
 import com.cyksj.common.exception.BusinessRuntimeException;
 import com.cyksj.common.util.Jsons;
@@ -91,7 +92,7 @@ public class CouponFrontController {
 		//实物还是虚物
 		GoodsDonSkuView goodsDonSkuView = beanSearcher.searchFirst(GoodsDonSkuView.class, MapUtils.builder().field(GoodsDonSkuView::getSkuId, skuId).op(Operator.Equal).build());
 		if (goodsDonSkuView == null) {
-			throw BusinessRuntimeException.getInstance("规格不存在");
+			throw BusinessRuntimeException.getInstance(I18nValueEnumUtil.getI18nValue(I18nValueEnumUtil.SYS_ERROR));
 		}
 		if (goodsDonSkuView.getType() == 2) {
 			goodsId = goodsDonSkuView.getGoodsId();
@@ -138,7 +139,7 @@ public class CouponFrontController {
 	public Result<String> collectWholeRecommendCoupon() {
 		Long userId = StpUserUtil.getLoginIdAsLong();
 		couponFontService.collectWholeRecommendCoupon(userId);
-		return GatewayResponse.SUCCESS.newBuilder().toResult("领取成功");
+		return GatewayResponse.SUCCESS.newBuilder().toResult(I18nValueEnumUtil.getI18nValue(I18nValueEnumUtil.RECEIVE_SUCCESS));
 	}
 
 	/**
@@ -162,7 +163,7 @@ public class CouponFrontController {
 	public Result<String> collectCoupon(@RequestBody CouponCollectReq couponCollectReq) {
 		Long userId = StpUserUtil.getLoginIdAsLong();
 		couponFontService.collectCoupon(couponCollectReq, userId);
-		return GatewayResponse.SUCCESS.newBuilder().toResult("领取优惠券成功");
+		return GatewayResponse.SUCCESS.newBuilder().toResult(I18nValueEnumUtil.getI18nValue(I18nValueEnumUtil.RECEIVE_SUCCESS));
 	}
 
 	/**
@@ -172,7 +173,7 @@ public class CouponFrontController {
 	public Result<String> collectRecommendCoupon(@RequestBody CouponCollectReq couponCollectReq) {
 		Long userId = StpUserUtil.getLoginIdAsLong();
 		couponFontService.collectRecommendCoupon(couponCollectReq, userId);
-		return GatewayResponse.SUCCESS.newBuilder().toResult("领取优惠券成功");
+		return GatewayResponse.SUCCESS.newBuilder().toResult(I18nValueEnumUtil.getI18nValue(I18nValueEnumUtil.RECEIVE_SUCCESS));
 	}
 
 	/**