فهرست منبع

Merge branch 'abroad_073' into abroad_pre

zoujiajian 2 سال پیش
والد
کامیت
df4f2e5d26

+ 1 - 3
netflix-common/src/main/java/com/cyksj/common/constant/Constant.java

@@ -92,9 +92,7 @@ public interface Constant {
 	 */
 	String QR_CODE_WX_APP_ID = "qr_code_wx_app_id";
 
-	String CHANGE_GROUPS_TRIPS_ACCOUNT = "您好,您购买的%s,账号已替换,请登陆网站%s查看最新账号密码【银河录像局】";
-
-	String ACCOUNT_EXPIRY_MSG_TEMPLATE = "您好,您购买的%s,还有%s到期,请登陆网站%s及时续费。【银河录像局】";
+	String CHANGE_GROUPS_TRIPS_ACCOUNT = "您好,您购买的%s,账号已替换,请登陆网站%s 查看最新账号密码【银河录像局】";
 
 	String AMERICA_APPID_SECRET = "1990-01-01 朋友 aaa111 工作 aab112 父母 aac113";
 

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

@@ -16,6 +16,7 @@ import com.cyksj.model.manage.request.ReqGoodsSkuSpec;
 import com.cyksj.model.manage.request.ReqGoodsSpecSingle;
 import com.cyksj.model.request.CombinationSkuReq;
 import com.cyksj.service.mange.CmsGoodsDonSpecService;
+import com.cyksj.service.translations.BackInfoTranslationsFrontService;
 import com.cyksj.service.translations.BackInfoTranslationsService;
 import com.fasterxml.jackson.databind.JavaType;
 import lombok.RequiredArgsConstructor;
@@ -47,6 +48,8 @@ public class CmsGoodsDonSpecServiceImpl extends ServiceImpl<GoodsDonSpecMapper,
 
 	private final BackInfoTranslationsService backInfoTranslationsService;
 
+	private final BackInfoTranslationsFrontService backInfoTranslationsFrontService;
+
 	@Override
 	@Transactional(rollbackFor = Throwable.class)
 	public void insertOrUpdateSkuSpec(ReqGoodsSkuInsert insert, Boolean isUpdate) throws Exception {
@@ -139,7 +142,13 @@ public class CmsGoodsDonSpecServiceImpl extends ServiceImpl<GoodsDonSpecMapper,
 		spec.setSpecNumber(specNumber);
 		spec.setSpecMapping(Jsons.toJson(map));
 		if (!StrUtil.equals(UserPageLanguage.Language.zh_HK.name(), lang)) {
+			//spec
 			backInfoTranslationsService.saveOrUpdateBackInfoTranslations(BackInfoTranslations.Type.spec, spec.getId(), spec, lang);
+			//sku
+			List<GoodsDonSku> goodsDonSkus = goodsDonSkuMapper.selectList(Wrappers.lambdaQuery(GoodsDonSku.class)
+					.eq(GoodsDonSku::getGoodsId, goods.getId()));
+			resetSkuSpec(goodsDonSkus, spec);
+			goodsDonSkus.stream().forEach(sku -> backInfoTranslationsService.saveOrUpdateBackInfoTranslations(BackInfoTranslations.Type.sku, sku.getId(), sku, lang));
 		} else {
 			if (insert.getId() != null) {
 				this.updateById(spec);
@@ -284,7 +293,7 @@ public class CmsGoodsDonSpecServiceImpl extends ServiceImpl<GoodsDonSpecMapper,
 			unifiedHandleCombinationSku(combinations, request.getValues(), specValueMap, nodeIdMap, specIdLists, skus);
 		} else {
 			ReqGoodsSkuSpec reqGoodsSkuSpec = reqGoodsSkuSpecs.get(0);
-			unifiedHandleCombinationSku(combinations,reqGoodsSkuSpec.getValues(),specValueMap, nodeIdMap,specIdLists,skus);
+			unifiedHandleCombinationSku(combinations, reqGoodsSkuSpec.getValues(), specValueMap, nodeIdMap, specIdLists, skus);
 		}
 		reqGoodsSkuInsert.setSkus(skus);
 		skuAppend(reqGoodsSkuInsert, goodsDon);
@@ -473,11 +482,7 @@ public class CmsGoodsDonSpecServiceImpl extends ServiceImpl<GoodsDonSpecMapper,
 								}
 							}
 							if (!StrUtil.equals(UserPageLanguage.Language.zh_HK.name(), lang)) {
-								GoodsDonSku specValLanguage = new GoodsDonSku();
-								specValLanguage.setId(sku.getId());
-								specValLanguage.setSpecVal(sku.getSpecVal());
-								specValLanguage.setSpecJson(sku.getSpecJson());
-								backInfoTranslationsService.saveOrUpdateBackInfoTranslations(BackInfoTranslations.Type.sku, specValLanguage.getId(), specValLanguage, lang);
+
 							} else {
 								goodsDonSkuMapper.updateById(sku);
 							}
@@ -488,4 +493,40 @@ public class CmsGoodsDonSpecServiceImpl extends ServiceImpl<GoodsDonSpecMapper,
 			}
 		}
 	}
+
+	//多语言设置sku
+	public void resetSkuSpec(List<GoodsDonSku> skus, GoodsDonSpec loveSpec) throws Exception {
+		StringBuilder builder = new StringBuilder();
+		List<ReqGoodsSpecSingle> specList = null;
+		JavaType type = Jsons.javaType().constructMapType(HashMap.class, Integer.class, ReqGoodsSpecSingle.class);
+		Map<Integer, ReqGoodsSpecSingle> map = Jsons.parseObject(loveSpec.getSpecMapping(), type);
+		int specNumber = loveSpec.getSpecNumber();
+		for (GoodsDonSku sku : skus) {
+			final String specIds = sku.getSpecIds();
+			if (StringUtils.isBlank(specIds)) {
+				throw new RuntimeException("请选择商品的规格.");
+			}
+			int[] ids = Jsons.parseObject(specIds, int[].class);
+
+			// init
+			builder.delete(0, builder.length());
+			if (null == specList) {
+				specList = new ArrayList<>(specNumber);
+			} else {
+				specList.clear();
+			}
+			for (int id : ids) {
+				ReqGoodsSpecSingle single = map.get(id);
+				if (null == single) {
+					throw new RuntimeException("总规格属性id中 不存在 sku中的id.");
+				}
+				builder.append(single.getName()).append(';');
+				specList.add(single);
+			}
+			String specVal = builder.toString();
+			String specJson = Jsons.toJson(specList);
+			sku.setSpecVal(specVal);
+			sku.setSpecJson(specJson);
+		}
+	}
 }

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
netflix-web/src/main/resources/application-prd.yml


+ 9 - 9
netflix-web/src/main/resources/application-pre.yml

@@ -126,7 +126,7 @@ wechat:
   oldAppid: wxd58016eee53b6558
   appid: wx6cbc2de2a55e5579
   secret: 2ab6340e7787ab24de9f29094dee9d24
-  domain: https://galaxydvd.com/8085/api/
+  domain: https://galaxyva.com/8085/api/
   #默认微信商户
   shopid: 1634772026
   shopKey: p2B8BAKi2V3PgMDSSez82V67aIvMKBt5
@@ -135,11 +135,11 @@ wechat:
 wx-login:
   appid: wx7c5494c38c6a78bd
   secret: 95c7c542a583b42840765d758ec49bf5
-  redirectUri: https://galaxydvd.com/8085/api/auth/wx/authLogin/baseRedirect
-  loginUrl: https://galaxydvd.com
-  cpsRedirectUri: https://galaxydvd.com/8085/api/cps/manage/wx/authLogin/baseRedirect
-  cpsLoginUrl: https://cps.galaxydvd.com/yinhe/cps/loginNexte
-  baRedirectUrl: https://galaxydvd.com/8085/api/applets/market/task/bind/wx/baseRedirect
+  redirectUri: https://galaxyva.com/8085/api/auth/wx/authLogin/baseRedirect
+  loginUrl: https://galaxyva.com
+  cpsRedirectUri: https://galaxyva.com/8085/api/cps/manage/wx/authLogin/baseRedirect
+  cpsLoginUrl: https://cps.galaxyva.com/yinhe/cps/loginNexte
+  baRedirectUrl: https://galaxyva.com/8085/api/applets/market/task/bind/wx/baseRedirect
   remark: 银河录像网页微信登录
 
 yhlx:
@@ -147,7 +147,7 @@ yhlx:
   corpSecret: Ov0mlArSItBrs9EuOMt5Ou_faGdplDDIvPgIhgup51E
   encodingAESKey: bqoACJutQEgW7KOgBoezuQkk7y2HQSyRp1sQ8qnAi6C
   token: 2e0aWIfBewWNN5BNMq9cBeLf9x
-  domain: https://galaxydvd.com/8085/api/
+  domain: https://galaxyva.com/8085/api/
 
 #银河录像局小程序
 yhmini:
@@ -160,7 +160,7 @@ advertisement:
   secret: 19b5f5121bc7cc1bc010ee7c4ac509e9
   shopId: 1644299849
   shopKey: 5y5ZScTJGm0q0umHQOD4r3EfjRvCioUx
-  notify: https://galaxydvd.com/8085/api/
+  notify: https://galaxyva.com/8085/api/
 
 #广告投放公众号
 advertisementwxapp:
@@ -181,4 +181,4 @@ feedback:
 cryptomus:
   shopId: 15d39001-dec3-4949-8872-69b241825c5d
   shopKey: zk4alqQNueK2RiWH2YM3auEEDbCxYZGh2XsJQv3AdoJYASQkUxvaGR0ID81xIg1sm0H3ZMeWgDzIFlqMYJeqrBvQeFRHceEH83PABCiAYBeGp75XfqoUN8Oa1No1UYas
-  host: https://galaxydvd.com/8085/api/
+  host: https://galaxyva.com/8085/api/

برخی فایل ها در این مقایسه diff نمایش داده نمی شوند زیرا تعداد فایل ها بسیار زیاد است