diff --git a/hai-bweb/src/main/java/com/bweb/controller/HighGasController.java b/hai-bweb/src/main/java/com/bweb/controller/HighGasController.java
index ef189203..acc0bf4e 100644
--- a/hai-bweb/src/main/java/com/bweb/controller/HighGasController.java
+++ b/hai-bweb/src/main/java/com/bweb/controller/HighGasController.java
@@ -851,12 +851,8 @@ public class HighGasController {
                             order.setRefundPrice(order.getPayRealPrice());
                             highOrderService.updateOrderDetail(order);
                         }
-<<<<<<< HEAD
                     } else if (order.getPayType() == 3){
                         String remark = "订单" + order.getOrderNo() + "退款，退还积分：" +  order.getPayGold();
-=======
-                    } else if (order.getPayType() == 3) {
->>>>>>> pre
                         // 积分退款
                         highUserService.goldHandle(order.getMemId(), order.getPayGold(),1, 3, order.getId() , remark);
                         order.setOrderStatus(4);
diff --git a/hai-service/src/main/java/com/hai/entity/HighOrder.java b/hai-service/src/main/java/com/hai/entity/HighOrder.java
index ce7cbca2..d08cbfd0 100644
--- a/hai-service/src/main/java/com/hai/entity/HighOrder.java
+++ b/hai-service/src/main/java/com/hai/entity/HighOrder.java
@@ -247,6 +247,14 @@ public class HighOrder implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
     public String getPayPwd() {
         return payPwd;
     }
@@ -655,33 +663,6 @@ public class HighOrder implements Serializable {
         this.ext3 = ext3;
     }
 
-<<<<<<< HEAD
-    public String getPassword() {
-        return password;
-    }
-
-    public void setPassword(String password) {
-        this.password = password;
-    }
-
-    public Boolean getTyAgent() {
-        return isTyAgent;
-    }
-
-    public void setTyAgent(Boolean tyAgent) {
-        isTyAgent = tyAgent;
-    }
-
-    public Boolean getBuyPoints() {
-        return buyPoints;
-    }
-
-    public void setBuyPoints(Boolean buyPoints) {
-        this.buyPoints = buyPoints;
-    }
-
-=======
->>>>>>> 848fcba6384da50fdbd18a8fcc2e19ac7c72a25a
     @Override
     public boolean equals(Object that) {
         if (this == that) {
diff --git a/hai-service/src/main/java/com/hai/service/impl/HighOrderServiceImpl.java b/hai-service/src/main/java/com/hai/service/impl/HighOrderServiceImpl.java
index c9ad1069..3bee51b5 100644
--- a/hai-service/src/main/java/com/hai/service/impl/HighOrderServiceImpl.java
+++ b/hai-service/src/main/java/com/hai/service/impl/HighOrderServiceImpl.java
@@ -319,7 +319,8 @@ public class HighOrderServiceImpl implements HighOrderService {
                 updateOrderDetail(highOrder);
 
                 // 扣除用户积分
-                highUserService.goldHandle(highOrder.getMemId(), highOrder.getPayGold(), 2, 2, highOrder.getId());
+                highUserService.goldHandle(highOrder.getMemId(), highOrder.getPayGold(), 2, 2, highOrder.getId(),
+                        "抵扣积分订单：" + highOrder.getOrderNo() + "，使用积分:" + highOrder.getPayGold());
             }
 
             // 积分金额等于应付金额
@@ -337,7 +338,8 @@ public class HighOrderServiceImpl implements HighOrderService {
                     throw ErrorHelp.genException(SysCode.System, ErrorCode.USER_PAY_PWD_ERROR, "");
                 }
                 // 扣除用户积分
-                highUserService.goldHandle(highOrder.getMemId(), highOrder.getPayGold(), 2, 2, highOrder.getId());
+                highUserService.goldHandle(highOrder.getMemId(), highOrder.getPayGold(), 2, 2, highOrder.getId(),
+                        "抵扣积分订单：" + highOrder.getOrderNo() + "，使用积分:" + highOrder.getPayGold());
 
                 highOrder.setOrderStatus(OrderStatusEnum.type3.getType());
                 highOrder.setPayTime(new Date());
@@ -1359,9 +1361,11 @@ public class HighOrderServiceImpl implements HighOrderService {
 
             if (highChildOrder.getGoodsType() == 2) {
                 highChildOrder.setChildOrdeStatus(3);  // 子订单状态：1 待支付  2 已支付  3.已完成  4. 已退款  5.已取消
+
                 // 金币 1：100
                 Integer goldNum = new BigDecimal(highChildOrder.getTotalPrice().toString()).multiply(new BigDecimal("100")).intValue();
-                highUserService.goldHandle(highChildOrder.getGoodsId(), goldNum, 1, 1, highChildOrder.getId());
+                String remark = "订单" + order.getOrderNo() + "积分充值积分：" +  goldNum;
+                highUserService.goldHandle(highChildOrder.getGoodsId(), goldNum, 1, 1, highChildOrder.getId(), remark);
             }
 
             if (highChildOrder.getGoodsType() == 3) {