营销活动-赠送积分 界面开发

kmall-admin/src/main/java/com/kmall/admin/controller/mk/MkActivitiesPresentIntegralController.java

@@ -30,7 +30,7 @@ public class MkActivitiesPresentIntegralController {
      * 查看列表
      */
     @RequestMapping("/list")
-    @RequiresPermissions("mkactivitiespresentintegral:list")
+//    @RequiresPermissions("mkactivitiespresentintegral:list")
     @ResponseBody
     public R list(@RequestParam Map<String, Object> params) {
         //查询列表数据
@@ -48,7 +48,7 @@ public class MkActivitiesPresentIntegralController {
      * 查看信息
      */
     @RequestMapping("/info/{mapId}")
-    @RequiresPermissions("mkactivitiespresentintegral:info")
+//    @RequiresPermissions("mkactivitiespresentintegral:info")
     @ResponseBody
     public R info(@PathVariable("mapId") Long mapId) {
         MkActivitiesPresentIntegralEntity mkActivitiesPresentIntegral = mkActivitiesPresentIntegralService.queryObject(mapId);
@@ -60,31 +60,29 @@ public class MkActivitiesPresentIntegralController {
      * 保存
      */
     @RequestMapping("/save")
-    @RequiresPermissions("mkactivitiespresentintegral:save")
+//    @RequiresPermissions("mkactivitiespresentintegral:save")
     @ResponseBody
     public R save(@RequestBody MkActivitiesPresentIntegralEntity mkActivitiesPresentIntegral) {
-        mkActivitiesPresentIntegralService.save(mkActivitiesPresentIntegral);
-
-        return R.ok();
+        return mkActivitiesPresentIntegralService.save(mkActivitiesPresentIntegral);
     }
 
     /**
      * 修改
      */
     @RequestMapping("/update")
-    @RequiresPermissions("mkactivitiespresentintegral:update")
+//    @RequiresPermissions("mkactivitiespresentintegral:update")
     @ResponseBody
     public R update(@RequestBody MkActivitiesPresentIntegralEntity mkActivitiesPresentIntegral) {
-        mkActivitiesPresentIntegralService.update(mkActivitiesPresentIntegral);
 
-        return R.ok();
+
+        return mkActivitiesPresentIntegralService.update(mkActivitiesPresentIntegral);
     }
 
     /**
      * 删除
      */
     @RequestMapping("/delete")
-    @RequiresPermissions("mkactivitiespresentintegral:delete")
+//    @RequiresPermissions("mkactivitiespresentintegral:delete")
     @ResponseBody
     public R delete(@RequestBody Long[]mapIds) {
         mkActivitiesPresentIntegralService.deleteBatch(mapIds);

kmall-admin/src/main/java/com/kmall/admin/dao/ProductStoreRelaDao.java

@@ -118,6 +118,8 @@ public interface ProductStoreRelaDao extends BaseDao<ProductStoreRelaEntity> {
 
     String queryproductStoreByName(@Param("sku")String sku,@Param("storeId")Long storeId);
 
+    String queryProdBarcode(Map<String,Object> map);
+
     ProductStoreRelaEntity queryByGoodsIdAndStoreIdHkMall(@Param("storeId") Long storeId, @Param("goodsId") Long goodsId);
 
     void updateStockNumberByOutbound(List<StockChangeRecordEntity> outboundList);

kmall-admin/src/main/java/com/kmall/admin/dao/mk/MkActivitiesPresentIntegralDao.java

@@ -3,6 +3,8 @@ package com.kmall.admin.dao.mk;
 import com.kmall.admin.entity.mk.MkActivitiesPresentIntegralEntity;
 import com.kmall.manager.dao.BaseDao;
 
+import java.util.List;
+
 /**
  * 营销活动-赠送积分Dao
  *
@@ -11,5 +13,5 @@ import com.kmall.manager.dao.BaseDao;
  * @date 2022-04-14 10:20:48
  */
 public interface MkActivitiesPresentIntegralDao extends BaseDao<MkActivitiesPresentIntegralEntity> {
-
+    List<MkActivitiesPresentIntegralEntity> list(MkActivitiesPresentIntegralEntity mkActivitiesPresentIntegralEntity);
 }

kmall-admin/src/main/java/com/kmall/admin/entity/mk/MkActivitiesPresentIntegralEntity.java

@@ -1,5 +1,8 @@
 package com.kmall.admin.entity.mk;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
@@ -66,6 +69,8 @@ public class MkActivitiesPresentIntegralEntity implements Serializable {
     /**
      * 创建时间
      */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createTime;
     /**
      * 创建人编号
@@ -78,6 +83,8 @@ public class MkActivitiesPresentIntegralEntity implements Serializable {
     /**
      * 修改时间
      */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date updateTime;
 
     /**

kmall-admin/src/main/java/com/kmall/admin/service/impl/mk/MkActivitiesPresentIntegralServiceImpl.java

@@ -2,12 +2,19 @@ package com.kmall.admin.service.impl.mk;
 
 import com.kmall.admin.dao.mk.MkActivitiesPresentIntegralDao;
 import com.kmall.admin.entity.mk.MkActivitiesPresentIntegralEntity;
+import com.kmall.admin.fromcomm.entity.SysUserEntity;
+import com.kmall.admin.haikong.task.MemberSysAccessTokenRefreshTask;
 import com.kmall.admin.service.mk.MkActivitiesPresentIntegralService;
+import com.kmall.admin.service.vip.Mall2PointsRulesService;
+import com.kmall.admin.utils.ShiroUtils;
+import com.kmall.admin.utils.jackson.JacksonUtil;
+import com.kmall.common.utils.R;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * 营销活动-赠送积分Service实现类
@@ -18,8 +25,11 @@ import java.util.Map;
  */
 @Service("mkActivitiesPresentIntegralService")
 public class MkActivitiesPresentIntegralServiceImpl implements MkActivitiesPresentIntegralService {
+    private static final Logger log = LoggerFactory.getLogger(MkActivitiesPresentIntegralServiceImpl.class);
     @Autowired
     private MkActivitiesPresentIntegralDao mkActivitiesPresentIntegralDao;
+    @Autowired
+    private Mall2PointsRulesService mall2PointsRulesService;
 
     @Override
     public MkActivitiesPresentIntegralEntity queryObject(Long mapId) {
@@ -37,13 +47,71 @@ public class MkActivitiesPresentIntegralServiceImpl implements MkActivitiesPrese
     }
 
     @Override
-    public int save(MkActivitiesPresentIntegralEntity mkActivitiesPresentIntegral) {
-        return mkActivitiesPresentIntegralDao.save(mkActivitiesPresentIntegral);
+    public R save(MkActivitiesPresentIntegralEntity mkActivitiesPresentIntegral) {
+        log.debug("添加营销活动-赠送积分数据:{}", JacksonUtil.toJson(mkActivitiesPresentIntegral));
+        SysUserEntity userEntity = ShiroUtils.getUserEntity();
+        log.debug("添加营销活动-赠送积分操作人信息:{}", JacksonUtil.toJson(userEntity));
+        // sku，条码，门店id查询如果有则说明添加过一次
+        MkActivitiesPresentIntegralEntity query = new MkActivitiesPresentIntegralEntity();
+        query.setSku(mkActivitiesPresentIntegral.getSku());
+        query.setMkaId(mkActivitiesPresentIntegral.getMkaId());
+//        query.setShopSn(Integer.toString(userEntity.getStoreId()));
+        List<MkActivitiesPresentIntegralEntity> list = mkActivitiesPresentIntegralDao.list(query);
+        if (!list.isEmpty()){
+            return R.error("该赠送积分活动sku:"+mkActivitiesPresentIntegral.getSku()+"已添加过,请进行更新操作");
+        }
+        // 校验sku 条码的准确性
+        Map<String, Object> map = new HashMap<>();
+        map.put("sku",mkActivitiesPresentIntegral.getSku());
+        map.put("mkaId",mkActivitiesPresentIntegral.getMkaId());
+        String prodBarcode = mall2PointsRulesService.queryProdBarcode(map);
+        if (Objects.isNull(prodBarcode)){
+            return R.error("该门店没有sku:"+mkActivitiesPresentIntegral.getSku());
+        }
+        mkActivitiesPresentIntegral.setBarcode(prodBarcode);
+//        mkActivitiesPresentIntegral.setShopSn(Integer.toString(userEntity.getStoreId()));
+        mkActivitiesPresentIntegral.setCreateTime(new Date());
+        mkActivitiesPresentIntegral.setUpdateTime(new Date());
+        log.debug("添加营销活动-赠送积分数据:{}",JacksonUtil.toJson(mkActivitiesPresentIntegral));
+        int save = mkActivitiesPresentIntegralDao.save(mkActivitiesPresentIntegral);
+        if (save <=0){
+            return R.error("添加错误");
+        }
+        return R.ok();
     }
 
     @Override
-    public int update(MkActivitiesPresentIntegralEntity mkActivitiesPresentIntegral) {
-        return mkActivitiesPresentIntegralDao.update(mkActivitiesPresentIntegral);
+    public R update(MkActivitiesPresentIntegralEntity mkActivitiesPresentIntegral) {
+        log.debug("修改营销活动-赠送积分数据:{}", JacksonUtil.toJson(mkActivitiesPresentIntegral));
+        SysUserEntity userEntity = ShiroUtils.getUserEntity();
+        log.debug("修改营销活动-赠送积分操作人信息:{}", JacksonUtil.toJson(userEntity));
+        // sku，条码，门店id查询如果有则说明添加过一次
+        MkActivitiesPresentIntegralEntity query = new MkActivitiesPresentIntegralEntity();
+        query.setSku(mkActivitiesPresentIntegral.getSku());
+        query.setMkaId(mkActivitiesPresentIntegral.getMkaId());
+//        query.setShopSn(Integer.toString(userEntity.getStoreId()));
+        List<MkActivitiesPresentIntegralEntity> list = mkActivitiesPresentIntegralDao.list(query);
+        if (!list.isEmpty()){
+            return R.error("该赠送积分活动sku:"+mkActivitiesPresentIntegral.getSku()+"已存在！");
+        }
+        // 校验sku 条码的准确性
+        Map<String, Object> map = new HashMap<>();
+        map.put("sku",mkActivitiesPresentIntegral.getSku());
+        map.put("mkaId",mkActivitiesPresentIntegral.getMkaId());
+        String prodBarcode = mall2PointsRulesService.queryProdBarcode(map);
+        if (Objects.isNull(prodBarcode)){
+            return R.error("该门店没有sku:"+mkActivitiesPresentIntegral.getSku());
+        }
+        mkActivitiesPresentIntegral.setBarcode(prodBarcode);
+//        mkActivitiesPresentIntegral.setShopSn(Integer.toString(userEntity.getStoreId()));
+        mkActivitiesPresentIntegral.setCreateTime(new Date());
+        mkActivitiesPresentIntegral.setUpdateTime(new Date());
+        log.debug("修改营销活动-赠送积分数据:{}",JacksonUtil.toJson(mkActivitiesPresentIntegral));
+        int update = mkActivitiesPresentIntegralDao.update(mkActivitiesPresentIntegral);
+        if (update <=0){
+            return R.error("更新错误");
+        }
+        return R.ok();
     }
 
     @Override

kmall-admin/src/main/java/com/kmall/admin/service/impl/vip/Mall2PointsRulesServiceImpl.java

@@ -277,6 +277,11 @@ public class Mall2PointsRulesServiceImpl implements Mall2PointsRulesService {
         return mall2PointsRulesDao.queryListBy(mall2PointsRulesDto);
     }
 
+    @Override
+    public String queryProdBarcode(Map<String, Object> map) {
+        return productStoreRelaDao.queryProdBarcode(map);
+    }
+
     /**
      * 导入参数校验
      * @param mall2RulesDto

kmall-admin/src/main/java/com/kmall/admin/service/mk/MkActivitiesPresentIntegralService.java

@@ -1,6 +1,7 @@
 package com.kmall.admin.service.mk;
 
 import com.kmall.admin.entity.mk.MkActivitiesPresentIntegralEntity;
+import com.kmall.common.utils.R;
 
 import java.util.List;
 import java.util.Map;
@@ -44,7 +45,7 @@ public interface MkActivitiesPresentIntegralService {
      * @param mkActivitiesPresentIntegral 实体
      * @return 保存条数
      */
-    int save(MkActivitiesPresentIntegralEntity mkActivitiesPresentIntegral);
+    R save(MkActivitiesPresentIntegralEntity mkActivitiesPresentIntegral);
 
     /**
      * 根据主键更新实体
@@ -52,7 +53,7 @@ public interface MkActivitiesPresentIntegralService {
      * @param mkActivitiesPresentIntegral 实体
      * @return 更新条数
      */
-    int update(MkActivitiesPresentIntegralEntity mkActivitiesPresentIntegral);
+    R update(MkActivitiesPresentIntegralEntity mkActivitiesPresentIntegral);
 
     /**
      * 根据主键删除

kmall-admin/src/main/java/com/kmall/admin/service/vip/Mall2PointsRulesService.java

@@ -107,4 +107,6 @@ public interface Mall2PointsRulesService {
      */
     List<PointsRulesAndDetailVO> queryList(Mall2PointsRulesDto mall2PointsRulesDto);
 
+    String queryProdBarcode(Map<String,Object> map);
+
 }

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

@@ -958,6 +958,25 @@
         where a.sku = #{sku} and a.store_id= #{storeId}
     </select>
 
+    <select id="queryProdBarcode" resultType="java.lang.String" parameterType="java.util.Map">
+        select g.prod_barcode
+        from mall_product_store_rela r
+        left join mall_goods g on r.sku = g.sku
+        left join mk_activities a on a.mka_store_id = r.store_id
+        <where>
+            <if test="sku != null">
+                and r.sku=#{sku}
+            </if>
+            <if test="storeId != null">
+                and r.store_id=#{storeId}
+            </if>
+            <if test="mkaId != null">
+                and a.mka_id=#{mkaId}
+            </if>
+        </where>
+
+    </select>
+
     <!--批量修改-->
     <update id="updateProductStoreRela" parameterType="list">
         update mall_product_store_rela

kmall-admin/src/main/resources/mybatis/mapper/mk/MkActivitiesPresentIntegralDao.xml

@@ -67,6 +67,12 @@
 		<if test="name != null and name.trim() != ''">
 			AND name LIKE concat('%',#{name},'%')
 		</if>
+		<if test="sku != null and sku != ''">
+			AND sku =#{sku}
+		</if>
+		<if test="activityGiveType != null and activityGiveType != ''">
+			AND activity_give_type =#{activityGiveType}
+		</if>
         <choose>
             <when test="sidx != null and sidx.trim() != ''">
                 order by ${sidx} ${order}
@@ -156,4 +162,39 @@
 		</foreach>
 	</delete>
 
+	<select id="list" parameterType="com.kmall.admin.entity.mk.MkActivitiesPresentIntegralEntity" resultMap="mkActivitiesPresentIntegralMap">
+		select
+			`map_id`,
+			`product_name`,
+			`activity_give_type`,
+			`activity_give_num`,
+			`shop_sn`,
+			`sku`,
+			`barcode`,
+			`product_brand`,
+			`product_series`,
+			`mka_id`,
+			`reject_score`,
+			`deadline`,
+			`create_time`,
+			`creater_sn`,
+			`moder_sn`,
+			`update_time`
+		from mk_activities_present_integral
+		<where>
+			<if test="mapId != null">
+				and map_id=#{mapId}
+			</if>
+			<if test="shopSn != null">
+				and shop_sn=#{shopSn}
+			</if>
+			<if test="sku != null">
+				and sku=#{sku}
+			</if>
+			<if test="mkaId != null">
+				and mka_id=#{mkaId}
+			</if>
+		</where>
+	</select>
+
 </mapper>

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

@@ -10,21 +10,20 @@
         <Row :gutter="16">
             <div class="search-group">
                 <i-col span="4">
-                    <i-input v-model="q.name" @on-enter="query" placeholder="名称"/>
+                    <i-input v-model="q.sku" @on-enter="query" placeholder="sku"/>
+                </i-col>
+                <i-col span="4">
+                    <i-select v-model="q.activityGiveType" @on-enter="query"  placeholder="赠送方式">
+                        <i-option v-for="activityGiveType in activityGiveTypes" :value="activityGiveType.value" :key="activityGiveType.value">{{activityGiveType.name}}</i-option>
+                    </i-select>
                 </i-col>
                 <i-button @click="query">查询</i-button>
                 <i-button @click="reloadSearch">重置</i-button>
             </div>
             <div class="buttons-group">
-                #if($shiro.hasPermission("mkactivitiespresentintegral:save"))
                 <i-button type="info" @click="add"><i class="fa fa-plus"></i>&nbsp;新增</i-button>
-                #end
-                #if($shiro.hasPermission("mkactivitiespresentintegral:update"))
                 <i-button type="warning" @click="update"><i class="fa fa-pencil-square-o"></i>&nbsp;修改</i-button>
-                #end
-                #if($shiro.hasPermission("mkactivitiespresentintegral:delete"))
                 <i-button type="error" @click="del"><i class="fa fa-trash-o"></i>&nbsp;删除</i-button>
-                #end
                 <i-button type="warning" @click="reloadMkactivities" v-show="!isMkactivitiesShow">返回营销方式页</i-button>
             </div>
         </Row>
@@ -38,37 +37,34 @@
             <Form-item label="产品中文名" prop="productName">
                 <i-input v-model="mkActivitiesPresentIntegral.productName" placeholder="产品中文名"/>
             </Form-item>
-            <Form-item label="赠送方式- 1 ：固定值 2：倍率" prop="activityGiveType">
-                <i-select v-model="mkActivitiesPresentIntegral.activityGiveType" filterable placeholder="赠送方式-1 ：固定值 2：倍率" label-in-value>
-                    <i-option v-for="activityGiveType in activityGiveTypes" :value="activityGiveType.id" :key="activityGiveType.id">{{activityGiveType.name}}</i-option>
-                </i-select>
-            </Form-item>
             <Form-item label="赠送方式" prop="activityGiveType" >
                 <i-select v-model="mkActivitiesPresentIntegral.activityGiveType" filterable placeholder="赠送方式" label-in-value>
-                    <i-option v-for="activityGiveType in activityGiveTypes" :value="activityGiveType.id" :key="activityGiveType.id">{{activityGiveType.name}}</i-option>
+                    <i-option v-for="activityGiveType in activityGiveTypes" :value="activityGiveType.value" :key="activityGiveType.value">{{activityGiveType.name}}</i-option>
                 </i-select>
             </Form-item>
 
             <Form-item label="赠送数值" prop="activityGiveNum">
-                <i-input v-model="mkActivitiesPresentIntegral.activityGiveNum" placeholder="赠送数值"/>
+                <i-input type="number" v-model="mkActivitiesPresentIntegral.activityGiveNum" placeholder="赠送数值"/>
             </Form-item>
             <Form-item label="商品sku" prop="sku">
                 <i-input v-model="mkActivitiesPresentIntegral.sku" placeholder="商品sku"/>
             </Form-item>
-            <Form-item label="条形码" prop="barcode">
-                <i-input v-model="mkActivitiesPresentIntegral.barcode" placeholder="条形码"/>
-            </Form-item>
+<!--            <Form-item label="条形码" prop="barcode">-->
+<!--                <i-input v-model="mkActivitiesPresentIntegral.barcode" placeholder="条形码"/>-->
+<!--            </Form-item>-->
             <Form-item label="商品品牌" prop="productBrand">
                 <i-input v-model="mkActivitiesPresentIntegral.productBrand" placeholder="商品品牌"/>
             </Form-item>
             <Form-item label="商品系列" prop="productSeries">
                 <i-input v-model="mkActivitiesPresentIntegral.productSeries" placeholder="商品系列"/>
             </Form-item>
-            <Form-item label="是否与积分抵扣互斥，0:不互斥 1:互斥" prop="rejectScore">
-                <i-input v-model="mkActivitiesPresentIntegral.rejectScore" placeholder="是否与积分抵扣互斥，0:不互斥 1:互斥"/>
+            <Form-item label="是否与积分抵扣互斥" prop="rejectScore">
+                <i-select v-model="mkActivitiesPresentIntegral.rejectScore" filterable placeholder="是否与积分抵扣互斥" label-in-value>
+                    <i-option v-for="rejectScore in rejectScores" :value="rejectScore.value" :key="rejectScore.value">{{rejectScore.name}}</i-option>
+                </i-select>
             </Form-item>
             <Form-item label="截止日期" prop="deadline">
-                <i-input v-model="mkActivitiesPresentIntegral.deadline" placeholder="截止日期"/>
+                <i-input type="date" v-model="mkActivitiesPresentIntegral.deadline" placeholder="截止日期"/>
             </Form-item>
             <Form-item>
                 <i-button type="primary" @click="handleSubmit('formValidate')">提交</i-button>

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

@@ -23,21 +23,33 @@ $(function () {
         datatype: "json",
         colModel: [
 			{label: 'mapId', name: 'mapId', index: 'map_id', key: true, hidden: true},
-			{label: '产品中文名', name: 'productName', index: 'product_name', width: 80},
-			{label: '赠送方式- 1 ：固定值 2：倍率', name: 'activityGiveType', index: 'activity_give_type', width: 80},
-			{label: '赠送数值', name: 'activityGiveNum', index: 'activity_give_num', width: 80},
-			{label: '门店编号', name: 'shopSn', index: 'shop_sn', width: 80},
-			{label: '商品sku', name: 'sku', index: 'sku', width: 80},
-			{label: '条形码', name: 'barcode', index: 'barcode', width: 80},
-			{label: '商品品牌', name: 'productBrand', index: 'product_brand', width: 80},
-			{label: '商品系列', name: 'productSeries', index: 'product_series', width: 80},
-			{label: '营销活动编号', name: 'mkaId', index: 'mka_id', width: 80},
-			{label: '是否与积分抵扣互斥，0:不互斥 1:互斥', name: 'rejectScore', index: 'reject_score', width: 80},
-			{label: '截止日期', name: 'deadline', index: 'deadline', width: 80},
-			{label: '创建时间', name: 'createTime', index: 'create_time', width: 80},
-			{label: '创建人编号', name: 'createrSn', index: 'creater_sn', width: 80},
-			{label: '修改人编号', name: 'moderSn', index: 'moder_sn', width: 80},
-			{label: '修改时间', name: 'updateTime', index: 'update_time', width: 80}],
+			{label: '产品中文名', name: 'productName', index: 'product_name', width: 80,align: 'center'},
+			{label: '赠送方式', name: 'activityGiveType', index: 'activity_give_type', width: 80,align: 'center',
+				formatter: function (value) {
+					if (value == '1') {
+						return '固定值';
+					} else if (value == '2') {
+						return '倍率';
+					}
+					return '-';
+				}},
+			{label: '赠送数值', name: 'activityGiveNum', index: 'activity_give_num', 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: 'productSeries', index: 'product_series', width: 80,align: 'center'},
+			// {label: '营销活动编号', name: 'mkaId', index: 'mka_id', width: 80},
+			{label: '是否与积分抵扣互斥', name: 'rejectScore', index: 'reject_score', width: 80,align: 'center',
+				formatter: function (value) {
+					if (value == '0') {
+						return '不互斥';
+					} else if (value == '1') {
+						return '互斥';
+					}
+					return '-';
+				}},
+			{label: '截止日期', name: 'deadline', index: 'deadline', width: 80,align: 'center'},
+			{label: '创建时间', name: 'createTime', index: 'deadline', width: 80,align: 'center'}],
 		viewrecords: true,
         height: 550,
         rowNum: 10,
@@ -76,14 +88,15 @@ let vm = new Vue({
 			]
 		},
 		q: {
-		    name: ''
+		    sku: ''
 		},
 		isMkactivitiesShow: true,
 		mkCode: '',
 		uploadData:[],
 		storeId : '',
 		mkaId : '',
-		activityGiveTypes:{}
+		activityGiveTypes:{},
+		rejectScores:{}
 	},
 	methods: {
 		query: function () {
@@ -106,6 +119,9 @@ let vm = new Vue({
 		},
 		saveOrUpdate: function (event) {
             let url = vm.mkActivitiesPresentIntegral.mapId == null ? "../mkactivitiespresentintegral/save" : "../mkactivitiespresentintegral/update";
+            vm.mkActivitiesPresentIntegral.mkaId=vm.mkaId;
+            vm.mkActivitiesPresentIntegral.shop_sn=vm.storeId;
+
 			$.ajax({
 				type: "POST",
 			    url: url,
@@ -161,7 +177,7 @@ let vm = new Vue({
 			vm.showList = true;
             let page = $("#jqGrid").jqGrid('getGridParam', 'page');
 			$("#jqGrid").jqGrid('setGridParam', {
-                postData: {'name': vm.q.name},
+                postData: {'sku': vm.q.sku,'activityGiveType':vm.q.activityGiveType},
                 page: page
             }).trigger("reloadGrid");
             vm.handleReset('formValidate');
@@ -183,5 +199,8 @@ let vm = new Vue({
 		$.get("../sys/macro/queryMacrosByValue?value=activityGiveType", function (r) {
 			vm.activityGiveTypes = r.list;
 		});
+		$.get("../sys/macro/queryMacrosByValue?value=rejectScore", function (r) {
+			vm.rejectScores = r.list;
+		});
 	}
 });