1

business/partner/delivery/uupt/waybill.go

@@ -2,11 +2,12 @@ package uupt
 
 import (
 	"fmt"
-	tao "git.rosy.net.cn/baseapi/platformapi/tao_vegetable"
-	"git.rosy.net.cn/jx-callback/business/partner/purchase/tao_vegetable"
 	"strings"
 	"time"
 
+	tao "git.rosy.net.cn/baseapi/platformapi/tao_vegetable"
+	"git.rosy.net.cn/jx-callback/business/partner/purchase/tao_vegetable"
+
 	"git.rosy.net.cn/baseapi/platformapi/baidunavi"
 	"git.rosy.net.cn/baseapi/platformapi/mtpsapi"
 	"git.rosy.net.cn/baseapi/platformapi/uuptapi"
@@ -223,7 +224,6 @@ func (d DeliveryHandler) GetRiderInfo(orderId string, deliveryId int64, mtPeison
 	if err != nil {
 		return nil, err
 	}
-	temp := strings.Split(waybill.DriverLastloc, ",") //格式:113.71776,34.767501
 	param := &mtpsapi.RiderInfo{
 		OrderId:               orderId,
 		ThirdCarrierOrderId:   waybill.OrderCode,
@@ -231,8 +231,19 @@ func (d DeliveryHandler) GetRiderInfo(orderId string, deliveryId int64, mtPeison
 		CourierPhone:          waybill.DriverMobile,
 		LogisticsProviderCode: mtpsapi.UUPTCode,
 		LogisticsStatus:       utils.Str2Int(waybill.State),
-		Longitude:             temp[0],
+	}
-		Latitude:              temp[1],
+	if len(waybill.DriverLastloc) == 0 {
+		if waybill.State == uuptapi.StateOrderCancel {
+			param.Longitude = waybill.FromLng
+			param.Latitude = waybill.FromLat
+		} else if waybill.State == uuptapi.StateReceiverGetGoods {
+			param.Longitude = waybill.ToLng
+			param.Latitude = waybill.ToLat
+		}
+	} else {
+		temp := strings.Split(waybill.DriverLastloc, ",") //格式:113.71776,34.767501
+		param.Longitude = temp[0]
+		param.Latitude = temp[1]
 	}
 	switch waybill.State {
 	case uuptapi.StateConfirmSuccess:

business/partner/purchase/tao_vegetable/act.go

@@ -60,7 +60,7 @@ func act2TxdActivity(act *model.Act2) (activity *domain.AlibabaRetailMarketingIt
 
 func storeSku2ActData(act *model.Act2, actStoreSku []*model.ActStoreSku2, handler func(int8) bool) (actData *domain.AlibabaRetailMarketingItemdiscountActivitySkuAddItemDiscountActivityElementOperateRequest) {
 	var (
-		limitCount = int64(1)
+		//limitCount = int64(1)
 		//userLimitCount = int64(1)
 		fixPriceMoney = int64(0)
 		discountRate  = int64(0)
@@ -96,27 +96,27 @@ func storeSku2ActData(act *model.Act2, actStoreSku []*model.ActStoreSku2, handle
 				skuElement = domain.AlibabaRetailMarketingItemdiscountActivitySkuAddSkuActivityElementDto{
 					SkuCode:       utils.String2Pointer(utils.Int2Str(v.SkuID)),
 					DecreaseMoney: &decreaseMoney,
-					Limit: &domain.AlibabaRetailMarketingItemdiscountActivitySkuAddLimitDto{
+					//Limit: &domain.AlibabaRetailMarketingItemdiscountActivitySkuAddLimitDto{
-						OrderLimitCnt: &limitCount,
+					//	OrderLimitCnt: &limitCount,
-					},
+					//},
 				}
 			case tao_vegetable.DiscountTypeOnePrice:
 				fixPriceMoney = v.ActualActPrice
 				skuElement = domain.AlibabaRetailMarketingItemdiscountActivitySkuAddSkuActivityElementDto{
 					SkuCode:       utils.String2Pointer(utils.Int2Str(v.SkuID)),
 					FixPriceMoney: &fixPriceMoney,
-					Limit: &domain.AlibabaRetailMarketingItemdiscountActivitySkuAddLimitDto{
+					//Limit: &domain.AlibabaRetailMarketingItemdiscountActivitySkuAddLimitDto{
-						OrderLimitCnt: &limitCount,
+					//	OrderLimitCnt: &limitCount,
-					},
+					//},
 				}
 			case tao_vegetable.DiscountTypeDiscounts:
 				discountRate = int64(v.PricePercentage * 10)
 				skuElement = domain.AlibabaRetailMarketingItemdiscountActivitySkuAddSkuActivityElementDto{
 					SkuCode:      utils.String2Pointer(utils.Int2Str(v.SkuID)),
 					DiscountRate: &discountRate,
-					Limit: &domain.AlibabaRetailMarketingItemdiscountActivitySkuAddLimitDto{
+					//Limit: &domain.AlibabaRetailMarketingItemdiscountActivitySkuAddLimitDto{
-						OrderLimitCnt: &limitCount,
+					//	OrderLimitCnt: &limitCount,
-					},
+					//},
 				}
 			}
 			skuElements = append(skuElements, skuElement)