فهرست منبع

增加系统配置接口

kobe6258 4 ماه پیش
والد
کامیت
79a85bb549
2فایلهای تغییر یافته به همراه79 افزوده شده و 2 حذف شده
  1. 1 2
      controllers/order.go
  2. 78 0
      controllers/user.go

+ 1 - 2
controllers/order.go

@@ -232,7 +232,6 @@ func (this *OrderController) ProductOrderList() {
 				RefundAmount:  orderItem.RefundAmount,
 				RefundTradeId: orderItem.RefundTradeId,
 				PaymentWay:    PaymentWayMap[orderItem.PaymentWay],
-				PaymentAmount: orderItem.PaymentAmount,
 				PaymentTime:   orderItem.PaymentTime.Format(time.DateTime),
 				Status:        ProductOrderStatus[orderItem.Status],
 				RefundStatus:  RefundStatusMap[orderItem.RefundStatus],
@@ -245,7 +244,7 @@ func (this *OrderController) ProductOrderList() {
 				if tradeErr != nil {
 					utils.FileLog.Error("获取支付订单失败,支付订单号:" + orderItem.TradeNo + ",err:" + tradeErr.Error())
 				} else {
-					view.PaymentAmount = fmt.Sprintf("%s %.2f", tradeOrder.Currency, tradeOrder.Amount)
+					view.PaymentAmount = fmt.Sprintf("%s %s", tradeOrder.Currency, tradeOrder.Amount)
 				}
 			}
 			if orderItem.Status == models.OrderStatusPaid {

+ 78 - 0
controllers/user.go

@@ -598,3 +598,81 @@ func (this *UserController) ExportOfficialUsers() {
 	br.Success = true
 	br.Msg = "获取成功"
 }
+
+//
+//// UnReadMessageList  获取未读消息
+//// @Summary 获取未读消息
+//// @Description 获取未读消息
+//// @Success 200 {object} controllers.BaseResponse
+//// @router /message [get]
+//func (u *UserController) UnReadMessageList() {
+//		messages, err := models.GetUnReadMessageList(u.SysUser.SysUserId)
+//		if err != nil {
+//			u.FailedResult("获取我的未读消息失败", result)
+//			return
+//		}
+//		u.SuccessResult("获取我的未读消息成功", messages, result)
+//		return
+//	})
+//}
+//
+//type ReadMessageReq struct {
+//	AnalystId int `json:"analystId"`
+//	MessageId int `json:"MessageId"`
+//}
+//
+//// ReadMessage  获取未读消息
+//// @Summary 获取未读消息
+//// @Description 获取未读消息
+//// @Success 200 {object} controllers.BaseResponse
+//// @router /readMessage [post]
+//func (u *UserController) ReadMessage() {
+//	controllers.Wrap(&u.BaseController, func() (result *controllers.WrapData, err error) {
+//		result = u.InitWrapData("获取我的未读消息失败")
+//		readMessageReq := new(ReadMessageReq)
+//		u.GetPostParams(readMessageReq)
+//		if readMessageReq.MessageId <= 0 {
+//			logger.Error("消息Id非法")
+//			err = exception.New(exception.IllegalMessageId)
+//			u.FailedResult("已读消息失败", result)
+//			return
+//		}
+//		userInfo := u.Data["user"].(user.User)
+//		if user.ReadMessage(userInfo.Id, readMessageReq.MessageId) {
+//			u.SuccessResult("已读消息成功", nil, result)
+//			return
+//		} else {
+//			err = exception.New(exception.ReadMessageFailed)
+//			u.FailedResult("已读消息失败", result)
+//			return
+//		}
+//	})
+//}
+//
+//// ReadMessages  获取未读消息
+//// @Summary 获取未读消息
+//// @Description 获取未读消息
+//// @Success 200 {object} controllers.BaseResponse
+//// @router /readMessages [post]
+//func (u *UserController) ReadMessages() {
+//	controllers.Wrap(&u.BaseController, func() (result *controllers.WrapData, err error) {
+//		result = u.InitWrapData("获取我的未读消息失败")
+//		readMessageReq := new(ReadMessageReq)
+//		u.GetPostParams(readMessageReq)
+//		if readMessageReq.AnalystId <= 0 {
+//			logger.Error("研究员Id非法")
+//			err = exception.New(exception.IllegalAnalystId)
+//			u.FailedResult("已读消息失败", result)
+//			return
+//		}
+//		userInfo := u.Data["user"].(user.User)
+//		if user.ReadMessages(userInfo.Id, readMessageReq.AnalystId) {
+//			u.SuccessResult("已读消息成功", nil, result)
+//			return
+//		} else {
+//			err = exception.New(exception.ReadMessageFailed)
+//			u.FailedResult("已读消息失败", result)
+//			return
+//		}
+//	})
+//}