From 70cc74893fef87d63afc79a22614a010bac280ef Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Mon, 6 Aug 2018 14:45:22 +0800
Subject: [PATCH] - handle call ReaddOrder when second times Add waybill on
 dada.

---
 business/controller/dada/waybill.go | 27 ++++++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/business/controller/dada/waybill.go b/business/controller/dada/waybill.go
index 7b7eafdec..7e803a8cb 100644
--- a/business/controller/dada/waybill.go
+++ b/business/controller/dada/waybill.go
@@ -88,15 +88,33 @@ func (c *WaybillController) CreateWaybill(order *model.GoodsOrder) (err error) {
 	if billParams.CargoPrice > maxCargoPrice {
 		billParams.CargoPrice = maxCargoPrice
 	}
-
-	if billParams.CityCode, err = c.getDataCityCodeFromOrder(order); err == nil {
+	db := orm.NewOrm()
+	if billParams.CityCode, err = c.getDataCityCodeFromOrder(order, db); err == nil {
 		billParams.ReceiverLng, billParams.ReceiverLat, _ = jxutils.IntCoordinate2MarsStandard(order.ConsigneeLng, order.ConsigneeLat, order.CoordinateType)
 		addParams := map[string]interface{}{
 			"info": order.BuyerComment,
 			// "origin_mark":    model.VendorNames[order.VendorID],
 			"origin_mark_no": fmt.Sprintf("%d", order.OrderSeq),
 		}
-		_, err = api.DadaAPI.AddOrder(billParams, addParams)
+
+		// 达达要求第二次创建运单，调用函数不同。所以查找两天内有无相同订单号的运单
+		var lists []orm.ParamsList
+		num, err2 := db.Raw(`
+		SELECT vendor_waybill_id
+		FROM waybill
+		WHERE waybill_created_at > DATE_ADD(NOW(), interval -2 day)
+		AND vendor_order_id = ?
+		AND waybill_vendor_id = ?
+		`, jxutils.ComposeUniversalOrderID(order.VendorOrderID, order.VendorID), model.VendorIDDada).ValuesList(&lists)
+		if err2 == nil && num > 0 {
+			globals.SugarLogger.Debugf("CreateWaybill orderID:%s num=%d use ReaddOrder", order.VendorOrderID, num)
+			_, err = api.DadaAPI.ReaddOrder(billParams, addParams)
+		} else {
+			if err2 != nil {
+				globals.SugarLogger.Warnf("CreateWaybill orderID:%s error:%v", order.VendorOrderID, err2)
+			}
+			_, err = api.DadaAPI.AddOrder(billParams, addParams)
+		}
 	}
 	return err
 }
@@ -115,7 +133,7 @@ func (c *WaybillController) CancelWaybill(bill *model.Waybill) (err error) {
 	return err
 }
 
-func (c *WaybillController) getDataCityCodeFromOrder(order *model.GoodsOrder) (retVal string, err error) {
+func (c *WaybillController) getDataCityCodeFromOrder(order *model.GoodsOrder, db orm.Ormer) (retVal string, err error) {
 	var sql string
 	if order.VendorID == model.VendorIDJD {
 		sql = `
@@ -136,7 +154,6 @@ func (c *WaybillController) getDataCityCodeFromOrder(order *model.GoodsOrder) (r
 	} else {
 		panic(fmt.Sprintf("wrong vendorid:%d", order.VendorID))
 	}
-	db := orm.NewOrm()
 	var lists []orm.ParamsList
 	num, err := db.Raw(sql, utils.Str2Int64(order.VendorStoreID)).ValuesList(&lists)
 	if err == nil && num == 1 {