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:
邹宗楠
2025-08-18 11:38:26 +08:00
parent 62606b178d
commit 2e45d73280
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
business/lakala/lakala_incoming.go
View File

@@ -64,7 +64,7 @@ func LaKaLaApplyContractByPeople(storeId int, apply *lakala.ApplyContractByPeopl
return "", nil return "", nil
} }
// QueryElectronicContract 拉卡拉签约合同查询 // QueryElectronicContract 人工复合结果查询
func QueryElectronicContract(orderNo string, orgId int, ecApplyId string, storeID int) (*lakala.ElectronicContractStatus, error) { func QueryElectronicContract(orderNo string, orgId int, ecApplyId string, storeID int) (*lakala.ElectronicContractStatus, error) {
db := dao.GetDB() db := dao.GetDB()
merchantInfo, err := dao.GetStoreContract(db, storeID, orderNo, "") merchantInfo, err := dao.GetStoreContract(db, storeID, orderNo, "")

3
business/partner/purchase/mtwm/act.go
View File

@@ -141,7 +141,10 @@ func createOneShopAct(act *model.Act2, vendorStoreID string, actStoreSku []*mode
func cancelOneShopAct(act *model.Act2, vendorStoreID string, actStoreSku []*model.ActStoreSku2) (failedList []*partner.StoreSkuInfoWithErr, err error) { func cancelOneShopAct(act *model.Act2, vendorStoreID string, actStoreSku []*model.ActStoreSku2) (failedList []*partner.StoreSkuInfoWithErr, err error) {
if list := storeSku2ActData4Delete(actStoreSku, nil /*model.IsSyncStatusNeedDelete*/); len(list) > 0 { if list := storeSku2ActData4Delete(actStoreSku, nil /*model.IsSyncStatusNeedDelete*/); len(list) > 0 {
if globals.EnableMtwmStoreWrite { if globals.EnableMtwmStoreWrite {
globals.SugarLogger.Debugf("----cancelOneShopAct--: %s", utils.Format4Output(list, false))
failedList2, err2 := api.MtwmAPI.RetailDiscountDelete2(vendorStoreID, jxActType2Mtwm(act.Type), list) failedList2, err2 := api.MtwmAPI.RetailDiscountDelete2(vendorStoreID, jxActType2Mtwm(act.Type), list)
globals.SugarLogger.Debugf("failedList2---- %s", utils.Format4Output(failedList2, false))
globals.SugarLogger.Debugf("err2---- %v", err2)
actStoreSkuMap := make(map[string]*model.ActStoreSku2) actStoreSkuMap := make(map[string]*model.ActStoreSku2)
for _, v := range actStoreSku { for _, v := range actStoreSku {
actStoreSkuMap[v.VendorActID] = v actStoreSkuMap[v.VendorActID] = v