From b6a66bed41e672fc164d507c49e8833c3588e900 Mon Sep 17 00:00:00 2001 From: xupei Date: Wed, 15 Jan 2025 10:45:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BA=A4=E6=98=93=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=20=E6=B7=BB=E5=8A=A0=E4=BB=98=E6=AC=BE=E4=BA=BA?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../da/controller/DesignDetailController.java | 3 - .../da/mapper/primary/PaymentInfoMapper.java | 4 +- .../ai/da/model/dto/QueryPaymentInfoDTO.java | 2 + .../com/ai/da/model/vo/PaymentInfoVO.java | 2 + .../impl/ConvenientInquiryServiceImpl.java | 4 +- .../mapper/primary/PaymentInfoMapper.xml | 79 +++++++++++-------- 6 files changed, 56 insertions(+), 38 deletions(-) diff --git a/src/main/java/com/ai/da/controller/DesignDetailController.java b/src/main/java/com/ai/da/controller/DesignDetailController.java index 994b0b2c..a02e0835 100644 --- a/src/main/java/com/ai/da/controller/DesignDetailController.java +++ b/src/main/java/com/ai/da/controller/DesignDetailController.java @@ -5,7 +5,6 @@ import com.ai.da.model.dto.*; import com.ai.da.model.vo.*; import com.ai.da.service.DesignItemService; import com.ai.da.service.DesignService; -import com.ai.da.service.UserLikeService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; @@ -15,8 +14,6 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.validation.Valid; import java.io.IOException; -import java.util.List; -import java.util.Map; @Api(tags = "design Detail模块") 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 1d2cf84d..c6721dd1 100644 --- a/src/main/java/com/ai/da/mapper/primary/PaymentInfoMapper.java +++ b/src/main/java/com/ai/da/mapper/primary/PaymentInfoMapper.java @@ -16,11 +16,11 @@ public interface PaymentInfoMapper extends BaseMapper { List queryPaymentInfo(String paymentType,String payerTotal, String type, String status, String country, String city, String startTime, String endTime, - int limit, int offset, String order + int limit, int offset, String order, String payer ); Long queryPaymentInfoCount(String paymentType,String payerTotal, String type, String status, - String country, String city, String startTime, String endTime + String country, String city, String startTime, String endTime, String payer ); List> getCities(); diff --git a/src/main/java/com/ai/da/model/dto/QueryPaymentInfoDTO.java b/src/main/java/com/ai/da/model/dto/QueryPaymentInfoDTO.java index fa61e724..6aa95e9a 100644 --- a/src/main/java/com/ai/da/model/dto/QueryPaymentInfoDTO.java +++ b/src/main/java/com/ai/da/model/dto/QueryPaymentInfoDTO.java @@ -25,4 +25,6 @@ public class QueryPaymentInfoDTO extends QueryPageByTimeDTO { private String city; @ApiModelProperty("按id排序 DESC || ASC") private String order = "DESC"; + @ApiModelProperty("付款用户名") + private String payer; } diff --git a/src/main/java/com/ai/da/model/vo/PaymentInfoVO.java b/src/main/java/com/ai/da/model/vo/PaymentInfoVO.java index 34ddbf79..caa1955c 100644 --- a/src/main/java/com/ai/da/model/vo/PaymentInfoVO.java +++ b/src/main/java/com/ai/da/model/vo/PaymentInfoVO.java @@ -11,6 +11,8 @@ import lombok.NoArgsConstructor; @ApiModel("交易记录详情") public class PaymentInfoVO { private Long id; + @ApiModelProperty("付款用户名") + private String payer; @ApiModelProperty("选择的支付平台 PayPal || Stripe || Alipay-HK") private String platform; @ApiModelProperty("支付的金额 单位:HKD") 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 20b97125..e0d6d978 100644 --- a/src/main/java/com/ai/da/service/impl/ConvenientInquiryServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/ConvenientInquiryServiceImpl.java @@ -628,12 +628,12 @@ public class ConvenientInquiryServiceImpl extends ServiceImpl SELECT - id, - payment_type platform, - payer_total, - type, - payment_method, - last4, - country, - city, - create_time, + p.id, + a.user_name payer, + p.payment_type platform, + p.payer_total, + p.type, + p.payment_method, + p.last4, + p.country, + p.city, + p.create_time, CASE - WHEN trade_state IN ('paid', 'COMPLETED', 'complete', 'liquidated') THEN 'Success' - WHEN trade_state IN ('failed', 'expired', 'VOIDED', 'void', 'uncollectible') THEN 'Fail' - ELSE 'Pending' + + WHEN p.trade_state IN ( 'paid', 'COMPLETED', 'complete', 'liquidated' ) THEN + 'Success' + WHEN p.trade_state IN ( 'failed', 'expired', 'VOIDED', 'void', 'uncollectible' ) THEN + 'Fail' ELSE 'Pending' END AS status FROM - t_payment_info + t_payment_info p + LEFT JOIN + t_order_info o ON p.order_no = o.order_no + LEFT JOIN + t_account a ON a.id = o.account_id WHERE 1 = 1 - AND payment_type = #{paymentType} + AND p.payment_type = #{paymentType} - AND payer_total = #{payerTotal} + AND p.payer_total = #{payerTotal} - AND type = #{type} + AND p.type = #{type} AND CASE - WHEN trade_state IN ('paid', 'COMPLETED', 'complete', 'liquidated') THEN 'Success' - WHEN trade_state IN ('failed', 'expired', 'VOIDED', 'void', 'uncollectible') THEN 'Fail' + WHEN p.trade_state IN ('paid', 'COMPLETED', 'complete', 'liquidated') THEN 'Success' + WHEN p.trade_state IN ('failed', 'expired', 'VOIDED', 'void', 'uncollectible') THEN 'Fail' ELSE 'Pending' END = #{status} - AND country = #{country} + AND p.country = #{country} - AND city = #{city} + AND p.city = #{city} - AND create_time BETWEEN #{startTime} AND #{endTime} + AND p.create_time BETWEEN #{startTime} AND #{endTime} + + + AND a.user_name = #{payer} ORDER BY - id ${order} + p.id ${order} LIMIT ${limit} OFFSET ${offset} @@ -99,34 +109,41 @@ SELECT COUNT(*) FROM - t_payment_info + t_payment_info p + LEFT JOIN + t_order_info o ON p.order_no = o.order_no + LEFT JOIN + t_account a ON a.id = o.account_id WHERE 1 = 1 - AND payment_type = #{paymentType} + AND p.payment_type = #{paymentType} - AND payer_total = #{payerTotal} + AND p.payer_total = #{payerTotal} - AND type = #{type} + AND p.type = #{type} AND CASE - WHEN trade_state IN ('paid', 'COMPLETED', 'complete', 'liquidated') THEN 'Success' - WHEN trade_state IN ('failed', 'expired', 'VOIDED', 'void', 'uncollectible') THEN 'Fail' + WHEN p.trade_state IN ('paid', 'COMPLETED', 'complete', 'liquidated') THEN 'Success' + WHEN p.trade_state IN ('failed', 'expired', 'VOIDED', 'void', 'uncollectible') THEN 'Fail' ELSE 'Pending' END = #{status} - AND country = #{country} + AND p.country = #{country} - AND city = #{city} + AND p.city = #{city} - AND create_time BETWEEN #{startTime} AND #{endTime} + AND p.create_time BETWEEN #{startTime} AND #{endTime} + + + AND a.user_name = #{payer}