aidlab/aida_back
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev/dev_xp' into dev/dev

Browse Source
This commit is contained in:
xupei
2025-01-15 10:49:08 +08:00
parent 5f277ed815 b6a66bed41
commit dcdb0d06c4
6 changed files with 56 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/ai/da/controller/DesignDetailController.java
View File

@@ -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模块")

4
src/main/java/com/ai/da/mapper/primary/PaymentInfoMapper.java
View File

@@ -16,11 +16,11 @@ public interface PaymentInfoMapper extends BaseMapper<PaymentInfo> {
List<PaymentInfoVO> 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<Map<String, String>> getCities();

2
src/main/java/com/ai/da/model/dto/QueryPaymentInfoDTO.java
View File

@@ -25,4 +25,6 @@ public class QueryPaymentInfoDTO extends QueryPageByTimeDTO {
private String city;
@ApiModelProperty("按id排序 DESC || ASC")
private String order = "DESC";
@ApiModelProperty("付款用户名")
private String payer;
}

2
src/main/java/com/ai/da/model/vo/PaymentInfoVO.java
View File

@@ -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")

4
src/main/java/com/ai/da/service/impl/ConvenientInquiryServiceImpl.java
View File

@@ -628,12 +628,12 @@ public class ConvenientInquiryServiceImpl extends ServiceImpl<QuestionnaireMappe
queryPaymentInfoDTO.getType(), queryPaymentInfoDTO.getStatus(),
queryPaymentInfoDTO.getCountry(), queryPaymentInfoDTO.getCity(),
queryPaymentInfoDTO.getStartTime(), queryPaymentInfoDTO.getEndTime(),
size, offset, order);
size, offset, order, queryPaymentInfoDTO.getPayer());
// 查询数据总量
Long total = paymentInfoMapper.queryPaymentInfoCount(queryPaymentInfoDTO.getPlatform(), queryPaymentInfoDTO.getPayerTotal(),
queryPaymentInfoDTO.getType(), queryPaymentInfoDTO.getStatus(),
queryPaymentInfoDTO.getCountry(), queryPaymentInfoDTO.getCity(),
queryPaymentInfoDTO.getStartTime(), queryPaymentInfoDTO.getEndTime());
queryPaymentInfoDTO.getStartTime(), queryPaymentInfoDTO.getEndTime(), queryPaymentInfoDTO.getPayer());
// 总页数
double totalPage = Math.ceil((double) total / size);