1

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 {

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
 }

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 {