From fd910b2da00cd9d66c4c3537ff7df500d31dc309 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Fri, 19 Jun 2020 11:18:38 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=BA=8F=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxcallback/orderman/order.go | 21 +++++++++++++++------
 business/jxutils/jxutils.go           |  2 ++
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go
index 7c72bdde8..b99e0d1c4 100644
--- a/business/jxcallback/orderman/order.go
+++ b/business/jxcallback/orderman/order.go
@@ -1075,7 +1075,7 @@ func result2Orders(ctx *jxcontext.Context, result *jdshopapi.AllOrdersResult) (o
 		}
 		order := &model.GoodsOrder{
 			VendorOrderID2:   utils.Int64ToStr(jdsOrder.OrderID),
-			VendorOrderID:    utils.Int64ToStr(jdsOrder.OrderID) + "01",
+			VendorOrderID:    utils.Int64ToStr(jdsOrder.OrderID) + "001",
 			VendorID:         model.VendorIDJDShop,
 			BaseFreightMoney: jxutils.StandardPrice2Int(jdsOrder.Freight),
 			VendorStatus:     utils.Int2Str(jdsOrder.OrderStatus),
@@ -1091,6 +1091,7 @@ func result2Orders(ctx *jxcontext.Context, result *jdshopapi.AllOrdersResult) (o
 			Status:           model.OrderStatusNew,
 			TotalShopMoney:   utils.Float64TwoInt64(math.Round(utils.Int64ToFloat64(orderDetail.ActualPayPrice) * jdshopapi.JdsPayPercentage)),
 			DeliveryFlag:     model.OrderDeliveryFlagMaskScheduleDisabled,
+			DeliveryType:     model.OrderDeliveryTypeStoreSelf,
 			StatusTime:       utils.Str2Time(jdsOrder.OrderCreateTime + ":00"),
 			OrderSeq:         0,
 		}
@@ -1160,10 +1161,17 @@ func result2Orders(ctx *jxcontext.Context, result *jdshopapi.AllOrdersResult) (o
 	return orders, err
 }
 
-func setJdsOrderSeq(orders *model.GoodsOrder) {
-	// sql := `
-	// 	SELECT * FROM
-	// `
+func setJdsOrderSeq(order *model.GoodsOrder) (err error) {
+	var count int
+	sql := `
+		SELECT count(*) FROM goods_order WHERE store_id = ? AND order_create_at >= ? AND order_create_at <= ? AND vendor_id = ?
+	`
+	sqlParams := []interface{}{
+		order.StoreID, utils.Time2Date(time.Now()), utils.Time2Date(time.Now().AddDate(0, 0, 1)), order.VendorID,
+	}
+	err = dao.GetRow(dao.GetDB(), &count, sql, sqlParams)
+	order.OrderSeq = count + 1
+	return err
 }
 
 func TransferJdsOrder(ctx *jxcontext.Context, vendorOrderID string, storeID int) (vendorOrderIDJds string, err error) {
@@ -1222,7 +1230,7 @@ func TransferJdsOrder(ctx *jxcontext.Context, vendorOrderID string, storeID int)
 	if len(order.VendorOrderID) > 12 {
 		suffix := utils.Str2Int(order.VendorOrderID[12:len(order.VendorOrderID)])
 		suffix++
-		order.VendorOrderID = utils.Int64ToStr(utils.Str2Int64(order.VendorOrderID2)*10) + utils.Int2Str(suffix)
+		order.VendorOrderID = utils.Int64ToStr(utils.Str2Int64(order.VendorOrderID2)*100) + utils.Int2Str(suffix)
 	}
 	for _, sku := range skus {
 		sku.VendorOrderID = order.VendorOrderID
@@ -1233,6 +1241,7 @@ func TransferJdsOrder(ctx *jxcontext.Context, vendorOrderID string, storeID int)
 		order.DeliveryFlag = model.NO
 	}
 	order.Status = model.OrderStatusNew
+	setJdsOrderSeq(order)
 	err = partner.CurOrderManager.OnOrderNew(order, model.Order2Status(order))
 	vendorOrderIDJds = order.VendorOrderID
 	return vendorOrderIDJds, err
diff --git a/business/jxutils/jxutils.go b/business/jxutils/jxutils.go
index 5842cad0f..6a878ed2c 100644
--- a/business/jxutils/jxutils.go
+++ b/business/jxutils/jxutils.go
@@ -161,6 +161,8 @@ func GetPossibleVendorIDFromVendorOrderID(vendorOrderID string) (vendorID int) {
 			vendorID = model.VendorIDWSC
 		} else if orderIDLen == len("1000004390") {
 			vendorID = model.VendorIDJX
+		} else if orderIDLen == len("124557362562002") {
+			vendorID = model.VendorIDJDShop
 		}
 	}
 	return vendorID