Merge remote-tracking branch 'origin/jdshop' into jxact

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,
@@ -543,37 +539,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)
 }
@@ -1219,6 +1184,7 @@ func orderSolutionForWuLiao(order *model.GoodsOrder) (err error) {
 				checkMatterDeliveryAddress(deliveryAddress)
 				order2, err2 := jxOrder2GoodsOrder(jxcontext.AdminCtx, outJxOrder, deliveryAddress, order.UserID, false)
 				if err = err2; err == nil {
+					order2.FromStoreID = v.FromStoreID
 					order2.AddressID = order.AddressID
 					order2.Status = model.OrderStatusDelivering
 					err = partner.CurOrderManager.OnOrderNew(order2, model.Order2Status(order2))
@@ -1970,6 +1936,7 @@ func SendFailedMatterOrder(ctx *jxcontext.Context, vendorOrderID string) (err er
 	if order == nil || order.StoreID != model.MatterStoreID || order.FromStoreID == 0 {
 		return fmt.Errorf("只允许物料店重发物料订单调用此接口！")
 	}
+	err = CancelMatterOrder(db, order, cancelMatterOrderReason)
 	// queryOrderStatus, err := api.JdEclpAPI.QueryOrderStatus(order.EclpOutID)
 	// if len(queryOrderStatus.OrderStatusList) > 0 {
 	// 	code := queryOrderStatus.OrderStatusList[len(queryOrderStatus.OrderStatusList)-1].SoStatusCode
@@ -1980,7 +1947,6 @@ func SendFailedMatterOrder(ctx *jxcontext.Context, vendorOrderID string) (err er
 			globals.SugarLogger.Debugf("SendFailedMatterOrder err : [%v]", err)
 			return err
 		}
-		err = CancelMatterOrder(db, order, cancelMatterOrderReason)
 		changeOrderStatus(order.VendorOrderID, model.OrderStatusCanceled, cancelMatterOrderReason)
 		for _, v := range order.Skus {
 			cms.RefreshMatterStock(jxcontext.AdminCtx, v.SkuID)
@@ -1997,13 +1963,12 @@ func SendFailedMatterOrder(ctx *jxcontext.Context, vendorOrderID string) (err er
 					return err
 				}
 				suffix := utils.Str2Int64(cOrder.VendorOrderID[len(cOrder.VendorOrderID)-2:]) + int64(len(goodsList))
-				_, err = createMatterOrder(buildJxOrderInfo(cOrder, cOrder.Skus), cOrder, suffix)
+				_, err = createMatterOrder(buildJxOrderInfo(cOrder, cOrder.Skus), order, suffix)
 				for _, v := range cOrder.Skus {
 					cms.RefreshMatterStock(jxcontext.AdminCtx, v.SkuID)
 				}
 			}
 		}
-		// err = CancelMatterOrder(db, order, cancelMatterOrderReason)
 		changeOrderStatus(order.VendorOrderID, model.OrderStatusCanceled, cancelMatterOrderReason)
 	} else if len(order.VendorOrderID) == 16 && order.EclpOutID != "" { // 这是分包的子订单
 		return fmt.Errorf("请重发主订单！主订单号：[%v]", order.VendorOrderID[len(order.VendorOrderID)-2:])
@@ -2101,7 +2066,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 {