Merge remote-tracking branch 'upsteam/master'

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

@@ -23,7 +23,6 @@ public class TemporaryPromotionalItemsDto implements Serializable {
      * 是否参与积分抵扣，0：参与 1：不参与
      */
     private String rejectScore;
-    private String deadline; // 截止日期
 
 
     public String getStoreId() {
@@ -82,14 +81,6 @@ public class TemporaryPromotionalItemsDto implements Serializable {
         this.activitiesPrice = activitiesPrice;
     }
 
-    public String getDeadline() {
-        return deadline;
-    }
-
-    public void setDeadline(String deadline) {
-        this.deadline = deadline;
-    }
-
     public String getRejectScore() {
         return rejectScore;
     }

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

@@ -89,7 +89,6 @@ public class MkActivitiesPromotionServiceImpl implements MkActivitiesPromotionSe
                 builder.put("goodsEnglishName", "产品英文名称");
                 builder.put("rejectScore", "是否参与积分抵扣");
                 builder.put("activitiesPrice", "活动价格");
-                builder.put("deadline", "截止日期");
 
                 R r = ValidatorUtil.isEmpty(builder.build(), valideDate);
                 if (Integer.valueOf(r.get("code").toString()) != 0) {
@@ -109,7 +108,6 @@ public class MkActivitiesPromotionServiceImpl implements MkActivitiesPromotionSe
                 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/resources/XmlTemplate/TemporaryPromotionalItemsDtoList.xml

@@ -12,7 +12,6 @@
                 <mapping row="1" col="3">TemporaryPromotionalItemsDto.goodsName</mapping>
                 <mapping row="1" col="5">TemporaryPromotionalItemsDto.activitiesPrice</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/webapp/js/mk/mkactivityform.js

@@ -122,7 +122,7 @@ $(function () {
                     return '';
                 }
             },*/
-            {label: '提前结束时间', name: 'mkdEndEarlyTime', index: 'mkd_end_early_time', width: 200, align: 'center'}
+            // {label: '提前结束时间', name: 'mkdEndEarlyTime', index: 'mkd_end_early_time', width: 200, align: 'center'}
             ],
         viewrecords: true,
         height: '100%',

kmall-admin/src/main/webapp/js/sale/sale.js

@@ -620,7 +620,8 @@ let vm = new Vue({
         // 会员openid
         openId: '',
         // 是否点击了加号或减号的标识
-        clickFlag: false
+        clickFlag: false,
+        deleteFlag: false
     },
     watch: {
         prodBarcode (){
@@ -833,6 +834,8 @@ let vm = new Vue({
             console.log(value);
         },
         deleteItem:function(value){
+            vm.deleteFlag = true;
+            vm.clickFlag = true;
             // 删除这条记录
             for(var i = 0 ; i < this.goodsList.length ; i++){
                 if(this.goodsList[i].id == value){
@@ -966,7 +969,7 @@ let vm = new Vue({
             console.log("vm.clickFlag==>" + vm.clickFlag);
             if (vm.clickFlag) {
                 let value = vm.$refs.couponBarCode.value;
-                if (value != null || value != "" || value != 'undefined') {
+                if (value != null || value != "" || value != 'undefined' || vm.deleteFlag) {
                     alert("请重新计算优惠价再提交订单！");
                     return;
                 }