京西也支持订单转移

business/partner/purchase/jx/localjx/order.go

@@ -1,7 +1,6 @@
 package localjx
 
 import (
-	"crypto/md5"
 	"fmt"
 	"math"
 	"regexp"
@@ -140,8 +139,6 @@ type MatterOrderStatus struct {
 }
 
 var (
-	orderNoBeginTimestamp int64
-
 	weekdayMap = map[int]string{
 		1: "一",
 		2: "二",
@@ -174,7 +171,6 @@ var (
 )
 
 func init() {
-	orderNoBeginTimestamp = utils.Str2Time("2010-01-01 00:00:00").Unix()
 }
 
 func GetMyOrders(ctx *jxcontext.Context, fromDateStr, toDateStr string, params map[string]interface{}, offset, pageSize int) (pagedInfo *model.PagedInfo, err error) {
@@ -250,7 +246,7 @@ func CreateOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, addressID int64,
 		if jxOrder.IsPriceDefend == model.YES {
 			outJxOrder.OrderID = jxOrder.OrderID
 		} else {
-			outJxOrder.OrderID = GenOrderNo(ctx)
+			outJxOrder.OrderID = jxutils.GenOrderNo()
 		}
 		order, err2 := jxOrder2GoodsOrder(ctx, outJxOrder, deliveryAddress, "", IsDeliverySelf)
 		if err = err2; err == nil {
@@ -273,7 +269,7 @@ func buildDefendPriceOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, address
 	)
 	issue = jxutils.GetDefendPriceIssue()
 	priceDefendOrder := &model.PriceDefendOrder{
-		VendorOrderID: utils.Int64ToStr(GenOrderNo(ctx)),
+		VendorOrderID: utils.Int64ToStr(jxutils.GenOrderNo()),
 		StoreID:       jxOrder.StoreID,
 		SkuID:         jxOrder.Skus[0].SkuID,
 		AddressID:     addressID,
@@ -471,37 +467,6 @@ func OnPayFinished(orderPay *model.OrderPay) (err error) {
 	return err
 }
 
-func GenOrderNo(ctx *jxcontext.Context) (orderNo int64) {
-	const prefix = 88
-	const randPartNum = 1000
-	orderNo = time.Now().Unix() - orderNoBeginTimestamp
-	// fmt.Println(orderNo)
-	orderNo = orderNo * randPartNum
-	md5Bytes := md5.Sum([]byte(utils.GetUUID()))
-	randPart := 0
-	for k, v := range md5Bytes {
-		randPart += int(v) << ((k % 3) * 8)
-	}
-	orderNo += int64(randPart % randPartNum)
-	orderNo += int64(math.Pow10(int(math.Log10(float64(orderNo)))+1)) * prefix
-	return orderNo
-}
-
-func GenAfsOrderNo(ctx *jxcontext.Context) (orderNo int64) {
-	const prefix = 80
-	const randPartNum = 100
-	orderNo = time.Now().Unix() - orderNoBeginTimestamp
-	orderNo = orderNo * randPartNum
-	md5Bytes := md5.Sum([]byte(utils.GetUUID()))
-	randPart := 0
-	for k, v := range md5Bytes {
-		randPart += int(v) << ((k % 3) * 8)
-	}
-	orderNo += int64(randPart % randPartNum)
-	orderNo += int64(math.Pow10(int(math.Log10(float64(orderNo)))+1)) * prefix
-	return orderNo
-}
-
 func GenPayOrderID(order *model.GoodsOrder) (payOrderID int64) {
 	return utils.Str2Int64(order.VendorOrderID)
 }
@@ -2007,7 +1972,7 @@ func CreateOrderByPriceDefend(ctx *jxcontext.Context) (err error) {
 					BuyerComment:  "守价订单",
 					StoreID:       vv[0].StoreID,
 					IsPriceDefend: model.YES,
-					OrderID:       GenOrderNo(ctx),
+					OrderID:       jxutils.GenOrderNo(),
 					UserID:        address.UserID,
 				}
 				for _, priceDefend := range vv {

business/partner/purchase/jx/order_afs.go

@@ -5,6 +5,8 @@ import (
 	"strings"
 	"time"
 
+	"git.rosy.net.cn/jx-callback/business/jxutils"
+
 	"git.rosy.net.cn/jx-callback/globals"
 
 	"git.rosy.net.cn/jx-callback/business/model/dao"
@@ -142,7 +144,7 @@ func (c *PurchaseHandler) PartRefundOrder(ctx *jxcontext.Context, order *model.G
 
 func buildOrderStatus(ctx *jxcontext.Context, order *model.GoodsOrder, reason string, isJxShop bool) (orderStatus *model.OrderStatus) {
 	orderStatus = &model.OrderStatus{
-		VendorOrderID:    utils.Int64ToStr(localjx.GenAfsOrderNo(ctx)), // 是售后单ID，不是订单ID，订单ID在RefVendorOrderID中
+		VendorOrderID:    utils.Int64ToStr(jxutils.GenAfsOrderNo()), // 是售后单ID，不是订单ID，订单ID在RefVendorOrderID中
 		VendorID:         order.VendorID,
 		OrderType:        model.OrderTypeAfsOrder,
 		RefVendorOrderID: order.VendorOrderID,