订单列表

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

@@ -6,7 +6,9 @@ import (
 	"fusenapi/model/gmodel"
 	"fusenapi/utils/auth"
 	"fusenapi/utils/basic"
+	"fusenapi/utils/configs"
 	"fusenapi/utils/format"
+	"fusenapi/utils/order"
 	"math"
 	"time"
 
@@ -83,6 +85,12 @@ 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")
+		}
+
 		// 数据处理
 		for _, item := range listRes {
 			var pbData types.Items
@@ -100,6 +108,48 @@ func (l *UserOrderListLogic) UserOrderList(req *types.UserOrderListReq, userinfo
 			var pcsBox int64
 			var pcs int64
 			var productList []*types.Product
+
+			var surplusAt int64
+
+			//如果是部分支付状态，那么取消订单倒计时2天
+			if *item.Status == int64(constants.STATUS_NEW_PART_PAY) {
+				surplusAt = (*item.Ctime + int64(constants.CANCLE_ORDER_EXPIRE)) - time.Now().Unix()
+				if surplusAt < 0 {
+					surplusAt = 0
+				}
+			}
+
+			fsOrderAffiliateInfo := item.FsOrderAffiliateInfo
+
+			statusAndLogisticsRes := order.GetOrderStatusAndLogistics(order.GetOrderStatusAndLogisticsReq{
+				OrderStatus:    constants.Order(*item.Status),
+				DeliveryMethod: constants.DeliveryMethod(*item.DeliveryMethod),
+				IsPayCompleted: *item.IsAllProductCompleted,
+				SureTime:       *fsOrderAffiliateInfo.SureTime,
+				ProductTime:    *fsOrderAffiliateInfo.SureTime,
+				ProductEndtime: *fsOrderAffiliateInfo.SureTime,
+				DeliverTime:    *fsOrderAffiliateInfo.SureTime,
+				UpsDeliverTime: *fsOrderAffiliateInfo.SureTime,
+				UpsTime:        *fsOrderAffiliateInfo.SureTime,
+				ArrivalTime:    *fsOrderAffiliateInfo.SureTime,
+				RecevieTime:    *fsOrderAffiliateInfo.SureTime,
+
+				OrderCtime:     *item.Ctime,
+				WebSetTimeInfo: orderTimeConfig,
+			})
+
+			// 流程控制
+			statusTime := make([]*types.StatusTime, 5)
+			for _, itemTimes := range statusAndLogisticsRes.Times {
+				statusTime = append(statusTime, &types.StatusTime{
+					Key:  itemTimes.Key,
+					Time: itemTimes.Time,
+				})
+			}
+			pbData.StatusTimes = statusTime
+			pbData.LogisticsStatus = int64(statusAndLogisticsRes.LogisticsStatus)
+			pbData.Status = int64(statusAndLogisticsRes.OrderStatus)
+
 			if len(item.FsOrderDetails) > 0 {
 				for _, fsOrderDetailItem := range item.FsOrderDetails {
 					fsOrderDetailBuyNum := *fsOrderDetailItem.FsOrderDetail.BuyNum
@@ -130,35 +180,9 @@ func (l *UserOrderListLogic) UserOrderList(req *types.UserOrderListReq, userinfo
 				pbData.ProductList = productList
 			}
 
-			var surplusAt int64
-			surplusAt = (*item.Ctime + constants.CANCLE_ORDER_EXPIRE) - time.Now().Unix()
-			if surplusAt < 0 {
-				surplusAt = 0
-			}
-			//fsOrderAffiliateInfo := item.FsOrderAffiliateInfo
-
-			// 流程控制
-			// statusTime := make([]*types.StatusTime,8)
-			// statusTime[0] = &types.StatusTime{
-			// 	Key: 1,Time:*fsOrderAffiliateInfo.SureTime,
-			// }
-			// statusTime[1] = &types.StatusTime{
-			// 	Key: 1,Time:*ifsOrderAffiliateInfo.ProductTime,
-			// }
-
-			// 			`sure_time` int(10) unsigned DEFAULT '0' COMMENT '确认时间',
-			//   `product_time` int(10) unsigned DEFAULT '0' COMMENT '生产时间',
-			//   `product_endtime` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '生成完成时间',
-			//   `deliver_time` int(10) unsigned DEFAULT '0' COMMENT '发货时间',
-			//   `ups_deliver_time` int(10) unsigned DEFAULT '0' COMMENT 'ups发货时间',
-			//   `ups_time` int(10) unsigned DEFAULT '0' COMMENT 'UPS提货时间',
-			//   `arrival_time` int(10) unsigned DEFAULT '0' COMMENT '到达云仓的时间',
-			//   `recevie_time` int(10) unsigned DEFAULT '0' COMMENT '云仓收货时间',
-
 			pbData.PcsBox = pcsBox
 			pbData.Pcs = pcs
 			pbData.SurplusAt = surplusAt
-			pbData.LogisticsStatus = 1
 			pbData.Deposit = *item.TotalAmount / 2
 			pbData.Remaining = pbData.Deposit
 			respList = append(respList, pbData)