From 4498d63f6c558785625e9a576d06458c55e1c540 Mon Sep 17 00:00:00 2001
From: pikachu <1321288662@qq.com>
Date: Thu, 5 Aug 2021 08:26:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=A7=AF=E5=88=86=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E4=BF=AE=E6=94=B9=E5=BC=95=E5=8F=91=E7=9A=84=E7=A7=AF?=
 =?UTF-8?q?=E5=88=86=E5=AF=B9=E4=B8=8D=E4=B8=8A=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/aop/interceptor/PointLogInterceptor.java   |  2 +-
 .../member/mapper/MemberPointsHistoryMapper.java      |  4 ++--
 .../serviceimpl/MemberPointsHistoryServiceImpl.java   | 11 +++++++----
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/framework/src/main/java/cn/lili/modules/member/entity/aop/interceptor/PointLogInterceptor.java b/framework/src/main/java/cn/lili/modules/member/entity/aop/interceptor/PointLogInterceptor.java
index bc9dc56b..a99731f5 100644
--- a/framework/src/main/java/cn/lili/modules/member/entity/aop/interceptor/PointLogInterceptor.java
+++ b/framework/src/main/java/cn/lili/modules/member/entity/aop/interceptor/PointLogInterceptor.java
@@ -59,7 +59,7 @@ public class PointLogInterceptor {
                 memberPointsHistory.setPointType(type ? PointTypeEnum.INCREASE.name() : PointTypeEnum.REDUCE.name());
 
                 memberPointsHistory.setVariablePoint(point);
-                memberPointsHistory.setBeforePoint(true ? new Double(CurrencyUtil.sub(member.getPoint(), point)).longValue() : new Double(CurrencyUtil.add(member.getPoint(), point)).longValue());
+                memberPointsHistory.setBeforePoint(type ? member.getPoint() - point : member.getPoint() + point);
                 memberPointsHistory.setPoint(member.getPoint());
                 memberPointsHistory.setContent(obj[3] == null ? "" : obj[3].toString());
                 memberPointsHistory.setCreateBy("系统");
diff --git a/framework/src/main/java/cn/lili/modules/member/mapper/MemberPointsHistoryMapper.java b/framework/src/main/java/cn/lili/modules/member/mapper/MemberPointsHistoryMapper.java
index e9e8f906..a2c98e4f 100644
--- a/framework/src/main/java/cn/lili/modules/member/mapper/MemberPointsHistoryMapper.java
+++ b/framework/src/main/java/cn/lili/modules/member/mapper/MemberPointsHistoryMapper.java
@@ -19,7 +19,7 @@ public interface MemberPointsHistoryMapper extends BaseMapper<MemberPointsHistor
      * @return
      */
     @Select("SELECT SUM( variable_point ) FROM li_member_points_history WHERE point_type = #{pointType}")
-    Long getALLMemberPointsHistoryVO(Integer pointType);
+    Long getALLMemberPointsHistoryVO(String pointType);
 
     /**
      * 获取用户的积分数量
@@ -29,7 +29,7 @@ public interface MemberPointsHistoryMapper extends BaseMapper<MemberPointsHistor
      * @return 积分数量
      */
     @Select("SELECT SUM( variable_point ) FROM li_member_points_history WHERE point_type = #{pointType} AND member_id=#{memberId}")
-    Long getMemberPointsHistoryVO(Integer pointType, String memberId);
+    Long getMemberPointsHistoryVO(String pointType, String memberId);
 
 
 }
\ No newline at end of file
diff --git a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberPointsHistoryServiceImpl.java b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberPointsHistoryServiceImpl.java
index 15111ca4..12128316 100644
--- a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberPointsHistoryServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberPointsHistoryServiceImpl.java
@@ -1,6 +1,7 @@
 package cn.lili.modules.member.serviceimpl;
 
 
+import cn.lili.modules.member.entity.enums.PointTypeEnum;
 import cn.lili.mybatis.util.PageUtil;
 import cn.lili.common.utils.StringUtils;
 import cn.lili.common.vo.PageVO;
@@ -22,6 +23,8 @@ import org.springframework.stereotype.Service;
 @Service
 public class MemberPointsHistoryServiceImpl extends ServiceImpl<MemberPointsHistoryMapper, MemberPointsHistory> implements MemberPointsHistoryService {
 
+
+
     @Override
     public MemberPointsHistoryVO getMemberPointsHistoryVO(String memberId) {
         MemberPointsHistoryVO memberPointsHistoryVO = new MemberPointsHistoryVO();
@@ -29,12 +32,12 @@ public class MemberPointsHistoryServiceImpl extends ServiceImpl<MemberPointsHist
         Long variablePoint = 0L;
 
         if (StringUtils.isNotEmpty(memberId)) {
-            point = this.baseMapper.getMemberPointsHistoryVO(1, memberId);
-            variablePoint = this.baseMapper.getMemberPointsHistoryVO(0, memberId);
+            point = this.baseMapper.getMemberPointsHistoryVO(PointTypeEnum.INCREASE.name(), memberId);
+            variablePoint = this.baseMapper.getMemberPointsHistoryVO(PointTypeEnum.REDUCE.name(), memberId);
 
         } else {
-            point = this.baseMapper.getALLMemberPointsHistoryVO(0);
-            variablePoint = this.baseMapper.getALLMemberPointsHistoryVO(1);
+            point = this.baseMapper.getALLMemberPointsHistoryVO(PointTypeEnum.REDUCE.name());
+            variablePoint = this.baseMapper.getALLMemberPointsHistoryVO(PointTypeEnum.INCREASE.name());
         }
         memberPointsHistoryVO.setPoint(point == null ? 0 : point);
         memberPointsHistoryVO.setVariablePoint(variablePoint == null ? 0 : variablePoint);