fix

netflix-dao/src/main/java/com/cyksj/model/manage/views/OrderDonSearchView.java

@@ -57,6 +57,9 @@ public class OrderDonSearchView {
 	@DbField("sku.is_benefits")
 	private Boolean isBenefits;
 
+	@DbField("sku.id")
+	private Long skuId;
+
 	@DbField("sku.benefits_list")
 	@JsonIgnore
 	private String benefitsList;

netflix-service/src/main/java/com/cyksj/service/translations/BackInfoTranslationsFrontService.java

@@ -20,13 +20,13 @@ public interface BackInfoTranslationsFrontService {
 
 	void setCategoryGoodsLanguage(GoodsFrontListCategoryView data, String lang);
 
-	String setLanguagePayTitle(Long goodsId, Long skuId, String language);
+	String getLanguagePayTitle(Long goodsId, Long skuId, String language);
 
 	void setGoodsBackLanguage(GoodsDonViewer goodsDonViewer, String lang);
 
 	void setSkuBackLanguage(List<GoodsDonSku> goodsDonSkus, String lang);
 
-	String setSpecVal(Long skuId, String lang);
+	String getLanguageSpecVal(Long skuId, String lang);
 
 	String setGoodsTitle(Long goodsId, String lang);
 

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

@@ -64,7 +64,7 @@ public class BackInfoTranslationsFrontServiceImpl implements BackInfoTranslation
 	}
 
 	@Override
-	public String setLanguagePayTitle(Long goodsId, Long skuId, String lang) {
+	public String getLanguagePayTitle(Long goodsId, Long skuId, String lang) {
 		if (StrUtil.isEmpty(lang)) {
 			return null;
 		}
@@ -73,13 +73,22 @@ public class BackInfoTranslationsFrontServiceImpl implements BackInfoTranslation
 				.eq(BackInfoTranslations::getFuncId, goodsId)
 				.eq(BackInfoTranslations::getLang, lang)
 				.eq(BackInfoTranslations::getFieldName, "title"));
-		BackInfoTranslations skuL = backInfoTranslationsMapper.selectOne(Wrappers.lambdaQuery(BackInfoTranslations.class)
-				.eq(BackInfoTranslations::getType, BackInfoTranslations.Type.sku.ordinal())
-				.eq(BackInfoTranslations::getFuncId, skuId)
-				.eq(BackInfoTranslations::getLang, lang)
-				.eq(BackInfoTranslations::getFieldName, "specVal"));
-		if (goodsL != null && skuL != null) {
-			return new StringBuilder().append(goodsL.getDesp()).append(skuL.getDesp()).toString();
+		StringBuilder payTitle = new StringBuilder();
+		if (goodsL != null) {
+			payTitle.append(goodsL.getDesp());
+		}
+		if (skuId != null) {
+			BackInfoTranslations skuL = backInfoTranslationsMapper.selectOne(Wrappers.lambdaQuery(BackInfoTranslations.class)
+					.eq(BackInfoTranslations::getType, BackInfoTranslations.Type.sku.ordinal())
+					.eq(BackInfoTranslations::getFuncId, skuId)
+					.eq(BackInfoTranslations::getLang, lang)
+					.eq(BackInfoTranslations::getFieldName, "specVal"));
+			if (skuL != null) {
+				payTitle.append(skuL.getDesp());
+			}
+		}
+		if (payTitle.length() > 0) {
+			return payTitle.toString();
 		}
 		return null;
 	}
@@ -98,7 +107,10 @@ public class BackInfoTranslationsFrontServiceImpl implements BackInfoTranslation
 	}
 
 	@Override
-	public String setSpecVal(Long skuId, String lang) {
+	public String getLanguageSpecVal(Long skuId, String lang) {
+		if (skuId == null) {
+			return null;
+		}
 		BackInfoTranslations skuL = backInfoTranslationsMapper.selectOne(Wrappers.lambdaQuery(BackInfoTranslations.class)
 				.eq(BackInfoTranslations::getType, BackInfoTranslations.Type.sku.ordinal())
 				.eq(BackInfoTranslations::getFuncId, skuId)

netflix-web/src/main/java/com/cyksj/web/controller/payment/OrderController.java

@@ -42,6 +42,7 @@ import com.cyksj.service.paypal.PaypalPayConfigService;
 import com.cyksj.service.paypal.PaypalV2Service;
 import com.cyksj.service.stripe.StripePayConfigService;
 import com.cyksj.service.stripe.StripeService;
+import com.cyksj.service.translations.BackInfoTranslationsFrontService;
 import com.cyksj.service.user.UserBindRelationService;
 import com.cyksj.web.util.StpUserUtil;
 import com.ejlchina.searcher.BeanSearcher;
@@ -142,6 +143,9 @@ public class OrderController {
     @Autowired
     private GroupsRelationMapper relationMapper;
 
+    @Autowired
+    private BackInfoTranslationsFrontService backInfoTranslationsFrontService;
+
     /**
      * 支付
      * @author chan
@@ -470,6 +474,7 @@ public class OrderController {
                 .field(OrderDonView::getUserId, userIds).op(Operator.InList)
                 .orderBy(OrderDonView::getId).desc()
                 .build());
+        String lang = request.getHeader("lang");
         search.getDataList().forEach(data->{
             Integer count = availableBenefitsMapper.selectCount(Wrappers.lambdaQuery(UserPayEquipmentAvailableBenefits.class)
                     .eq(UserPayEquipmentAvailableBenefits::getRealOrderId, data.getId())
@@ -499,6 +504,16 @@ public class OrderController {
                         .last("limit 1"));
                 data.setIsRenewPackage(orderDonRenewRecord != null ? true : false);
             }
+            if (lang != null && !StrUtil.equals(UserPageLanguage.Language.zh_CN.name(), lang)) {
+                String languagePayTitle = backInfoTranslationsFrontService.getLanguagePayTitle(data.getGoodsId(), data.getSkuId(), lang);
+                if (StrUtil.isNotBlank(languagePayTitle)) {
+                    data.setPayTitle(languagePayTitle);
+                }
+                String languageSpecVal = backInfoTranslationsFrontService.getLanguageSpecVal(data.getSkuId(), lang);
+                if (StrUtil.isNotBlank(languageSpecVal)) {
+                    data.setSpecVal(languageSpecVal);
+                }
+            }
         });
         return GatewayResponse.SUCCESS.newBuilder().toResult(search);
     }
@@ -546,6 +561,18 @@ public class OrderController {
                         orderDonView.setOriSpecVal(sku.getSpecVal());
                     });
         }
+        String lang = request.getHeader("lang");
+        if (lang != null && !StrUtil.equals(UserPageLanguage.Language.zh_CN.name(), lang)) {
+            String languagePayTitle = backInfoTranslationsFrontService.getLanguagePayTitle(orderDonView.getGoodsId(), orderDonView.getSkuId(), lang);
+            if (StrUtil.isNotBlank(languagePayTitle)) {
+                orderDonView.setPayTitle(languagePayTitle);
+            }
+            String languageSpecVal = backInfoTranslationsFrontService.getLanguageSpecVal(orderDonView.getSkuId(), lang);
+            if (StrUtil.isNotBlank(languageSpecVal)) {
+                orderDonView.setSpecVal(languageSpecVal);
+            }
+        }
+
         return GatewayResponse.SUCCESS.newBuilder().toResult(orderDonView);
     }