This commit is contained in:
2025-07-27 09:28:32 +08:00
parent 563d83f849
commit f8de4abd09
10 changed files with 32 additions and 0 deletions

View File

@@ -1,6 +1,7 @@
package com.ycwl.basic.model.mobile.goods; package com.ycwl.basic.model.mobile.goods;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Builder; import lombok.Builder;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
@@ -42,6 +43,8 @@ public class GoodsDetailVO {
private Integer isFree; private Integer isFree;
private Integer parts; private Integer parts;
private Integer sort; private Integer sort;
@JsonProperty("sourceType")
public Integer getSourceType() { public Integer getSourceType() {
return goodsType; return goodsType;
} }

View File

@@ -1,6 +1,7 @@
package com.ycwl.basic.model.mobile.goods; package com.ycwl.basic.model.mobile.goods;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data; import lombok.Data;
import java.math.BigDecimal; import java.math.BigDecimal;
@@ -56,6 +57,7 @@ public class VideoGoodsDetailVO {
private Integer width; private Integer width;
private BigDecimal duration; private BigDecimal duration;
@JsonProperty("discountPrice")
public BigDecimal getDiscountPrice() { public BigDecimal getDiscountPrice() {
if (slashPrice == null) { if (slashPrice == null) {
return BigDecimal.ZERO; return BigDecimal.ZERO;

View File

@@ -1,5 +1,6 @@
package com.ycwl.basic.model.mobile.order; package com.ycwl.basic.model.mobile.order;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data; import lombok.Data;
import java.math.BigDecimal; import java.math.BigDecimal;
@@ -18,6 +19,7 @@ public class IsBuyBatchRespVO {
private BigDecimal couponPrice = BigDecimal.ZERO; private BigDecimal couponPrice = BigDecimal.ZERO;
private BigDecimal slashPrice; private BigDecimal slashPrice;
@JsonProperty("price")
public BigDecimal getPrice() { public BigDecimal getPrice() {
if (origPrice == null) { if (origPrice == null) {
return BigDecimal.ZERO; return BigDecimal.ZERO;
@@ -27,6 +29,7 @@ public class IsBuyBatchRespVO {
} }
return origPrice.subtract(couponPrice); return origPrice.subtract(couponPrice);
} }
@JsonProperty("discountPrice")
public BigDecimal getDiscountPrice() { public BigDecimal getDiscountPrice() {
if (slashPrice == null) { if (slashPrice == null) {
return BigDecimal.ZERO; return BigDecimal.ZERO;

View File

@@ -1,5 +1,6 @@
package com.ycwl.basic.model.mobile.order; package com.ycwl.basic.model.mobile.order;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data; import lombok.Data;
import java.math.BigDecimal; import java.math.BigDecimal;
@@ -17,6 +18,7 @@ public class IsBuyRespVO {
private BigDecimal couponPrice = BigDecimal.ZERO; private BigDecimal couponPrice = BigDecimal.ZERO;
private BigDecimal slashPrice; private BigDecimal slashPrice;
@JsonProperty("price")
public BigDecimal getPrice() { public BigDecimal getPrice() {
if (origPrice == null) { if (origPrice == null) {
return BigDecimal.ZERO; return BigDecimal.ZERO;
@@ -26,6 +28,7 @@ public class IsBuyRespVO {
} }
return origPrice.subtract(couponPrice); return origPrice.subtract(couponPrice);
} }
@JsonProperty("discountPrice")
public BigDecimal getDiscountPrice() { public BigDecimal getDiscountPrice() {
if (slashPrice == null) { if (slashPrice == null) {
return BigDecimal.ZERO; return BigDecimal.ZERO;

View File

@@ -1,5 +1,6 @@
package com.ycwl.basic.model.mobile.statistic.resp; package com.ycwl.basic.model.mobile.statistic.resp;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data; import lombok.Data;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.math.RoundingMode; import java.math.RoundingMode;
@@ -45,11 +46,13 @@ public class AppStatisticsFunnelVO {
private BigDecimal refundOfOrderAmount; // ro3 private BigDecimal refundOfOrderAmount; // ro3
// 镜头检测游客数_扫码访问人数_转化率 // 镜头检测游客数_扫码访问人数_转化率
@JsonProperty("csom_scaom")
public String getCsom_scaom() { public String getCsom_scaom() {
return "-"; // TODO: REAL return "-"; // TODO: REAL
} }
// 扫码访问人数_上传头像人数_转化率 // 扫码访问人数_上传头像人数_转化率
@JsonProperty("scaom_ufom")
public String getScaom_ufom() { public String getScaom_ufom() {
if (uploadFaceOfMemberNum == 0 || scanCodeVisitorOfMemberNum == 0) { if (uploadFaceOfMemberNum == 0 || scanCodeVisitorOfMemberNum == 0) {
return "0.00"; return "0.00";
@@ -60,6 +63,7 @@ public class AppStatisticsFunnelVO {
.toString(); .toString();
} }
// 上传头像人数_推送订阅人数_转化率 // 上传头像人数_推送订阅人数_转化率
@JsonProperty("ufom_pom")
public String getUfom_pom() { public String getUfom_pom() {
if (pushOfMemberNum == 0 || uploadFaceOfMemberNum == 0) { if (pushOfMemberNum == 0 || uploadFaceOfMemberNum == 0) {
return "0.00"; return "0.00";
@@ -70,6 +74,7 @@ public class AppStatisticsFunnelVO {
.toString(); .toString();
} }
// 推送订阅人数_生成视频人数_转化率 // 推送订阅人数_生成视频人数_转化率
@JsonProperty("pom_cvom")
public String getPom_cvom() { public String getPom_cvom() {
if (completeVideoOfMemberNum == 0 || pushOfMemberNum == 0) { if (completeVideoOfMemberNum == 0 || pushOfMemberNum == 0) {
return "0.00"; return "0.00";
@@ -80,6 +85,7 @@ public class AppStatisticsFunnelVO {
.toString(); .toString();
} }
// 生成视频人数_预览视频人数_转化率 // 生成视频人数_预览视频人数_转化率
@JsonProperty("cvom_pvom")
public String getCvom_pvom() { public String getCvom_pvom() {
if (previewVideoOfMemberNum == 0 || completeVideoOfMemberNum == 0) { if (previewVideoOfMemberNum == 0 || completeVideoOfMemberNum == 0) {
return "0.00"; return "0.00";
@@ -90,6 +96,7 @@ public class AppStatisticsFunnelVO {
.toString(); .toString();
} }
// 预览视频人数_点击购买人数_转化率 // 预览视频人数_点击购买人数_转化率
@JsonProperty("pvom_cpom")
public String getPvom_cpom() { public String getPvom_cpom() {
if (clickOnPayOfMemberNum == 0 || previewVideoOfMemberNum == 0) { if (clickOnPayOfMemberNum == 0 || previewVideoOfMemberNum == 0) {
return "0.00"; return "0.00";
@@ -100,6 +107,7 @@ public class AppStatisticsFunnelVO {
.toString(); .toString();
} }
// 点击购买人数_支付订单人数_转化率 // 点击购买人数_支付订单人数_转化率
@JsonProperty("cpom_pom")
public String getCpom_pom() { public String getCpom_pom() {
if (payOfMemberNum == 0 || clickOnPayOfMemberNum == 0) { if (payOfMemberNum == 0 || clickOnPayOfMemberNum == 0) {
return "0.00"; return "0.00";
@@ -112,6 +120,7 @@ public class AppStatisticsFunnelVO {
public BigDecimal payOfOrderAmount() { public BigDecimal payOfOrderAmount() {
return payOfOrderAmount; return payOfOrderAmount;
} }
@JsonProperty("payOfOrderAmount")
public String getPayOfOrderAmount() { public String getPayOfOrderAmount() {
if (payOfOrderAmount == null) { if (payOfOrderAmount == null) {
return "0.00"; return "0.00";
@@ -121,6 +130,7 @@ public class AppStatisticsFunnelVO {
public BigDecimal refundOfOrderAmount() { public BigDecimal refundOfOrderAmount() {
return refundOfOrderAmount; return refundOfOrderAmount;
} }
@JsonProperty("refundOfOrderAmount")
public String getRefundOfOrderAmount() { public String getRefundOfOrderAmount() {
if (refundOfOrderAmount == null) { if (refundOfOrderAmount == null) {
return "0.00"; return "0.00";

View File

@@ -2,6 +2,7 @@ package com.ycwl.basic.model.pc.order.entity;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data; import lombok.Data;
import java.math.BigDecimal; import java.math.BigDecimal;
@@ -91,6 +92,7 @@ public class OrderEntity {
*/ */
private Date refundAt; private Date refundAt;
@JsonProperty("discountPrice")
public BigDecimal getDiscountPrice() { public BigDecimal getDiscountPrice() {
if (slashPrice == null) { if (slashPrice == null) {
return BigDecimal.ZERO; return BigDecimal.ZERO;

View File

@@ -1,6 +1,7 @@
package com.ycwl.basic.model.pc.order.resp; package com.ycwl.basic.model.pc.order.resp;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data; import lombok.Data;
import java.math.BigDecimal; import java.math.BigDecimal;
@@ -88,6 +89,7 @@ public class OrderAppRespVO {
// 订单明细 // 订单明细
private List<OrderItemVO> orderItemList; private List<OrderItemVO> orderItemList;
@JsonProperty("discountPrice")
public BigDecimal getDiscountPrice() { public BigDecimal getDiscountPrice() {
if (slashPrice == null) { if (slashPrice == null) {
return BigDecimal.ZERO; return BigDecimal.ZERO;

View File

@@ -1,6 +1,7 @@
package com.ycwl.basic.model.pc.order.resp; package com.ycwl.basic.model.pc.order.resp;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.ycwl.basic.model.mobile.goods.GoodsDetailVO; import com.ycwl.basic.model.mobile.goods.GoodsDetailVO;
import com.ycwl.basic.model.pc.order.entity.OrderItemEntity; import com.ycwl.basic.model.pc.order.entity.OrderItemEntity;
import lombok.Data; import lombok.Data;
@@ -112,6 +113,7 @@ public class OrderRespVO {
private String scenicName; private String scenicName;
private List<GoodsDetailVO> goodsList; private List<GoodsDetailVO> goodsList;
@JsonProperty("discountPrice")
public BigDecimal getDiscountPrice() { public BigDecimal getDiscountPrice() {
if (slashPrice == null) { if (slashPrice == null) {
return BigDecimal.ZERO; return BigDecimal.ZERO;

View File

@@ -1,6 +1,7 @@
package com.ycwl.basic.model.pc.video.resp; package com.ycwl.basic.model.pc.video.resp;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data; import lombok.Data;
import java.math.BigDecimal; import java.math.BigDecimal;
@@ -62,6 +63,7 @@ public class VideoRespVO {
private Integer width; private Integer width;
private BigDecimal duration; private BigDecimal duration;
@JsonProperty("discountPrice")
public BigDecimal getDiscountPrice() { public BigDecimal getDiscountPrice() {
if (slashPrice == null) { if (slashPrice == null) {
return BigDecimal.ZERO; return BigDecimal.ZERO;

View File

@@ -1,5 +1,6 @@
package com.ycwl.basic.model.viid.entity; package com.ycwl.basic.model.viid.entity;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data; import lombok.Data;
@Data @Data
@@ -10,9 +11,11 @@ public class FacePositionObject {
private Integer ltY; private Integer ltY;
private Integer rbX; private Integer rbX;
private Integer rbY; private Integer rbY;
@JsonProperty("width")
public Integer getWidth(){ public Integer getWidth(){
return rbX - ltX; return rbX - ltX;
} }
@JsonProperty("height")
public Integer getHeight(){ public Integer getHeight(){
return rbY - ltY; return rbY - ltY;
} }