Merge branch 'abroad_073' into abroad_pre

netflix-service/src/main/java/com/cyksj/service/translations/impl/BackInfoTranslationsFrontServiceImpl.java

@@ -1,6 +1,7 @@
 package com.cyksj.service.translations.impl;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.cyksj.mapper.BackInfoTranslationsMapper;
 import com.cyksj.model.entity.BackInfoTranslations;
@@ -52,6 +53,9 @@ public class BackInfoTranslationsFrontServiceImpl implements BackInfoTranslation
 
 	@Override
 	public String setLanguagePayTitle(Long goodsId, Long skuId, String lang) {
+		if (StrUtil.isEmpty(lang)) {
+			return null;
+		}
 		BackInfoTranslations goodsL = backInfoTranslationsMapper.selectOne(Wrappers.lambdaQuery(BackInfoTranslations.class)
 				.eq(BackInfoTranslations::getType, BackInfoTranslations.Type.goods.ordinal())
 				.eq(BackInfoTranslations::getFuncId, goodsId)
@@ -79,6 +83,9 @@ public class BackInfoTranslationsFrontServiceImpl implements BackInfoTranslation
 	}
 
 	public void setFieldLanguage(Class<?> tclass, Object obj, Integer type, Long funcId, String lang) {
+		if (StrUtil.isEmpty(lang)) {
+			return;
+		}
 		List<BackInfoTranslations> backInfoTranslations = backInfoTranslationsMapper.selectList(Wrappers.lambdaQuery(BackInfoTranslations.class)
 				.eq(BackInfoTranslations::getType, type)
 				.eq(BackInfoTranslations::getLang, lang)

netflix-service/src/main/java/com/cyksj/service/translations/impl/BackInfoTranslationsServiceImpl.java

@@ -1,6 +1,7 @@
 package com.cyksj.service.translations.impl;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.cyksj.mapper.BackInfoTranslationsMapper;
@@ -37,6 +38,9 @@ public class BackInfoTranslationsServiceImpl extends ServiceImpl<BackInfoTransla
 
 	@Override
 	public void saveOrUpdateBackInfoTranslations(BackInfoTranslations.Type type, Long funcId, Object obj, String lang) {
+		if (StrUtil.isEmpty(lang)) {
+			return;
+		}
 		TranslationsDto translationsDto = new TranslationsDto();
 		translationsDto.setType(type);
 		translationsDto.setLang(lang);
@@ -46,10 +50,12 @@ public class BackInfoTranslationsServiceImpl extends ServiceImpl<BackInfoTransla
 			try {
 				declaredField.setAccessible(true);
 				Optional.ofNullable(declaredField.get(obj)).ifPresent(val -> {
-					BackInfoTranslations backInfoTranslations = new BackInfoTranslations();
-					backInfoTranslations.setFieldName(declaredField.getName());
-					backInfoTranslations.setDesp(val.toString());
-					fields.add(backInfoTranslations);
+					if (val instanceof String) {
+						BackInfoTranslations backInfoTranslations = new BackInfoTranslations();
+						backInfoTranslations.setFieldName(declaredField.getName());
+						backInfoTranslations.setDesp(val.toString());
+						fields.add(backInfoTranslations);
+					}
 				});
 			} catch (IllegalAccessException e) {
 			}