会员经验值设置

consumer/src/main/java/cn/lili/event/impl/MemberExperienceExecute.java

@@ -1,11 +1,17 @@
 package cn.lili.event.impl;
 
 
+import cn.lili.common.utils.CurrencyUtil;
 import cn.lili.event.GoodsCommentCompleteEvent;
 import cn.lili.event.MemberRegisterEvent;
+import cn.lili.event.OrderStatusChangeEvent;
 import cn.lili.modules.member.entity.dos.Member;
 import cn.lili.modules.member.entity.dos.MemberEvaluation;
 import cn.lili.modules.member.service.MemberService;
+import cn.lili.modules.order.order.entity.dos.Order;
+import cn.lili.modules.order.order.entity.dto.OrderMessage;
+import cn.lili.modules.order.order.entity.enums.OrderStatusEnum;
+import cn.lili.modules.order.order.service.OrderService;
 import cn.lili.modules.system.entity.dos.Setting;
 import cn.lili.modules.system.entity.dto.ExperienceSetting;
 import cn.lili.modules.system.entity.enums.SettingEnum;
@@ -21,7 +27,7 @@ import org.springframework.stereotype.Service;
  * @date: 2021/5/16 11:16 下午
  */
 @Service
-public class MemberExperienceExecute implements MemberRegisterEvent, GoodsCommentCompleteEvent {
+public class MemberExperienceExecute implements MemberRegisterEvent, GoodsCommentCompleteEvent, OrderStatusChangeEvent {
 
     //配置
     @Autowired
@@ -29,22 +35,59 @@ public class MemberExperienceExecute implements MemberRegisterEvent, GoodsCommen
     //会员
     @Autowired
     private MemberService memberService;
+    //订单
+    @Autowired
+    private OrderService orderService;
 
+    /**
+     * 会员注册赠送经验值
+     * @param member 会员
+     */
     @Override
     public void memberRegister(Member member) {
         //获取经验值设置
-        Setting setting = settingService.get(SettingEnum.EXPERIENCE_SETTING.name());
-        ExperienceSetting experienceSetting = new Gson().fromJson(setting.getSettingValue(), ExperienceSetting.class);
+        ExperienceSetting experienceSetting = getExperienceSetting();
         //赠送会员经验值
-        memberService.updateMemberPoint(Long.valueOf(experienceSetting.getRegister().longValue()), 1, member.getId(), "会员注册，赠送经验值" + experienceSetting.getRegister());
+        memberService.updateMemberExperience(Long.valueOf(experienceSetting.getRegister().longValue()), true, member.getId(), "会员注册，赠送经验值" + experienceSetting.getRegister());
     }
 
+    /**
+     * 商品评价赠送经验值
+     * @param memberEvaluation 会员评价
+     */
     @Override
     public void goodsComment(MemberEvaluation memberEvaluation) {
-        //获取签到经验值设置
-        Setting setting = settingService.get(SettingEnum.EXPERIENCE_SETTING.name());
-        ExperienceSetting experienceSetting = new Gson().fromJson(setting.getSettingValue(), ExperienceSetting.class);
+        //获取经验值设置
+        ExperienceSetting experienceSetting = getExperienceSetting();
         //赠送会员经验值
-        memberService.updateMemberPoint(Long.valueOf(experienceSetting.getComment().longValue()), 1, memberEvaluation.getMemberId(), "会员评价，赠送经验值" + experienceSetting.getComment());
+        memberService.updateMemberExperience(Long.valueOf(experienceSetting.getComment().longValue()), true, memberEvaluation.getMemberId(), "会员评价，赠送经验值" + experienceSetting.getComment());
+    }
+
+    /**
+     * 完成订单赠送经验值
+     * @param orderMessage 订单消息
+     */
+    @Override
+    public void orderChange(OrderMessage orderMessage) {
+        if(orderMessage.getNewStatus().equals(OrderStatusEnum.COMPLETED)){
+            //获取经验值设置
+            ExperienceSetting experienceSetting = getExperienceSetting();
+            //获取订单信息
+            Order order = orderService.getBySn(orderMessage.getOrderSn());
+            //计算赠送经验值数量
+            Double point= CurrencyUtil.mul(experienceSetting.getMoney(),order.getFlowPrice(),0);
+            //赠送会员经验值
+            memberService.updateMemberExperience(point.longValue(), true, order.getMemberId(), "会员下单，赠送经验值" + point + "分");
+
+        }
+    }
+
+    /**
+     * 获取经验值设置
+     * @return 经验值设置
+     */
+    private ExperienceSetting getExperienceSetting(){
+        Setting setting = settingService.get(SettingEnum.EXPERIENCE_SETTING.name());
+        return new Gson().fromJson(setting.getSettingValue(), ExperienceSetting.class);
     }
 }

consumer/src/main/java/cn/lili/event/impl/MemberPointExecute.java

@@ -52,7 +52,7 @@ public class MemberPointExecute implements MemberRegisterEvent, GoodsCommentComp
         //获取积分设置
         PointSetting pointSetting=getPointSetting();
         //赠送会员积分
-        memberService.updateMemberPoint(Long.valueOf(pointSetting.getRegister().longValue()), 1, member.getId(), "会员注册，赠送积分" + pointSetting.getRegister() + "分");
+        memberService.updateMemberPoint(Long.valueOf(pointSetting.getRegister().longValue()), true, member.getId(), "会员注册，赠送积分" + pointSetting.getRegister() + "分");
     }
 
     /**
@@ -64,7 +64,7 @@ public class MemberPointExecute implements MemberRegisterEvent, GoodsCommentComp
         //获取积分设置
         PointSetting pointSetting=getPointSetting();
         //赠送会员积分
-        memberService.updateMemberPoint(Long.valueOf(pointSetting.getComment().longValue()), 1, memberEvaluation.getMemberId(), "会员评价，赠送积分" + pointSetting.getComment() + "分");
+        memberService.updateMemberPoint(Long.valueOf(pointSetting.getComment().longValue()), true, memberEvaluation.getMemberId(), "会员评价，赠送积分" + pointSetting.getComment() + "分");
     }
 
     /**
@@ -85,7 +85,7 @@ public class MemberPointExecute implements MemberRegisterEvent, GoodsCommentComp
             //计算赠送积分数量
             Double point=CurrencyUtil.mul(pointSetting.getMoney(),order.getFlowPrice(),0);
             //赠送会员积分
-            memberService.updateMemberPoint(point.longValue(), 1, order.getMemberId(), "会员下单，赠送积分" + point + "分");
+            memberService.updateMemberPoint(point.longValue(), true, order.getMemberId(), "会员下单，赠送积分" + point + "分");
 
         }
     }
@@ -102,7 +102,7 @@ public class MemberPointExecute implements MemberRegisterEvent, GoodsCommentComp
             //计算扣除积分数量
             Double point=CurrencyUtil.mul(pointSetting.getMoney(), afterSale.getActualRefundPrice(),0);
             //扣除会员积分
-            memberService.updateMemberPoint(point.longValue(), 1, afterSale.getMemberId(), "会员退款，扣除积分" + point + "分");
+            memberService.updateMemberPoint(point.longValue(), false, afterSale.getMemberId(), "会员退款，扣除积分" + point + "分");
 
         }
     }

consumer/src/main/resources/application.yml

@@ -4,9 +4,6 @@ server:
   servlet:
     context-path: /
 
-  # 正式部署时候，解开此处配置，防止文件夹被清除导致的文件上传失败问题
-  #    multipart:
-  #      location: /Users/lifenlong/Desktop/ceshi
   tomcat:
     uri-encoding: UTF-8
     threads: