diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/group/MemberGroupController.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/group/MemberGroupController.java index 89cbf5ab..5b1a287e 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/group/MemberGroupController.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/group/MemberGroupController.java @@ -8,11 +8,9 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.module.member.controller.admin.group.vo.*; import cn.iocoder.yudao.module.member.controller.admin.user.vo.MemberUserListVO; import cn.iocoder.yudao.module.member.convert.group.MemberGroupConvert; -import cn.iocoder.yudao.module.member.dal.dataobject.card.CardDO; import cn.iocoder.yudao.module.member.dal.dataobject.group.MemberGroupDO; import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO; import cn.iocoder.yudao.module.member.dal.mysql.card.CardMapper; -import cn.iocoder.yudao.module.member.enums.CostTypeEnum; import cn.iocoder.yudao.module.member.service.group.MemberGroupService; import cn.iocoder.yudao.module.member.service.user.MemberUserService; import cn.iocoder.yudao.module.member.util.MemberTimeUtils; @@ -20,14 +18,7 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.validation.Valid; @@ -158,4 +149,10 @@ public class MemberGroupController { groupService.setAdmin(vo); return success(true); } + + @PutMapping("/cleanCashAmount/{groupId}") + @Operation(summary = "清零") + public CommonResult cleanCashAmount(@PathVariable("groupId") Long groupId) { + return success(groupService.cleanCashAmount(groupId)); + } } diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/group/MemberGroupService.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/group/MemberGroupService.java index 29bfbf4c..599590b5 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/group/MemberGroupService.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/group/MemberGroupService.java @@ -143,4 +143,6 @@ public interface MemberGroupService { Boolean judgeStoreUse(Long userId); Boolean judgeGroup(Long userId,Long canteenId); + + Boolean cleanCashAmount(Long groupId); } diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/group/MemberGroupServiceImpl.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/group/MemberGroupServiceImpl.java index 037eeef3..e8c129bc 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/group/MemberGroupServiceImpl.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/group/MemberGroupServiceImpl.java @@ -270,4 +270,31 @@ public class MemberGroupServiceImpl implements MemberGroupService { } return false; } + + @Override + public Boolean cleanCashAmount(Long groupId) { + List byGroupId = memberGroupMapper.getByGroupId(groupId); + for (MemberUserDO memberUserDO : byGroupId) { + BigDecimal money = memberUserDO.getMoney(); + BigDecimal wxAmount = memberUserDO.getWxAmount(); + if(money.compareTo(BigDecimal.ZERO)>0){ + memberUserDO.setMoney(BigDecimal.ZERO); + memberUserDO.setCashAmount(BigDecimal.ZERO); + memberUserDO.setWxAmount(wxAmount); + memberUserDO.setGiftAmount(BigDecimal.ZERO); + }else if (money.compareTo(BigDecimal.ZERO) == 0){ + memberUserDO.setMoney(BigDecimal.ZERO); + memberUserDO.setCashAmount(BigDecimal.ZERO); + memberUserDO.setWxAmount(BigDecimal.ZERO); + memberUserDO.setGiftAmount(BigDecimal.ZERO); + }else { + memberUserDO.setMoney(money); + memberUserDO.setCashAmount(BigDecimal.ZERO); + memberUserDO.setWxAmount(BigDecimal.ZERO); + memberUserDO.setGiftAmount(BigDecimal.ZERO); + } + } + return memberUserService.updateList(byGroupId); + + } } diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserService.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserService.java index 74a24999..64b10707 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserService.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserService.java @@ -275,4 +275,6 @@ public interface MemberUserService { void imgCreate(String filePath,Long storeId); void general(String mobile); + + Boolean updateList(List updateList); } diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImpl.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImpl.java index c57ec936..acbb511c 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImpl.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImpl.java @@ -1305,4 +1305,9 @@ public class MemberUserServiceImpl implements MemberUserService { public void general(String mobile) { memberUserMapper.updateFaceCanteenId(mobile); } + + @Override + public Boolean updateList(List updateList) { + return memberUserMapper.updateBatch(updateList); + } }