bug--修复金额问题,以防精度丢失
This commit is contained in:
@ -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 (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 (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 (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 (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 (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);
|
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);
|
||||||
|
@ -1,6 +1,8 @@
|
|||||||
package co.yixiang.modules.cart.vo;
|
package co.yixiang.modules.cart.vo;
|
||||||
|
|
||||||
import co.yixiang.modules.product.vo.YxStoreProductQueryVo;
|
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.ApiModel;
|
||||||
import io.swagger.annotations.ApiModelProperty;
|
import io.swagger.annotations.ApiModelProperty;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
@ -52,14 +54,17 @@ public class YxStoreCartQueryVo implements Serializable {
|
|||||||
private YxStoreProductQueryVo productInfo;
|
private YxStoreProductQueryVo productInfo;
|
||||||
|
|
||||||
@ApiModelProperty(value = "成本价")
|
@ApiModelProperty(value = "成本价")
|
||||||
|
@JsonSerialize(using = DoubleSerializer.class)
|
||||||
private Double costPrice;
|
private Double costPrice;
|
||||||
|
|
||||||
@ApiModelProperty(value = "真实价格")
|
@ApiModelProperty(value = "真实价格")
|
||||||
|
@JsonSerialize(using = DoubleSerializer.class)
|
||||||
private Double truePrice;
|
private Double truePrice;
|
||||||
|
|
||||||
@ApiModelProperty(value = "真实库存")
|
@ApiModelProperty(value = "真实库存")
|
||||||
private Integer trueStock;
|
private Integer trueStock;
|
||||||
|
|
||||||
|
@JsonSerialize(using = DoubleSerializer.class)
|
||||||
@ApiModelProperty(value = "vip真实价格")
|
@ApiModelProperty(value = "vip真实价格")
|
||||||
private Double vipTruePrice;
|
private Double vipTruePrice;
|
||||||
|
|
||||||
|
@ -1,5 +1,7 @@
|
|||||||
package co.yixiang.modules.order.service.dto;
|
package co.yixiang.modules.order.service.dto;
|
||||||
|
|
||||||
|
import co.yixiang.serializer.BigDecimalSerializer;
|
||||||
|
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
import java.math.BigDecimal;
|
import java.math.BigDecimal;
|
||||||
@ -12,10 +14,19 @@ import java.math.BigDecimal;
|
|||||||
@Data
|
@Data
|
||||||
public class PriceGroupDto {
|
public class PriceGroupDto {
|
||||||
|
|
||||||
|
@JsonSerialize(using = BigDecimalSerializer.class)
|
||||||
private BigDecimal costPrice;
|
private BigDecimal costPrice;
|
||||||
|
|
||||||
|
@JsonSerialize(using = BigDecimalSerializer.class)
|
||||||
private BigDecimal storeFreePostage;
|
private BigDecimal storeFreePostage;
|
||||||
|
|
||||||
|
@JsonSerialize(using = BigDecimalSerializer.class)
|
||||||
private BigDecimal storePostage;
|
private BigDecimal storePostage;
|
||||||
|
|
||||||
|
@JsonSerialize(using = BigDecimalSerializer.class)
|
||||||
private BigDecimal totalPrice;
|
private BigDecimal totalPrice;
|
||||||
|
|
||||||
|
@JsonSerialize(using = BigDecimalSerializer.class)
|
||||||
private BigDecimal vipPrice;
|
private BigDecimal vipPrice;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -1,5 +1,7 @@
|
|||||||
package co.yixiang.modules.order.vo;
|
package co.yixiang.modules.order.vo;
|
||||||
|
|
||||||
|
import co.yixiang.serializer.BigDecimalSerializer;
|
||||||
|
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
|
||||||
import lombok.AllArgsConstructor;
|
import lombok.AllArgsConstructor;
|
||||||
import lombok.Builder;
|
import lombok.Builder;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
@ -18,10 +20,21 @@ import java.math.BigDecimal;
|
|||||||
@NoArgsConstructor
|
@NoArgsConstructor
|
||||||
@AllArgsConstructor
|
@AllArgsConstructor
|
||||||
public class ComputeVo implements Serializable {
|
public class ComputeVo implements Serializable {
|
||||||
|
|
||||||
|
@JsonSerialize(using = BigDecimalSerializer.class)
|
||||||
private BigDecimal couponPrice;
|
private BigDecimal couponPrice;
|
||||||
|
|
||||||
|
@JsonSerialize(using = BigDecimalSerializer.class)
|
||||||
private BigDecimal deductionPrice;
|
private BigDecimal deductionPrice;
|
||||||
|
|
||||||
|
@JsonSerialize(using = BigDecimalSerializer.class)
|
||||||
private BigDecimal payPostage;
|
private BigDecimal payPostage;
|
||||||
|
|
||||||
|
@JsonSerialize(using = BigDecimalSerializer.class)
|
||||||
private BigDecimal payPrice;
|
private BigDecimal payPrice;
|
||||||
|
|
||||||
|
@JsonSerialize(using = BigDecimalSerializer.class)
|
||||||
private BigDecimal totalPrice;
|
private BigDecimal totalPrice;
|
||||||
|
|
||||||
private Double usedIntegral; //使用了多少积分
|
private Double usedIntegral; //使用了多少积分
|
||||||
}
|
}
|
||||||
|
@ -1,5 +1,7 @@
|
|||||||
package co.yixiang.modules.order.vo;
|
package co.yixiang.modules.order.vo;
|
||||||
|
|
||||||
|
import co.yixiang.serializer.DoubleSerializer;
|
||||||
|
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
@ -12,6 +14,7 @@ import java.io.Serializable;
|
|||||||
@Data
|
@Data
|
||||||
public class OrderDataVo implements Serializable {
|
public class OrderDataVo implements Serializable {
|
||||||
private Integer count;
|
private Integer count;
|
||||||
|
@JsonSerialize(using = DoubleSerializer.class)
|
||||||
private Double price;
|
private Double price;
|
||||||
private String time;
|
private String time;
|
||||||
}
|
}
|
||||||
|
@ -7,9 +7,11 @@ package co.yixiang.modules.product.domain;
|
|||||||
|
|
||||||
import cn.hutool.core.bean.BeanUtil;
|
import cn.hutool.core.bean.BeanUtil;
|
||||||
import cn.hutool.core.bean.copier.CopyOptions;
|
import cn.hutool.core.bean.copier.CopyOptions;
|
||||||
|
import co.yixiang.serializer.BigDecimalSerializer;
|
||||||
import com.baomidou.mybatisplus.annotation.TableField;
|
import com.baomidou.mybatisplus.annotation.TableField;
|
||||||
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.databind.annotation.JsonSerialize;
|
||||||
import io.swagger.annotations.ApiModelProperty;
|
import io.swagger.annotations.ApiModelProperty;
|
||||||
import lombok.AllArgsConstructor;
|
import lombok.AllArgsConstructor;
|
||||||
import lombok.Builder;
|
import lombok.Builder;
|
||||||
@ -66,14 +68,17 @@ public class YxStoreProductAttrValue implements Serializable {
|
|||||||
|
|
||||||
/** 属性金额 */
|
/** 属性金额 */
|
||||||
@ApiModelProperty(value = "属性金额")
|
@ApiModelProperty(value = "属性金额")
|
||||||
|
@JsonSerialize(using = BigDecimalSerializer.class)
|
||||||
private BigDecimal price;
|
private BigDecimal price;
|
||||||
|
|
||||||
/** 拼团属性对应的金额 */
|
/** 拼团属性对应的金额 */
|
||||||
@ApiModelProperty(value = "拼团属性对应的金额")
|
@ApiModelProperty(value = "拼团属性对应的金额")
|
||||||
|
@JsonSerialize(using = BigDecimalSerializer.class)
|
||||||
private BigDecimal pinkPrice;
|
private BigDecimal pinkPrice;
|
||||||
|
|
||||||
/** 秒杀属性对应的金额 */
|
/** 秒杀属性对应的金额 */
|
||||||
@ApiModelProperty(value = "秒杀属性对应的金额")
|
@ApiModelProperty(value = "秒杀属性对应的金额")
|
||||||
|
@JsonSerialize(using = BigDecimalSerializer.class)
|
||||||
private BigDecimal seckillPrice;
|
private BigDecimal seckillPrice;
|
||||||
|
|
||||||
/** 图片 */
|
/** 图片 */
|
||||||
@ -89,6 +94,7 @@ public class YxStoreProductAttrValue implements Serializable {
|
|||||||
|
|
||||||
/** 成本价 */
|
/** 成本价 */
|
||||||
@ApiModelProperty(value = "成本价")
|
@ApiModelProperty(value = "成本价")
|
||||||
|
@JsonSerialize(using = BigDecimalSerializer.class)
|
||||||
private BigDecimal cost;
|
private BigDecimal cost;
|
||||||
|
|
||||||
/** 商品条码 */
|
/** 商品条码 */
|
||||||
|
@ -4,6 +4,8 @@ package co.yixiang.modules.product.vo;
|
|||||||
|
|
||||||
import cn.hutool.core.util.StrUtil;
|
import cn.hutool.core.util.StrUtil;
|
||||||
import co.yixiang.modules.product.domain.YxStoreProductAttrValue;
|
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.ApiModel;
|
||||||
import io.swagger.annotations.ApiModelProperty;
|
import io.swagger.annotations.ApiModelProperty;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
@ -78,15 +80,19 @@ public class YxStoreProductQueryVo implements Serializable {
|
|||||||
private String cateId;
|
private String cateId;
|
||||||
|
|
||||||
@ApiModelProperty(value = "商品价格")
|
@ApiModelProperty(value = "商品价格")
|
||||||
|
@JsonSerialize(using = BigDecimalSerializer.class)
|
||||||
private BigDecimal price;
|
private BigDecimal price;
|
||||||
|
|
||||||
@ApiModelProperty(value = "会员价格")
|
@ApiModelProperty(value = "会员价格")
|
||||||
|
@JsonSerialize(using = BigDecimalSerializer.class)
|
||||||
private BigDecimal vipPrice;
|
private BigDecimal vipPrice;
|
||||||
|
|
||||||
@ApiModelProperty(value = "市场价")
|
@ApiModelProperty(value = "市场价")
|
||||||
|
@JsonSerialize(using = BigDecimalSerializer.class)
|
||||||
private BigDecimal otPrice;
|
private BigDecimal otPrice;
|
||||||
|
|
||||||
@ApiModelProperty(value = "邮费")
|
@ApiModelProperty(value = "邮费")
|
||||||
|
@JsonSerialize(using = BigDecimalSerializer.class)
|
||||||
private BigDecimal postage;
|
private BigDecimal postage;
|
||||||
|
|
||||||
@ApiModelProperty(value = "单位名")
|
@ApiModelProperty(value = "单位名")
|
||||||
@ -108,6 +114,7 @@ public class YxStoreProductQueryVo implements Serializable {
|
|||||||
private Integer isPostage;
|
private Integer isPostage;
|
||||||
|
|
||||||
@ApiModelProperty(value = "成本价")
|
@ApiModelProperty(value = "成本价")
|
||||||
|
@JsonSerialize(using = BigDecimalSerializer.class)
|
||||||
private BigDecimal cost;
|
private BigDecimal cost;
|
||||||
|
|
||||||
@ApiModelProperty(value = "秒杀状态 0 未开启 1已开启")
|
@ApiModelProperty(value = "秒杀状态 0 未开启 1已开启")
|
||||||
|
@ -1,5 +1,7 @@
|
|||||||
package co.yixiang.modules.product.vo;
|
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.ApiModel;
|
||||||
import io.swagger.annotations.ApiModelProperty;
|
import io.swagger.annotations.ApiModelProperty;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
@ -44,12 +46,14 @@ public class YxStoreProductRelationQueryVo implements Serializable {
|
|||||||
private Integer isShow;
|
private Integer isShow;
|
||||||
|
|
||||||
@ApiModelProperty(value = "原价")
|
@ApiModelProperty(value = "原价")
|
||||||
|
@JsonSerialize(using = DoubleSerializer.class)
|
||||||
private Double otPrice;
|
private Double otPrice;
|
||||||
|
|
||||||
@ApiModelProperty(value = "父ID")
|
@ApiModelProperty(value = "父ID")
|
||||||
private Integer pid;
|
private Integer pid;
|
||||||
|
|
||||||
@ApiModelProperty(value = "产品价格")
|
@ApiModelProperty(value = "产品价格")
|
||||||
|
@JsonSerialize(using = DoubleSerializer.class)
|
||||||
private Double price;
|
private Double price;
|
||||||
|
|
||||||
@ApiModelProperty(value = "产品销量")
|
@ApiModelProperty(value = "产品销量")
|
||||||
|
Reference in New Issue
Block a user