Merge branch 'develop/v1.0' into master-test

pdf-office-payment/src/main/java/cn/kdan/cloud/pdf/office/payment/webhook/appstore/notification/AppStoreData.java

@@ -31,4 +31,6 @@ public class AppStoreData {
    * 自动续期订阅将被撤销。
    */
   private Integer status;
+
+  private String consumptionRequestReason;
 }

pdf-office-product/src/main/java/cn/kdan/cloud/pdf/office/product/entity/Prize.java

@@ -63,6 +63,9 @@ public class Prize extends BaseEntity{
      */
     private String voucher;
 
+    /**
+     * 活动类型黑五1老带新2
+     */
     private String activityType;
     /**
      * 0不可用1可用2已使用

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

@@ -421,7 +421,7 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
         }
         if(ObjectUtils.isNotEmpty(listingProductVO.getDisplayPrice())){
             if (prize.getActivityType().equals("1")){
-                throw new BackendRuntimeException(ExceptionEnum.EXCEPTION_COUPON_INVALID);
+                throw new BackendRuntimeException(ExceptionEnum.EXCEPTION_COUPON_PRODUCT_ERROR);
             }
             listingProductVO.setDisplayPrice(listingProductVO.getDisplayPrice().subtract(prize.getUsdPrice()));
             listingProductVO.setCnyDisplayPrice(listingProductVO.getCnyDisplayPrice().subtract(prize.getCnyPrice()));