Merge branch 'feat/coupon' into dev

dotbitHQ · Nov 10, 2023 · 6e34f07 · 6e34f07
2 parents ed1241f + 3353336
commit 6e34f07
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/dao/t_order_info.go b/dao/t_order_info.go
@@ -303,7 +303,7 @@ func (d *DbDao) UpdateOrderStatusToFailForUnconfirmedPayHash(orderId, payHash st
 }
 
 func (d *DbDao) GetPendingOrderByAccIdAndActionType(accountId string, actionType tables.ActionType) (order tables.OrderInfo, err error) {
-	err = d.db.Where("accountId=? and action_type=? and order_status=?", accountId, actionType, tables.OrderStatusDefault).First(&order).Error
+	err = d.db.Where("account_id=? and action_type=? and order_status=?", accountId, actionType, tables.OrderStatusDefault).First(&order).Error
 	if errors.Is(err, gorm.ErrRecordNotFound) {
 		err = nil
 	}

diff --git a/http_server/handle/coupon_order_create.go b/http_server/handle/coupon_order_create.go
@@ -130,7 +130,7 @@ func (h *HttpHandle) doCouponOrderCreate(req *ReqCouponOrderCreate, apiResp *api
 		return fmt.Errorf("GetPendingOrderByAccIdAndActionType err: %s", err.Error())
 	}
 	if order.Id > 0 {
-		apiResp.ApiRespErr(api_code.ApiCodeOperationFrequent, "have pending order: "+order.OrderId)
+		apiResp.ApiRespErr(api_code.ApiCodeOperationFrequent, "have pending order")
 		apiResp.Data = map[string]interface{}{
 			"order_id": order.OrderId,
 		}