1. 订单表修改

eladmin-system/src/main/java/cn/ysk/cashier/pojo/order/TbOrderInfo.java

@@ -246,9 +246,11 @@ public class TbOrderInfo implements Serializable {
     // 使用的积分数量
     private Integer pointsNum;
     // 用户优惠券id
-    private String activateInInfoList;
+    private String userCouponInfoList;
     // 优惠券折扣金额
-    private BigDecimal activateInDiscountAmount;
+    private BigDecimal productCouponDiscountAmount;
+    // 满减抵扣金额
+    private BigDecimal fullCouponDiscountAmount;
 
     public void copy(TbOrderInfo source){
         BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));