Merge branch 'abroad_073' into abroad_pre

netflix-dao/src/main/java/com/cyksj/model/entity/BackInfoTranslations.java

@@ -32,7 +32,7 @@ public class BackInfoTranslations extends BaseEntity{
 	/**
 	 * 英文表述
 	 */
-	private String desc;
+	private String desp;
 
 
 	@Getter

netflix-dao/src/main/resources/mapper/BackInfoTranslationsMapper.xml

@@ -5,12 +5,12 @@
 
 
     <insert id="batchInsertOrUpdate">
-        insert into `back_info_translations`(`type`,`func_id`,`field_name`,`desc`,`lang`,`created_time`,`update_time`)
+        insert into `back_info_translations`(`type`,`func_id`,`field_name`,`desp`,`lang`,`created_time`,`update_time`)
         values
         <foreach collection="list" item="item" separator=",">
-            (#{type},#{funcId},#{item.fieldName},#{item.desc},#{lang},now(),now());
+            (#{type},#{funcId},#{item.fieldName},#{item.desp},#{lang},now(),now())
         </foreach>
-        ON DUPLICATE KEY UPDATE desc_us = VALUES(desc_us),
+        ON DUPLICATE KEY UPDATE `desp` = VALUES(`desp`),
         update_time = VALUES(update_time)
     </insert>
 </mapper>

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

@@ -63,7 +63,7 @@ public class BackInfoTranslationsFrontServiceImpl implements BackInfoTranslation
 				.eq(BackInfoTranslations::getLang, lang)
 				.eq(BackInfoTranslations::getFieldName, "specVal"));
 		if (goodsL != null && skuL != null) {
-			return new StringBuilder().append(goodsL.getDesc()).append(skuL.getDesc()).toString();
+			return new StringBuilder().append(goodsL.getDesp()).append(skuL.getDesp()).toString();
 		}
 		return null;
 	}
@@ -90,7 +90,7 @@ public class BackInfoTranslationsFrontServiceImpl implements BackInfoTranslation
 				try {
 					Field declaredField = tclass.getDeclaredField(fieldName);
 					declaredField.setAccessible(true);
-					declaredField.set(obj, tanslate.getDesc());
+					declaredField.set(obj, tanslate.getDesp());
 				} catch (IllegalAccessException e) {
 				} catch (NoSuchFieldException e) {
 				}

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 com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.cyksj.mapper.BackInfoTranslationsMapper;
 import com.cyksj.model.dto.TranslationsDto;
@@ -28,7 +29,7 @@ public class BackInfoTranslationsServiceImpl extends ServiceImpl<BackInfoTransla
 	@Override
 	public void saveOrUpdateTranslations(TranslationsDto dto) {
 		List<BackInfoTranslations> fields = dto.getFields();
-		if (CollUtil.isNotEmpty(fields)) {
+		if (CollUtil.isEmpty(fields)) {
 			return;
 		}
 		backInfoTranslationsMapper.batchInsertOrUpdate(dto.getFuncId(), dto.getType().ordinal(), dto.getFields(), dto.getLang());
@@ -42,15 +43,22 @@ public class BackInfoTranslationsServiceImpl extends ServiceImpl<BackInfoTransla
 		translationsDto.setFuncId(funcId);
 		List<BackInfoTranslations> fields = new ArrayList<>();
 		for (Field declaredField : obj.getClass().getDeclaredFields()) {
-			BackInfoTranslations backInfoTranslations = new BackInfoTranslations();
-			backInfoTranslations.setFieldName(declaredField.getName());
 			try {
 				declaredField.setAccessible(true);
-				Optional.ofNullable(declaredField.get(obj)).ifPresent(val -> backInfoTranslations.setDesc(val.toString()));
-				fields.add(backInfoTranslations);
+				Optional.ofNullable(declaredField.get(obj)).ifPresent(val -> {
+					BackInfoTranslations backInfoTranslations = new BackInfoTranslations();
+					backInfoTranslations.setFieldName(declaredField.getName());
+					backInfoTranslations.setDesp(val.toString());
+					fields.add(backInfoTranslations);
+				});
 			} catch (IllegalAccessException e) {
 			}
 		}
-		saveOrUpdateTranslations(translationsDto);
+		if (CollUtil.isNotEmpty(fields)) {
+			translationsDto.setFields(fields);
+			saveOrUpdateTranslations(translationsDto);
+		} else {
+			backInfoTranslationsMapper.delete(Wrappers.lambdaQuery(BackInfoTranslations.class).eq(BackInfoTranslations::getType, type.ordinal()).eq(BackInfoTranslations::getFuncId, funcId).eq(BackInfoTranslations::getLang, lang));
+		}
 	}
 }