This commit is contained in:
邹宗楠
2025-07-28 14:45:39 +08:00
parent 173215ee0f
commit 23d57dc86f
3 changed files with 3 additions and 3 deletions

View File

@@ -321,7 +321,6 @@ func (c *BaseScheduler) AgreeOrRefuseRefund(ctx *jxcontext.Context, afsOrderID s
dao.SetAfsOrderFlag(dao.GetDB(), ctx.GetUserName(), afsOrderID, vendorID, flag) dao.SetAfsOrderFlag(dao.GetDB(), ctx.GetUserName(), afsOrderID, vendorID, flag)
} }
} }
if approveType != partner.AfsApproveTypeRefused && err == nil { if approveType != partner.AfsApproveTypeRefused && err == nil {
storeDetail, err := partner.CurOrderManager.LoadStoreDetail(afsOrder.StoreID, afsOrder.VendorID) storeDetail, err := partner.CurOrderManager.LoadStoreDetail(afsOrder.StoreID, afsOrder.VendorID)
if err != nil { if err != nil {

View File

@@ -443,7 +443,7 @@ func ApplyBind(param *lakala.SeparateApplyBindReq) (*lakala.SeparateApplyBindRes
db := dao.GetDB() db := dao.GetDB()
merchant, err := dao.GetStoreInfoByMerchantID(db, param.MerInnerNo, 0, "", "") merchant, err := dao.GetStoreInfoByMerchantID(db, param.MerInnerNo, 0, "", "")
if err != nil { if err != nil {
return nil, err return applyInfo, err
} }
bind := map[string]*model.BindAccountObj{param.ReceiverNo: &model.BindAccountObj{ bind := map[string]*model.BindAccountObj{param.ReceiverNo: &model.BindAccountObj{
ApplyId: utils.Int64ToStr(applyInfo.RespData.ApplyId), ApplyId: utils.Int64ToStr(applyInfo.RespData.ApplyId),
@@ -454,7 +454,7 @@ func ApplyBind(param *lakala.SeparateApplyBindReq) (*lakala.SeparateApplyBindRes
merchant.BindAccount = string(bodyBind) merchant.BindAccount = string(bodyBind)
_, err = dao.UpdateEntity(db, merchant, "BindAccount") _, err = dao.UpdateEntity(db, merchant, "BindAccount")
if err != nil { if err != nil {
return nil, err return applyInfo, err
} }
return applyInfo, nil return applyInfo, nil
} }

View File

@@ -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) { 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 := "" appOrgCode := ""
if len(storeSkuList) == 0 { if len(storeSkuList) == 0 {