From 6146112d04dad87df11dc52c86d3a26f637590fc Mon Sep 17 00:00:00 2001 From: xupei Date: Tue, 27 Jan 2026 16:39:39 +0800 Subject: [PATCH 1/8] TO PROD --- .../java/com/ai/da/common/config/MyTaskScheduler.java | 2 +- src/main/java/com/ai/da/common/task/AccountTask.java | 2 +- src/main/java/com/ai/da/common/task/PaymentTask.java | 4 ++-- .../com/ai/da/common/task/SubscriptionReminderTask.java | 4 ++-- src/main/java/com/ai/da/common/utils/SendEmailUtil.java | 4 ++-- .../java/com/ai/da/service/impl/AffiliateServiceImpl.java | 4 ++-- .../java/com/ai/da/service/impl/EmailServiceImpl.java | 4 ++-- src/main/resources/application.properties | 4 ++-- src/main/resources/payment.properties | 8 ++++---- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/main/java/com/ai/da/common/config/MyTaskScheduler.java b/src/main/java/com/ai/da/common/config/MyTaskScheduler.java index be6bd63b..84f7d1ee 100644 --- a/src/main/java/com/ai/da/common/config/MyTaskScheduler.java +++ b/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); diff --git a/src/main/java/com/ai/da/common/task/AccountTask.java b/src/main/java/com/ai/da/common/task/AccountTask.java index ee573eaa..cb14a867 100644 --- a/src/main/java/com/ai/da/common/task/AccountTask.java +++ b/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(); diff --git a/src/main/java/com/ai/da/common/task/PaymentTask.java b/src/main/java/com/ai/da/common/task/PaymentTask.java index 0e5efb03..4c4d3828 100644 --- a/src/main/java/com/ai/da/common/task/PaymentTask.java +++ b/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 被执行......"); @@ -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(); diff --git a/src/main/java/com/ai/da/common/task/SubscriptionReminderTask.java b/src/main/java/com/ai/da/common/task/SubscriptionReminderTask.java index 0c6ada03..07af58db 100644 --- a/src/main/java/com/ai/da/common/task/SubscriptionReminderTask.java +++ b/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 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(); diff --git a/src/main/java/com/ai/da/common/utils/SendEmailUtil.java b/src/main/java/com/ai/da/common/utils/SendEmailUtil.java index 2d7a9e74..dcdeb4bd 100644 --- a/src/main/java/com/ai/da/common/utils/SendEmailUtil.java +++ b/src/main/java/com/ai/da/common/utils/SendEmailUtil.java @@ -767,7 +767,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(); @@ -968,7 +968,7 @@ public class SendEmailUtil { req.setFromEmailAddress(SEND_ADDRESS); String merchantEmail = "kimwong@code-create.com.hk"; String developerEmail = "xupei@code-create.com.hk"; - req.setDestination(new String[]{/*merchantEmail,*/ developerEmail}); + req.setDestination(new String[]{merchantEmail, developerEmail}); Template template = new Template(); req.setSubject("New Credit Purchase Order"); template.setTemplateID(CREDITS_PURCHASE_MERCHANT); diff --git a/src/main/java/com/ai/da/service/impl/AffiliateServiceImpl.java b/src/main/java/com/ai/da/service/impl/AffiliateServiceImpl.java index 853f7824..c80a0f5d 100644 --- a/src/main/java/com/ai/da/service/impl/AffiliateServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/AffiliateServiceImpl.java @@ -82,7 +82,7 @@ public class AffiliateServiceImpl extends ServiceImpl merchantReceiver = Arrays.asList(/*merchantEmail,*/ developer); + List merchantReceiver = Arrays.asList(merchantEmail, developer); String merchantSubject = null; String merchantTemplate = null; @@ -731,7 +731,7 @@ public class EmailServiceImpl implements EmailService { jsonObject.put("quantity", quantity); jsonObject.put("totalFee", amount); - sendEmail(Arrays.asList(/*merchantEmail,*/ developerEmail), jsonObject, CREDITS_PURCHASE_MERCHANT, "New Credit Purchase Order", null, null); + sendEmail(Arrays.asList(merchantEmail, developerEmail), jsonObject, CREDITS_PURCHASE_MERCHANT, "New Credit Purchase Order", null, null); } private final static String COMMON_EXCEPTION_REMINDER = "135279_common-exception-reminder.html"; diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 974fee23..8550475d 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -2,7 +2,7 @@ #spring.profiles.active=test #����application-prod�ļ�(��������) -#spring.profiles.active=prod +spring.profiles.active=prod #����application-dev�ļ�(��������) -spring.profiles.active=dev +#spring.profiles.active=dev diff --git a/src/main/resources/payment.properties b/src/main/resources/payment.properties index 0f2800d6..f4b98130 100644 --- a/src/main/resources/payment.properties +++ b/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 From 45dd78032a179558236ed4df7f447967e9ec9200 Mon Sep 17 00:00:00 2001 From: xupei Date: Mon, 2 Feb 2026 15:04:27 +0800 Subject: [PATCH 2/8] =?UTF-8?q?BUGFIX:=201.token=E8=BF=87=E6=9C=9F?= =?UTF-8?q?=EF=BC=8C=E9=87=8D=E6=96=B0=E7=99=BB=E5=BD=95=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E8=A7=A3=E5=86=B3=202.motion=E7=94=9F=E6=88=90=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E6=95=B0=E6=8D=AE=E7=B1=BB=E5=9E=8B=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/ai/da/service/impl/AccountServiceImpl.java | 5 +++-- .../java/com/ai/da/service/impl/GenerateServiceImpl.java | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java b/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java index c7543b1c..246f3e94 100644 --- a/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java @@ -244,12 +244,13 @@ public class AccountServiceImpl extends ServiceImpl impl AccountLoginVO response = CopyUtil.copyObject(account, AccountLoginVO.class); response.setEmail(account.getUserEmail()); String token = LocalCacheUtils.getTokenCache(String.valueOf(account.getId())); - if (StringUtils.isNotBlank(token)) { + /*if (StringUtils.isNotBlank(token)) { //用户已登入 response.setToken(token); } else { response.setToken(createAccountToken(account)); - } + }*/ + response.setToken(createAccountToken(account)); response.setUserId(account.getId()); response.setSystemUser(account.getSystemUser()); // 设置头像 diff --git a/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java b/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java index a3235f5c..8c25c7fc 100644 --- a/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java @@ -4295,7 +4295,7 @@ public class GenerateServiceImpl extends ServiceImpl i MotionModeEnum motionModeEnum = MotionModeEnum.of(poseTransformDTO.getMode()); switch (motionModeEnum) { case POSE_TO_VIDEO: - params.put("pose_id", poseTransformDTO.getPoseId()); + params.put("pose_id", poseTransformDTO.getPoseId().toString()); params.put("image_url", poseTransformDTO.getProductImage()); break; case PROMPT_TO_VIDEO: From fc3fd877a80785ac9a5c49ddf53db9095b9a1c00 Mon Sep 17 00:00:00 2001 From: litianxiang Date: Thu, 5 Mar 2026 16:58:17 +0800 Subject: [PATCH 3/8] =?UTF-8?q?transpose=E5=92=8Crotate=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ai/da/service/impl/DesignItemServiceImpl.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java b/src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java index 6b9de8dd..8de4dc4a 100644 --- a/src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java @@ -497,6 +497,10 @@ public class DesignItemServiceImpl extends ServiceImpl priorityToItemDTOMap = designSingleItemDTOList.stream() + .collect(Collectors.toMap(DesignSingleItemDTO::getPriority, dto -> dto, (old, newVal) -> old)); + List list = new ArrayList<>(); for (int i = 0; i < layers.size(); i++) { JSONObject jsonObject = layers.getJSONObject(i); @@ -525,8 +529,12 @@ public class DesignItemServiceImpl extends ServiceImpl> setPriorityAndUndividedLayer(JSONArray layers, DesignSingleIncludeLayersDTO designSingleIncludeLayersDTO) { - String designType = "default"; + String designType = "default"; if (Objects.nonNull(designSingleIncludeLayersDTO)) { designType = designSingleIncludeLayersDTO.getDesignType(); } From a1f489f3a181c727af5c3c7e270c61b9944b22e7 Mon Sep 17 00:00:00 2001 From: litianxiang Date: Thu, 12 Mar 2026 17:39:05 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E6=AF=94=E8=B5=9Burl=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application-dev.properties | 2 +- src/main/resources/application-prod.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties index da4dfdcb..9a084f29 100644 --- a/src/main/resources/application-dev.properties +++ b/src/main/resources/application-dev.properties @@ -181,4 +181,4 @@ file.upload.max.size.video=104857600 # 上传任务过期时间（小时） file.upload.task.expiry.hours=24 -global.award.link=https://develop.aida.com.hk/award/contestants?id= \ No newline at end of file +global.award.link=https://aida-global-design-awards.com.hk/contestants?id= \ No newline at end of file diff --git a/src/main/resources/application-prod.properties b/src/main/resources/application-prod.properties index 6df1d7ad..c1108874 100644 --- a/src/main/resources/application-prod.properties +++ b/src/main/resources/application-prod.properties @@ -179,4 +179,4 @@ file.upload.max.size.video=104857600 # 上传任务过期时间（小时） file.upload.task.expiry.hours=24 -global.award.link=https://www.aida.com.hk/award/contestants?id= \ No newline at end of file +global.award.link=https://aida-global-design-awards.com.hk/contestants?id= \ No newline at end of file From a5093311f93e5b6881281b70203c19cb934cf675 Mon Sep 17 00:00:00 2001 From: litianxiang Date: Thu, 12 Mar 2026 19:06:54 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E5=BD=93style=E4=B8=BA=E6=B4=9B=E4=B8=BD?= =?UTF-8?q?=E5=A1=94=E6=97=B6=E6=97=A0sketch=E5=92=8C=E8=B0=B7=E6=AD=8C?= =?UTF-8?q?=E9=A3=8E=E6=8E=A7=E9=97=AE=E9=A2=98FIX?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/ai/da/python/PythonService.java | 3 +++ .../com/ai/da/service/impl/GenerateServiceImpl.java | 10 ++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/ai/da/python/PythonService.java b/src/main/java/com/ai/da/python/PythonService.java index 5ef07e16..6bebcaf3 100644 --- a/src/main/java/com/ai/da/python/PythonService.java +++ b/src/main/java/com/ai/da/python/PythonService.java @@ -3993,6 +3993,9 @@ public class PythonService { // throw new BusinessException("system.error"); // } //**********************end*********************************** + if (category.split("_")[0].equals("male")&&style.toLowerCase().equals("lolita")){ + style=null; + } AuthPrincipalVo userHolder = UserContext.getUserHolder(); OkHttpClient client = new OkHttpClient().newBuilder() diff --git a/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java b/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java index 8c25c7fc..4a40fa2b 100644 --- a/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java @@ -1260,8 +1260,14 @@ public class GenerateServiceImpl extends ServiceImpl i modelAndPromptMap.put(ModelConstants.USE_MODEL, ModelConstants.LOCAL_MODEL); } } else if (ModelConstants.SKETCHBOARD.equals(generateDTO.getLevel1Type())) { - String prompt = generateDTO.getText() + "rules:front view sketch only,plain white background, single garment only, orthographic, centered on white background, borderless canvas, thin monochrome black line art.\n" + - " No clothes hanger, no fake clothes hanger, no human-related lines, no color fill, no words, no text, no black background, no boundary or frame."; + String[] split = generateDTO.getText().split(","); + String style = split[0].trim(); + if ("Lolita".equals( style)){ + style = "洛丽塔"; + } + String userPrompt = split[1]; + String prompt = userPrompt + "rules:front view sketch only,plain white background, single garment only, orthographic, centered on white background, borderless canvas, thin monochrome black line art.\n" + + " No clothes hanger, no fake clothes hanger, no human-related lines, no color fill, no words, no text, no black background, no boundary or frame.sketch style:"+ style; modelAndPromptMap.put(ModelConstants.PROMPT, prompt); if (isUseImage) { if (ModelConstants.ADVANCED.equals(modelName)) { From 2e846e671a95656bebd0202f02f5ed9e1ea155eb Mon Sep 17 00:00:00 2001 From: litianxiang Date: Fri, 13 Mar 2026 10:06:26 +0800 Subject: [PATCH 6/8] =?UTF-8?q?romantic=E9=A3=8E=E6=A0=BC=E7=BC=BA?= =?UTF-8?q?=E5=B0=91=E4=B8=8B=E8=A3=85fix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/ai/da/python/PythonService.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/com/ai/da/python/PythonService.java b/src/main/java/com/ai/da/python/PythonService.java index 6bebcaf3..e281a5b3 100644 --- a/src/main/java/com/ai/da/python/PythonService.java +++ b/src/main/java/com/ai/da/python/PythonService.java @@ -3993,9 +3993,13 @@ public class PythonService { // throw new BusinessException("system.error"); // } //**********************end*********************************** + //临时补丁 if (category.split("_")[0].equals("male")&&style.toLowerCase().equals("lolita")){ style=null; } + if (category.split("_")[0].equals("male")&&style.toLowerCase().equalsIgnoreCase("romantic")){ + style=null; + } AuthPrincipalVo userHolder = UserContext.getUserHolder(); OkHttpClient client = new OkHttpClient().newBuilder() From dc291ea0864daa87815009201d7c2087a889be4f Mon Sep 17 00:00:00 2001 From: litianxiang Date: Sat, 14 Mar 2026 01:50:39 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E9=9D=9E=E7=A9=BA?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/ai/da/python/PythonService.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/ai/da/python/PythonService.java b/src/main/java/com/ai/da/python/PythonService.java index e281a5b3..dbb005ff 100644 --- a/src/main/java/com/ai/da/python/PythonService.java +++ b/src/main/java/com/ai/da/python/PythonService.java @@ -3994,11 +3994,12 @@ public class PythonService { // } //**********************end*********************************** //临时补丁 - if (category.split("_")[0].equals("male")&&style.toLowerCase().equals("lolita")){ - style=null; - } - if (category.split("_")[0].equals("male")&&style.toLowerCase().equalsIgnoreCase("romantic")){ - style=null; + if (category != null && style != null) { + String categoryPrefix = category.split("_")[0]; + if ("male".equals(categoryPrefix) && + (style.equalsIgnoreCase("lolita") || style.equalsIgnoreCase("romantic"))) { + style = null; + } } AuthPrincipalVo userHolder = UserContext.getUserHolder(); From 3e53401f7666b24f6309905088e7c10254fca16d Mon Sep 17 00:00:00 2001 From: xupei Date: Mon, 23 Mar 2026 11:55:07 +0800 Subject: [PATCH 8/8] =?UTF-8?q?TASK:=E8=BF=94=E5=9B=9E=E7=AC=A6=E5=90=88?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E7=9A=84=E9=87=91=E9=A2=9D?= =?UTF-8?q?=E6=80=BB=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ai/da/service/impl/ConvenientInquiryServiceImpl.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/ai/da/service/impl/ConvenientInquiryServiceImpl.java b/src/main/java/com/ai/da/service/impl/ConvenientInquiryServiceImpl.java index 05b5b960..62b6d62b 100644 --- a/src/main/java/com/ai/da/service/impl/ConvenientInquiryServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/ConvenientInquiryServiceImpl.java @@ -870,19 +870,20 @@ public class ConvenientInquiryServiceImpl extends ServiceImpl paymentInfoVOS = paymentInfoMapper.queryPaymentInfo(queryPaymentInfoDTO.getPlatform(), queryPaymentInfoDTO.getPayerTotal(), - queryPaymentInfoDTO.getType(), queryPaymentInfoDTO.getStatus(), + queryPaymentInfoDTO.getType(), status, queryPaymentInfoDTO.getCountry(), queryPaymentInfoDTO.getCity(), queryPaymentInfoDTO.getStartTime(), queryPaymentInfoDTO.getEndTime(), size, offset, order, queryPaymentInfoDTO.getPayer()); // 查询数据总量 Long total = paymentInfoMapper.queryPaymentInfoCount(queryPaymentInfoDTO.getPlatform(), queryPaymentInfoDTO.getPayerTotal(), - queryPaymentInfoDTO.getType(), queryPaymentInfoDTO.getStatus(), + queryPaymentInfoDTO.getType(), status, queryPaymentInfoDTO.getCountry(), queryPaymentInfoDTO.getCity(), queryPaymentInfoDTO.getStartTime(), queryPaymentInfoDTO.getEndTime(), queryPaymentInfoDTO.getPayer()); // 查询符合查询条件的总金额 BigDecimal payerTotal = paymentInfoMapper.queryTotalPaymentAmount(queryPaymentInfoDTO.getPlatform(), queryPaymentInfoDTO.getPayerTotal(), - queryPaymentInfoDTO.getType(), queryPaymentInfoDTO.getStatus(), + queryPaymentInfoDTO.getType(), status, queryPaymentInfoDTO.getCountry(), queryPaymentInfoDTO.getCity(), queryPaymentInfoDTO.getStartTime(), queryPaymentInfoDTO.getEndTime(), queryPaymentInfoDTO.getPayer()); // 总页数