From 86d0ecc89ee7af71d0bd657058cc0386eac18d3b Mon Sep 17 00:00:00 2001
From: Chopper <liushuai711@gmail.com>
Date: Wed, 4 Aug 2021 18:58:56 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=AF=E5=88=86=E7=9B=B8=E5=85=B3=E5=B0=8F?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lili/modules/member/service/MemberService.java   |  4 ++--
 .../member/serviceimpl/MemberServiceImpl.java        | 12 ++++++++----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/framework/src/main/java/cn/lili/modules/member/service/MemberService.java b/framework/src/main/java/cn/lili/modules/member/service/MemberService.java
index 20ee42e8..fb73b153 100644
--- a/framework/src/main/java/cn/lili/modules/member/service/MemberService.java
+++ b/framework/src/main/java/cn/lili/modules/member/service/MemberService.java
@@ -178,9 +178,9 @@ public interface MemberService extends IService<Member> {
      * 会员积分变动
      *
      * @param point    变动积分
-     * @param type     是否增加积分
+     * @param type     是否增加积分 true 增加积分，反之扣减积分
      * @param memberId 会员id
-     * @param content  变动详细
+     * @param content  变动日志
      * @return 操作结果
      */
     Boolean updateMemberPoint(Long point, Boolean type, String memberId, String content);
diff --git a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java
index 05a8f2b5..64676fe9 100644
--- a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java
@@ -382,10 +382,13 @@ public class MemberServiceImpl extends ServiceImpl<MemberMapper, Member> impleme
         if (member != null) {
             //积分变动后的会员积分
             long currentPoint;
+            //如果增加积分
             if (type) {
-                currentPoint = CurrencyUtil.add(member.getPoint(), point).longValue();
-            } else {
-                currentPoint = CurrencyUtil.sub(member.getPoint(), point) < 0 ? 0 : new Double(CurrencyUtil.sub(member.getPoint(), point)).longValue();
+                currentPoint = member.getPoint() + point;
+            }
+            //否则扣除积分
+            else {
+                currentPoint = member.getPoint() - point < 0 ? 0 : member.getPoint() - point;
             }
             member.setPoint(currentPoint);
             Boolean result = this.updateById(member);
@@ -576,7 +579,8 @@ public class MemberServiceImpl extends ServiceImpl<MemberMapper, Member> impleme
         queryWrapper.like(StringUtils.isNotBlank(memberSearchVO.getMobile()), "mobile", memberSearchVO.getMobile());
         //按照状态查询
         queryWrapper.eq(StringUtils.isNotBlank(memberSearchVO.getDisabled()), "disabled",
-                memberSearchVO.getDisabled().equals(SwitchEnum.OPEN.name()) ? 1 : 0);        queryWrapper.orderByDesc("create_time");
+                memberSearchVO.getDisabled().equals(SwitchEnum.OPEN.name()) ? 1 : 0);
+        queryWrapper.orderByDesc("create_time");
         return this.count(queryWrapper);
     }