Merge remote-tracking branch 'origin/master'

fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue

@@ -637,6 +637,10 @@ export default {
         courtesyReward:[],
         activeNewlywedsChildList:[],
       }
+      this.form.tableDatas = []
+      this.tableDatas = []
+      this.pdidlist = []
+      this.pddhidlist = []
     },
     qrcodelook(url) {
       this.loadingdialog = true

fuintAdmin/src/views/EventMarketing/activeRecommend/index.vue

@@ -10,12 +10,12 @@
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
-        <el-form-item label="状态">
+<!--        <el-form-item label="状态">-->
-          <el-select v-model="queryParams.status" clearable placeholder="请选择活动状态">
+<!--          <el-select v-model="queryParams.status" clearable placeholder="请选择活动状态">-->
-            <el-option label="启用" value="0"></el-option>
+<!--            <el-option label="启用" value="0"></el-option>-->
-            <el-option label="禁用" value="1"></el-option>
+<!--            <el-option label="禁用" value="1"></el-option>-->
-          </el-select>
+<!--          </el-select>-->
-        </el-form-item>
+<!--        </el-form-item>-->
         <el-form-item label="是否在线" prop="isonline">
           <el-select v-model="queryParams.isonline" clearable placeholder="请选择是否在线">
             <el-option label="在线" value="0"></el-option>
@@ -56,8 +56,9 @@
         </el-table-column>
         <el-table-column label="活动状态 " align="center" prop="status" >
           <template slot-scope="scope">
-            <span style="cursor: pointer;" @click="qiyong(scope.row)" v-if="scope.row.status == 0"> <el-tag>启用</el-tag > </span>
+            <span style="cursor: pointer;"  v-if="scope.row.status == 0"> <el-tag>进行中</el-tag > </span>
-            <span style="cursor: pointer;" @click="jinyong(scope.row)" v-if="scope.row.status == 1"> <el-tag type="danger">禁用</el-tag>  </span>
+            <span style="cursor: pointer;"  v-if="scope.row.status == 1"> <el-tag type="danger">待生效</el-tag>  </span>
+            <span style="cursor: pointer;"  v-if="scope.row.status == 2"> <el-tag type="danger">已结束</el-tag>  </span>
           </template>
         </el-table-column>
         <el-table-column label="赠送积分" align="center" prop="adaptUserType" >
@@ -114,7 +115,7 @@
         :total="total"
         :page.sync="queryParams.pageNum"
         :limit.sync="queryParams.pageSize"
-        @pagination="getList"
+        @pagination="getactivelist"
       />
 
     </el-card>
@@ -786,7 +787,7 @@ export default {
     getactivelist(){
       this.loading = true;
       listActiveRecommend(this.queryParams).then(res=>{
-        console.log(res)
+        console.log(res,111)
         this.zList = res.data.records
         this.total = res.data.total
         this.loading = false;
@@ -1052,7 +1053,8 @@ export default {
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;
-      this.getList();
+      this.getactivelist();
+      // this.getList();
     },
     /** 重置按钮操作 */
     resetQuery() {
@@ -1112,6 +1114,7 @@ export default {
 
         let data = response.data
         data.isonline = 1
+        data.status = 2
         updateActiveRecommend(data).then(response => {
           this.$modal.msgSuccess("下线成功");
 

fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeDiscount/service/impl/ActiveDiscountServiceImpl.java

@@ -168,8 +168,8 @@ public class ActiveDiscountServiceImpl extends ServiceImpl<ActiveDiscountMapper,
                 activeDiscountVO.setDieselUserLevel(str.split(","));
             }
             activeDiscountVO.setActiveDiscountChildList(activeDiscountChildList);
-            TAccount accountInfoById = accountService.getAccountInfoById(Integer.parseInt(s.getCreateBy()));
+//            TAccount accountInfoById = accountService.getAccountInfoById(Integer.parseInt(s.getCreateBy()));
-            if (ObjectUtil.isNotEmpty(accountInfoById)) activeDiscountVO.setCreateBy(accountInfoById.getRealName());
+//            if (ObjectUtil.isNotEmpty(accountInfoById)) activeDiscountVO.setCreateBy(accountInfoById.getRealName());
             return activeDiscountVO;
         }).collect(Collectors.toList());
         page1.setRecords(activeConsumptionVOList);

fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeFullminus/service/impl/ActiveFullminusServiceImpl.java

@@ -158,8 +158,8 @@ public class ActiveFullminusServiceImpl extends ServiceImpl<ActiveFullminusMappe
                 activeFullminusVO.setDieselUserLevel(str.split(","));
             }
             activeFullminusVO.setActiveDiscountChildList(activeDiscountChildList);
-            TAccount accountInfoById = accountService.getAccountInfoById(Integer.parseInt(s.getCreateBy()));
+//            TAccount accountInfoById = accountService.getAccountInfoById(Integer.parseInt(s.getCreateBy()));
-            if (ObjectUtil.isNotEmpty(accountInfoById)) activeFullminusVO.setCreateBy(accountInfoById.getRealName());
+//            if (ObjectUtil.isNotEmpty(accountInfoById)) activeFullminusVO.setCreateBy(accountInfoById.getRealName());
             return activeFullminusVO;
         }).collect(Collectors.toList());
         page1.setRecords(activeFullminusVOList);

fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeNewlyweds/service/impl/ActiveNewlywedsServiceImpl.java

@@ -163,6 +163,10 @@ public class ActiveNewlywedsServiceImpl extends ServiceImpl<ActiveNewlywedsMappe
             //获取新人有礼活动信息
             LambdaQueryWrapper<ActiveNewlyweds> lambdaQueryWrapper = new LambdaQueryWrapper<>();
             lambdaQueryWrapper.eq(ActiveNewlyweds::getStoreId,TokenUtil.getNowAccountInfo().getStoreId());
+            if (ObjectUtil.isNotEmpty(activeNewlywedss.getName()))
+                lambdaQueryWrapper.like(ActiveNewlyweds::getName,activeNewlywedss.getName());
+            if (ObjectUtil.isNotEmpty(activeNewlywedss.getIsonline()))
+                lambdaQueryWrapper.eq(ActiveNewlyweds::getIsonline,activeNewlywedss.getIsonline());
             //ActiveNewlyweds activeNewlyweds = getOne(lambdaQueryWrapper);
             IPage page1 = page(page, lambdaQueryWrapper);
             List<ActiveNewlyweds> list = page1.getRecords();

fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeRecommend/service/impl/ActiveRecommendServiceImpl.java

@@ -233,6 +233,8 @@ public class ActiveRecommendServiceImpl extends ServiceImpl<ActiveRecommendMappe
         if (ObjectUtil.isNotEmpty(accountInfoById)) activeRecommend.setCreateBy(accountInfoById.getRealName());
         //柴油会员等级
         activeRecommend.setInviterGiftType(arrayToString(activeRecommendDTO.getInviterGiftType()));
+        if (activeRecommendDTO.getStatus().equals("0")) activeRecommend.setIsonline("0");
+        if (activeRecommendDTO.getStatus().equals("2")) activeRecommend.setIsonline("1");
 
         update = updateById(activeRecommend);
         //更新子表数据
@@ -320,6 +322,10 @@ public class ActiveRecommendServiceImpl extends ServiceImpl<ActiveRecommendMappe
             //获取新人有礼活动信息
             LambdaQueryWrapper<ActiveRecommend> lambdaQueryWrapper = new LambdaQueryWrapper<>();
             lambdaQueryWrapper.eq(ActiveRecommend::getStoreId,TokenUtil.getNowAccountInfo().getStoreId());
+            if (ObjectUtil.isNotEmpty(activeRecommends.getActiveName()))
+                lambdaQueryWrapper.like(ActiveRecommend::getActiveName,activeRecommends.getActiveName());
+            if (ObjectUtil.isNotEmpty(activeRecommends.getIsonline()))
+                lambdaQueryWrapper.like(ActiveRecommend::getIsonline,activeRecommends.getIsonline());
             //ActiveRecommend activeRecommend = getOne(lambdaQueryWrapper);
             //List<ActiveRecommend> list = list(lambdaQueryWrapper);
         IPage page1 = page(page, lambdaQueryWrapper);