diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/WxUserMemberController.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/WxUserMemberController.java index 476f887..deaa77b 100644 --- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/WxUserMemberController.java +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/WxUserMemberController.java @@ -202,4 +202,28 @@ public class WxUserMemberController extends BaseController { return R.ok(); } + /** + * 开启或者禁止打卡 + */ + @GetMapping("/openOrCloseClock/{id}") + public R openOrCloseClock(@PathVariable Long id) { + if (id == null) { + return R.fail("id 不能为空"); + } + wxUserMemberService.openOrCloseClock(id); + return R.ok(); + } + + /** + * 开启或者禁止活动 + */ + @GetMapping("/openOrCloseActivity/{id}") + public R openOrCloseActivity(@PathVariable Long id) { + if (id == null) { + return R.fail("id 不能为空"); + } + wxUserMemberService.openOrCloseActivity(id); + return R.ok(); + } + } diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/IWxUserMemberService.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/IWxUserMemberService.java index 0dfdf35..5be3c2a 100644 --- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/IWxUserMemberService.java +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/IWxUserMemberService.java @@ -80,4 +80,8 @@ public interface IWxUserMemberService void batchDelMiniProgramTag(List tagIdList, List userIdList); void batchChangIntegral(WxUserIntegralVm wxUserIntegralVm, List userIdList); + + void openOrCloseClock(Long id); + + void openOrCloseActivity(Long id); } diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxUserMemberServiceImpl.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxUserMemberServiceImpl.java index 9e5bab3..05ee30c 100644 --- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxUserMemberServiceImpl.java +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxUserMemberServiceImpl.java @@ -13,6 +13,7 @@ import com.flossom.common.core.domain.vo.WxUserMemberVo; import com.flossom.common.core.enums.IntegralChangeTypeEnum; import com.flossom.common.core.enums.Status; import com.flossom.common.core.enums.TagTypeStatus; +import com.flossom.common.core.exception.ServiceException; import com.flossom.common.core.mapper.*; import com.flossom.common.core.utils.DateUtils; import com.flossom.common.security.utils.SecurityUtils; @@ -318,4 +319,36 @@ public class WxUserMemberServiceImpl implements IWxUserMemberService { } // TODO: 对接数赢：批量积分操作 } + + @Override + public void openOrCloseClock(Long id) { + WxUserMember wxUserMember = wxUserMemberMapper.selectWxUserMemberById(id); + if (wxUserMember == null) { + throw new ServiceException("用户不存在"); + } + WxUserMember update = new WxUserMember(); + update.setId(id); + if (wxUserMember.getClock() == 1) { + update.setClock(2); + } else { + update.setClock(1); + } + wxUserMemberMapper.updateWxUserMember(update); + } + + @Override + public void openOrCloseActivity(Long id) { + WxUserMember wxUserMember = wxUserMemberMapper.selectWxUserMemberById(id); + if (wxUserMember == null) { + throw new ServiceException("用户不存在"); + } + WxUserMember update = new WxUserMember(); + update.setId(id); + if (wxUserMember.getActivity() == 1) { + update.setActivity(2); + } else { + update.setActivity(1); + } + wxUserMemberMapper.updateWxUserMember(update); + } } diff --git a/flossom-ui/src/api/system/member.js b/flossom-ui/src/api/system/member.js index e4d7f4b..1047869 100644 --- a/flossom-ui/src/api/system/member.js +++ b/flossom-ui/src/api/system/member.js @@ -233,3 +233,19 @@ export function delRemark(id) { method: 'delete', }) } + +// 开关打卡 +export function openOrCloseClock(id) { + return request({ + url: '/system/member/openOrCloseClock/' + id, + method: 'get' + }) +} + +// 开关活动 +export function openOrCloseActivity(id) { + return request({ + url: '/system/member/openOrCloseActivity/' + id, + method: 'get' + }) +} diff --git a/flossom-ui/src/views/system/member/index.vue b/flossom-ui/src/views/system/member/index.vue index 245bd44..771b57f 100644 --- a/flossom-ui/src/views/system/member/index.vue +++ b/flossom-ui/src/views/system/member/index.vue @@ -8,7 +8,7 @@ - + @@ -175,38 +175,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -221,61 +189,70 @@ - + - - + + - - + + + + - + + + - + + + - - + + + + + 查看详情 + @@ -395,7 +372,8 @@ @@ -591,6 +569,7 @@ import { getMiniProgramTagsTree, scriptTreeSelect, editRemark, delRemark, + openOrCloseClock, openOrCloseActivity, } from "@/api/system/member"; import Treeselect from "@riophae/vue-treeselect"; import {tagTreeSelect} from "@/api/system/wechatTab"; @@ -1114,6 +1093,49 @@ export default { } }); }, + // 开关打卡 + openOrCloseClock(row) { + let spanContent; + if (row.clock == 1) { + spanContent = "确定将选择的数据禁止打卡？"; + } else { + spanContent = "确定将选择的数据开启打卡？"; + } + this.$confirm("" + spanContent + "
请谨慎操作，一旦成功将无法撤销。", '注销账号', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning', + dangerouslyUseHTMLString: true + }).then(() => { + openOrCloseClock(row.id).then(response => { + this.$modal.msgSuccess("操作成功"); + this.getList(); + }); + }).catch(() => { + }); + }, + // 开关活动 + openOrCloseActivity(row) { + let spanContent; + if (row.activity == 1) { + spanContent = "确定将选择的数据禁止活动？"; + } else { + spanContent = "确定将选择的数据开启活动？"; + } + this.$confirm("" + spanContent + "
请谨慎操作，一旦成功将无法撤销。", '注销账号', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning', + dangerouslyUseHTMLString: true + }).then(() => { + openOrCloseActivity(row.id).then(response => { + this.$modal.msgSuccess("操作成功"); + this.getList(); + }); + }).catch(() => { + }); + + }, /** 提交按钮 */ submitForm() { if (this.form.id != null) { @@ -1225,9 +1247,9 @@ export default { if (this.form.wxUserRemarkList != null && this.form.wxUserRemarkList.length > 0) { let that = this; this.form.wxUserRemarkList.forEach(function (item) { - if(item.id = that.editRemarkForm.id) { - item.content = that.editRemarkForm.content; - } + if (item.id = that.editRemarkForm.id) { + item.content = that.editRemarkForm.content; + } }) } this.ocEditRemarkDialog(); @@ -1245,7 +1267,7 @@ export default { this.$modal.msgSuccess("删除用户备注成功"); let list = this.form.wxUserRemarkList; for (let i = 0; i < list.length; i++) { - if(list[i].id == row.id) { + if (list[i].id == row.id) { this.form.wxUserRemarkList.splice(i, 1); } }