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 86d82fd4..9dc8cd13 100644 --- a/src/main/java/com/ai/da/common/config/MyTaskScheduler.java +++ b/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 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); 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 1deeb4c2..ec6bd430 100644 --- a/src/main/java/com/ai/da/common/task/AccountTask.java +++ b/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 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 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("重置所有用户的用户名修改次数"); 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 223757f7..a30388f3 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 被执行......"); @@ -85,7 +85,7 @@ public class PaymentTask { } // 提前7天向用户发送提醒邮件,每天早上8点执行 - @Scheduled(cron = "0 0 8 * * ?") +// @Scheduled(cron = "0 0 8 * * ?") public void subscriptionReminder(){ stripeService.subscriptionReminder(); } @@ -102,13 +102,13 @@ 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(); } - @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/utils/RequestInfoUtil.java b/src/main/java/com/ai/da/common/utils/RequestInfoUtil.java index d041362f..ace3af37 100644 --- a/src/main/java/com/ai/da/common/utils/RequestInfoUtil.java +++ b/src/main/java/com/ai/da/common/utils/RequestInfoUtil.java @@ -93,7 +93,7 @@ public class RequestInfoUtil { BufferedReader br = new BufferedReader(new InputStreamReader(conn.getInputStream())); String output; StringBuilder outputBuilder = new StringBuilder(); - System.out.println("Output from Server .... \n"); +// System.out.println("Output from Server .... \n"); while ((output = br.readLine()) != null) { outputBuilder.append(output); System.out.println(output); diff --git a/src/main/java/com/ai/da/mapper/primary/PaymentInfoMapper.java b/src/main/java/com/ai/da/mapper/primary/PaymentInfoMapper.java index c6721dd1..8841e85c 100644 --- a/src/main/java/com/ai/da/mapper/primary/PaymentInfoMapper.java +++ b/src/main/java/com/ai/da/mapper/primary/PaymentInfoMapper.java @@ -4,6 +4,7 @@ import com.ai.da.mapper.primary.entity.PaymentInfo; import com.ai.da.model.vo.OrderListVO; import com.ai.da.model.vo.PaymentInfoVO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; @@ -26,4 +27,6 @@ public interface PaymentInfoMapper extends BaseMapper { List> getCities(); List> getCountries(); + + int insertIgnore(@Param("paymentInfo")PaymentInfo paymentInfo); } diff --git a/src/main/java/com/ai/da/mapper/primary/SubscriptionInfoMapper.java b/src/main/java/com/ai/da/mapper/primary/SubscriptionInfoMapper.java index 8a45bb7e..79a6c14f 100644 --- a/src/main/java/com/ai/da/mapper/primary/SubscriptionInfoMapper.java +++ b/src/main/java/com/ai/da/mapper/primary/SubscriptionInfoMapper.java @@ -2,7 +2,8 @@ package com.ai.da.mapper.primary; import com.ai.da.mapper.primary.entity.SubscriptionInfo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; public interface SubscriptionInfoMapper extends BaseMapper { - + int insertIgnore(@Param("subscriptionInfo") SubscriptionInfo subscriptionInfo); } diff --git a/src/main/java/com/ai/da/mapper/primary/entity/DesignItemDetailPrint.java b/src/main/java/com/ai/da/mapper/primary/entity/DesignItemDetailPrint.java index 09e142b5..e8c0ac73 100644 --- a/src/main/java/com/ai/da/mapper/primary/entity/DesignItemDetailPrint.java +++ b/src/main/java/com/ai/da/mapper/primary/entity/DesignItemDetailPrint.java @@ -41,7 +41,7 @@ public class DesignItemDetailPrint { /** * 印花缩放比例 */ - private Double scale; + private String scale; /** * 印花旋转角度 */ diff --git a/src/main/java/com/ai/da/mapper/primary/entity/SubscriptionInfo.java b/src/main/java/com/ai/da/mapper/primary/entity/SubscriptionInfo.java index 7ee32ab0..9d3ce981 100644 --- a/src/main/java/com/ai/da/mapper/primary/entity/SubscriptionInfo.java +++ b/src/main/java/com/ai/da/mapper/primary/entity/SubscriptionInfo.java @@ -19,7 +19,7 @@ public class SubscriptionInfo extends BaseEntity{ // month || year private String type; - // active || expired + // active || canceled private String status = "active"; private byte cancelNotified = (byte)0; diff --git a/src/main/java/com/ai/da/model/vo/DesignSinglePrint.java b/src/main/java/com/ai/da/model/vo/DesignSinglePrint.java index 88bb9475..e861d2d3 100644 --- a/src/main/java/com/ai/da/model/vo/DesignSinglePrint.java +++ b/src/main/java/com/ai/da/model/vo/DesignSinglePrint.java @@ -29,11 +29,11 @@ public class DesignSinglePrint implements Serializable { private String minIOPath; @ApiModelProperty("印花位置") - private List location; + private List location; @ApiModelProperty("印花大小") @Range(max = 1, message = "印花缩放值需用大于等于0小于等于1的数表示") - private Double scale; + private List scale; @Range(min = -360, max = 360, message = "印花旋转角度范围为-360° ~ 360°") @ApiModelProperty("印花角度") @@ -46,12 +46,12 @@ public class DesignSinglePrint implements Serializable { public DesignSinglePrint() { } - public DesignSinglePrint(String path, Double scale) { + public DesignSinglePrint(String path, List scale) { this.path = path; this.scale = scale; } - public DesignSinglePrint(String level2Type, String path, String minIOPath, List location, Double scale, Double angle, Integer priority, Boolean ifSingle) { + public DesignSinglePrint(String level2Type, String path, String minIOPath, List location, List scale, Double angle, Integer priority, Boolean ifSingle) { this.level2Type = level2Type; this.path = path; this.minIOPath = minIOPath; diff --git a/src/main/java/com/ai/da/python/PythonService.java b/src/main/java/com/ai/da/python/PythonService.java index e3bebcd7..31c9c43a 100644 --- a/src/main/java/com/ai/da/python/PythonService.java +++ b/src/main/java/com/ai/da/python/PythonService.java @@ -2767,13 +2767,13 @@ public class PythonService { int size = printObject.size(); // 占位符填充数组 - List> locationS = new ArrayList<>(Collections.nCopies(size, null)); - List scaleS = new ArrayList<>(Collections.nCopies(size, null)); + List> locationS = new ArrayList<>(Collections.nCopies(size, null)); + List> scaleS = new ArrayList<>(Collections.nCopies(size, null)); List angleS = new ArrayList<>(Collections.nCopies(size, null)); ArrayList pathsS = new ArrayList<>(Collections.nCopies(size, null)); - List> locationO = new ArrayList<>(Collections.nCopies(size, null)); - List scaleO = new ArrayList<>(Collections.nCopies(size, null)); + List> locationO = new ArrayList<>(Collections.nCopies(size, null)); + List> scaleO = new ArrayList<>(Collections.nCopies(size, null)); List angleO = new ArrayList<>(Collections.nCopies(size, null)); ArrayList pathsO = new ArrayList<>(Collections.nCopies(size, null)); @@ -2830,8 +2830,8 @@ public class PythonService { int size = trims.getPrints().size(); // 占位符填充数组 - List> location = new ArrayList<>(Collections.nCopies(size, null)); - List scale = new ArrayList<>(Collections.nCopies(size, null)); + List> location = new ArrayList<>(Collections.nCopies(size, null)); + List> scale = new ArrayList<>(Collections.nCopies(size, null)); List angle = new ArrayList<>(Collections.nCopies(size, null)); ArrayList paths = new ArrayList<>(Collections.nCopies(size, null)); @@ -2841,6 +2841,8 @@ public class PythonService { prints.forEach(p -> { p.getLocation().set(0, p.getLocation().get(0)); p.getLocation().set(1, p.getLocation().get(1)); + p.getScale().set(0, p.getScale().get(0)); + p.getScale().set(1, p.getScale().get(1)); Integer priority = p.getPriority(); location.set(priority - 1, p.getLocation()); scale.set(priority - 1, p.getScale()); diff --git a/src/main/java/com/ai/da/python/vo/DesignPythonItemElement.java b/src/main/java/com/ai/da/python/vo/DesignPythonItemElement.java index 71560f2d..70e6521e 100644 --- a/src/main/java/com/ai/da/python/vo/DesignPythonItemElement.java +++ b/src/main/java/com/ai/da/python/vo/DesignPythonItemElement.java @@ -10,12 +10,12 @@ import java.util.List; public class DesignPythonItemElement { @ApiModelProperty("print的位置 传 [[0.2, 0.2]]") - private List> location = new ArrayList<>(); + private List> location = new ArrayList<>(); private List element_path_list = new ArrayList<>(); @ApiModelProperty("print的缩放比例 传 [0.2, 0.2]") - private List element_scale_list = new ArrayList<>(); + private List> element_scale_list = new ArrayList<>(); @ApiModelProperty("print的旋转角度 传 [0.2, 0.2]") private List element_angle_list = new ArrayList<>(); diff --git a/src/main/java/com/ai/da/python/vo/DesignPythonItemPrint.java b/src/main/java/com/ai/da/python/vo/DesignPythonItemPrint.java index 617c8e65..a4f980bb 100644 --- a/src/main/java/com/ai/da/python/vo/DesignPythonItemPrint.java +++ b/src/main/java/com/ai/da/python/vo/DesignPythonItemPrint.java @@ -36,10 +36,10 @@ public class DesignPythonItemPrint { @ApiModelProperty("print的位置 传 [[0.2, 0.2]]") - private List> location = new ArrayList<>(); + private List> location = new ArrayList<>(); @ApiModelProperty("print的缩放比例 传 [0.2, 0.2]") - private List print_scale_list = new ArrayList<>(); + private List> print_scale_list = new ArrayList<>(); @ApiModelProperty("print的旋转角度 传 [0.2, 0.2]") private List print_angle_list = new ArrayList<>(); @@ -52,8 +52,8 @@ public class DesignPythonItemPrint { public DesignPythonItemPrint(List print_path_list, Boolean ifDesign) { if (ifDesign){ this.print_path_list = print_path_list; - this.location = Collections.singletonList(Arrays.asList(0.0, 0.0)); - this.print_scale_list = Arrays.asList(0.0, 0.0); + this.location = Collections.singletonList(Arrays.asList(0.0f, 0.0f)); + this.print_scale_list = Collections.singletonList(Arrays.asList(0.0f, 0.0f)); this.print_angle_list = Arrays.asList(0.0, 0.0); } 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 e0b34131..0c4159d3 100644 --- a/src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java @@ -816,7 +816,7 @@ public class DesignItemServiceImpl extends ServiceImpl impleme print.setPosition("[0.0,0.0]"); // print.setScale(1d); // todo mark 将print默认scale置为0.3 - print.setScale(0.3d); + print.setScale(Arrays.toString(new Float[]{0.3f, 0.3f})); print.setAngle(0.0); print.setPriority(1); QueryWrapper getPrintboardLevel2TypeQw = new QueryWrapper<>(); @@ -951,7 +951,7 @@ public class DesignServiceImpl extends ServiceImpl impleme print.setPosition("[0.0,0.0]"); // print.setScale(1d); // todo mark 将print默认scale置为0.3 - print.setScale(0.3d); + print.setScale(Arrays.toString(new Float[]{0.3f, 0.3f})); print.setAngle(0.0); print.setPriority(1); QueryWrapper getPrintboardLevel2TypeQw = new QueryWrapper<>(); @@ -1596,12 +1596,12 @@ public class DesignServiceImpl extends ServiceImpl impleme DesignSinglePrint designSinglePrint = new DesignSinglePrint(); // designSinglePrintDTO.setIfSingle(detailPrint.getSingleOrOverall().equals("single") ? Boolean.TRUE : Boolean.FALSE); designSinglePrint.setLevel2Type(detailPrint.getLevel2Type()); - designSinglePrint.setLocation(JSONArray.parseArray(detailPrint.getPosition(), Double.class)); + designSinglePrint.setLocation(JSONArray.parseArray(detailPrint.getPosition(), Float.class)); designSinglePrint.setAngle(detailPrint.getAngle()); designSinglePrint.setPriority(detailPrint.getPriority()); designSinglePrint.setPath(minioUtil.getPreSignedUrl(detailPrint.getPath(), 24 * 60)); designSinglePrint.setMinIOPath(detailPrint.getPath()); - designSinglePrint.setScale(detailPrint.getScale()); + designSinglePrint.setScale(JSONArray.parseArray(detailPrint.getScale(), Float.class)); designSinglePrint.setIfSingle(detailPrint.getSingleOrOverall().equals("single") ? Boolean.TRUE : Boolean.FALSE); prints.add(designSinglePrint); } else { @@ -1613,8 +1613,8 @@ public class DesignServiceImpl extends ServiceImpl impleme print.getLevel2Type(), minioUtil.getPreSignedUrl(print.getPath(), 24 * 60), print.getPath(), - JSONArray.parseArray(print.getPosition(), Double.class), - print.getScale(), + JSONArray.parseArray(print.getPosition(), Float.class), + JSONArray.parseArray(print.getScale(), Float.class), print.getAngle(), print.getPriority(), print.getSingleOrOverall().equals("single") ? Boolean.TRUE : Boolean.FALSE)); @@ -1977,7 +1977,7 @@ public class DesignServiceImpl extends ServiceImpl impleme print.setPosition("[0.0,0.0]"); // print.setScale(1d); // todo mark 将print默认scale置为0.3 - print.setScale(0.3d); + print.setScale(Arrays.toString(new Float[]{0.3f, 0.3f})); print.setAngle(0.0); print.setPriority(1); QueryWrapper getPrintboardLevel2TypeQw = new QueryWrapper<>(); diff --git a/src/main/java/com/ai/da/service/impl/PaymentInfoServiceImpl.java b/src/main/java/com/ai/da/service/impl/PaymentInfoServiceImpl.java index f5db3e24..fa22e6e9 100644 --- a/src/main/java/com/ai/da/service/impl/PaymentInfoServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/PaymentInfoServiceImpl.java @@ -285,7 +285,8 @@ public class PaymentInfoServiceImpl extends ServiceImpl + + INSERT IGNORE INTO + t_payment_info (order_no, transaction_id, payment_type, trade_state, payer_total, + type, content, notified, payment_method, last4, hosted_invoice_url, + country, city, ip_address, create_time) + VALUES (#{paymentInfo.orderNo}, #{paymentInfo.transactionId}, #{paymentInfo.paymentType}, + #{paymentInfo.tradeState}, #{paymentInfo.payerTotal}, #{paymentInfo.content},#{paymentInfo.type}, + #{paymentInfo.notified},#{paymentInfo.paymentMethod}, #{paymentInfo.last4},#{paymentInfo.hostedInvoiceUrl}, + #{paymentInfo.ipAddress},#{paymentInfo.country},#{paymentInfo.city},#{paymentInfo.createTime}); + + diff --git a/src/main/resources/mapper/primary/SubscriptionInfoMapper.xml b/src/main/resources/mapper/primary/SubscriptionInfoMapper.xml new file mode 100644 index 00000000..bfbb6979 --- /dev/null +++ b/src/main/resources/mapper/primary/SubscriptionInfoMapper.xml @@ -0,0 +1,13 @@ + + + + + INSERT IGNORE INTO + t_subscription_info (account_id, order_no, subscription_id, type, status, cancel_notified, + next_pay_date, current_period_start, current_period_end, create_time) + VALUES (#{subscriptionInfo.accountId}, #{subscriptionInfo.orderNo}, #{subscriptionInfo.subscriptionId}, + #{subscriptionInfo.type}, #{subscriptionInfo.status}, #{subscriptionInfo.cancelNotified}, + #{subscriptionInfo.nextPayDate}, #{subscriptionInfo.currentPeriodStart}, + #{subscriptionInfo.currentPeriodEnd}, #{subscriptionInfo.createTime}); + +