From 35ca3a47ccf895896a0c522989edc0345047ea65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Fri, 14 Jul 2023 17:46:44 +0800
Subject: [PATCH] 1

---
 business/jxcallback/orderman/order.go            | 2 +-
 business/model/dao/dao_order.go                  | 2 +-
 business/model/order.go                          | 2 +-
 business/partner/purchase/tao_vegetable/order.go | 2 +-
 business/partner/purchase/tiktok_store/order.go  | 2 +-
 controllers/jx_order.go                          | 4 ++--
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go
index 7c2d02618..8299d38c9 100644
--- a/business/jxcallback/orderman/order.go
+++ b/business/jxcallback/orderman/order.go
@@ -868,7 +868,7 @@ func updateSingleOrderEarningPrice(order *model.GoodsOrder, db *dao.DaoDB) {
 					if actStoreSku := actStoreSkuMap.GetActStoreSku(jxStoreID, skuID, order.VendorID); actStoreSku != nil {
 						v.EarningPrice = actStoreSku.EarningPrice
 						if true { //v.StoreSubName != "" { // 之前这里为什么要加判断？
-							v.StoreSubID = actStoreSku.ActID
+							v.StoreSubID = int64(actStoreSku.ActID)
 						}
 					}
 				}
diff --git a/business/model/dao/dao_order.go b/business/model/dao/dao_order.go
index 637b4e99c..3a3a276ff 100644
--- a/business/model/dao/dao_order.go
+++ b/business/model/dao/dao_order.go
@@ -144,7 +144,7 @@ func QueryOrders(db *DaoDB, vendorOrderID string, actID int, vendorIDs []int, st
 				ID:            v.OrderSkuID,
 				VendorOrderID: v.VendorOrderID,
 				VendorID:      v.VendorID,
-				StoreSubID:    v.StoreSubID,
+				StoreSubID:    int64(v.StoreSubID),
 				StoreSubName:  v.StoreSubName,
 				Count:         v.Count,
 				VendorSkuID:   v.VendorSkuID,
diff --git a/business/model/order.go b/business/model/order.go
index 8997a5041..44ad263d6 100644
--- a/business/model/order.go
+++ b/business/model/order.go
@@ -196,7 +196,7 @@ type OrderSku struct {
 	VendorOrderID    string    `orm:"column(vendor_order_id);size(48)" json:"vendorOrderID"`
 	VendorSubOrderID string    `orm:"column(vendor_sub_order_id);size(48)" json:"vendorSubOrderID"` // 子订单id
 	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
 	Count            int       `json:"count"`
 	VendorSkuID      string    `orm:"column(vendor_sku_id);size(48)" json:"vendorSkuID"`
diff --git a/business/partner/purchase/tao_vegetable/order.go b/business/partner/purchase/tao_vegetable/order.go
index dd1378acc..a171c4af6 100644
--- a/business/partner/purchase/tao_vegetable/order.go
+++ b/business/partner/purchase/tao_vegetable/order.go
@@ -148,7 +148,7 @@ func (p *PurchaseHandler) getOrder(vendorOrgCode string, vendorOrderID int64, ve
 			}
 
 			if len(activityId) > 0 {
-				sku.StoreSubID = int(activityId[0])
+				sku.StoreSubID = activityId[0]
 				sku.StoreSubName = strings.Join(activityName, ",")
 			}
 			if sku.Weight == 0 {
diff --git a/business/partner/purchase/tiktok_store/order.go b/business/partner/purchase/tiktok_store/order.go
index 82a0d6653..eea07f2aa 100644
--- a/business/partner/purchase/tiktok_store/order.go
+++ b/business/partner/purchase/tiktok_store/order.go
@@ -162,7 +162,7 @@ func (p *PurchaseHandler) getOrder(vendorOrgCode, vendorOrderID, vendorStoreID s
 				activityName = append(activityName, utils.Int64ToStr(v.CampaignId)+":"+v.CampaignName)
 			}
 			if len(activityId) > 0 {
-				sku.StoreSubID = int(activityId[0])
+				sku.StoreSubID = activityId[0]
 				sku.StoreSubName = strings.Join(activityName, ",")
 			}
 			if sku.Weight == 0 {
diff --git a/controllers/jx_order.go b/controllers/jx_order.go
index 664e86d5e..652d05250 100644
--- a/controllers/jx_order.go
+++ b/controllers/jx_order.go
@@ -571,7 +571,7 @@ func skuList2Map(skuList []*model.OrderSku) (skuCount int, skuMap map[int64]*mod
 		skuCount += sku.Count
 		skuID := jxutils.GetSkuIDFromOrderSku(sku)
 		if sku.SkuID > 0 {
-			index := jxutils.Combine2Int(skuID, sku.StoreSubID)
+			index := jxutils.Combine2Int(skuID, int(sku.StoreSubID))
 			if skuMap[index] == nil {
 				tmpSku := *sku
 				skuMap[index] = &tmpSku
@@ -901,7 +901,7 @@ func fillSkuList(skuList, orderSkuList []*model.OrderSku) (isSame bool, err erro
 		skuCount2 += sku.Count
 		skuID := jxutils.GetSkuIDFromOrderSku(sku)
 		actID := sku.StoreSubID
-		sku2 := getSkuFromMap(orderSkuMap, skuID, actID)
+		sku2 := getSkuFromMap(orderSkuMap, skuID, int(actID))
 		if sku2 == nil {
 			err = fmt.Errorf("找不到SKU:%d", skuID)
 		} else if sku.Count > sku2.Count {