推客直接收益,调整顺序

This commit is contained in:
2025-02-28 10:12:19 +08:00
parent 34924ad351
commit 553ef3a2cd
13 changed files with 94 additions and 43 deletions

View File

@@ -22,6 +22,7 @@ public class BrokerRecord {
private BigDecimal orderPrice;
private BigDecimal brokerRate;
private BigDecimal brokerPrice;
private BigDecimal directPrice;
private String reason;
private Date createTime;
}

View File

@@ -1,6 +1,7 @@
package com.ycwl.basic.model.pc.broker.req;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ycwl.basic.model.common.BaseQueryParameterReq;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -18,7 +19,9 @@ public class BrokerRecordReqQuery extends BaseQueryParameterReq {
private Long brokerId;
private Long orderId;
@ApiModelProperty("开始时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date startTime;
@ApiModelProperty("结束时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date endTime;
}

View File

@@ -1,5 +1,6 @@
package com.ycwl.basic.model.pc.broker.resp;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.math.BigDecimal;
@@ -11,7 +12,10 @@ import java.util.Date;
*/
@Data
public class DailySummaryRespVO {
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date date;
private Long recordCount;
private Long scanCount;
private Long orderCount;
private BigDecimal totalOrderPrice;
private BigDecimal totalBrokerPrice;
}

View File

@@ -3,6 +3,7 @@ package com.ycwl.basic.model.pc.scenic.entity;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ycwl.basic.storage.enums.StorageType;
import lombok.Data;
import java.math.BigDecimal;
@@ -65,4 +66,7 @@ public class ScenicConfigEntity {
* 人脸识别阈值,是0~100的数值
*/
private Float faceScoreThreshold;
private StorageType storeType;
private String storeConfigJson;
private BigDecimal brokerDirectRate;
}