diff --git a/sql/yshop3.1.sql b/sql/yshop3.1.sql index ce71f68f..e0350e7a 100644 --- a/sql/yshop3.1.sql +++ b/sql/yshop3.1.sql @@ -6691,7 +6691,7 @@ INSERT INTO `yx_system_group_data` VALUES (216, 'yshop_home_menus', '{\"imageArr INSERT INTO `yx_system_group_data` VALUES (217, 'yshop_home_menus', '{\"imageArr\":[\"https://image.dayouqiantu.cn/bar.png\"],\"uniapp_url\":\"/pages/activity/GoodsBargain/index\",\"name\":\"砍价专区\",\"id\":217,\"pic\":\"https://image.dayouqiantu.cn/bar.png\",\"sort\":2,\"url\":\"/activity/bargain\",\"wxapp_url\":\"/pages/activity/GoodsBargain/main\",\"status\":1}', '2020-06-25 18:54:35', '2020-06-26 18:27:16', 2, 1, 0); INSERT INTO `yx_system_group_data` VALUES (218, 'yshop_my_menus', '{\"imageArr\":[\"https://image.dayouqiantu.cn/5dfd7b748e053.png\"],\"uniapp_url\":\"/pages/activity/BargainRecord/index\",\"name\":\"砍价记录\",\"id\":218,\"pic\":\"https://image.dayouqiantu.cn/5dfd7b748e053.png\",\"sort\":1,\"url\":\"/activity/bargain/record\",\"wxapp_url\":\"/pages/activity/BargainRecord/main\",\"status\":1}', '2020-06-25 18:54:35', NULL, 1, 1, 0); INSERT INTO `yx_system_group_data` VALUES (219, 'yshop_home_banner', '{\"name\":\"222\",\"id\":\"\",\"pic\":\"https://image.dayouqiantu.cn/5c9f117f624ee.jpg\",\"sort\":\"\",\"url\":\"/\",\"status\":\"\"}', '2020-06-25 18:54:35', NULL, 0, 1, 0); -INSERT INTO `yx_system_group_data` VALUES (221, 'yshop_my_menus', '{\"imageArr\":[\"https://image.dayouqiantu.cn/5e60da498cfdd.png\"],\"name\":\"订单核销\",\"id\":230,\"pic\":\"https://image.dayouqiantu.cn/5e60da498cfdd.png\",\"sort\":0,\"url\":\"/order/order_cancellation\",\"wxapp_url\":\"\",\"status\":1}', '2020-06-25 18:54:35', NULL, 0, 1, 0); +INSERT INTO `yx_system_group_data` VALUES (221, 'yshop_my_menus', '{\"imageArr\":[\"https://image.dayouqiantu.cn/5e60da498cfdd.png\"],\"uniapp_url\":\"/pages/orderAdmin/OrderCancellation/index\",\"name\":\"订单核销\",\"id\":221,\"pic\":\"https://image.dayouqiantu.cn/5e60da498cfdd.png\",\"sort\":0,\"url\":\"/order/order_cancellation\",\"wxapp_url\":\"\",\"status\":1}', '2020-06-25 18:54:35', '2020-09-15 15:46:36', 0, 1, 0); INSERT INTO `yx_system_group_data` VALUES (222, 'yshop_recharge_price_ways', '{\"give_price\":\"10\",\"price\":\"100\",\"id\":\"\",\"sort\":0,\"status\":1}', '2020-06-25 18:54:35', NULL, 1, 1, 0); INSERT INTO `yx_system_group_data` VALUES (223, 'yshop_recharge_price_ways', '{\"give_price\":\"1000\",\"price\":1,\"id\":223,\"sort\":0,\"status\":1}', '2020-06-25 18:54:35', '2020-09-12 18:34:21', 0, 1, 0); INSERT INTO `yx_system_group_data` VALUES (224, 'yshop_home_banner', '{\"imageArr\":[\"https://consoleapi.xinxintuan.co/file/pic/20200903171807647067.jpg\"],\"uniapp_url\":\"3\",\"name\":\"3\",\"id\":224,\"pic\":\"https://consoleapi.xinxintuan.co/file/pic/20200903171807647067.jpg\",\"sort\":0,\"url\":\"3\",\"wxapp_url\":\"\",\"status\":1}', '2020-09-03 17:13:59', '2020-09-15 07:54:11', 0, 1, 0); diff --git a/yshop-mall/src/main/java/co/yixiang/modules/cart/vo/YxStoreCartQueryVo.java b/yshop-mall/src/main/java/co/yixiang/modules/cart/vo/YxStoreCartQueryVo.java index e6b41e4c..ef58c3e4 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/cart/vo/YxStoreCartQueryVo.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/cart/vo/YxStoreCartQueryVo.java @@ -1,6 +1,8 @@ package co.yixiang.modules.cart.vo; import co.yixiang.modules.product.vo.YxStoreProductQueryVo; +import co.yixiang.serializer.DoubleSerializer; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -52,14 +54,17 @@ public class YxStoreCartQueryVo implements Serializable { private YxStoreProductQueryVo productInfo; @ApiModelProperty(value = "成本价") + @JsonSerialize(using = DoubleSerializer.class) private Double costPrice; @ApiModelProperty(value = "真实价格") + @JsonSerialize(using = DoubleSerializer.class) private Double truePrice; @ApiModelProperty(value = "真实库存") private Integer trueStock; + @JsonSerialize(using = DoubleSerializer.class) @ApiModelProperty(value = "vip真实价格") private Double vipTruePrice; diff --git a/yshop-mall/src/main/java/co/yixiang/modules/order/service/dto/PriceGroupDto.java b/yshop-mall/src/main/java/co/yixiang/modules/order/service/dto/PriceGroupDto.java index 969a7f50..6acfa48b 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/order/service/dto/PriceGroupDto.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/order/service/dto/PriceGroupDto.java @@ -1,5 +1,7 @@ package co.yixiang.modules.order.service.dto; +import co.yixiang.serializer.BigDecimalSerializer; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; import lombok.Data; import java.math.BigDecimal; @@ -12,10 +14,19 @@ import java.math.BigDecimal; @Data public class PriceGroupDto { + @JsonSerialize(using = BigDecimalSerializer.class) private BigDecimal costPrice; + + @JsonSerialize(using = BigDecimalSerializer.class) private BigDecimal storeFreePostage; + + @JsonSerialize(using = BigDecimalSerializer.class) private BigDecimal storePostage; + + @JsonSerialize(using = BigDecimalSerializer.class) private BigDecimal totalPrice; + + @JsonSerialize(using = BigDecimalSerializer.class) private BigDecimal vipPrice; } diff --git a/yshop-mall/src/main/java/co/yixiang/modules/order/vo/ComputeVo.java b/yshop-mall/src/main/java/co/yixiang/modules/order/vo/ComputeVo.java index 23c6efd7..0205c7a9 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/order/vo/ComputeVo.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/order/vo/ComputeVo.java @@ -1,5 +1,7 @@ package co.yixiang.modules.order.vo; +import co.yixiang.serializer.BigDecimalSerializer; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -18,10 +20,21 @@ import java.math.BigDecimal; @NoArgsConstructor @AllArgsConstructor public class ComputeVo implements Serializable { + + @JsonSerialize(using = BigDecimalSerializer.class) private BigDecimal couponPrice; + + @JsonSerialize(using = BigDecimalSerializer.class) private BigDecimal deductionPrice; + + @JsonSerialize(using = BigDecimalSerializer.class) private BigDecimal payPostage; + + @JsonSerialize(using = BigDecimalSerializer.class) private BigDecimal payPrice; + + @JsonSerialize(using = BigDecimalSerializer.class) private BigDecimal totalPrice; + private Double usedIntegral; //使用了多少积分 } diff --git a/yshop-mall/src/main/java/co/yixiang/modules/order/vo/OrderDataVo.java b/yshop-mall/src/main/java/co/yixiang/modules/order/vo/OrderDataVo.java index 5bdec73e..e0b03d4f 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/order/vo/OrderDataVo.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/order/vo/OrderDataVo.java @@ -1,5 +1,7 @@ package co.yixiang.modules.order.vo; +import co.yixiang.serializer.DoubleSerializer; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; import lombok.Data; import java.io.Serializable; @@ -12,6 +14,7 @@ import java.io.Serializable; @Data public class OrderDataVo implements Serializable { private Integer count; + @JsonSerialize(using = DoubleSerializer.class) private Double price; private String time; } diff --git a/yshop-mall/src/main/java/co/yixiang/modules/product/domain/YxStoreProductAttrValue.java b/yshop-mall/src/main/java/co/yixiang/modules/product/domain/YxStoreProductAttrValue.java index 370c8347..605e004f 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/product/domain/YxStoreProductAttrValue.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/product/domain/YxStoreProductAttrValue.java @@ -7,9 +7,11 @@ package co.yixiang.modules.product.domain; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; +import co.yixiang.serializer.BigDecimalSerializer; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Builder; @@ -66,14 +68,17 @@ public class YxStoreProductAttrValue implements Serializable { /** 属性金额 */ @ApiModelProperty(value = "属性金额") + @JsonSerialize(using = BigDecimalSerializer.class) private BigDecimal price; /** 拼团属性对应的金额 */ @ApiModelProperty(value = "拼团属性对应的金额") + @JsonSerialize(using = BigDecimalSerializer.class) private BigDecimal pinkPrice; /** 秒杀属性对应的金额 */ @ApiModelProperty(value = "秒杀属性对应的金额") + @JsonSerialize(using = BigDecimalSerializer.class) private BigDecimal seckillPrice; /** 图片 */ @@ -89,6 +94,7 @@ public class YxStoreProductAttrValue implements Serializable { /** 成本价 */ @ApiModelProperty(value = "成本价") + @JsonSerialize(using = BigDecimalSerializer.class) private BigDecimal cost; /** 商品条码 */ diff --git a/yshop-mall/src/main/java/co/yixiang/modules/product/vo/YxStoreProductQueryVo.java b/yshop-mall/src/main/java/co/yixiang/modules/product/vo/YxStoreProductQueryVo.java index 58c0397c..319a770f 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/product/vo/YxStoreProductQueryVo.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/product/vo/YxStoreProductQueryVo.java @@ -4,6 +4,8 @@ package co.yixiang.modules.product.vo; import cn.hutool.core.util.StrUtil; import co.yixiang.modules.product.domain.YxStoreProductAttrValue; +import co.yixiang.serializer.BigDecimalSerializer; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -78,15 +80,19 @@ public class YxStoreProductQueryVo implements Serializable { private String cateId; @ApiModelProperty(value = "商品价格") + @JsonSerialize(using = BigDecimalSerializer.class) private BigDecimal price; @ApiModelProperty(value = "会员价格") + @JsonSerialize(using = BigDecimalSerializer.class) private BigDecimal vipPrice; @ApiModelProperty(value = "市场价") + @JsonSerialize(using = BigDecimalSerializer.class) private BigDecimal otPrice; @ApiModelProperty(value = "邮费") + @JsonSerialize(using = BigDecimalSerializer.class) private BigDecimal postage; @ApiModelProperty(value = "单位名") @@ -108,6 +114,7 @@ public class YxStoreProductQueryVo implements Serializable { private Integer isPostage; @ApiModelProperty(value = "成本价") + @JsonSerialize(using = BigDecimalSerializer.class) private BigDecimal cost; @ApiModelProperty(value = "秒杀状态 0 未开启 1已开启") diff --git a/yshop-mall/src/main/java/co/yixiang/modules/product/vo/YxStoreProductRelationQueryVo.java b/yshop-mall/src/main/java/co/yixiang/modules/product/vo/YxStoreProductRelationQueryVo.java index 58ec6136..07e4a7d5 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/product/vo/YxStoreProductRelationQueryVo.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/product/vo/YxStoreProductRelationQueryVo.java @@ -1,5 +1,7 @@ package co.yixiang.modules.product.vo; +import co.yixiang.serializer.DoubleSerializer; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -44,12 +46,14 @@ public class YxStoreProductRelationQueryVo implements Serializable { private Integer isShow; @ApiModelProperty(value = "原价") + @JsonSerialize(using = DoubleSerializer.class) private Double otPrice; @ApiModelProperty(value = "父ID") private Integer pid; @ApiModelProperty(value = "产品价格") + @JsonSerialize(using = DoubleSerializer.class) private Double price; @ApiModelProperty(value = "产品销量")