From 23d57dc86ffdb8e3695bc7157e7de1b23ef9dbfe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Mon, 28 Jul 2025 14:45:39 +0800
Subject: [PATCH] 1

---
 business/jxcallback/scheduler/basesch/basesch_ext.go | 1 -
 business/lakala/lakala_incoming.go                   | 4 ++--
 business/partner/purchase/tiktok_store/store_sku2.go | 1 +
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/business/jxcallback/scheduler/basesch/basesch_ext.go b/business/jxcallback/scheduler/basesch/basesch_ext.go
index 68771148d..c70ee6bca 100644
--- a/business/jxcallback/scheduler/basesch/basesch_ext.go
+++ b/business/jxcallback/scheduler/basesch/basesch_ext.go
@@ -321,7 +321,6 @@ func (c *BaseScheduler) AgreeOrRefuseRefund(ctx *jxcontext.Context, afsOrderID s
 			dao.SetAfsOrderFlag(dao.GetDB(), ctx.GetUserName(), afsOrderID, vendorID, flag)
 		}
 	}
-
 	if approveType != partner.AfsApproveTypeRefused && err == nil {
 		storeDetail, err := partner.CurOrderManager.LoadStoreDetail(afsOrder.StoreID, afsOrder.VendorID)
 		if err != nil {
diff --git a/business/lakala/lakala_incoming.go b/business/lakala/lakala_incoming.go
index 405f04d56..f283fdb82 100644
--- a/business/lakala/lakala_incoming.go
+++ b/business/lakala/lakala_incoming.go
@@ -443,7 +443,7 @@ func ApplyBind(param *lakala.SeparateApplyBindReq) (*lakala.SeparateApplyBindRes
 	db := dao.GetDB()
 	merchant, err := dao.GetStoreInfoByMerchantID(db, param.MerInnerNo, 0, "", "")
 	if err != nil {
-		return nil, err
+		return applyInfo, err
 	}
 	bind := map[string]*model.BindAccountObj{param.ReceiverNo: &model.BindAccountObj{
 		ApplyId: utils.Int64ToStr(applyInfo.RespData.ApplyId),
@@ -454,7 +454,7 @@ func ApplyBind(param *lakala.SeparateApplyBindReq) (*lakala.SeparateApplyBindRes
 	merchant.BindAccount = string(bodyBind)
 	_, err = dao.UpdateEntity(db, merchant, "BindAccount")
 	if err != nil {
-		return nil, err
+		return applyInfo, err
 	}
 	return applyInfo, nil
 }
diff --git a/business/partner/purchase/tiktok_store/store_sku2.go b/business/partner/purchase/tiktok_store/store_sku2.go
index 40354a323..a61e6059f 100644
--- a/business/partner/purchase/tiktok_store/store_sku2.go
+++ b/business/partner/purchase/tiktok_store/store_sku2.go
@@ -217,6 +217,7 @@ func (p *PurchaseHandler) UpdateStoreSkusStock(ctx *jxcontext.Context, vendorOrg
 }
 
 func (p *PurchaseHandler) GetStoreSkusFullInfo(ctx *jxcontext.Context, parentTask tasksch.ITask, storeID int, vendorStoreID string, storeSkuList []*partner.StoreSkuInfo) (skuNameList []*partner.SkuNameInfo, err error) {
+	return nil, nil
 	// 查询单个门店商品
 	appOrgCode := ""
 	if len(storeSkuList) == 0 {