diff --git a/sql/3.1升级3.2sql.sql b/sql/3.1升级3.2sql.sql index 09cfddc2..489bef6d 100644 --- a/sql/3.1升级3.2sql.sql +++ b/sql/3.1升级3.2sql.sql @@ -6,5 +6,6 @@ ALTER TABLE yx_store_product ADD COLUMN is_integral tinyint(1) ZEROFILL NULL DEFAULT 0 COMMENT '是开启积分兑换' AFTER is_del; ALTER TABLE yx_store_product_attr_value ADD COLUMN integral INT(10) DEFAULT 0 COMMENT '需要多少积分兑换' AFTER seckill_price; +ALTER TABLE yx_store_order ADD COLUMN `pay_integral` decimal(8, 2) UNSIGNED NOT NULL DEFAULT 0.00 COMMENT '支付积分'; diff --git a/yshop-mall/src/main/java/co/yixiang/modules/order/domain/YxStoreOrder.java b/yshop-mall/src/main/java/co/yixiang/modules/order/domain/YxStoreOrder.java index 4477eb16..fe374b11 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/order/domain/YxStoreOrder.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/order/domain/YxStoreOrder.java @@ -11,6 +11,7 @@ import co.yixiang.domain.BaseDomain; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -236,6 +237,8 @@ public class YxStoreOrder extends BaseDomain { private Integer isSystemDel; + @ApiModelProperty(value = "实际支付积分") + private BigDecimal payIntegral; public void copy(YxStoreOrder source){ BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true)); diff --git a/yshop-mall/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java b/yshop-mall/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java index edd660aa..d6900385 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java @@ -1442,8 +1442,10 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl