订单

server/home-user-auth/internal/logic/userorderlistlogic.go

@@ -6,6 +6,7 @@ import (
 	"fusenapi/model/gmodel"
 	"fusenapi/utils/auth"
 	"fusenapi/utils/basic"
+	"fusenapi/utils/configs"
 
 	"fusenapi/utils/format"
 	"fusenapi/utils/order"
@@ -39,6 +40,9 @@ func (l *UserOrderListLogic) UserOrderList(req *types.UserOrderListReq, userinfo
 	// 返回值必须调用Set重新返回, resp可以空指针调用 resp.SetStatus(basic.CodeOK, data)
 	// userinfo 传入值时, 一定不为null
 
+	// 测试
+	userinfo.UserId = 39
+
 	orderDetailModel := gmodel.NewFsOrderDetailModel(l.svcCtx.MysqlConn)
 	orderModel := gmodel.NewFsOrderModel(l.svcCtx.MysqlConn)
 	rowBuilder := orderModel.RowSelectBuilder(nil)
@@ -86,10 +90,10 @@ func (l *UserOrderListLogic) UserOrderList(req *types.UserOrderListReq, userinfo
 	var respList []types.Items
 	if listResLen > 0 {
 		// 获取订单时间配置
-		// orderTimeConfig, err := configs.GetOrderTimeConfig(l.ctx, l.svcCtx.MysqlConn)
-		// if err != nil {
-		// 	return resp.SetStatusWithMessage(basic.CodeServiceErr, "failed to get config time info")
-		// }
+		orderTimeConfig, err := configs.GetOrderTimeConfig(l.ctx, l.svcCtx.MysqlConn)
+		if err != nil {
+			return resp.SetStatusWithMessage(basic.CodeServiceErr, "failed to get config time info")
+		}
 
 		// 数据处理
 		for _, item := range listRes {
@@ -121,9 +125,9 @@ func (l *UserOrderListLogic) UserOrderList(req *types.UserOrderListReq, userinfo
 
 			fsOrderAffiliateInfo := item.FsOrderAffiliateInfo
 
-			statusAndLogisticsRes := order.GetOrderStatusAndLogistics(order.GetOrderStatusAndLogisticsReq{
-				OrderStatus:    constants.Order(*item.Status),
-				DeliveryMethod: constants.DeliveryMethod(*item.DeliveryMethod),
+			var getOrderStatusAndLogisticsReq = order.GetOrderStatusAndLogisticsReq{
+				OrderStatus:    1,
+				DeliveryMethod: 1,
 				IsPayCompleted: *item.IsAllProductCompleted,
 				SureTime:       *fsOrderAffiliateInfo.SureTime,
 				ProductTime:    *fsOrderAffiliateInfo.SureTime,
@@ -134,9 +138,11 @@ func (l *UserOrderListLogic) UserOrderList(req *types.UserOrderListReq, userinfo
 				ArrivalTime:    *fsOrderAffiliateInfo.SureTime,
 				RecevieTime:    *fsOrderAffiliateInfo.SureTime,
 
-				OrderCtime: *item.Ctime,
-				//WebSetTimeInfo: orderTimeConfig,
-			})
+				OrderCtime:     *item.Ctime,
+				WebSetTimeInfo: orderTimeConfig,
+			}
+
+			statusAndLogisticsRes := order.GetOrderStatusAndLogistics(getOrderStatusAndLogisticsReq)
 
 			// 流程控制
 			statusTime := make([]*types.StatusTime, 5)