Merge branch 'release/3.0' into dev/dev

src/main/java/com/ai/da/common/config/MyTaskScheduler.java

@@ -53,7 +53,7 @@ public class MyTaskScheduler {
 
     // 定时任务，每十五天执行一次
 //    @Scheduled(cron = "0 0 0 ? * MON")
-//    @Scheduled(cron = "0 0 0 */15 * ?")
+    @Scheduled(cron = "0 0 0 */15 * ?")
     public void checkExpiry() {
         // 检测正式用户是否快要过期
         QueryWrapper<Account> qw = new QueryWrapper<>();
@@ -87,7 +87,7 @@ public class MyTaskScheduler {
             }
         }
     }
-//    @Scheduled(cron = "0 0 9 * * ?")
+    @Scheduled(cron = "0 0 9 * * ?")
     public void sendTrialOrderExcelToManagements() {
         // 获取前一天日期
         LocalDate yesterday = LocalDate.now().minusDays(1);

src/main/java/com/ai/da/common/task/AccountTask.java

@@ -25,20 +25,20 @@ public class AccountTask {
      * 每个月月初只刷新年付用户的积分
      */
 //    @Scheduled(cron = "59 59 23 * * ?")
-//    @Scheduled(cron = "0 0 0 1 * ?")
+    @Scheduled(cron = "0 0 0 1 * ?")
     public void refreshCreditsMonthly() {
         log.info("每月1号0点 将年费用户积分重置为 6000");
         accountService.refreshCreditsWeekly();
     }
 
-//    @Scheduled(cron = "0 */5 * * * *") // Run every 5 minutes
+    @Scheduled(cron = "0 */5 * * * *") // Run every 5 minutes
     public void getPaidUser() {
         // 获取code-create 表中 指定日期之后 订单状态为wc-processing的订单
         accountService.extendValidityForCC();
     }
 
     // 每天凌晨0点执行一次
-//    @Scheduled(cron = "0 0 0 * * ?")
+    @Scheduled(cron = "0 0 0 * * ?")
     public void cancelActivityBenefits() {
         // 1、查询当前所有参与了活动且过期的用户
         List<Account> accountList = accountService.getExpiredUserBySystemUser(4);
@@ -51,7 +51,7 @@ public class AccountTask {
     }
 
     // 每天检测正式用户到期情况，每天凌晨0点执行
-//    @Scheduled(cron = "0 0 0 * * ?")
+    @Scheduled(cron = "0 0 0 * * ?")
     public void paidUserToVisitor() {
         // 1、查询当前已过期正式用户或试用用户
         List<Account> accountList = accountService.getExpiredUserBySystemUser(1);
@@ -68,12 +68,12 @@ public class AccountTask {
     /**
      * 将Code-Create上注册的用户添加为AiDA的游客
      */
-//    @Scheduled(cron = "0 */5 * * * *") // Run every 5 minutes
+    @Scheduled(cron = "0 */5 * * * *") // Run every 5 minutes
     public void registerUserToVisitor() {
         accountService.registerUserToVisitor();
     }
 
-//    @Scheduled(cron = "0 0 0 1 * ?")
+    @Scheduled(cron = "0 0 0 1 * ?")
     // 每月初刷新所有用户用户名剩余修改次数
     public void resetUsernameModifyTimes(){
         log.info("重置所有用户的用户名修改次数");

src/main/java/com/ai/da/common/task/PaymentTask.java

@@ -45,7 +45,7 @@ public class PaymentTask {
     @Resource
     private PayPalCheckoutService payPalCheckoutService;
 
-//    @Scheduled(cron = "0/30 * * * * ?")
+    @Scheduled(cron = "0/30 * * * * ?")
     public void orderConfirmForPaypal() throws SerializeException {
 
 //        log.info("PayPal orderConfirm 被执行......");
@@ -85,30 +85,24 @@ public class PaymentTask {
     }
 
     // 提前7天向用户发送提醒邮件,每天早上8点执行
-//    @Scheduled(cron = "0 0 8 * * ?")
+    @Scheduled(cron = "0 0 8 * * ?")
     public void subscriptionReminder(){
         stripeService.subscriptionReminder();
     }
 
-    // 每天凌晨检查subscription中有哪些已过期，更新状态
-//    @Scheduled(cron = "0 0 0 * * ?")
-//    public void checkSubscriptionExpiration(){
-//        stripeService.checkSubscriptionExpiration();
-//    }
 
     // 如果有订阅已创建，但是没有发邮件通知的，需要主动获取回调信息并向用户发送邮件
     public void checkSubscriptionPayment(){
         //
-
     }
 
-//    @Scheduled(cron = "0 */5 * * * *") // Run every 5 minutes
+    @Scheduled(cron = "0 */5 * * * *") // Run every 5 minutes
     public void updateAffiliateInfoWithPayment(){
 //        log.info("佣金计算定时器");
         affiliateService.updateAffiliateInfoWithPayment();
     }
 
-//    @Scheduled(cron = "0 0 8 28-31 * ?")
+    @Scheduled(cron = "0 0 8 28-31 * ?")
     public void commissionSummaryReminder(){
         // 每个月末的最后一天的早上八点执行
         LocalDate today = LocalDate.now();

src/main/java/com/ai/da/common/utils/SendEmailUtil.java

@@ -844,7 +844,7 @@ public class SendEmailUtil {
         try {
             String merchantEmail = "kimwong@code-create.com.hk";
             String developer = "xupei3360@163.com";
-            String[] receiverEmail = {/*merchantEmail,*/ developer};
+            String[] receiverEmail = {merchantEmail, developer};
             Credential cred = new Credential(SECRET_ID, SECRET_KEy);
             // 实例化一个http选项，可选的，没有特殊需求可以跳过
             HttpProfile httpProfile = new HttpProfile();

src/main/java/com/ai/da/service/impl/StripeServiceImpl.java

@@ -77,6 +77,9 @@ public class StripeServiceImpl implements StripeService {
     @Value("${orderList.link}")
     private String orderListLink;
 
+    @Value("${stripe.paymentMethodConfiguration}")
+    private String paymentMethodConfigurationId;
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public String pay(ProductPurchaseDTO productPurchaseDTO, HttpServletRequest request) {
@@ -143,12 +146,8 @@ public class StripeServiceImpl implements StripeService {
                 // one-time 手动创建发票;订阅会自动创建invoice
                 sessionBuilder.setInvoiceCreation(SessionCreateParams.InvoiceCreation.builder().setEnabled(Boolean.TRUE).build());
             }
-            // developer test
+
-            sessionBuilder.setPaymentMethodConfiguration("pmc_1QIKyq02n1TEydyNKVEYvhW7");
+            sessionBuilder.setPaymentMethodConfiguration(paymentMethodConfigurationId);
-            // kim test
-//            sessionBuilder.setPaymentMethodConfiguration("pmc_1LywTWH7nPZ8bkrN6FvdCUWG");
-            // kim live
-//            sessionBuilder.setPaymentMethodConfiguration("pmc_1Qu6yJH7nPZ8bkrNULYnFFPf");
 //            sessionBuilder.addPaymentMethodType(SessionCreateParams.PaymentMethodType.ALIPAY);
 //            sessionBuilder.addPaymentMethodType(SessionCreateParams.PaymentMethodType.CARD);
             sessionBuilder.setCustomer(customerId);

src/main/resources/application-dev.properties

@@ -110,3 +110,5 @@ orderList.link=https://develop.aida.com.hk/home/homePage?order=
 
 # 0 不发送邮件通知 1 发送邮件通知
 stripe.webhook.fail.reminder=0
+# kim test
+stripe.paymentMethodConfiguration=pmc_1LywTWH7nPZ8bkrN6FvdCUWG

src/main/resources/application-prod.properties

@@ -112,3 +112,5 @@ orderList.link=https://aida.com.hk/home/homePage?order=
 
 # 0 不发送邮件通知 1 发送邮件通知
 stripe.webhook.fail.reminder=1
+# kim live
+stripe.paymentMethodConfiguration=pmc_1Qu6yJH7nPZ8bkrNULYnFFPf

src/main/resources/application.properties

@@ -2,7 +2,7 @@
 #spring.profiles.active=test
 
 #<23><><EFBFBD><EFBFBD>application-prod<6F>ļ<EFBFBD>(<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)
-#spring.profiles.active=prod
+spring.profiles.active=prod
 
 #<23><><EFBFBD><EFBFBD>application-dev<65>ļ<EFBFBD>(<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)
-spring.profiles.active=dev
+#spring.profiles.active=dev

src/main/resources/payment.properties

@@ -27,9 +27,9 @@ paypal.webhook_id=1D107312EX592781K
 ##### Stripe
 
 # developer
-stripe.private-key=sk_test_51P4ZZL02n1TEydyN8qQHjOA9imsFU7Oxs2HMHGy2urHnnQgSHnZuu5vVP6pKhEACwUpsKNyrbZpdcg5TJWJLRHcY008dEO1fn2
+#stripe.private-key=sk_test_51P4ZZL02n1TEydyN8qQHjOA9imsFU7Oxs2HMHGy2urHnnQgSHnZuu5vVP6pKhEACwUpsKNyrbZpdcg5TJWJLRHcY008dEO1fn2
 # dev 端点
-stripe.webhook-sign-secret=whsec_e0dBiJngx6qqgJj6yPyJ2A9ouh1Cjv5w
+#stripe.webhook-sign-secret=whsec_e0dBiJngx6qqgJj6yPyJ2A9ouh1Cjv5w
 # local 端点
 #stripe.webhook-sign-secret=whsec_TJcMSnAkh4uktrNY1M6Iy8XaVze4Rzqm
 
@@ -43,8 +43,8 @@ stripe.webhook-sign-secret=whsec_e0dBiJngx6qqgJj6yPyJ2A9ouh1Cjv5w
 #stripe.webhook-sign-secret=whsec_pX0pPMQm85PaUSWnFMEzoccb3MGNkjoL
 
 # kim - live
-#stripe.private-key=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
+stripe.private-key=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
 # prod 端点
-#stripe.webhook-sign-secret=whsec_hhGDgdelQRHSg4LmChtQe41crj41eb11
+stripe.webhook-sign-secret=whsec_hhGDgdelQRHSg4LmChtQe41crj41eb11
 # dev 端点
 #stripe.webhook-sign-secret=whsec_cFUtjUOo8wnrIKZmt4GNvt7ZY1bOfrYr