- QueryOrderWaybillFeeInfo

2019-04-30 15:41:51 +08:00
parent 7389787b6a
commit 877109aee0
6 changed files with 154 additions and 45 deletions
--- a/business/partner/delivery/dada/waybill.go
+++ b/business/partner/delivery/dada/waybill.go
@@ -99,17 +99,23 @@ func (c *DeliveryHandler) callbackMsg2Waybill(msg *dadaapi.CallbackMsg) (retVal
 	return retVal
 }

-// IDeliveryPlatformHandler
-func (c *DeliveryHandler) CreateWaybill(order *model.GoodsOrder, policy partner.CreateWaybillPolicy) (bill *model.Waybill, err error) {
+func (c *DeliveryHandler) GetWaybillFee(order *model.GoodsOrder) (deliveryFeeInfo *partner.WaybillFeeInfo, err error) {
 	db := dao.GetDB()
-	deliveryFee, addFee, err := delivery.CalculateOrderDeliveryFee(order, time.Now(), db)
-	if err != nil {
-		return nil, err
+	deliveryFeeInfo = &partner.WaybillFeeInfo{}
+	deliveryFeeInfo.RefDeliveryFee, deliveryFeeInfo.RefAddFee, err = delivery.CalculateOrderDeliveryFee(order, time.Now(), db)
+	billParams, addParams, err := c.getBillParams(db, order)
+	if err == nil {
+		var result *dadaapi.CreateOrderResponse
+		if result, err = api.DadaAPI.QueryDeliverFee(billParams, addParams); err != nil {
+			return nil, err
+		}
+		deliveryFeeInfo.DeliveryFee = jxutils.StandardPrice2Int(result.Fee)
 	}
-	if err = delivery.CallCreateWaybillPolicy(policy, deliveryFee, addFee, deliveryFee, order, model.VendorIDDada); err != nil {
-		return nil, err
-	}
-	billParams := &dadaapi.OperateOrderRequiredParams{
+	return deliveryFeeInfo, err
+}
+
+func (c *DeliveryHandler) getBillParams(db *dao.DaoDB, order *model.GoodsOrder) (billParams *dadaapi.OperateOrderRequiredParams, addParams map[string]interface{}, err error) {
+	billParams = &dadaapi.OperateOrderRequiredParams{
 		// ShopNo:          utils.Int2Str(order.StoreID), // 当前达达的门店号与京西是一样的
 		OriginID:        jxutils.ComposeUniversalOrderID(order.VendorOrderID, order.VendorID),
 		CargoPrice:      jxutils.IntPrice2Standard(limitOrderPrice(order.ActualPayPrice)),
@@ -121,7 +127,7 @@ func (c *DeliveryHandler) CreateWaybill(order *model.GoodsOrder, policy partner.
 	if billParams.ShopNo, err = c.getDadaShopID(order, db); err == nil {
 		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{}{
+			addParams = map[string]interface{}{
 				"info": fmt.Sprintf("%s第%d号订单, %s", model.VendorChineseNames[order.VendorID], order.OrderSeq, utils.FilterMb4(order.BuyerComment)),
 				// "origin_mark":    model.VendorNames[order.VendorID], // 订单来源标示（该字段可以显示在达达app订单详情页面，只支持字母，最大长度为10）
 				// "origin_mark_no": fmt.Sprintf("%d", order.OrderSeq), // 订单来源编号（该字段可以显示在达达app订单详情页面，支持字母和数字，最大长度为30）
@@ -129,11 +135,27 @@ func (c *DeliveryHandler) CreateWaybill(order *model.GoodsOrder, policy partner.
 				"cargo_weight": jxutils.IntWeight2Float(limitOrderWeight(order.Weight)),
 				"cargo_num":    order.GoodsCount,
 			}
+		}
+	}
+	return billParams, addParams, err
+}

-			if globals.EnableStoreWrite {
-				// 达达要求第二次创建运单，调用函数不同。所以查找两天内有无相同订单号的运单
-				var waybillList []*model.Waybill
-				err2 := dao.GetRows(db, &waybillList, `
+// IDeliveryPlatformHandler
+func (c *DeliveryHandler) CreateWaybill(order *model.GoodsOrder, policy partner.CreateWaybillPolicy) (bill *model.Waybill, err error) {
+	db := dao.GetDB()
+	deliveryFee, addFee, err := delivery.CalculateOrderDeliveryFee(order, time.Now(), db)
+	if err != nil {
+		return nil, err
+	}
+	if err = delivery.CallCreateWaybillPolicy(policy, deliveryFee, addFee, deliveryFee, order, model.VendorIDDada); err != nil {
+		return nil, err
+	}
+	billParams, addParams, err := c.getBillParams(db, order)
+	if err == nil {
+		if globals.EnableStoreWrite {
+			// 达达要求第二次创建运单，调用函数不同。所以查找两天内有无相同订单号的运单
+			var waybillList []*model.Waybill
+			err2 := dao.GetRows(db, &waybillList, `
 					SELECT *
 					FROM waybill
 					WHERE waybill_created_at > DATE_ADD(NOW(), interval -2 day)
@@ -141,39 +163,38 @@ func (c *DeliveryHandler) CreateWaybill(order *model.GoodsOrder, policy partner.
 					AND waybill_vendor_id = ?
 					ORDER BY id DESC
 					`, jxutils.ComposeUniversalOrderID(order.VendorOrderID, order.VendorID), model.VendorIDDada)
-				var result *dadaapi.CreateOrderResponse
-				if err = err2; err == nil && len(waybillList) > 0 && waybillList[0].Status != model.WaybillStatusFailed {
-					globals.SugarLogger.Debugf("CreateWaybill orderID:%s len(waybillList)=%d use ReaddOrder", order.VendorOrderID, len(waybillList))
-					result, err = api.DadaAPI.ReaddOrder(billParams, addParams)
-				} else {
-					if err != nil {
-						globals.SugarLogger.Warnf("CreateWaybill orderID:%s error:%v", order.VendorOrderID, err)
-					}
-					if false {
-						result, err = api.DadaAPI.AddOrder(billParams, addParams)
-					} else {
-						if result, err = api.DadaAPI.QueryDeliverFee(billParams, addParams); err != nil {
-							return nil, err
-						}
-						dadaFee := jxutils.StandardPrice2Int(result.Fee)
-						if err = delivery.CallCreateWaybillPolicy(policy, deliveryFee, addFee, dadaFee, order, model.VendorIDDada); err != nil {
-							return nil, err
-						}
-						err = api.DadaAPI.AddOrderAfterQuery(result.DeliveryNo)
-					}
-				}
-				if err == nil && result != nil {
-					bill = &model.Waybill{
-						VendorOrderID:   order.VendorOrderID,
-						OrderVendorID:   order.VendorID,
-						WaybillVendorID: model.VendorIDDada,
-						DesiredFee:      deliveryFee,
-						ActualFee:       jxutils.StandardPrice2Int(result.Fee),
-					}
-				}
+			var result *dadaapi.CreateOrderResponse
+			if err = err2; err == nil && len(waybillList) > 0 && waybillList[0].Status != model.WaybillStatusFailed {
+				globals.SugarLogger.Debugf("CreateWaybill orderID:%s len(waybillList)=%d use ReaddOrder", order.VendorOrderID, len(waybillList))
+				result, err = api.DadaAPI.ReaddOrder(billParams, addParams)
 			} else {
-				err = fmt.Errorf("测试环境不能真正创建运单")
+				if err != nil {
+					globals.SugarLogger.Warnf("CreateWaybill orderID:%s error:%v", order.VendorOrderID, err)
+				}
+				if false {
+					result, err = api.DadaAPI.AddOrder(billParams, addParams)
+				} else {
+					if result, err = api.DadaAPI.QueryDeliverFee(billParams, addParams); err != nil {
+						return nil, err
+					}
+					dadaFee := jxutils.StandardPrice2Int(result.Fee)
+					if err = delivery.CallCreateWaybillPolicy(policy, deliveryFee, addFee, dadaFee, order, model.VendorIDDada); err != nil {
+						return nil, err
+					}
+					err = api.DadaAPI.AddOrderAfterQuery(result.DeliveryNo)
+				}
 			}
+			if err == nil && result != nil {
+				bill = &model.Waybill{
+					VendorOrderID:   order.VendorOrderID,
+					OrderVendorID:   order.VendorID,
+					WaybillVendorID: model.VendorIDDada,
+					DesiredFee:      deliveryFee,
+					ActualFee:       jxutils.StandardPrice2Int(result.Fee),
+				}
+			}
+		} else {
+			err = fmt.Errorf("测试环境不能真正创建运单")
 		}
 	}
 	return bill, err
--- a/business/partner/delivery/mtps/waybill.go
+++ b/business/partner/delivery/mtps/waybill.go
@@ -113,6 +113,18 @@ func (c *DeliveryHandler) callbackMsg2Waybill(msg *mtpsapi.CallbackOrderMsg) (re
 	return retVal
 }

+func (c *DeliveryHandler) GetWaybillFee(order *model.GoodsOrder) (deliveryFeeInfo *partner.WaybillFeeInfo, err error) {
+	db := dao.GetDB()
+	deliveryFeeInfo = &partner.WaybillFeeInfo{}
+	deliveryFeeInfo.RefDeliveryFee, deliveryFeeInfo.RefAddFee, err = delivery.CalculateOrderDeliveryFee(order, time.Now(), db)
+	if err == nil {
+		if _, err = c.getMTPSShopID(order, db); err == nil {
+			deliveryFeeInfo.DeliveryFee = deliveryFeeInfo.RefDeliveryFee
+		}
+	}
+	return deliveryFeeInfo, err
+}
+
 // IDeliveryPlatformHandler
 func (c *DeliveryHandler) CreateWaybill(order *model.GoodsOrder, policy partner.CreateWaybillPolicy) (bill *model.Waybill, err error) {
 	db := dao.GetDB()