- jxstorefeature support added.

business/controller/mtps/waybill.go

@@ -8,7 +8,6 @@ import (
 	"git.rosy.net.cn/baseapi/utils"
 	"git.rosy.net.cn/jx-callback/business/controller"
 	"git.rosy.net.cn/jx-callback/business/jxutils"
-	"git.rosy.net.cn/jx-callback/business/legacyorder"
 	"git.rosy.net.cn/jx-callback/business/model"
 	"git.rosy.net.cn/jx-callback/business/scheduler"
 	"git.rosy.net.cn/jx-callback/globals"
@@ -198,16 +197,10 @@ func (c *WaybillController) CancelWaybill(bill *model.Waybill) (err error) {
 	return nil
 }
 
-// todo 生成mtps deliveryid，为了兼容，现在取jxorder中的id
 func (c *WaybillController) getDeliveryID(order *model.GoodsOrder, db orm.Ormer) (retVal int64, err error) {
-	jxorder := &legacyorder.Jxorder2{
-		OrderId: utils.Str2Int64(order.VendorOrderID),
-	}
-	err = utils.CallFuncLogError(func() error {
-		err2 := db.Read(jxorder, "OrderId")
-		return err2
-	}, "getDeliveryID, orderID:%s", order.VendorOrderID)
-	return int64(jxorder.Id), err
+	// jxorder表当前已经有50多万条记录了，加100万避免冲突
+	// 508505
+	return order.ID + 1000000, nil
 }
 
 func (c *WaybillController) getMTPSShopID(order *model.GoodsOrder, db orm.Ormer) (retVal string, err error) {