Browse Source

Bug修复

tangxiangan 4 months ago
parent
commit
97ad51f6c4

+ 1 - 1
pdf-office-payment/src/main/java/cn/kdan/cloud/pdf/office/payment/client/AppStoreClient.java

@@ -249,7 +249,7 @@ public class AppStoreClient {
                 HttpMethod.GET, // Change to GET
                 new HttpEntity<>(null, httpHeaders), // No body for GET, just headers
                 HistoryResponse.class,
-                "2000000749373718" // Make sure to replace with the actual transactionId
+                "2000000775930767" // Make sure to replace with the actual transactionId
         ).getBody();
         List<AppTransaction> signedTransactions = new ArrayList<>();
         a.getSignedTransactions().stream().forEach(item->{

+ 9 - 2
pdf-office-pdf-website/src/main/java/cn/kdan/cloud/pdf/office/website/controller/TranslateController.java

@@ -67,6 +67,13 @@ public class TranslateController {
             TranslateResult<FileUploadVo> result =  aiService.fileUpload(param);
             FileUploadVo vo = result.getData();
             aiRecord(vo.getFileKey(), userId, result,0,AIActionEnum.UPLOAD_TRANSLATION_FILE,vo.getFileId(),vo.getCharCount());
+            Integer cost;
+            if (vo.getCharCount() < 10000) {
+                cost = 2; // 不满1000字符的费用为1
+            } else {
+                cost = (int) Math.ceil(vo.getCharCount() / 1000.0 )*2;
+            }
+            vo.setCredit(cost);
             return vo;
         } catch (Exception e) {
             TranslateResult<String> result = new TranslateResult<String>();
@@ -113,9 +120,9 @@ public class TranslateController {
             param.setCharCount(charCount);
             Integer cost;
             if (charCount < 10000) {
-                cost = 1; // 不满1000字符的费用为1
+                cost = 2; // 不满1000字符的费用为1
             } else {
-                cost = (int) Math.ceil(charCount / 5000.0 );
+                cost = (int) Math.ceil(charCount / 1000.0 )*2;
             }
             if(!checkPoint(vo, cost)){
                 TranslateResult<Map<String,Integer>> result = new TranslateResult<Map<String,Integer>>();

+ 2 - 0
pdf-office-pdf-website/src/main/java/cn/kdan/cloud/pdf/office/website/dto/ai/FileUploadVo.java

@@ -11,4 +11,6 @@ public class FileUploadVo {
     private Integer charCount;
     private String fileId;
 
+    private Integer credit;
+
 }

+ 6 - 0
pdf-office-product/src/main/java/cn/kdan/cloud/pdf/office/product/service/impl/ProductServiceImpl.java

@@ -417,9 +417,15 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
         List<ListingProductVO> productVOs = this.baseMapper.getProductsByIds(Collections.singletonList(productId));
         ListingProductVO listingProductVO = productVOs.get(0);
         if(ObjectUtils.isNotEmpty(listingProductVO.getDisplayPrice())){
+            if (prize.getActivityType().equals("1")&&listingProductVO.getDisplayPrice().compareTo(BigDecimal.valueOf(79.99))<0){
+                throw new BackendRuntimeException(ExceptionEnum.EXCEPTION_COUPON_INVALID);
+            }
             listingProductVO.setDisplayPrice(listingProductVO.getDisplayPrice().subtract(prize.getUsdPrice()));
             listingProductVO.setCnyDisplayPrice(listingProductVO.getCnyDisplayPrice().subtract(prize.getCnyPrice()));
         }else{
+            if (prize.getActivityType().equals("1")&&listingProductVO.getPrice().compareTo(BigDecimal.valueOf(79.99))<0){
+                throw new BackendRuntimeException(ExceptionEnum.EXCEPTION_COUPON_INVALID);
+            }
             listingProductVO.setDisplayPrice(listingProductVO.getPrice().subtract(prize.getUsdPrice()));
             listingProductVO.setCnyDisplayPrice(listingProductVO.getCnyPrice().subtract(prize.getCnyPrice()));
         }