商品订单

controllers/order.go

@@ -217,23 +217,22 @@ func (this *OrderController) ProductOrderList() {
 		go func(orderItem *models.ProductOrder) {
 			defer wg.Done()
 			view := &models.ProductOrderView{
-				OrderID:          orderItem.OrderID,
-				RealName:         orderItem.RealName,
-				Mobile:           fmt.Sprintf("+%s %s", orderItem.AreaCode, orderItem.Mobile),
-				ProductType:      ProductTypeMap[orderItem.ProductType],
-				ProductName:      orderItem.ProductName,
-				TotalAmount:      orderItem.TotalAmount,
-				TradeNO:          orderItem.TradeNO,
-				RefundAmount:     orderItem.RefundAmount,
-				PaymentWay:       PaymentWayMap[orderItem.PaymentWay],
-				PaymentTime:      orderItem.PaymentTime.Format(time.DateTime),
-				Status:           ProductOrderStatus[orderItem.Status],
-				RefundStatus:     RefundStatusMap[orderItem.RefundStatus],
-				RefundFinishTime: orderItem.RefundFinishTime.Format(time.DateTime),
-				Remark:           orderItem.Remark,
-				CreatedTime:      orderItem.CreatedTime.Format(time.DateTime),
+				OrderID:      orderItem.OrderID,
+				RealName:     orderItem.RealName,
+				Mobile:       fmt.Sprintf("+%s %s", orderItem.AreaCode, orderItem.Mobile),
+				ProductType:  ProductTypeMap[orderItem.ProductType],
+				ProductName:  orderItem.ProductName,
+				TotalAmount:  orderItem.TotalAmount,
+				TradeNO:      orderItem.TradeNO,
+				RefundAmount: orderItem.RefundAmount,
+				PaymentWay:   PaymentWayMap[orderItem.PaymentWay],
+				Status:       ProductOrderStatus[orderItem.Status],
+				RefundStatus: RefundStatusMap[orderItem.RefundStatus],
+				Remark:       orderItem.Remark,
+				CreatedTime:  orderItem.CreatedTime.Format(time.DateTime),
 			}
 			if orderItem.TradeNO != "" {
+				view.PaymentTime = orderItem.PaymentTime.Format(time.DateTime)
 				tradeOrder, tradeErr := models.GetTradeOrderByNo(orderItem.TradeNO)
 				if tradeErr != nil {
 					utils.FileLog.Error("获取支付订单失败，支付订单号：" + orderItem.TradeNO + ",err:" + tradeErr.Error())
@@ -252,6 +251,9 @@ func (this *OrderController) ProductOrderList() {
 					view.ValidDuration = "永久有效"
 				}
 			}
+			if orderItem.Status == models.OrderStatusRefund && orderItem.RefundStatus == models.RefundStatusSuccess {
+				view.RefundFinishTime = orderItem.RefundFinishTime.Format(time.DateTime)
+			}
 			ListView = append(ListView, view)
 		}(orderItem)
 	}
@@ -401,7 +403,7 @@ func (this *OrderController) TradeOrderList() {
 // @Param   SortParam   query   string  false       "排序字段参数，用来排序的字段， 枚举值：0：注册时间，1：阅读数，2：最近一次阅读时间"
 // @Param   SortType   query   string  true       "如何排序，是正序还是倒序，0：倒序，1：正序"
 // @Success 200 {object} response.TemplateUserListResp
-// @router /exportProductOrder [get]
+// @router /productOrder/export [get]
 func (this *OrderController) ExportProductOrder() {
 	br := new(models.BaseResponse).Init()
 	defer func() {
@@ -534,7 +536,7 @@ func (this *OrderController) ExportProductOrder() {
 // @Param   SortParam   query   string  false       "排序字段参数，用来排序的字段， 枚举值：0：注册时间，1：阅读数，2：最近一次阅读时间"
 // @Param   SortType   query   string  true       "如何排序，是正序还是倒序，0：倒序，1：正序"
 // @Success 200 {object} response.TemplateUserListResp
-// @router /exportTradeOrder [get]
+// @router /tradeOrder/export [get]
 func (this *OrderController) ExportTradeOrder() {
 	br := new(models.BaseResponse).Init()
 	defer func() {

routers/commentsRouter.go

@@ -336,7 +336,7 @@ func init() {
     beego.GlobalControllerRouter["eta/eta_mini_crm_ht/controllers:OrderController"] = append(beego.GlobalControllerRouter["eta/eta_mini_crm_ht/controllers:OrderController"],
         beego.ControllerComments{
             Method: "ExportProductOrder",
-            Router: `/exportProductOrder`,
+            Router: `/productOrder/export`,
             AllowHTTPMethods: []string{"get"},
             MethodParams: param.Make(),
             Filters: nil,
@@ -344,8 +344,8 @@ func init() {
 
     beego.GlobalControllerRouter["eta/eta_mini_crm_ht/controllers:OrderController"] = append(beego.GlobalControllerRouter["eta/eta_mini_crm_ht/controllers:OrderController"],
         beego.ControllerComments{
-            Method: "ExportTradeOrder",
-            Router: `/exportTradeOrder`,
+            Method: "ProductOrderList",
+            Router: `/productOrderList`,
             AllowHTTPMethods: []string{"get"},
             MethodParams: param.Make(),
             Filters: nil,
@@ -353,8 +353,8 @@ func init() {
 
     beego.GlobalControllerRouter["eta/eta_mini_crm_ht/controllers:OrderController"] = append(beego.GlobalControllerRouter["eta/eta_mini_crm_ht/controllers:OrderController"],
         beego.ControllerComments{
-            Method: "ProductOrderList",
-            Router: `/productOrderList`,
+            Method: "ExportTradeOrder",
+            Router: `/tradeOrder/export`,
             AllowHTTPMethods: []string{"get"},
             MethodParams: param.Make(),
             Filters: nil,