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:
邹宗楠
2024-10-16 09:17:05 +08:00
parent a6e6222075
commit 32cde499da
28 changed files with 271 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
business/jxcallback/orderman/order.go
View File

@@ -2152,8 +2152,7 @@ func RefreshOrderSkuInfo(ctx *jxcontext.Context, vendorOrderID string, vendorID,
return fmt.Errorf("未找到此门店商品！")
}
storeSku := storeSkus[0]
//if v.ShopPrice == v.EarningPrice {
if beego.BConfig.RunMode == "jxgy" || beego.BConfig.RunMode == "jxpet" {
if beego.BConfig.RunMode == model.ServerTypeFruits || beego.BConfig.RunMode == model.ServerTypePet {
if v.SalePrice > v.ShopPrice {
v.EarningPrice = int64(math.Round(float64(storeSku.Price) * float64(order.OrderPayPercentage) / 100))
} else {
@@ -2162,7 +2161,6 @@ func RefreshOrderSkuInfo(ctx *jxcontext.Context, vendorOrderID string, vendorID,
} else {
v.EarningPrice = int64(math.Round(float64(storeSku.Price) * float64(order.OrderPayPercentage) / 100))
}
//}
v.ShopPrice = int64(storeSku.Price)
dao.UpdateEntity(db, v, "ShopPrice", "EarningPrice")
return err

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

@@ -471,7 +471,7 @@ func (c *OrderManager) ExportOrders(ctx *jxcontext.Context, fromDateStr, toDateS
}
if v.SkuCount2 > 0 {
var skuStr string
if beego.BConfig.RunMode == "jxgy" || beego.BConfig.RunMode == "jxpet" {
if beego.BConfig.RunMode == model.ServerTypeFruits || beego.BConfig.RunMode == model.ServerTypePet {
skuStr = strings.Join([]string{
utils.Int2Str(v.SkuID),
utils.Int2Str(v.SkuCount2),
@@ -1676,9 +1676,9 @@ func RefreshJdShopOrdersEarningPrice(ctx *jxcontext.Context, orderStartTime, ord
db = dao.GetDB()
appOrgCode string
)
if beego.BConfig.RunMode == "jxgy" {
if beego.BConfig.RunMode == model.ServerTypeFruits {
appOrgCode = "339032"
} else if beego.BConfig.RunMode == "jxpet" {
} else if beego.BConfig.RunMode == model.ServerTypePet {
appOrgCode = "jxpet_apporg_code"
} else {
appOrgCode = "320406"

18
business/jxcallback/scheduler/defsch/defsch.go
View File

@@ -1107,15 +1107,15 @@ func (s *DefScheduler) swtich2SelfDeliverWithRetry(savedOrderInfo *WatchOrderInf
}
}
} else {
if order.VendorID == model.VendorIDEBAI && strings.Contains(order.ConsigneeAddress, "隐私保护") {
orderMap, err := api.EbaiAPI.OrderGet(order.VendorOrderID)
if err == nil {
// 部分订单在隐私条约的保护下会隐藏用户收货地址,转自送成功自后才可以获取到正确的地址.
userMap := orderMap["user"].(map[string]interface{})
order.ConsigneeAddress = utils.Interface2String(userMap["address"])
partner.CurOrderManager.UpdateOrderFields(order, []string{"ConsigneeAddress"})
}
}
//if order.VendorID == model.VendorIDEBAI && strings.Contains(order.ConsigneeAddress, "隐私保护") {
// orderMap, err := api.EbaiAPI.OrderGet(order.VendorOrderID)
// if err == nil {
// // 部分订单在隐私条约的保护下会隐藏用户收货地址,转自送成功自后才可以获取到正确的地址.
// userMap := orderMap["user"].(map[string]interface{})
// order.ConsigneeAddress = utils.Interface2String(userMap["address"])
// partner.CurOrderManager.UpdateOrderFields(order, []string{"ConsigneeAddress"})
// }
//}
s.notify3rdPartyWaybill(order, bill, false)
s.removeWaybillFromMap(savedOrderInfo, order.VendorID)
data := "断点打印"

6
business/jxcallback/scheduler/scheduler.go
View File

@@ -18,12 +18,6 @@ const (
TimerStatusTypeWaybill = 1
)
const (
JXC4B_RAND_JXGY = 1 // 京西菜市和果园品牌id
JXC4B_SHOP = 7 // 京西超市
JXC4B_ZHIGONG = 8 // 京西直供
)
var (
CurrentScheduler IScheduler
)