From 2784b736e1eb4b9952657c83f3e1ce7a7e4c35b9 Mon Sep 17 00:00:00 2001
From: hurui <177768073@qq.com>
Date: Wed, 17 Aug 2022 09:28:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hai-service/src/main/java/com/hai/entity/HighUser.java      | 6 ++++--
 .../com/hai/service/impl/BsIntegralRebateServiceImpl.java   | 2 ++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/hai-service/src/main/java/com/hai/entity/HighUser.java b/hai-service/src/main/java/com/hai/entity/HighUser.java
index 319dc82e..bb17936a 100644
--- a/hai-service/src/main/java/com/hai/entity/HighUser.java
+++ b/hai-service/src/main/java/com/hai/entity/HighUser.java
@@ -1,5 +1,7 @@
 package com.hai.entity;
 
+import com.hai.model.UserModel;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -12,7 +14,7 @@ import java.util.Date;
  * 代码由工具生成
  * 
  **/
-public class HighUser implements Serializable {
+public class HighUser extends UserModel implements Serializable {
     /**
      * 用户编号
      */
@@ -367,4 +369,4 @@ public class HighUser implements Serializable {
         sb.append("]");
         return sb.toString();
     }
-}
\ No newline at end of file
+}
diff --git a/hai-service/src/main/java/com/hai/service/impl/BsIntegralRebateServiceImpl.java b/hai-service/src/main/java/com/hai/service/impl/BsIntegralRebateServiceImpl.java
index cd8c12bb..17c39c9a 100644
--- a/hai-service/src/main/java/com/hai/service/impl/BsIntegralRebateServiceImpl.java
+++ b/hai-service/src/main/java/com/hai/service/impl/BsIntegralRebateServiceImpl.java
@@ -112,7 +112,9 @@ public class BsIntegralRebateServiceImpl implements BsIntegralRebateService {
 
                 BigDecimal integralNum = object.getBigDecimal("price").multiply(bsIntegralRebate.getPercentage()).setScale( 0, BigDecimal.ROUND_HALF_UP );
 
+/*
                 HighOrder order = highOrderService.getOrderById(object.getLong("orderId"));
+*/
 
                 highUserService.goldHandle(object.getLong("userId"), integralNum.intValue(), 1, 4, object.getLong("orderId") , object.getString("remark") + integralNum);