Browse Source

bug修改

wangfei 6 years ago
parent
commit
db4ccd9407
1 changed files with 3 additions and 4 deletions
  1. 3
    4
      service/goods/orders.go

+ 3
- 4
service/goods/orders.go View File

@@ -90,9 +90,7 @@ func (s *GoodsServ) ConfirmOrder(ordersID, customercouponid, remark string) erro
90 90
 		return errors.New("订单已付款,请勿重复付款!")
91 91
 	}
92 92
 
93
-	if info.Remark != "" {
94
-		info.Remark = remark
95
-	}
93
+	info.Remark = remark
96 94
 
97 95
 	if info.PayType == models.CONSUME_INNER {
98 96
 		// 内部人员, 可以直接购买
@@ -270,6 +268,7 @@ func (s *GoodsServ) ConfirmOrder(ordersID, customercouponid, remark string) erro
270 268
 	orders := info.TaGoodsOrders
271 269
 	orders.IsPay = models.BOOL_TRUE
272 270
 	orders.Status = models.STATUS_NORMAL
271
+	orders.Remark = info.Remark
273 272
 
274 273
 	if orders.ActualAmount == "" {
275 274
 		orders.ActualAmount = "0.0"
@@ -280,7 +279,7 @@ func (s *GoodsServ) ConfirmOrder(ordersID, customercouponid, remark string) erro
280 279
 	}
281 280
 
282 281
 	if err := s.dao.UpdateOrders(&orders, []string{
283
-		"status", "is_pay", "coupon_amount", "actual_amount",
282
+		"status", "is_pay", "coupon_amount", "actual_amount", "remark",
284 283
 	}); err != nil {
285 284
 		utils.LogError("修改订单状态失败:", err.Error())
286 285
 		return err