Merge branch 'abroad_073' into abroad_pre

netflix-service/src/main/java/com/cyksj/service/mail/impl/CuiQiuMailServiceImpl.java

@@ -130,8 +130,11 @@ public class CuiQiuMailServiceImpl implements CuiQiuMailService {
 		if (goodsId == 1) {
 			if (type != null && type == 1) {
 				String pre = "NetflixSans-Regular, Helvetica, Roboto, Segoe UI, sans-serif; font-weight";
-				if (body.contains("輸入此代碼登入") || body.contains("输入此代码登录")) {
+				if (body.contains("輸入此代碼登入") || body.contains("输入此代码登录") || body.contains("Enter this code to sign in")) {
 					code = StrUtil.subAfter(body, pre, false);
+					if (StrUtil.isEmpty(code)) {
+						code = StrUtil.subAfter(body, "Enter this code to sign in", true);
+					}
 				}
 				if (StrUtil.isEmpty(code)) {
 					throw BusinessRuntimeException.getInstance(I18nMessageUtil.getI18nMsg("ticket_login_code"));

netflix-service/src/main/java/com/cyksj/service/mange/goods/CmsGoodsDonSpecServiceImpl.java

@@ -528,6 +528,7 @@ public class CmsGoodsDonSpecServiceImpl extends ServiceImpl<GoodsDonSpecMapper,
 			reSku = new GoodsDonSku();
 			String specVal = builder.toString();
 			String specJson = Jsons.toJson(specList);
+			reSku.setId(sku.getId());
 			reSku.setSpecVal(specVal);
 			reSku.setSpecJson(specJson);
 			reSkuList.add(reSku);

netflix-service/src/main/java/com/cyksj/service/relation/impl/GroupRelationFrontServiceImpl.java

@@ -459,11 +459,14 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
 		//奈飞
 		if (goodsId == 1) {
 			if (type != null && type == 1) {
-				if (body.contains("輸入此代碼登入") || body.contains("输入此代码登录")) {
+				if (body.contains("輸入此代碼登入") || body.contains("输入此代码登录") || body.contains("Enter this code to sign in")) {
 					code = StrUtil.subBetween(body, "輸入此代碼登入", "請在裝置上輸入上");
 					if (StrUtil.isEmpty(code)) {
 						code = StrUtil.subAfter(body, "输入此代码登录", true);
 					}
+					if (StrUtil.isEmpty(code)) {
+						code = StrUtil.subAfter(body, "Enter this code to sign in", true);
+					}
 				}
 				if (StrUtil.isEmpty(code)) {
 					throw BusinessRuntimeException.getInstance(I18nMessageUtil.getI18nMsg("ticket_login_code"));

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

@@ -38,7 +38,7 @@ public class BackInfoTranslationsServiceImpl extends ServiceImpl<BackInfoTransla
 
 	@Override
 	public void saveOrUpdateBackInfoTranslations(BackInfoTranslations.Type type, Long funcId, Object obj, String lang) {
-		if (StrUtil.isEmpty(lang)) {
+		if (StrUtil.isEmpty(lang) || funcId == null) {
 			return;
 		}
 		TranslationsDto translationsDto = new TranslationsDto();