订单列表返回中繁体，支付成功后修改用户付费状态

pdf-office-api/pdf-office-api-payment/src/main/java/cn/kdan/cloud/pdf/office/api/payment/vo/OrdersVO.java

@@ -128,4 +128,7 @@ public class OrdersVO implements Serializable {
      * 付费模式（1自动续订 2单次付费）
      */
     private Integer paymentModel;
+
+    private String simplifiedChineseName;
+    private String traditionalChineseName;
 }

pdf-office-api/pdf-office-api-product/src/main/java/cn/kdan/cloud/pdf/office/api/product/vo/ListingProductVO.java

@@ -78,4 +78,7 @@ public class ListingProductVO {
      * 产品优惠类型，0正常商品，1教育优惠，2黑五
      */
     private Integer discountType;
+
+    private String simplifiedChineseName;
+    private String traditionalChineseName;
 }

pdf-office-payment/src/main/java/cn/kdan/cloud/pdf/office/payment/service/impl/PayCenterWebhookServiceImpl.java

@@ -10,6 +10,7 @@ import cn.kdan.cloud.pdf.office.api.payment.constant.SubscriptionConstant;
 import cn.kdan.cloud.pdf.office.api.payment.vo.OrdersVO;
 import cn.kdan.cloud.pdf.office.api.product.feign.ProductApi;
 import cn.kdan.cloud.pdf.office.api.product.vo.ProductVO;
+import cn.kdan.cloud.pdf.office.common.enums.account.AccountTypeEnum;
 import cn.kdan.cloud.pdf.office.common.enums.account.PDFOfficeUserSubscriptionStatusEnum;
 import cn.kdan.cloud.pdf.office.common.utils.CommonUtils;
 import cn.kdan.cloud.pdf.office.common.vo.UserInfoVO;
@@ -228,16 +229,17 @@ public class PayCenterWebhookServiceImpl implements PayCenterWebhookService {
                                 userSubscriptionInfo.setPlatform(productVO.getPlatform());
                                 userSubscriptionInfo.setAppId(ordersVO.getAppId());
                                 userSubscriptionInfo.setProductId(ordersVO.getProductId());
+                                UserVO userVO = new UserVO();
+                                userVO.setId(ordersVO.getUserId());
+                                userVO.setAccountType(AccountTypeEnum.PAID_ACCOUNT.value());
                                 if(productVO.getPlatform()==3){
                                     //如果是ai还要加ai点数
                                     userSubscriptionInfo.setPoint(userSubscriptionInfo.getPoint()+Integer.valueOf(productVO.getPoints()));
                                     if(productVO.getCode().contains("trail")){
-                                        UserVO userVO = new UserVO();
-                                        userVO.setId(ordersVO.getUserId());
                                         userVO.setCanAccessAi("0");
-                                        userApi.updateUser(userVO);
                                     }
                                 }
+                                userApi.updateUser(userVO);
                                 userSubscriptionInfoApi.update(userSubscriptionInfo);
                             }
                         } else {
@@ -272,16 +274,17 @@ public class PayCenterWebhookServiceImpl implements PayCenterWebhookService {
                                 userSubscriptionInfo.setEndDate(endDate);
                                 userSubscriptionInfo.setPayType(1);
                             }
+                            UserVO userVO = new UserVO();
+                            userVO.setId(ordersVO.getUserId());
+                            userVO.setAccountType(AccountTypeEnum.PAID_ACCOUNT.value());
                             if(productVO.getPlatform()==3){
                                 //如果是ai还要加ai点数
                                 userSubscriptionInfo.setPoint(Integer.valueOf(productVO.getPoints()));
                                 if(productVO.getCode().contains("trail")){
-                                    UserVO userVO = new UserVO();
-                                    userVO.setId(ordersVO.getUserId());
                                     userVO.setCanAccessAi("0");
-                                    userApi.updateUser(userVO);
                                 }
                             }
+                            userApi.updateUser(userVO);
                             userSubscriptionInfoApi.insert(userSubscriptionInfo);
                         }
                     }

pdf-office-pdf-website/src/main/java/cn/kdan/cloud/pdf/office/website/service/impl/OrderServiceImpl.java

@@ -344,6 +344,8 @@ public class OrderServiceImpl implements OrderService {
             ordersVO.setProductName(listingProductVO.getProductName());
             ordersVO.setProductCycle(listingProductVO.getCycle());
             ordersVO.setProductIsAi(listingProductVO.getIsAi());
+            ordersVO.setSimplifiedChineseName(listingProductVO.getSimplifiedChineseName());
+            ordersVO.setTraditionalChineseName(listingProductVO.getTraditionalChineseName());
             if (ordersVO.getStatus() == 0 && (ordersVO.getPayment() == 1 || ordersVO.getPayment() == 2) ) {
                 String pagePayUrl = ordersVO.getPagePayUrl();
                 String qrcode = generateQrcode(pagePayUrl);

pdf-office-product/src/main/resources/mapper/ProductMapper.xml

@@ -64,6 +64,7 @@
     <select id="getProductsByIds" resultType="cn.kdan.cloud.pdf.office.api.product.vo.ListingProductVO">
         select p.id, p.code, p.product_name, p.price, p.cny_price, p.max_device_num, p.product_line_id, p.payment_model,
                p.cycle, p.display_price, p.cny_display_price, p.discount_type, p.is_ai,
+               p.simplified_chinese_name,p.traditional_chinese_name,
         GROUP_CONCAT(DISTINCT(r.`level`)) AS levels,
         GROUP_CONCAT(p2.name) AS platforms
         from product p