限时特价新增是否参与积分抵扣字段

kmall-admin/src/main/java/com/kmall/admin/dto/TemporaryPromotionalItemsDto.java

@@ -13,12 +13,16 @@ public class TemporaryPromotionalItemsDto implements Serializable {
     private static final long serialVersionUID = 1L;
 
     private String storeId; // 门店编号
-    private String goodsSn; // 商品编码
+    private String sku; // 商品编码
     private String barCode; // 商品条码
     private String goodsName; // 产品名称
     private String goodsEnglishName; // 产品英文名称
     private String daliyPrice; // 日常价格
     private String activitiesPrice; // 活动价格
+    /**
+     * 是否参与积分抵扣，0：参与 1：不参与
+     */
+    private String rejectScore;
     private String deadline; // 截止日期
 
 
@@ -30,12 +34,12 @@ public class TemporaryPromotionalItemsDto implements Serializable {
         this.storeId = storeId;
     }
 
-    public String getGoodsSn() {
-        return goodsSn;
+    public String getSku() {
+        return sku;
     }
 
-    public void setGoodsSn(String goodsSn) {
-        this.goodsSn = goodsSn;
+    public void setSku(String sku) {
+        this.sku = sku;
     }
 
     public String getBarCode() {
@@ -85,4 +89,12 @@ public class TemporaryPromotionalItemsDto implements Serializable {
     public void setDeadline(String deadline) {
         this.deadline = deadline;
     }
+
+    public String getRejectScore() {
+        return rejectScore;
+    }
+
+    public void setRejectScore(String rejectScore) {
+        this.rejectScore = rejectScore;
+    }
 }

kmall-admin/src/main/java/com/kmall/admin/entity/MkActivitiesPromotionEntity.java

@@ -32,9 +32,9 @@ public class MkActivitiesPromotionEntity implements Serializable {
      */
     private String shopSn;
     /**
-     * 商品编码
+     * sku
      */
-    private String goodsSn;
+    private String sku;
     /**
      * 条形码
      */
@@ -51,6 +51,12 @@ public class MkActivitiesPromotionEntity implements Serializable {
      * 营销活动编号
      */
     private Long mkaId;
+
+    /**
+     * 是否与积分抵扣互斥，0:不互斥 1:互斥
+     */
+    private String rejectScore;
+
     /**
      * 截止日期
      */
@@ -124,19 +130,15 @@ public class MkActivitiesPromotionEntity implements Serializable {
     public String getShopSn() {
         return shopSn;
     }
-    /**
-     * 设置：商品编码
-     */
-    public void setGoodsSn(String goodsSn) {
-        this.goodsSn = goodsSn;
+
+    public String getSku() {
+        return sku;
     }
 
-    /**
-     * 获取：商品编码
-     */
-    public String getGoodsSn() {
-        return goodsSn;
+    public void setSku(String sku) {
+        this.sku = sku;
     }
+
     /**
      * 设置：条形码
      */
@@ -189,6 +191,15 @@ public class MkActivitiesPromotionEntity implements Serializable {
     public Long getMkaId() {
         return mkaId;
     }
+
+    public String getRejectScore() {
+        return rejectScore;
+    }
+
+    public void setRejectScore(String rejectScore) {
+        this.rejectScore = rejectScore;
+    }
+
     /**
      * 设置：截止日期
      */

kmall-admin/src/main/java/com/kmall/admin/service/impl/MkActivitiesPromotionServiceImpl.java

@@ -83,10 +83,11 @@ public class MkActivitiesPromotionServiceImpl implements MkActivitiesPromotionSe
                 // 校验excel传入的数据
                 ImmutableBiMap.Builder builder = new ImmutableBiMap.Builder();
                 builder.put("storeId", "门店编号");
-                builder.put("goodsSn", "商品编码");
+                builder.put("sku", "商品SKU");
                 builder.put("barCode", "商品条码");
                 builder.put("goodsName", "产品名称");
                 builder.put("goodsEnglishName", "产品英文名称");
+                builder.put("rejectScore", "是否参与积分抵扣");
                 builder.put("activitiesPrice", "活动价格");
                 builder.put("deadline", "截止日期");
 
@@ -105,8 +106,9 @@ public class MkActivitiesPromotionServiceImpl implements MkActivitiesPromotionSe
                 mkActivitiesPromotionEntity.setProductName(temporaryPromotionalItemsDto.getGoodsName()); // 商品名称
                 mkActivitiesPromotionEntity.setActivityPrice(new BigDecimal(temporaryPromotionalItemsDto.getActivitiesPrice())); // 活动价
                 mkActivitiesPromotionEntity.setShopSn(storeId); // 门店编号
-                mkActivitiesPromotionEntity.setGoodsSn(temporaryPromotionalItemsDto.getGoodsSn()); // 商品编号
+                mkActivitiesPromotionEntity.setSku(temporaryPromotionalItemsDto.getSku()); // 商品编号
                 mkActivitiesPromotionEntity.setBarcode(temporaryPromotionalItemsDto.getBarCode()); // 商品条码
+                mkActivitiesPromotionEntity.setRejectScore(temporaryPromotionalItemsDto.getRejectScore());
                 mkActivitiesPromotionEntity.setDeadline(temporaryPromotionalItemsDto.getDeadline());// 商品截止日期
                 mkActivitiesPromotionEntity.setMkaId(Long.parseLong(mkaId));
 

kmall-admin/src/main/java/com/kmall/admin/service/impl/OrderServiceImpl.java

@@ -4031,7 +4031,7 @@ public class OrderServiceImpl implements OrderService {
                 // 限时特价，直接替换实际支付价即可，并且拿特价计算税款
                 mkActivitiesPromotionEntities.forEach(mkActivitiesPromotionEntity -> {
                     String entityBarcode = mkActivitiesPromotionEntity.getBarcode();
-                    String entityGoodsSn = mkActivitiesPromotionEntity.getGoodsSn();
+                    String entityGoodsSn = mkActivitiesPromotionEntity.getSku();
                     BigDecimal activityPrice = mkActivitiesPromotionEntity.getActivityPrice();
                     String shopSn = mkActivitiesPromotionEntity.getShopSn();
                     goodsEntities.forEach(goodsEntity -> {

kmall-admin/src/main/resources/XmlTemplate/TemporaryPromotionalItemsDtoList.xml

@@ -6,12 +6,13 @@
               varType="com.kmall.admin.dto.TemporaryPromotionalItemsDto">
             <section startRow="1" endRow="1">
                 <mapping row="1" col="0">TemporaryPromotionalItemsDto.storeId</mapping>
-                <mapping row="1" col="1">TemporaryPromotionalItemsDto.goodsSn</mapping>
+                <mapping row="1" col="1">TemporaryPromotionalItemsDto.sku</mapping>
                 <mapping row="1" col="2">TemporaryPromotionalItemsDto.barCode</mapping>
                 <mapping row="1" col="4">TemporaryPromotionalItemsDto.goodsEnglishName</mapping>
                 <mapping row="1" col="3">TemporaryPromotionalItemsDto.goodsName</mapping>
                 <mapping row="1" col="5">TemporaryPromotionalItemsDto.activitiesPrice</mapping>
-                <mapping row="1" col="6">TemporaryPromotionalItemsDto.deadline</mapping>
+                <mapping row="1" col="6">TemporaryPromotionalItemsDto.rejectScore</mapping>
+                <mapping row="1" col="7">TemporaryPromotionalItemsDto.deadline</mapping>
             </section>
             <loopbreakcondition>
                 <rowcheck offset="0">

kmall-admin/src/main/resources/mybatis/mapper/MkActivitiesPromotionDao.xml

@@ -8,11 +8,12 @@
         <result property="productName" column="product_name"/>
         <result property="activityPrice" column="activity_price"/>
         <result property="shopSn" column="shop_sn"/>
-        <result property="goodsSn" column="goods_sn"/>
+        <result property="sku" column="sku"/>
         <result property="barcode" column="barcode"/>
         <result property="productBrand" column="product_brand"/>
         <result property="productSeries" column="product_series"/>
         <result property="mkaId" column="mka_id"/>
+        <result property="rejectScore" column="reject_score"/>
         <result property="deadline" column="deadline"/>
         <result property="createTime" column="create_time"/>
         <result property="createrSn" column="creater_sn"/>
@@ -26,11 +27,12 @@
 			`product_name`,
 			`activity_price`,
 			`shop_sn`,
-			`goods_sn`,
+			`sku`,
 			`barcode`,
 			`product_brand`,
 			`product_series`,
 			`mka_id`,
+			`reject_score`,
 			`deadline`,
 			`create_time`,
 			`creater_sn`,
@@ -46,11 +48,12 @@
     		`product_name`,
     		`activity_price`,
     		`shop_sn`,
-    		`goods_sn`,
+    		`sku`,
     		`barcode`,
     		`product_brand`,
     		`product_series`,
     		`mka_id`,
+    		`reject_score`,
     		`deadline`,
     		`create_time`,
     		`creater_sn`,
@@ -99,11 +102,12 @@
 			`product_name`,
 			`activity_price`,
 			`shop_sn`,
-			`goods_sn`,
+			`sku`,
 			`barcode`,
 			`product_brand`,
 			`product_series`,
 			`mka_id`,
+			`reject_score`,
 			`deadline`,
 			`create_time`,
 			`creater_sn`,
@@ -113,11 +117,12 @@
 			#{productName},
 			#{activityPrice},
 			#{shopSn},
-			#{goodsSn},
+			#{sku},
 			#{barcode},
 			#{productBrand},
 			#{productSeries},
 			#{mkaId},
+			#{rejectScore},
 			#{deadline},
 			#{createTime},
 			#{createrSn},
@@ -131,11 +136,12 @@
 			<if test="productName != null">`product_name` = #{productName}, </if>
 			<if test="activityPrice != null">`activity_price` = #{activityPrice}, </if>
 			<if test="shopSn != null">`shop_sn` = #{shopSn}, </if>
-			<if test="goodsSn != null">`goods_sn` = #{goodsSn}, </if>
+			<if test="sku != null">`sku` = #{sku}, </if>
 			<if test="barcode != null">`barcode` = #{barcode}, </if>
 			<if test="productBrand != null">`product_brand` = #{productBrand}, </if>
 			<if test="productSeries != null">`product_series` = #{productSeries}, </if>
 			<if test="mkaId != null">`mka_id` = #{mkaId}, </if>
+			<if test="rejectScore != null">`reject_score` = #{rejectScore}, </if>
 			<if test="deadline != null">`deadline` = #{deadline}, </if>
 			<if test="createTime != null">`create_time` = #{createTime}, </if>
 			<if test="createrSn != null">`creater_sn` = #{createrSn}, </if>
@@ -162,11 +168,12 @@
 			`product_name`,
 			`activity_price`,
 			`shop_sn`,
-			`goods_sn`,
+			`sku`,
 			`barcode`,
 			`product_brand`,
 			`product_series`,
 			`mka_id`,
+			`reject_score`,
 			`deadline`,
 			`create_time`,
 			`creater_sn`,
@@ -183,11 +190,12 @@
 			pro.product_name,
 			pro.activity_price,
 			pro.shop_sn,
-			pro.goods_sn,
+			pro.sku,
 			pro.barcode,
 			pro.product_brand,
 			pro.product_series,
 			pro.mka_id,
+			pro.reject_score,
 			pro.deadline,
 			pro.create_time,
 			pro.creater_sn,
@@ -210,11 +218,12 @@
 			product_name,
 			activity_price,
 			shop_sn,
-			goods_sn,
+			sku,
 			barcode,
 			product_brand,
 			product_series,
 			mka_id,
+			reject_score,
 			deadline,
 			create_time,
 			creater_sn,
@@ -226,7 +235,7 @@
 
 
     <update id="updatePriceBySku" >
-		update mk_activities_promotion set activity_price = #{updatePrice} where goods_sn = #{sku}
+		update mk_activities_promotion set activity_price = #{updatePrice} where sku = #{sku}
 		and mka_id = #{mkaId}
 	</update>
 

kmall-admin/src/main/webapp/WEB-INF/page/mk/mkactivitiespromotion.html

@@ -46,8 +46,8 @@
             <Form-item label="活动价格" prop="activityPrice">
                 <i-input v-model="mkActivitiesPromotion.activityPrice" placeholder="活动价格"/>
             </Form-item>
-            <Form-item label="商品编码" prop="goodsSn">
-                <i-input v-model="mkActivitiesPromotion.goodsSn" placeholder="商品编码"/>
+            <Form-item label="sku" prop="sku">
+                <i-input v-model="mkActivitiesPromotion.sku" placeholder="sku"/>
             </Form-item>
             <Form-item label="条形码" prop="barcode">
                 <i-input v-model="mkActivitiesPromotion.barcode" placeholder="条形码"/>
@@ -55,6 +55,9 @@
             <Form-item label="商品品牌" prop="productBrand">
                 <i-input v-model="mkActivitiesPromotion.productBrand" placeholder="商品品牌"/>
             </Form-item>
+            <Form-item label="是否参与积分抵扣" prop="rejectScore">
+                <i-input v-model="mkActivitiesPromotion.rejectScore" placeholder="是否参与积分抵扣，0：参与，1：不参与"/>
+            </Form-item>
             <Form-item label="商品系列" prop="productSeries">
                 <i-input v-model="mkActivitiesPromotion.productSeries" placeholder="商品系列"/>
             </Form-item>

kmall-admin/src/main/webapp/js/mk/mkactivitiespromotion.js

@@ -26,9 +26,18 @@ $(function () {
 			{label: 'mapId', name: 'mapId', index: 'map_id', key: true, hidden: true},
 			{label: '产品中文名', name: 'productName', index: 'product_name', width: 80, align: 'center'},
 			{label: '活动价格', name: 'activityPrice', index: 'activity_price', width: 80, align: 'center'},
-			{label: '商品编码', name: 'goodsSn', index: 'goods_sn', width: 80, align: 'center'},
+			{label: 'sku', name: 'sku', index: 'sku', width: 80, align: 'center'},
 			{label: '条形码', name: 'barcode', index: 'barcode', width: 80, align: 'center'},
 			{label: '商品品牌', name: 'productBrand', index: 'product_brand', width: 80, align: 'center'},
+			{label: '是否参与积分抵扣', name: 'rejectScore', index: 'reject_score', width: 80, align: 'center', formatter:
+				function (value) {
+					if (value === '0') {
+						return "参与";
+					} else {
+						return "不参与";
+					}
+				}
+			},
 			{label: '商品系列', name: 'productSeries', index: 'product_series', width: 80, align: 'center'},
 			{label: '截止日期', name: 'deadline', index: 'deadline', width: 80, align: 'center'}],
 		viewrecords: true,