fix

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

@@ -143,7 +143,7 @@ public class CmsGoodsDonSpecServiceImpl extends ServiceImpl<GoodsDonSpecMapper,
 		spec.setSpecsJson(Jsons.toJson(specs));
 		spec.setSpecNumber(specNumber);
 		spec.setSpecMapping(Jsons.toJson(map));
-		if (!StrUtil.equals(UserPageLanguage.Language.zh_CN.name(), lang)) {
+		if (lang != null && !StrUtil.equals(UserPageLanguage.Language.zh_CN.name(), lang)) {
 			//spec
 			backInfoTranslationsService.saveOrUpdateBackInfoTranslations(BackInfoTranslations.Type.spec, spec.getId(), spec, lang);
 			//sku
@@ -151,7 +151,7 @@ public class CmsGoodsDonSpecServiceImpl extends ServiceImpl<GoodsDonSpecMapper,
 					.eq(GoodsDonSku::getGoodsId, goods.getId()));
 			List<GoodsDonSku> resetSkuSpec = resetSkuSpec(goodsDonSkus, spec);
 			resetSkuSpec.stream().forEach(sku -> backInfoTranslationsService.saveOrUpdateBackInfoTranslations(BackInfoTranslations.Type.sku, sku.getId(), sku, lang));
-		}else {
+		} else {
 			if (insert.getId() != null) {
 				this.updateById(spec);
 				return;

netflix-web/src/main/java/com/cyksj/web/controller/goods/GoodsDonController.java

@@ -105,7 +105,7 @@ public class GoodsDonController {
 	    }
 	    String lang = request.getHeader("lang");
 	    AtomicBoolean language = new AtomicBoolean(false);
-	    if (UserPageLanguage.Language.en_US.name().equals(lang)) {
+	    if (lang != null && !StrUtil.equals(UserPageLanguage.Language.zh_CN.name(), lang)) {
 		    key += ":" + lang;
 		    language.set(true);
 	    }
@@ -370,7 +370,7 @@ public class GoodsDonController {
 		List<Long> filter_goodsIds = null;
 		String lang = request.getHeader("lang");
 		AtomicBoolean language = new AtomicBoolean(false);
-		if (UserPageLanguage.Language.en_US.name().equals(lang)) {
+		if (lang != null && !StrUtil.equals(UserPageLanguage.Language.zh_CN.name(), lang)) {
 			goodsDetailKey += ":" + lang;
 			language.set(true);
 		}
@@ -927,7 +927,7 @@ public class GoodsDonController {
 			}
 			data.setSold(getGoodsSold(data.getGoodsId(), data.getSold()));
 			data.setNotifyMsg(getPayMsgTime(data.getGoodsId(), now, 1, null));
-			if (!UserPageLanguage.Language.en_US.name().equals(lang)) {
+			if (lang == null || !UserPageLanguage.Language.en_US.name().equals(lang)) {
 				//设置用户存在优惠券的优惠商品价格
 				data.setChannelDiscount(discount);
 				setHomeManageUserCouponGoodsMoney(fUid, data);
@@ -1058,7 +1058,7 @@ public class GoodsDonController {
 		}
 		String lang = request.getHeader("lang");
 		AtomicBoolean language = new AtomicBoolean(false);
-		if (UserPageLanguage.Language.en_US.name().equals(lang)) {
+		if (lang != null && UserPageLanguage.Language.en_US.name().equals(lang)) {
 			categoryGoodsKey += ":" + lang;
 			language.set(true);
 		}
@@ -1132,7 +1132,7 @@ public class GoodsDonController {
 			}
 			//设置特定价格
 			setGcSpecificPrice(data, fUid, dsUserId.get());
-			if (!UserPageLanguage.Language.en_US.name().equals(lang)) {
+			if (lang == null || !UserPageLanguage.Language.en_US.name().equals(lang)) {
 				//设置用户存在优惠券的优惠商品价格
 				data.setChannelDiscount(discount);
 				setUserCouponGoodsMoney(fUid, data);

netflix-web/src/main/java/com/cyksj/web/controller/manage/goods/CmsGoodsDonCategoryController.java

@@ -73,7 +73,7 @@ public class CmsGoodsDonCategoryController {
 	public Result<String> updateGoodsDonCategory(@RequestBody List<GoodsDonCategory> categorys) {
 		String lang = request.getHeader("lang");
 		//多语言
-		if (!StrUtil.equals(UserPageLanguage.Language.zh_CN.name(), lang)) {
+		if (lang != null && !StrUtil.equals(UserPageLanguage.Language.zh_CN.name(), lang)) {
 			categorys.forEach(category -> backInfoTranslationsService.saveOrUpdateBackInfoTranslations(BackInfoTranslations.Type.goods_category, category.getId(), category, lang));
 		} else {
 			categorys.forEach(category -> goodsDonCategoryService.saveOrUpdateGoods(category));
@@ -138,7 +138,7 @@ public class CmsGoodsDonCategoryController {
 					.eq(GoodsClickUserRecord::getCategory, data.getId()));
 			data.setClick(count);
 			//多语言
-			if (!StrUtil.equals(UserPageLanguage.Language.zh_CN.name(), lang)) {
+			if (lang != null && !StrUtil.equals(UserPageLanguage.Language.zh_CN.name(), lang)) {
 				String categoryNameLanguage = backInfoTranslationsFrontService.getCategoryNameLanguage(data.getId(), lang);
 				if (StrUtil.isNotBlank(categoryNameLanguage)) {
 					data.setName(categoryNameLanguage);

netflix-web/src/main/java/com/cyksj/web/controller/manage/goods/CmsGoodsDonController.java

@@ -85,7 +85,7 @@ public class CmsGoodsDonController {
         List<GoodsDonCategory> categoryView = goodsDonCategoryService.getCateGoryViewByGoodsId(id);
         goodsDonViewer.setCategoryList(categoryView.stream().map(GoodsDonCategory::getId).collect(Collectors.toList()));
         String lang = request.getHeader("lang");
-        if (!StrUtil.equals(UserPageLanguage.Language.zh_CN.name(), lang)) {
+        if (lang != null && !StrUtil.equals(UserPageLanguage.Language.zh_CN.name(), lang)) {
             backInfoTranslationsFrontService.setGoodsBackLanguage(goodsDonViewer, lang);
         }
         return GatewayResponse.SUCCESS.newBuilder().toResult(goodsDonViewer);
@@ -100,7 +100,7 @@ public class CmsGoodsDonController {
                 .orderBy(GoodsDonSku::getSorted).asc()
                 .build());
         String lang = request.getHeader("lang");
-        if (!StrUtil.equals(UserPageLanguage.Language.zh_CN.name(), lang)) {
+        if (lang != null && !StrUtil.equals(UserPageLanguage.Language.zh_CN.name(), lang)) {
             backInfoTranslationsFrontService.setSkuBackLanguage(goodsDonSkus, lang);
         }
         return GatewayResponse.SUCCESS.newBuilder().toResult(goodsDonSkus);
@@ -170,7 +170,7 @@ public class CmsGoodsDonController {
             goods.setRecommendGoods(Jsons.toJson(re_goodsIds));
         }
         String lang = request.getHeader("lang");
-        if (!StrUtil.equals(UserPageLanguage.Language.zh_CN.name(), lang)) {
+        if (lang != null && !StrUtil.equals(UserPageLanguage.Language.zh_CN.name(), lang)) {
             backInfoTranslationsService.saveOrUpdateBackInfoTranslations(BackInfoTranslations.Type.goods, goods.getId(), goods, lang);
         } else {
             //平台 分类关系

netflix-web/src/main/java/com/cyksj/web/controller/manage/goods/CmsGoodsDonSkuController.java

@@ -162,7 +162,7 @@ public class CmsGoodsDonSkuController {
         }
         //多语言
         String lang = request.getHeader("lang");
-        if (!StrUtil.equals(UserPageLanguage.Language.zh_CN.name(), lang)) {
+        if (lang != null && !StrUtil.equals(UserPageLanguage.Language.zh_CN.name(), lang)) {
             backInfoTranslationsService.saveOrUpdateBackInfoTranslations(BackInfoTranslations.Type.sku, sku.getId(), sku, lang);
         } else {
             //优惠加购
@@ -183,7 +183,7 @@ public class CmsGoodsDonSkuController {
             //下架店铺低于这个规格价格的品
             goodsDonSkuService.setBelowPriceShopSkuDown(skuId, newPrice);
             //套餐包关联规格
-            goodsDonSkuService.handleGptPackageSku(dbSku,sku);
+            goodsDonSkuService.handleGptPackageSku(dbSku, sku);
         }
         refreshCacheService.refreshYhHomePageCache();
         return GatewayResponse.SUCCESS.newBuilder().toResult();
@@ -244,7 +244,7 @@ public class CmsGoodsDonSkuController {
             }
         });
         String lang = request.getHeader("lang");
-        if (!StrUtil.equals(lang, UserPageLanguage.Language.zh_CN.name())) {
+        if (lang != null && !StrUtil.equals(lang, UserPageLanguage.Language.zh_CN.name())) {
             backInfoTranslationsFrontService.setSkuBackLanguage(skuViewList.getDataList(), lang);
         }
         return GatewayResponse.SUCCESS.newBuilder().toResult(skuViewList);