|
@@ -189,11 +189,16 @@ public class VppLicenseCodeServiceImpl implements VppLicenseCodeService {
|
|
|
String text = "";
|
|
|
String appUrl = "";
|
|
|
String userWay = "";
|
|
|
+ List<String> havingUseWayList = new ArrayList<>();
|
|
|
for (LicenseCodes code : codes) {
|
|
|
Products product = productService.getById(code.getProductId());
|
|
|
text = text + String.format(CommonConstant.codeInfoTemplate,code.getCdkey(),product.getName());
|
|
|
appUrl = StringUtils.isEmpty(appUrl) ? appUrl + getAdminLink(product.getCode()) : appUrl;
|
|
|
- userWay = userWay + getProductUseWayTemplate(product.getCode());
|
|
|
+ //如果不是同一个产品的序列码则添加使用方式
|
|
|
+ if(!havingUseWayList.contains(product.getCode())){
|
|
|
+ userWay = userWay + getProductUseWayTemplate(product.getCode(),product.getName());
|
|
|
+ havingUseWayList.add(product.getCode());
|
|
|
+ }
|
|
|
}
|
|
|
VppMember vppMember = vppMemberService.getById(key);
|
|
|
//用户邮箱 序列码 对应产品主页 公司超管邮箱
|
|
@@ -224,12 +229,12 @@ public class VppLicenseCodeServiceImpl implements VppLicenseCodeService {
|
|
|
* @param productCode 产品code
|
|
|
* @return String
|
|
|
*/
|
|
|
- private String getProductUseWayTemplate (String productCode){
|
|
|
+ private String getProductUseWayTemplate (String productCode,String productName){
|
|
|
if(productCode.contains("pdfreaderpro.mac")){
|
|
|
- return MessageFormat.format(CommonConstant.pdfReaderProMac, ssoUrl, ssoUrl);
|
|
|
+ return MessageFormat.format(CommonConstant.pdfReaderProMac, productName,ssoUrl, ssoUrl);
|
|
|
}
|
|
|
if(productCode.contains("pdfreaderpro.windows")){
|
|
|
- return MessageFormat.format(CommonConstant.pdfReaderProWindows, ssoUrl, ssoUrl);
|
|
|
+ return MessageFormat.format(CommonConstant.pdfReaderProWindows, productName,ssoUrl, ssoUrl);
|
|
|
}
|
|
|
return "";
|
|
|
}
|