liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
邹宗楠
2025-01-06 09:39:38 +08:00
parent 46e03ee448
commit 66585a693b
3 changed files with 53 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
business/jxcallback/orderman/orderman_ext.go
View File

@@ -467,12 +467,9 @@ func (c *OrderManager) ExportOrders(ctx *jxcontext.Context, fromDateStr, toDateS
v.SkuCount2 -= minus v.SkuCount2 -= minus
if minus == 0 { // 有售后单,且通过,部分商品缺重等情况 if minus == 0 { // 有售后单,且通过,部分商品缺重等情况
if v.EarningType == model.EarningTypeQuote { if v.EarningType == model.EarningTypeQuote {
globals.SugarLogger.Debugf("----------------1 : %s", utils.Format4Output(v, false))
globals.SugarLogger.Debugf("----------------2 : %s", utils.Format4Output(afsInfo[v.SkuID], false))
v.SkuShopPrice = v.SkuShopPrice - utils.Float64TwoInt(float64(afsInfo[v.SkuID].UserMoney)/float64(v.SkuSalePrice)*float64(v.SkuShopPrice)) v.SkuShopPrice = v.SkuShopPrice - utils.Float64TwoInt(float64(afsInfo[v.SkuID].UserMoney)/float64(v.SkuSalePrice)*float64(v.SkuShopPrice))
v.SkuEarningPrice = v.SkuEarningPrice - utils.Float64TwoInt(float64(afsInfo[v.SkuID].UserMoney)/float64(v.SkuSalePrice)*float64(v.SkuEarningPrice)) v.SkuEarningPrice = v.SkuEarningPrice - utils.Float64TwoInt(float64(afsInfo[v.SkuID].UserMoney)/float64(v.SkuSalePrice)*float64(v.SkuEarningPrice))
v.SkuSalePrice = v.SkuSalePrice - int(afsInfo[v.SkuID].UserMoney) v.SkuSalePrice = v.SkuSalePrice - int(afsInfo[v.SkuID].UserMoney)
globals.SugarLogger.Debugf("----------------2 : %s", utils.Format4Output(v, false))
} }
} }
afsInfo[v.SkuID].Count -= minus afsInfo[v.SkuID].Count -= minus
@@ -1477,7 +1474,10 @@ func (c *OrderManager) AmendMissingOrders(ctx *jxcontext.Context, vendorIDs []in
pair := v.(*tOrderVendorPair) pair := v.(*tOrderVendorPair)
goodsOrder := localOrderMap[jxutils.ComposeUniversalOrderID(pair.VendorOrderID, pair.VendorID)] goodsOrder := localOrderMap[jxutils.ComposeUniversalOrderID(pair.VendorOrderID, pair.VendorID)]
if goodsOrder == nil { if goodsOrder == nil {
store, err := dao.GetStoreDetailByVendorStoreID(dao.GetDB(), pair.VendorStoreID, pair.VendorID, pair.VendorOrgCode)
if err == nil && store != nil {
missingOrderList = append(missingOrderList, pair) missingOrderList = append(missingOrderList, pair)
}
} else { } else {
if !model.IsOrderFinalStatus(goodsOrder.Status) { if !model.IsOrderFinalStatus(goodsOrder.Status) {
//if goodsOrder.BusinessType == model.BusinessTypeImmediate { //if goodsOrder.BusinessType == model.BusinessTypeImmediate {
@@ -1497,8 +1497,7 @@ func (c *OrderManager) AmendMissingOrders(ctx *jxcontext.Context, vendorIDs []in
task2 := tasksch.NewParallelTask("AmendMissingOrders GetOrders", tasksch.NewParallelConfig().SetIsContinueWhenError(isContinueWhenError), ctx, task2 := tasksch.NewParallelTask("AmendMissingOrders GetOrders", tasksch.NewParallelConfig().SetIsContinueWhenError(isContinueWhenError), ctx,
func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
pair := batchItemList[0].(*tOrderVendorPair) pair := batchItemList[0].(*tOrderVendorPair)
store, err3 := dao.GetStoreDetailByVendorStoreID(dao.GetDB(), pair.VendorStoreID, pair.VendorID, pair.VendorOrgCode) if handler := partner.GetPurchaseOrderHandlerFromVendorID(pair.VendorID); handler != nil {
if handler := partner.GetPurchaseOrderHandlerFromVendorID(pair.VendorID); handler != nil && err3 == nil && store != nil {
order, err2 := handler.GetOrder(pair.VendorOrgCode, pair.VendorOrderID, pair.VendorStoreID) order, err2 := handler.GetOrder(pair.VendorOrgCode, pair.VendorOrderID, pair.VendorStoreID)
if err = err2; err == nil { if err = err2; err == nil {
isDuplicated, err2 := c.SaveOrder(order, false, dao.GetDB()) isDuplicated, err2 := c.SaveOrder(order, false, dao.GetDB())
@@ -1522,8 +1521,7 @@ func (c *OrderManager) AmendMissingOrders(ctx *jxcontext.Context, vendorIDs []in
task3 := tasksch.NewParallelTask("AmendMissingOrders UpdateOrders", tasksch.NewParallelConfig().SetIsContinueWhenError(isContinueWhenError), ctx, task3 := tasksch.NewParallelTask("AmendMissingOrders UpdateOrders", tasksch.NewParallelConfig().SetIsContinueWhenError(isContinueWhenError), ctx,
func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
goodsOrder := batchItemList[0].(*model.GoodsOrder) goodsOrder := batchItemList[0].(*model.GoodsOrder)
store, err3 := dao.GetStoreDetailByVendorStoreID(dao.GetDB(), goodsOrder.VendorStoreID, goodsOrder.VendorID, goodsOrder.VendorOrgCode) if handler := partner.GetPurchaseOrderHandlerFromVendorID(goodsOrder.VendorID); handler != nil {
if handler := partner.GetPurchaseOrderHandlerFromVendorID(goodsOrder.VendorID); handler != nil && store != nil && err3 == nil {
order, err2 := handler.GetOrder(goodsOrder.VendorOrgCode, goodsOrder.VendorOrderID, goodsOrder.VendorStoreID) order, err2 := handler.GetOrder(goodsOrder.VendorOrgCode, goodsOrder.VendorOrderID, goodsOrder.VendorStoreID)
if err = err2; err == nil { if err = err2; err == nil {
if model.IsOrderFinalStatus(order.Status) { if model.IsOrderFinalStatus(order.Status) {

39
controllers/ebai_callback.go
View File

@@ -1,8 +1,13 @@
package controllers package controllers
import ( import (
"fmt"
"git.rosy.net.cn/baseapi/platformapi/dingdingapi"
"git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/jx-callback/business/jxutils/ddmsg"
"git.rosy.net.cn/jx-callback/business/model" "git.rosy.net.cn/jx-callback/business/model"
"git.rosy.net.cn/jx-callback/business/model/dao"
"git.rosy.net.cn/jx-callback/globals"
"net/http" "net/http"
"strings" "strings"
@@ -22,23 +27,23 @@ func (c *EbaiController) Msg() {
if callbackResponse == nil { if callbackResponse == nil {
vendorStoreId, _ := utils.TryInterface2Int64(obj.Body["platform_shop_id"]) vendorStoreId, _ := utils.TryInterface2Int64(obj.Body["platform_shop_id"])
if vendorStoreId != 0 { if vendorStoreId != 0 {
//storeDetail, _ := dao.GetStoreDetailByVendorStoreID(dao.GetDB(), vendorStoreId, model.VendorIDEBAI, "") storeDetail, _ := dao.GetStoreDetailByVendorStoreID(dao.GetDB(), utils.Int64ToStr(vendorStoreId), model.VendorIDEBAI, "")
//if storeDetail == nil { if storeDetail == nil {
// globals.SugarLogger.Debugf("-----饿百订单非菜市消息推送-%s", utils.Format4Output(obj, false)) globals.SugarLogger.Debugf("-----饿百订单非菜市消息推送-%s", utils.Format4Output(obj, false))
// switch beego.BConfig.RunMode { switch web.BConfig.RunMode {
// case model.ServerTypeVegetable: case model.ServerTypeVegetable:
// callbackResponse = c.EBaiMsgPush2FruitsOrPet(model.ServerTypeFruits, utils.Struct2Map(obj, "", false)) callbackResponse = c.EBaiMsgPush2FruitsOrPet(model.ServerTypeFruits, utils.Struct2Map(obj, "", false))
// case model.ServerTypeFruits: case model.ServerTypeFruits:
// callbackResponse = c.EBaiMsgPush2FruitsOrPet(model.ServerTypePet, utils.Struct2Map(obj, "", false)) callbackResponse = c.EBaiMsgPush2FruitsOrPet(model.ServerTypePet, utils.Struct2Map(obj, "", false))
// case model.ServerTypePet: case model.ServerTypePet:
// ddmsg.SendUserMessage(dingdingapi.MsgTyeText, "47B1E94E8D2411EFB666525400E86DC0", "饿了么菜市推果园,果园退超市未找到门店", fmt.Sprintf("cmd:%s,storeId:%s", obj.Cmd, vendorStoreId)) ddmsg.SendUserMessage(dingdingapi.MsgTyeText, "47B1E94E8D2411EFB666525400E86DC0", "饿了么菜市推果园,果园退超市未找到门店", fmt.Sprintf("cmd:%s,storeId:%s", obj.Cmd, vendorStoreId))
// callbackResponse = api.EbaiAPI.Err2CallbackResponse(ebaiapi.GetCmd(c.Ctx.Request), nil, nil) // api.EbaiAPI.Err2CallbackResponse(ebaiapi.GetCmd(c.Ctx.Request), fmt.Errorf("饿了么菜市推果园,果园退超市未找到门店cmd:%s,storeId:%s", obj.Cmd, vendorStoreId), nil) callbackResponse = api.EbaiAPI.Err2CallbackResponse(ebaiapi.GetCmd(c.Ctx.Request), nil, nil) // api.EbaiAPI.Err2CallbackResponse(ebaiapi.GetCmd(c.Ctx.Request), fmt.Errorf("饿了么菜市推果园,果园退超市未找到门店cmd:%s,storeId:%s", obj.Cmd, vendorStoreId), nil)
// return return
// } }
// c.Data["json"] = callbackResponse c.Data["json"] = callbackResponse
// c.ServeJSON() c.ServeJSON()
// return return
//} }
} }
callbackResponse = ebai.OnCallbackMsg(obj) callbackResponse = ebai.OnCallbackMsg(obj)
} }

44
controllers/mtwm_callback.go
View File

@@ -2,9 +2,15 @@ package controllers
import ( import (
"encoding/json" "encoding/json"
"fmt"
"git.rosy.net.cn/baseapi/platformapi/dingdingapi"
"git.rosy.net.cn/baseapi/platformapi/mtwmapi" "git.rosy.net.cn/baseapi/platformapi/mtwmapi"
"git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/jx-callback/business/jxutils/ddmsg"
"git.rosy.net.cn/jx-callback/business/model" "git.rosy.net.cn/jx-callback/business/model"
"git.rosy.net.cn/jx-callback/business/model/dao"
"git.rosy.net.cn/jx-callback/business/partner/purchase/mtwm" "git.rosy.net.cn/jx-callback/business/partner/purchase/mtwm"
"git.rosy.net.cn/jx-callback/globals"
"git.rosy.net.cn/jx-callback/globals/api" "git.rosy.net.cn/jx-callback/globals/api"
"github.com/astaxie/beego/server/web" "github.com/astaxie/beego/server/web"
"net/http" "net/http"
@@ -29,25 +35,25 @@ func (c *MtwmController) onCallbackMsg(msgType string) {
json.Unmarshal([]byte(msg.FormData.Get("pick_up_data")), &finishedPickup) json.Unmarshal([]byte(msg.FormData.Get("pick_up_data")), &finishedPickup)
vendorStoreId = finishedPickup.AppPoiCode vendorStoreId = finishedPickup.AppPoiCode
} }
//if vendorStoreId != "" { if vendorStoreId != "" {
// storeDetail, _ := dao.GetStoreDetailByVendorStoreID(dao.GetDB(), vendorStoreId, model.VendorIDMTWM, "") storeDetail, _ := dao.GetStoreDetailByVendorStoreID(dao.GetDB(), vendorStoreId, model.VendorIDMTWM, "")
// if storeDetail == nil { if storeDetail == nil {
// globals.SugarLogger.Debugf("-----美团订单非菜市消息推送-%s", utils.Format4Output(msg, false)) globals.SugarLogger.Debugf("-----美团订单非菜市消息推送-%s,服务平台:%s", utils.Format4Output(msg, false), web.BConfig.RunMode)
// switch web.BConfig.RunMode { switch web.BConfig.RunMode {
// case model.ServerTypeVegetable: case model.ServerTypeVegetable:
// callbackResponse = pushMTWMOrder2GY(msg.FormData, msgType, model.ServerTypeFruits) callbackResponse = pushMTWMOrder2GY(msg.FormData, msgType, model.ServerTypeFruits)
// case model.ServerTypeFruits: case model.ServerTypeFruits:
// callbackResponse = pushMTWMOrder2GY(msg.FormData, msgType, model.ServerTypePet) callbackResponse = pushMTWMOrder2GY(msg.FormData, msgType, model.ServerTypePet)
// case model.ServerTypePet: case model.ServerTypePet:
// ddmsg.SendUserMessage(dingdingapi.MsgTyeText, "47B1E94E8D2411EFB666525400E86DC0", "饿了么菜市推果园,果园退超市未找到门店", fmt.Sprintf("cmd:%s,storeId:%s", msgType, vendorStoreId)) ddmsg.SendUserMessage(dingdingapi.MsgTyeText, "47B1E94E8D2411EFB666525400E86DC0", "饿了么菜市推果园,果园退超市未找到门店", fmt.Sprintf("cmd:%s,storeId:%s", msgType, vendorStoreId))
// callbackResponse = mtwmapi.Err2CallbackResponse(nil, "") // mtwmapi.Err2CallbackResponse(fmt.Errorf("美团菜市推果园,果园退超市未找到门店cmd:%s,storeId:%s", msgType, vendorStoreId), "") callbackResponse = mtwmapi.Err2CallbackResponse(nil, "") // mtwmapi.Err2CallbackResponse(fmt.Errorf("美团菜市推果园,果园退超市未找到门店cmd:%s,storeId:%s", msgType, vendorStoreId), "")
// return return
// } }
// c.Data["json"] = callbackResponse c.Data["json"] = callbackResponse
// c.ServeJSON() c.ServeJSON()
// return return
// } }
//} }
callbackResponse = mtwm.OnCallbackMsg(msg, msgType) callbackResponse = mtwm.OnCallbackMsg(msg, msgType)
if callbackResponse == nil { if callbackResponse == nil {