From 87ce3357c4bd597ca647c9ef80f3ad4db26510cf Mon Sep 17 00:00:00 2001 From: kanade Date: Mon, 22 Aug 2022 18:02:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=9A=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/api/mobile/order/submit.go | 82 ++++++++++++++--------------- 1 file changed, 40 insertions(+), 42 deletions(-) diff --git a/internal/api/mobile/order/submit.go b/internal/api/mobile/order/submit.go index 19f9ee6..bd269dc 100755 --- a/internal/api/mobile/order/submit.go +++ b/internal/api/mobile/order/submit.go @@ -213,49 +213,47 @@ func SubmitOrder(c *gin.Context) { IsSplit: orderInfo.IsSplit, } kind := 0 - if vendor == 1800 || vendor == 2000 || vendor == 3000 { - switch vendor { - case 1800, 2000: - channelOrderID := strconv.Itoa(int(orderCopy.ID)) - resp, err := JdOrderSubmit(tx, c.ClientIP(), data, vendor, previewOrderAddr, fData, channelOrderID) - if err != nil { - log.Println("订单生成失败:", err.Error()) - back.Err(c, err.Error()) - tx.Rollback() - return - } - if vendor == 1800 { - kind = 1 - } else { - kind = 2 - } - orderCopy.Kind = kind - fmt.Println("订单号为", resp.OrderID) - orderCopy.JCookOrderID = resp.OrderID - case 3000: - channelOrderID := strconv.Itoa(int(orderCopy.ID)) - resp, err := ShaMaOrderSubmit(tx, c.ClientIP(), data, vendor, previewOrderAddr, fData, channelOrderID) - if err != nil { - log.Println("订单生成失败:", err.Error()) - back.Err(c, err.Error()) - tx.Rollback() - return - } - orderCopy.Kind = 3 - orderCopy.ShaMaOrderID = resp.OrderID - case 4000: - channelOrderID := strconv.Itoa(int(orderCopy.ID)) - thirdPartyOrderSn, err := SupplyOrderSubmit(tx, c.ClientIP(), data, vendor, previewOrderAddr, fData, channelOrderID) - if err != nil { - log.Println("订单生成失败:", err.Error()) - back.Err(c, err.Error()) - tx.Rollback() - return - } - orderCopy.Kind = 4 - orderCopy.ThirdPartyType = goods2.RecookGoodsInfoThirdPartyTypeSupply - orderCopy.ThirdPartyOrderSn = thirdPartyOrderSn + switch vendor { + case 1800, 2000: + channelOrderID := strconv.Itoa(int(orderCopy.ID)) + resp, err := JdOrderSubmit(tx, c.ClientIP(), data, vendor, previewOrderAddr, fData, channelOrderID) + if err != nil { + log.Println("订单生成失败:", err.Error()) + back.Err(c, err.Error()) + tx.Rollback() + return + } + if vendor == 1800 { + kind = 1 + } else { + kind = 2 + } + orderCopy.Kind = kind + fmt.Println("订单号为", resp.OrderID) + orderCopy.JCookOrderID = resp.OrderID + case 3000: + channelOrderID := strconv.Itoa(int(orderCopy.ID)) + resp, err := ShaMaOrderSubmit(tx, c.ClientIP(), data, vendor, previewOrderAddr, fData, channelOrderID) + if err != nil { + log.Println("订单生成失败:", err.Error()) + back.Err(c, err.Error()) + tx.Rollback() + return + } + orderCopy.Kind = 3 + orderCopy.ShaMaOrderID = resp.OrderID + case 4000: + channelOrderID := strconv.Itoa(int(orderCopy.ID)) + thirdPartyOrderSn, err := SupplyOrderSubmit(tx, c.ClientIP(), data, vendor, previewOrderAddr, fData, channelOrderID) + if err != nil { + log.Println("订单生成失败:", err.Error()) + back.Err(c, err.Error()) + tx.Rollback() + return } + orderCopy.Kind = 4 + orderCopy.ThirdPartyType = goods2.RecookGoodsInfoThirdPartyTypeSupply + orderCopy.ThirdPartyOrderSn = thirdPartyOrderSn } if condition { orderInfo.ID = orderCopy.ID