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:
邹宗楠
2023-07-14 17:46:44 +08:00
parent 2909a9ae8d
commit 35ca3a47cc
6 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -868,7 +868,7 @@ func updateSingleOrderEarningPrice(order *model.GoodsOrder, db *dao.DaoDB) {
if actStoreSku := actStoreSkuMap.GetActStoreSku(jxStoreID, skuID, order.VendorID); actStoreSku != nil { if actStoreSku := actStoreSkuMap.GetActStoreSku(jxStoreID, skuID, order.VendorID); actStoreSku != nil {
v.EarningPrice = actStoreSku.EarningPrice v.EarningPrice = actStoreSku.EarningPrice
if true { //v.StoreSubName != "" { // 之前这里为什么要加判断？ if true { //v.StoreSubName != "" { // 之前这里为什么要加判断？
v.StoreSubID = actStoreSku.ActID v.StoreSubID = int64(actStoreSku.ActID)
} }
} }
} }

2
business/model/dao/dao_order.go
View File

@@ -144,7 +144,7 @@ func QueryOrders(db *DaoDB, vendorOrderID string, actID int, vendorIDs []int, st
ID: v.OrderSkuID, ID: v.OrderSkuID,
VendorOrderID: v.VendorOrderID, VendorOrderID: v.VendorOrderID,
VendorID: v.VendorID, VendorID: v.VendorID,
StoreSubID: v.StoreSubID, StoreSubID: int64(v.StoreSubID),
StoreSubName: v.StoreSubName, StoreSubName: v.StoreSubName,
Count: v.Count, Count: v.Count,
VendorSkuID: v.VendorSkuID, VendorSkuID: v.VendorSkuID,

2
business/model/order.go
View File

@@ -196,7 +196,7 @@ type OrderSku struct {
VendorOrderID string `orm:"column(vendor_order_id);size(48)" json:"vendorOrderID"` VendorOrderID string `orm:"column(vendor_order_id);size(48)" json:"vendorOrderID"`
VendorSubOrderID string `orm:"column(vendor_sub_order_id);size(48)" json:"vendorSubOrderID"` // 子订单id VendorSubOrderID string `orm:"column(vendor_sub_order_id);size(48)" json:"vendorSubOrderID"` // 子订单id
VendorID int `orm:"column(vendor_id)" json:"vendorID"` VendorID int `orm:"column(vendor_id)" json:"vendorID"`
StoreSubID int `orm:"column(store_sub_id)" json:"storeSubID"` // EarningActID，当前这个字段被当成结算活动ID用 StoreSubID int64 `orm:"column(store_sub_id)" json:"storeSubID"` // EarningActID，当前这个字段被当成结算活动ID用
StoreSubName string `orm:"size(64)" json:"storeSubName"` // 当前这个字段被用作vendorActType StoreSubName string `orm:"size(64)" json:"storeSubName"` // 当前这个字段被用作vendorActType
Count int `json:"count"` Count int `json:"count"`
VendorSkuID string `orm:"column(vendor_sku_id);size(48)" json:"vendorSkuID"` VendorSkuID string `orm:"column(vendor_sku_id);size(48)" json:"vendorSkuID"`

2
business/partner/purchase/tao_vegetable/order.go
View File

@@ -148,7 +148,7 @@ func (p *PurchaseHandler) getOrder(vendorOrgCode string, vendorOrderID int64, ve
} }
if len(activityId) > 0 { if len(activityId) > 0 {
sku.StoreSubID = int(activityId[0]) sku.StoreSubID = activityId[0]
sku.StoreSubName = strings.Join(activityName, ",") sku.StoreSubName = strings.Join(activityName, ",")
} }
if sku.Weight == 0 { if sku.Weight == 0 {

2
business/partner/purchase/tiktok_store/order.go
View File

@@ -162,7 +162,7 @@ func (p *PurchaseHandler) getOrder(vendorOrgCode, vendorOrderID, vendorStoreID s
activityName = append(activityName, utils.Int64ToStr(v.CampaignId)+":"+v.CampaignName) activityName = append(activityName, utils.Int64ToStr(v.CampaignId)+":"+v.CampaignName)
} }
if len(activityId) > 0 { if len(activityId) > 0 {
sku.StoreSubID = int(activityId[0]) sku.StoreSubID = activityId[0]
sku.StoreSubName = strings.Join(activityName, ",") sku.StoreSubName = strings.Join(activityName, ",")
} }
if sku.Weight == 0 { if sku.Weight == 0 {

4
controllers/jx_order.go
View File

@@ -571,7 +571,7 @@ func skuList2Map(skuList []*model.OrderSku) (skuCount int, skuMap map[int64]*mod
skuCount += sku.Count skuCount += sku.Count
skuID := jxutils.GetSkuIDFromOrderSku(sku) skuID := jxutils.GetSkuIDFromOrderSku(sku)
if sku.SkuID > 0 { if sku.SkuID > 0 {
index := jxutils.Combine2Int(skuID, sku.StoreSubID) index := jxutils.Combine2Int(skuID, int(sku.StoreSubID))
if skuMap[index] == nil { if skuMap[index] == nil {
tmpSku := *sku tmpSku := *sku
skuMap[index] = &tmpSku skuMap[index] = &tmpSku
@@ -901,7 +901,7 @@ func fillSkuList(skuList, orderSkuList []*model.OrderSku) (isSame bool, err erro
skuCount2 += sku.Count skuCount2 += sku.Count
skuID := jxutils.GetSkuIDFromOrderSku(sku) skuID := jxutils.GetSkuIDFromOrderSku(sku)
actID := sku.StoreSubID actID := sku.StoreSubID
sku2 := getSkuFromMap(orderSkuMap, skuID, actID) sku2 := getSkuFromMap(orderSkuMap, skuID, int(actID))
if sku2 == nil { if sku2 == nil {
err = fmt.Errorf("找不到SKU:%d", skuID) err = fmt.Errorf("找不到SKU:%d", skuID)
} else if sku.Count > sku2.Count { } else if sku.Count > sku2.Count {