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 ea23d39d..797c5baf 100644 --- a/src/main/java/com/ai/da/mapper/primary/PaymentInfoMapper.java +++ b/src/main/java/com/ai/da/mapper/primary/PaymentInfoMapper.java @@ -8,7 +8,7 @@ import java.util.List; public interface PaymentInfoMapper extends BaseMapper { - List selectPageOrderList(Long accountId, String startTime, String endTime, int offset, int pageSize); + List selectPageOrderList(Long accountId, String startTime, String endTime, int offset, int pageSize, Long id); - int queryOrderListTotalCount(Long accountId, String startTime, String endTime); + int queryOrderListTotalCount(Long accountId, String startTime, String endTime, Long id); } diff --git a/src/main/java/com/ai/da/model/dto/QueryPageByTimeDTO.java b/src/main/java/com/ai/da/model/dto/QueryPageByTimeDTO.java index c0c37a98..669493eb 100644 --- a/src/main/java/com/ai/da/model/dto/QueryPageByTimeDTO.java +++ b/src/main/java/com/ai/da/model/dto/QueryPageByTimeDTO.java @@ -16,4 +16,7 @@ public class QueryPageByTimeDTO extends PageQueryBaseVo { @ApiModelProperty("结束时间 yyyy-mm-dd hh:mm:ss 可以不要时分秒") private String endTime; + + @ApiModelProperty("指定id") + private Long id; } diff --git a/src/main/java/com/ai/da/model/dto/SubscriptionEmailParamsDTO.java b/src/main/java/com/ai/da/model/dto/SubscriptionEmailParamsDTO.java index 1f35b705..1d6f6fd7 100644 --- a/src/main/java/com/ai/da/model/dto/SubscriptionEmailParamsDTO.java +++ b/src/main/java/com/ai/da/model/dto/SubscriptionEmailParamsDTO.java @@ -10,6 +10,9 @@ public class SubscriptionEmailParamsDTO { // t_payment_info id（每次支付对于用户来说是一笔新订单） private String orderId; + // 链接到订单列表的某个订单 + private String orderRef; + // 订单支付创建日期 private String createDate; @@ -48,7 +51,5 @@ public class SubscriptionEmailParamsDTO { // 付款失败原因 private String failMessage; - private String accountPageRef; - } 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 538886aa..4e4d11b2 100644 --- a/src/main/java/com/ai/da/service/impl/PaymentInfoServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/PaymentInfoServiceImpl.java @@ -355,12 +355,13 @@ public class PaymentInfoServiceImpl extends ServiceImpl orderListVOS = baseMapper.selectPageOrderList(accountId, startTime, endTime, offset, queryPageByTimeDTO.getSize()); + List orderListVOS = baseMapper.selectPageOrderList(accountId, startTime, endTime, offset, + queryPageByTimeDTO.getSize(), queryPageByTimeDTO.getId()); if (CollectionUtils.isEmpty(orderListVOS)) { return PageBaseResponse.success(new Page<>()); }else { - int totalCount = baseMapper.queryOrderListTotalCount(accountId, startTime, endTime); + int totalCount = baseMapper.queryOrderListTotalCount(accountId, startTime, endTime, queryPageByTimeDTO.getId()); IPage orderListVOIPage = new Page<>(); Integer size = queryPageByTimeDTO.getSize(); orderListVOIPage.setSize(size); diff --git a/src/main/java/com/ai/da/service/impl/StripeServiceImpl.java b/src/main/java/com/ai/da/service/impl/StripeServiceImpl.java index f16bbb85..d3b2df08 100644 --- a/src/main/java/com/ai/da/service/impl/StripeServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/StripeServiceImpl.java @@ -72,6 +72,9 @@ public class StripeServiceImpl implements StripeService { @Value("${stripe.webhook-sign-secret}") private String signSecret; + @Value("${orderList.link}") + private String orderListLink; + @Override @Transactional(rollbackFor = Exception.class) public String pay(ProductPurchaseDTO productPurchaseDTO) { @@ -834,6 +837,7 @@ public class StripeServiceImpl implements StripeService { emailParamsDTO.setUsername(userName); emailParamsDTO.setOrderId(paymentInfo.getId().toString()); + emailParamsDTO.setOrderRef("\"" + orderListLink + paymentInfo.getId().toString() + "\""); emailParamsDTO.setCreateDate(String.valueOf(paymentInfo.getCreateTime()).replace("T", " ")); emailParamsDTO.setQuantity(String.valueOf(1)); emailParamsDTO.setTotalFee(paymentInfo.getPayerTotal().toString()); @@ -936,8 +940,6 @@ public class StripeServiceImpl implements StripeService { emailParamsDTO.setQuantity(String.valueOf(1)); emailParamsDTO.setTotalFee(paymentInfo.getPayerTotal().toString()); setSubscriptionParams(paymentInfo, subscriptionInfo, orderByOrderNo, emailParamsDTO); - // todo - emailParamsDTO.setAccountPageRef("\"https://www.aida.com.hk/home/homePage\""); // 4、发邮件 SendEmailUtil.subscriptionEmailReminder("fail_renewal", emailParamsDTO, language, account.getUserEmail()); diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties index 2afd01c3..19854ce9 100644 --- a/src/main/resources/application-dev.properties +++ b/src/main/resources/application-dev.properties @@ -104,4 +104,6 @@ rabbitmq.queues.srResult=SuperResolution-dev rabbitmq.queues.generateResult=GenerateImage-dev rabbitmq.queues.toProductImageResult=ToProductImage-dev rabbitmq.queues.relightResult=Relight-dev -rabbitmq.exchange.generate=generate-exchange \ No newline at end of file +rabbitmq.exchange.generate=generate-exchange + +orderList.link=https://develop.aida.com.hk/home/homePage?order= \ No newline at end of file diff --git a/src/main/resources/application-prod.properties b/src/main/resources/application-prod.properties index 5e9bffe9..e17972c6 100644 --- a/src/main/resources/application-prod.properties +++ b/src/main/resources/application-prod.properties @@ -105,4 +105,6 @@ rabbitmq.queues.srResult=SuperResolution-prod rabbitmq.queues.generateResult=GenerateImage-prod rabbitmq.queues.toProductImageResult=ToProductImage-prod rabbitmq.queues.relightResult=Relight-prod -rabbitmq.exchange.generate=generate-exchange \ No newline at end of file +rabbitmq.exchange.generate=generate-exchange + +orderList.link=https://aida.com.hk/home/homePage?order= \ No newline at end of file diff --git a/src/main/resources/mapper/primary/PaymentInfoMapper.xml b/src/main/resources/mapper/primary/PaymentInfoMapper.xml index 8bab6ca5..f6e823e8 100644 --- a/src/main/resources/mapper/primary/PaymentInfoMapper.xml +++ b/src/main/resources/mapper/primary/PaymentInfoMapper.xml @@ -18,6 +18,9 @@ p.order_no = o.order_no WHERE o.account_id = #{accountId} + + AND p.id = #{id} + AND p.create_time BETWEEN #{startTime} AND #{endTime} ORDER BY p.id DESC @@ -35,6 +38,9 @@ p.order_no = o.order_no WHERE o.account_id = #{accountId} + + AND p.id = #{id} + AND p.create_time BETWEEN #{startTime} AND #{endTime};