From 257ce232897d0e4a232e827ba61516b747389078 Mon Sep 17 00:00:00 2001
From: zhanglin <852614290@qq.com>
Date: 星期日, 23 七月 2023 16:04:35 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/console/MemberController.java | 32 ++++++++++++++++++++++++++++----
1 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/console/MemberController.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/console/MemberController.java
index c1b09a2..c6da197 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/console/MemberController.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/console/MemberController.java
@@ -12,10 +12,7 @@
import com.ruoyi.system.api.model.AppMiniLoginDto;
import com.ruoyi.system.api.model.AppMiniLoginVo;
import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.List;
@@ -293,4 +290,31 @@
MemberGiftRecord memberGiftRecord = memberGiftRecordService.getById(verifyPrize);
return R.ok(memberGiftRecord);
}
+
+ /**
+ * @description 积分变动
+ * @author jqs
+ * @date 2023/7/12 17:04
+ * @param integralChangeDto
+ * @return R
+ */
+ @PostMapping("/changeIntegral")
+ public R signShare(@RequestBody IntegralChangeDto integralChangeDto) {
+ memberService.changeIntegral(integralChangeDto);
+ return R.ok();
+ }
+
+ /**
+ * @description 统计商户今日新增会员
+ * @author jqs
+ * @date 2023/7/14 20:00
+ * @param shopIdList
+ * @return R<Integer>
+ */
+ @PostMapping("/getAreaNewMember")
+ public R<Integer> getAreaNewMember(@RequestBody List<Long> shopIdList)
+ {
+ Integer count = memberService.getAreaNewMember(shopIdList);
+ return R.ok(count);
+ }
}
--
Gitblit v1.7.1