Explorar el Código

bugfix订单结算-是否是赠品

chao hace 3 años
padre
commit
051bd67f77

+ 4 - 0
src/main/java/com/caimei365/order/model/vo/CartItemVo.java

@@ -90,6 +90,10 @@ public class CartItemVo implements Serializable {
      * 发票类型(基于是否含税基础) 1增值税票,2普通票, 3不能开票
      */
     private Integer invoiceType;
+    /**
+     * 是否是赠品 2是,其他否
+     */
+    private Integer productType;
     /**
      * 商品是否处于活动状态 1是 0否
      */

+ 1 - 0
src/main/resources/mapper/BaseMapper.xml

@@ -112,6 +112,7 @@
         p.mainImage AS image,
         cpg.number AS number,
         0 AS price,
+        2 as productType,
         p.price1 AS originalPrice,
         p.unit AS unit,
         p.stock AS stock,