|
@@ -12,6 +12,7 @@ import cn.kdan.pdf.backend.core.service.MemberService;
|
|
import cn.kdan.pdf.backend.core.service.PricingDiscountService;
|
|
import cn.kdan.pdf.backend.core.service.PricingDiscountService;
|
|
import cn.kdan.pdf.backend.core.service.PricingService;
|
|
import cn.kdan.pdf.backend.core.service.PricingService;
|
|
import cn.kdan.pdf.backend.core.service.SubscriptionService;
|
|
import cn.kdan.pdf.backend.core.service.SubscriptionService;
|
|
|
|
+import cn.kdan.pdf.backend.core.utils.CommonUtils;
|
|
import enums.CommonEnum;
|
|
import enums.CommonEnum;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import org.apache.commons.lang.StringUtils;
|
|
import org.apache.commons.lang.StringUtils;
|
|
@@ -37,14 +38,6 @@ public class PricingServiceImpl implements PricingService {
|
|
@Autowired
|
|
@Autowired
|
|
private MemberService memberService;
|
|
private MemberService memberService;
|
|
|
|
|
|
- /**
|
|
|
|
- * 语言(zh、zh-CN、zh-Hans表示汉语,en表示英语)
|
|
|
|
- */
|
|
|
|
- private final static String ZH = "zh";
|
|
|
|
- private final static String ZH_CN = "zh-CN";
|
|
|
|
- private final static String ZH_HANS = "zh-Hans";
|
|
|
|
- private final static String EN = "en";
|
|
|
|
-
|
|
|
|
/**
|
|
/**
|
|
* 1个月
|
|
* 1个月
|
|
*/
|
|
*/
|
|
@@ -61,11 +54,7 @@ public class PricingServiceImpl implements PricingService {
|
|
client = ClientEnum.WEB.value();
|
|
client = ClientEnum.WEB.value();
|
|
}
|
|
}
|
|
String language = req.getLanguage();
|
|
String language = req.getLanguage();
|
|
- if ("".equals(language) || ZH.equals(language) || ZH_CN.equals(language) || ZH_HANS.equals(language)) {
|
|
|
|
- language = ZH_CN;
|
|
|
|
- } else {
|
|
|
|
- language = EN;
|
|
|
|
- }
|
|
|
|
|
|
+ language = CommonUtils.judgeLanguage(language);
|
|
|
|
|
|
Members member = memberService.getCurrentUser();
|
|
Members member = memberService.getCurrentUser();
|
|
PricingsExample example = new PricingsExample();
|
|
PricingsExample example = new PricingsExample();
|