From 77bcea27bdd87b5ec1841068587b0e447abd8802 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 07 三月 2024 16:23:27 +0800
Subject: [PATCH] ERP接口
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberCardServiceImpl.java | 2 ++
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 14 +++++++++++++-
server/dmvisit_service/src/main/java/com/doumee/service/business/MemberService.java | 2 ++
server/dmvisit_admin/src/main/java/com/doumee/api/business/MemberCardController.java | 16 ++++++++--------
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/EmpowerServiceImpl.java | 1 +
server/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java | 11 +++++++++++
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java | 9 ---------
7 files changed, 37 insertions(+), 18 deletions(-)
diff --git a/server/dmvisit_admin/src/main/java/com/doumee/api/business/MemberCardController.java b/server/dmvisit_admin/src/main/java/com/doumee/api/business/MemberCardController.java
index b075d7d..b4ccc8d 100644
--- a/server/dmvisit_admin/src/main/java/com/doumee/api/business/MemberCardController.java
+++ b/server/dmvisit_admin/src/main/java/com/doumee/api/business/MemberCardController.java
@@ -33,14 +33,14 @@
@PreventRepeat
@ApiOperation("鏂板缓")
@PostMapping("/create")
- //@RequiresPermissions("business:membercard:create")
+ @RequiresPermissions("business:membercard:create")
public ApiResponse create(@RequestBody MemberCard memberCard) {
return ApiResponse.success(memberCardService.create(memberCard));
}
@ApiOperation("鏍规嵁ID鍒犻櫎")
@GetMapping("/delete/{id}")
- //@RequiresPermissions("business:membercard:delete")
+ @RequiresPermissions("business:membercard:delete")
public ApiResponse deleteById(@PathVariable Integer id) {
memberCardService.deleteById(id);
return ApiResponse.success(null);
@@ -48,7 +48,7 @@
@ApiOperation("鎵归噺鍒犻櫎")
@GetMapping("/delete/batch")
- //@RequiresPermissions("business:membercard:delete")
+ @RequiresPermissions("business:membercard:delete")
public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
String [] idArray = ids.split(",");
List<Integer> idList = new ArrayList<>();
@@ -61,7 +61,7 @@
@ApiOperation("鏍规嵁ID淇敼")
@PostMapping("/updateById")
- //@RequiresPermissions("business:membercard:update")
+ @RequiresPermissions("business:membercard:update")
public ApiResponse updateById(@RequestBody MemberCard memberCard) {
memberCardService.updateById(memberCard);
return ApiResponse.success(null);
@@ -69,7 +69,7 @@
@ApiOperation("鎸傚け鎿嶄綔")
@PostMapping("/batchLoss")
- //@RequiresPermissions("business:membercard:update")
+ @RequiresPermissions("business:membercard:update")
public ApiResponse batchLoss(@RequestBody List<MemberCard> memberCards) {
memberCardService.updateByIdInBatch(memberCards,0);
return ApiResponse.success(null);
@@ -77,7 +77,7 @@
@ApiOperation("瑙ｆ寕鎿嶄綔")
@PostMapping("/batchUnLoss")
- //@RequiresPermissions("business:membercard:update")
+ @RequiresPermissions("business:membercard:update")
public ApiResponse batchUnLoss(@RequestBody List<MemberCard> memberCards) {
memberCardService.updateByIdInBatch(memberCards,1);
return ApiResponse.success(null);
@@ -85,7 +85,7 @@
@ApiOperation("閫�鍗℃搷浣�")
@PostMapping("/refundCard")
- //@RequiresPermissions("business:membercard:update")
+ @RequiresPermissions("business:membercard:update")
public ApiResponse refundCard(@RequestBody MemberCard memberCard) {
memberCardService.updateRefundCard(memberCard);
return ApiResponse.success(null);
@@ -93,7 +93,7 @@
@ApiOperation("鍒嗛〉鏌ヨ")
@PostMapping("/page")
- //@RequiresPermissions("business:membercard:query")
+ @RequiresPermissions("business:membercard:query")
public ApiResponse<PageData<MemberCard>> findPage (@RequestBody PageWrap<MemberCard> pageWrap) {
return ApiResponse.success(memberCardService.findPage(pageWrap));
}
diff --git a/server/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java b/server/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java
index 9311b3f..f514f8d 100644
--- a/server/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java
+++ b/server/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java
@@ -80,6 +80,15 @@
return ApiResponse.success(null);
}
+ @ApiOperation("鍛樺伐鏉冮檺涓嬪彂")
+ @GetMapping("/roleAuth/{id}")
+ @RequiresPermissions("business:empower:create")
+ public ApiResponse roleAuthById(@PathVariable Integer id) {
+ memberService.roleAuthById(id);
+ return ApiResponse.success(null);
+ }
+
+
@ApiOperation("鏍规嵁ID淇敼")
@PostMapping("/updateById")
@RequiresPermissions("business:member:update")
@@ -183,6 +192,8 @@
}
+
+
/**
*
* 鍒嗛〉鏌ヨ鍐呴儴浜哄憳淇℃伅
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/MemberService.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/MemberService.java
index a329b1d..ae0dfc7 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/MemberService.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/MemberService.java
@@ -46,6 +46,8 @@
*/
void deleteById(Integer id);
+ void roleAuthById(Integer id);
+
/**
* 鍒犻櫎
*
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/EmpowerServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/EmpowerServiceImpl.java
index 77cb8f1..646d48d 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/EmpowerServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/EmpowerServiceImpl.java
@@ -125,6 +125,7 @@
queryWrapper.eq(Objects.nonNull(pageWrap.getModel().getSendStatus()),Empower::getSendStatus,pageWrap.getModel().getSendStatus());
queryWrapper.eq(StringUtils.isNotBlank(pageWrap.getModel().getCompanyId()),Company::getId,pageWrap.getModel().getCompanyId());
queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()),Company::getName,pageWrap.getModel().getCompanyName());
+ queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getDeviceName()),Device::getName,pageWrap.getModel().getDeviceName());
queryWrapper.ge(Objects.nonNull(pageWrap.getModel().getSendStartDate()),Empower::getSendDate,pageWrap.getModel().getSendStartDate());
queryWrapper.le(Objects.nonNull(pageWrap.getModel().getSendEndDate()),Empower::getSendDate,pageWrap.getModel().getSendEndDate());
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberCardServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberCardServiceImpl.java
index 4a84782..dcbcda9 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberCardServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberCardServiceImpl.java
@@ -72,6 +72,8 @@
memberCard.setCreator(userInfo.getId());
memberCard.setCreateDate(new Date());
memberCard.setStatus(Constants.ONE);
+ memberCard.setIsdeleted(Constants.ZERO);
+ memberCard.setHkStatus(Constants.ZERO);
memberCardMapper.insert(memberCard);
dealMemberRoleEmpower(memberMapper.selectById(memberCard.getMemberId()));
Member member = memberMapper.selectById(memberCard.getMemberId());
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index 9bce39b..589242c 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -179,6 +179,18 @@
memberMapper.updateById(member);
}
+
+ @Override
+ public void roleAuthById(Integer id) {
+ LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ Member member = memberMapper.selectById(id);
+
+
+
+
+ }
+
+
@Override
public void delete(Member member) {
UpdateWrapper<Member> deleteWrapper = new UpdateWrapper<>(member);
@@ -603,7 +615,7 @@
queryWrapper.selectAll(Member.class);
queryWrapper.selectAs(Company::getName,Member::getCompanyName);
- queryWrapper.select(" ( select count(1) from member_card mc where mc.member_id = t.id ) as memberCardCount ");
+ queryWrapper.select(" ( select count(1) from member_card mc where mc.isdeleted = 0 and mc.member_id = t.id ) as memberCardCount ");
queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId);
queryWrapper.in(Objects.nonNull(pageWrap.getModel().getCompanyIds())&&pageWrap.getModel().getCompanyIds().size()>0,
Member::getCompanyId,pageWrap.getModel().getCompanyIds())
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java
index 9cce8e3..46bfd45 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java
@@ -1051,15 +1051,6 @@
if(param.getRoleIds()!=null && param.getRoleIds().length>0 && StringUtils.isBlank(member.getRoleId())){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝鏈煡璇㈠埌鏈夋晥闂ㄧ缁勬暟鎹�");
}
- //鏇存柊鎺堟潈鏈夋晥鏈�
- Member update = new Member();
- update.setId(member.getId());
- update.setEditDate(new Date());
- update.setStartTime(param.getValidStartTime());
- update.setEndTime(param.getValidEndTime());
- update.setRoleId(StringUtils.isNotBlank(member.getRoleId())?member.getRoleId():null);
- update.setHkStatus(Constants.ZERO);//鍋氫竴閬嶆洿鏂伴�昏緫
- update.setRemark("寰呭悓姝ュ畨闃插钩鍙�");
memberMapper.update(null,new UpdateWrapper<Member>().lambda()
.eq(Member::getId,member.getId())
.set(Member::getRoleId,member.getRoleId())
--
Gitblit v1.9.3