提交代码

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();
     }
-}
+}

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);