fix:购物车下单

utils/order/order.go

@@ -81,7 +81,7 @@ func GetAmountInfo(req GetAmountInfoReq) gmodel.AmountInfo {
 	}
 }
 
-func GenerateOrderNumber(userID int) string {
+func GenerateOrderNumber(deliveryMethod int, userID int) string {
 	// 获取当前时间
 	now := time.Now()
 
@@ -98,26 +98,30 @@ func GenerateOrderNumber(userID int) string {
 	randomNum := fmt.Sprintf("%02d", rand.Intn(100))
 
 	// 拼接订单号
-	orderNumber := year + month + day + hour + minute + second + randomNum + strconv.Itoa(userID)
+	orderNumber := year + month + day + hour + minute + second + randomNum + strconv.Itoa(userID) + strconv.Itoa(deliveryMethod)
 	return orderNumber
 }
 
 // 初始化订单状态
-func GenerateOrderStatusLink(req []gmodel.OrderStatus) []gmodel.OrderStatus {
+func GenerateOrderStatusLink(deliveryMethod int64, noTime time.Time) []gmodel.OrderStatus {
 	var list []gmodel.OrderStatus
 
-	for _, v := range constants.OrderStatusUser {
-		for _, v1 := range req {
-			if v1.StatusCode == v {
-				list = append(list, v1)
-			} else {
-				list = append(list, gmodel.OrderStatus{
-					StatusCode:  v,
-					StatusTitle: constants.OrderStatusMessage[v],
-				})
-			}
-		}
+	var orderStatus []constants.OrderStatusCode
+	if deliveryMethod == constants.DELIVERYMETHODDIRECTMAIL {
+		orderStatus = constants.OrderStatusUserDIRECTMAIL
+	} else {
+		orderStatus = constants.OrderStatusUserCLOUDSTORE
 	}
+	for _, v := range orderStatus {
+		list = append(list, gmodel.OrderStatus{
+			StatusCode:  v,
+			StatusTitle: constants.OrderStatusMessage[v],
+		})
+	}
+	list[0].Ctime = noTime
+	list[0].Utime = noTime
+	tPlus60Days := noTime.AddDate(0, 0, 60)
+	list[len(list)-1].ExpectedTime = tPlus60Days
 	return list
 }