From 39e851ee789c714900cdb59e4d45de6aac5ec75f Mon Sep 17 00:00:00 2001
From: Chopper <liushuai711@gmail.com>
Date: Tue, 29 Jun 2021 11:15:27 +0800
Subject: [PATCH] =?UTF-8?q?aop=E7=A7=AF=E5=88=86=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E5=85=BC=E5=AE=B9=E9=97=AE=E9=A2=98=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/lili/event/impl/NoticeMessageExecute.java     | 5 ++++-
 .../entity/aop/interceptor/PointLogInterceptor.java       | 8 ++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/consumer/src/main/java/cn/lili/event/impl/NoticeMessageExecute.java b/consumer/src/main/java/cn/lili/event/impl/NoticeMessageExecute.java
index 5a038765..e3346136 100644
--- a/consumer/src/main/java/cn/lili/event/impl/NoticeMessageExecute.java
+++ b/consumer/src/main/java/cn/lili/event/impl/NoticeMessageExecute.java
@@ -148,11 +148,14 @@ public class NoticeMessageExecute implements TradeEvent, OrderStatusChangeEvent,
 
     @Override
     public void memberPointChange(MemberPointMessage memberPointMessage) {
+        if (memberPointMessage == null) {
+            return;
+        }
         //组织站内信参数
         NoticeMessageDTO noticeMessageDTO = new NoticeMessageDTO();
         noticeMessageDTO.setMemberId(memberPointMessage.getMemberId());
         Map<String, String> params = new HashMap<>();
-        if (memberPointMessage.getType().equals(1)) {
+        if (memberPointMessage.getType()) {
             params.put("expenditure_points", "0");
             params.put("income_points", memberPointMessage.getPoint().toString());
         } else {
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 7d6708ab..425fcb72 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
@@ -40,9 +40,9 @@ public class PointLogInterceptor {
                 point = Long.valueOf(obj[0].toString());
             }
             //变动类型
-            Integer type = 0;
+            Boolean type = false;
             if (obj[1] != null) {
-                type = Integer.valueOf(obj[1].toString());
+                type = Boolean.valueOf(obj[1].toString());
             }
             //会员ID
             String memberId = "";
@@ -55,7 +55,7 @@ public class PointLogInterceptor {
                 MemberPointsHistory memberPointsHistory = new MemberPointsHistory();
                 memberPointsHistory.setMemberId(member.getId());
                 memberPointsHistory.setMemberName(member.getUsername());
-                memberPointsHistory.setPointType(type);
+                memberPointsHistory.setPointType(type ? 1 : 0);
                 memberPointsHistory.setVariablePoint(point);
                 memberPointsHistory.setBeforePoint(new Double(CurrencyUtil.sub(member.getPoint(), point)).longValue());
                 memberPointsHistory.setPoint(member.getPoint());
@@ -64,7 +64,7 @@ public class PointLogInterceptor {
                 memberPointsHistoryService.save(memberPointsHistory);
             }
         } catch (Exception e) {
-            log.error("积分操作错误",e);
+            log.error("积分操作错误", e);
         }