TO DEV

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

@@ -202,7 +202,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

@@ -34,7 +34,7 @@ public class AccountTask {
         accountService.refreshCreditsMonthly();
     }
 
-    //    @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();

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 被执行......");
@@ -97,7 +97,7 @@ public class PaymentTask {
         //
     }
 
-    //    @Scheduled(cron = "0 */5 * * * *") // Run every 5 minutes
+        @Scheduled(cron = "0 */5 * * * *") // Run every 5 minutes
     public void updateAffiliateInfoWithPayment(){
 //        log.info("佣金计算定时器");
         affiliateService.updateAffiliateInfoWithPayment();
@@ -109,7 +109,7 @@ public class PaymentTask {
         affiliateService.syncLinkViewCountToDB();
     }
 
-    //    @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/task/SubscriptionReminderTask.java

@@ -40,7 +40,7 @@ public class SubscriptionReminderTask {
         REMINDER_DAYS_CONFIG.put("year", 14);
     }
 
-    //    @Scheduled(cron = "0 0 9 * * ?")
+//        @Scheduled(cron = "0 0 9 * * ?")
     public void subscriptionReminder() {
         // 获取所有需要通知的订阅
         List<SubscriptionInfo> subscriptionInfos = getDueSubscriptions();
@@ -97,7 +97,7 @@ public class SubscriptionReminderTask {
         return subscriptionInfoMapper.selectList(qw);
     }
 
-    //    @Scheduled(cron = "0 0 9 * * ?")
+//        @Scheduled(cron = "0 0 9 * * ?")
     public void trialReminder() {
         // 今天的 00:00:00 和 23:59:59
         LocalDateTime startOfDay = LocalDateTime.now().toLocalDate().atStartOfDay();

src/main/java/com/ai/da/model/vo/QueryUserConditionsVO.java

@@ -34,4 +34,8 @@ public class QueryUserConditionsVO extends PageQueryBaseVo {
 
     private Integer systemUser;
 
+    private Long subscriptionPlanId;
+
+    private Long organizationId;
+
 }

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

@@ -787,6 +787,14 @@ public class ConvenientInquiryServiceImpl extends ServiceImpl<QuestionnaireMappe
             queryWrapper.lt("create_date", queryUserConditionsVO.getEndTime());
         }
 
+        if (!Objects.isNull(queryUserConditionsVO.getSubscriptionPlanId())) {
+            queryWrapper.eq("subscription_plan_id", queryUserConditionsVO.getSubscriptionPlanId());
+        }
+
+        if (!Objects.isNull(queryUserConditionsVO.getOrganizationId())) {
+            queryWrapper.eq("organization_id", queryUserConditionsVO.getOrganizationId());
+        }
+
         // 排序
         if (!StringUtils.isNullOrEmpty(queryUserConditionsVO.getOrder()) && !StringUtils.isNullOrEmpty(queryUserConditionsVO.getOrderBy())) {
             String orderBy = "id";

src/main/resources/payment.properties

@@ -11,18 +11,18 @@
 #paypal.webhook_id=51V87014T6406322F
 
 #  aida-sandbox-kim
-#paypal.client-id=AbDDH8jnTrKqjnWLFgEu6LogYzVz2ZLuirE4W54t1M4lrofrP5OzXfhbxqktLLFB-rAO9KeYQVYFJ_tO
-#paypal.client-secret=EOOoiIAe_dyR2YhY7qCIqWipZvYXCDrmBlFYchphuvkPFms1spsBGTlStlrx580y4hN-EukWwF9m_LAs
-#paypal.receiver.email=sb-4xe8i29784722@business.example.com
-#paypal.mode=sandbox
-#paypal.webhook_id=1WH327112B602422N
+paypal.client-id=AbDDH8jnTrKqjnWLFgEu6LogYzVz2ZLuirE4W54t1M4lrofrP5OzXfhbxqktLLFB-rAO9KeYQVYFJ_tO
+paypal.client-secret=EOOoiIAe_dyR2YhY7qCIqWipZvYXCDrmBlFYchphuvkPFms1spsBGTlStlrx580y4hN-EukWwF9m_LAs
+paypal.receiver.email=sb-4xe8i29784722@business.example.com
+paypal.mode=sandbox
+paypal.webhook_id=1WH327112B602422N
 
 #  aida-live-kim
-paypal.client-id=ASWSIZ3MXJU5w5VOeOHeigWcSw6iinl30ZCipruziKpHclxP0ryf8-7VKG1Ba2VwZwa2DMvGEzTfCTgz
-paypal.client-secret=EHQg_K5PSqmp4FJlzEcOEH_kFkmq4aBzaI7jridw53L6cOQRULBAnfv2KakRfrsqaU1PDSkO4Co9Vyxc
-paypal.receiver.email=kimwong@code-create.com.hk
-paypal.mode=live
-paypal.webhook_id=1D107312EX592781K
+#paypal.client-id=ASWSIZ3MXJU5w5VOeOHeigWcSw6iinl30ZCipruziKpHclxP0ryf8-7VKG1Ba2VwZwa2DMvGEzTfCTgz
+#paypal.client-secret=EHQg_K5PSqmp4FJlzEcOEH_kFkmq4aBzaI7jridw53L6cOQRULBAnfv2KakRfrsqaU1PDSkO4Co9Vyxc
+#paypal.receiver.email=kimwong@code-create.com.hk
+#paypal.mode=live
+#paypal.webhook_id=1D107312EX592781K
 
 ##### Stripe