From aa6ebe5e4daa8b9797a1271f43749e01c9cf320e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com> Date: Tue, 23 Jun 2020 09:14:48 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=AF=BC=E5=87=BA=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E7=BB=93=E7=AE=97=E4=BB=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxcallback/orderman/orderman_ext.go | 134 +++++-------------- business/partner/delivery/mtps/waybill.go | 12 -- 2 files changed, 30 insertions(+), 116 deletions(-) diff --git a/business/jxcallback/orderman/orderman_ext.go b/business/jxcallback/orderman/orderman_ext.go index 8eb0e4846..7c3f9f1f1 100644 --- a/business/jxcallback/orderman/orderman_ext.go +++ b/business/jxcallback/orderman/orderman_ext.go @@ -7,6 +7,8 @@ import ( "strings" "time" + "github.com/astaxie/beego" + "git.rosy.net.cn/jx-callback/globals/api" "git.rosy.net.cn/jx-callback/business/jxutils/tasksch" @@ -314,111 +316,35 @@ func (c *OrderManager) ExportOrders(ctx *jxcontext.Context, fromDateStr, toDateS afsInfo[v.SkuID].Count -= minus } } - // if v.SkuCount2 == 1 { - // skuStr1 := strings.Join([]string{ - // utils.Int2Str(v.SkuID), - // utils.Int2Str(v.SkuCount2), - // utils.Int2Str(v.SkuShopPrice), - // utils.Int2Str(v.SkuSalePrice), - // utils.Int2Str(v.SkuEarningPrice), - // }, ",") - // if order == nil || v.ID != order.ID { - // order = v - // v.CourierVendorName = model.VendorChineseNames[v.WaybillVendorID] - // v.Status2 = model.OrderStatusName[v.Status] - // v.SkuInfo = skuStr1 - // v.SkuInfo2 = skuStr1 - // orders2 = append(orders2, v) - // } else { - // order.SkuInfo += ";" + skuStr1 - // order.SkuInfo2 += ";" + skuStr1 - // } - // } else if v.SkuCount2 > 1 { - // storeID := 0 - // if v.StoreID == 0 { - // storeID = v.JxStoreID - // } else { - // storeID = v.StoreID - // } - // result, _ := dao.GetEffectiveActStoreSkuInfo(dao.GetDB(), 0, nil, 0, []int{storeID}, []int{v.SkuID}, v.OrderCreatedAt, v.OrderCreatedAt) - // if len(result) > 0 { - // if result[0].EarningPrice != 0 { - // var ( - // storePayPercentage, price int - // ) - // stores, _ := dao.GetStoreList(dao.GetDB(), []int{v.StoreID}, nil, nil, nil, "") - // if len(stores) > 0 { - // storePayPercentage = stores[0].PayPercentage - // } else { - // storePayPercentage = 70 - // } - // skuStr1 := strings.Join([]string{ - // utils.Int2Str(v.SkuID), - // utils.Int2Str(v.SkuCount2), - // utils.Int2Str(v.SkuShopPrice), - // utils.Int2Str(v.SkuSalePrice), - // utils.Int2Str(v.SkuEarningPrice), - // }, ",") - // skuStr2 := strings.Join([]string{ - // utils.Int2Str(v.SkuID), - // utils.Int2Str(1), - // utils.Int2Str(v.SkuShopPrice), - // utils.Int2Str(v.SkuSalePrice), - // utils.Int2Str(v.SkuEarningPrice), - // }, ",") - // if v.SkuShopPrice < v.SkuSalePrice { - // price = v.SkuShopPrice * storePayPercentage - // } else { - // price = v.SkuSalePrice * storePayPercentage - // } - // skuStr3 := strings.Join([]string{ - // utils.Int2Str(v.SkuID), - // utils.Int2Str(v.SkuCount2 - 1), - // utils.Int2Str(v.SkuShopPrice), - // utils.Int2Str(v.SkuSalePrice), - // utils.Int2Str(price), - // }, ",") - // if order == nil || v.ID != order.ID { - // order = v - // v.CourierVendorName = model.VendorChineseNames[v.WaybillVendorID] - // v.Status2 = model.OrderStatusName[v.Status] - // v.SkuInfo2 = skuStr1 - // v.SkuInfo = skuStr2 + ";" + skuStr3 - // orders2 = append(orders2, v) - // } else { - // order.SkuInfo2 += ";" + skuStr1 - // order.SkuInfo += ";" + skuStr2 + ";" + skuStr3 - // } - // } - // } else { - // skuStr1 := strings.Join([]string{ - // utils.Int2Str(v.SkuID), - // utils.Int2Str(v.SkuCount2), - // utils.Int2Str(v.SkuShopPrice), - // utils.Int2Str(v.SkuSalePrice), - // utils.Int2Str(v.SkuEarningPrice), - // }, ",") - // if order == nil || v.ID != order.ID { - // order = v - // v.CourierVendorName = model.VendorChineseNames[v.WaybillVendorID] - // v.Status2 = model.OrderStatusName[v.Status] - // v.SkuInfo = skuStr1 - // v.SkuInfo2 = skuStr1 - // orders2 = append(orders2, v) - // } else { - // order.SkuInfo += ";" + skuStr1 - // order.SkuInfo2 += ";" + skuStr1 - // } - // } - // } if v.SkuCount2 > 0 { - skuStr := strings.Join([]string{ - utils.Int2Str(v.SkuID), - utils.Int2Str(v.SkuCount2), - utils.Int2Str(v.SkuShopPrice), - utils.Int2Str(v.SkuSalePrice), - utils.Int2Str(v.SkuEarningPrice), - }, ",") + var skuStr string + if beego.BConfig.RunMode == "jxgy" { + skuStr = strings.Join([]string{ + utils.Int2Str(v.SkuID), + utils.Int2Str(v.SkuCount2), + utils.Int2Str(v.SkuShopPrice), + utils.Int2Str(v.SkuSalePrice), + utils.Int2Str(v.SkuEarningPrice), + }, ",") + } else { + if v.PayPercentage == 100 { + skuStr = strings.Join([]string{ + utils.Int2Str(v.SkuID), + utils.Int2Str(v.SkuCount2), + utils.Int2Str(v.SkuEarningPrice), + utils.Int2Str(v.SkuSalePrice), + utils.Int2Str(v.SkuShopPrice), + }, ",") + } else { + skuStr = strings.Join([]string{ + utils.Int2Str(v.SkuID), + utils.Int2Str(v.SkuCount2), + utils.Int2Str(v.SkuShopPrice), + utils.Int2Str(v.SkuSalePrice), + utils.Int2Str(v.SkuEarningPrice), + }, ",") + } + } if order == nil || v.ID != order.ID { order = v v.CourierVendorName = model.VendorChineseNames[v.WaybillVendorID] diff --git a/business/partner/delivery/mtps/waybill.go b/business/partner/delivery/mtps/waybill.go index 4ef35ec60..9ca35c69c 100644 --- a/business/partner/delivery/mtps/waybill.go +++ b/business/partner/delivery/mtps/waybill.go @@ -133,18 +133,6 @@ func (c *DeliveryHandler) pushToGy(msg *mtpsapi.CallbackOrderMsg) { if err != nil { return } - request.PostForm.Set("mt_peisong_id", msg.MtPeisongID) - request.PostForm.Set("courier_name", msg.CourierName) - request.PostForm.Set("delivery_id", utils.Int64ToStr(msg.DeliveryID)) - request.PostForm.Set("appkey", msg.AppKey) - request.PostForm.Set("order_id", msg.OrderID) - request.PostForm.Set("courier_phone", msg.CourierPhone) - request.PostForm.Set("status", utils.Int2Str(msg.Status)) - request.PostForm.Set("timestamp", utils.Int64ToStr(msg.Timestamp)) - request.PostForm.Set("cancel_reason_id", utils.Int2Str(msg.CancelReasonId)) - request.PostForm.Set("cancel_reason", msg.CancelReason) - request.PostForm.Set("sign", sign) - fmt.Println("testgy request : %v", request.FormValue("sign")) request.Header.Set("content_type", "application/x-www-form-urlencoded; charset=UTF-8") cl.Do(request) }