From 4d89774362d00739284652433365eda1b594efd2 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Mon, 29 Jan 2024 10:29:59 +0800 Subject: [PATCH 1/3] 1 --- business/partner/im/im.go | 1 + 1 file changed, 1 insertion(+) diff --git a/business/partner/im/im.go b/business/partner/im/im.go index 46ba65928..9bbae3bce 100644 --- a/business/partner/im/im.go +++ b/business/partner/im/im.go @@ -555,6 +555,7 @@ func CheckAndReply(req *JXMsg, elmAppID string) (err error) { temp.MsgContent = AutoReplyByAppID[mt.AppID] } } + temp.MsgType = mtwmapi.MsgTypeText temp.MsgSource = mtwmapi.MsgSourceStore temp.Cts = int(time.Now().Unix()) temp.MsgID = RandTimeNumber() From c0530fc8e9145a016b6580f4dde2ba9834d3bc8f Mon Sep 17 00:00:00 2001 From: richboo111 Date: Mon, 29 Jan 2024 17:35:46 +0800 Subject: [PATCH 2/3] 1 --- business/partner/im/im.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/business/partner/im/im.go b/business/partner/im/im.go index 9bbae3bce..ee8cc32c7 100644 --- a/business/partner/im/im.go +++ b/business/partner/im/im.go @@ -743,7 +743,7 @@ func GetDefaultTemplate(appID, vendorStoreID string, vendorID int) (string, erro if err != nil && err != orm.ErrNoRows { return "", err } - if err == orm.ErrNoRows || (len(store.Tel1) == 0 && len(store.Tel2) == 0) { + if err == orm.ErrNoRows || store.Tel1 == "" { t = BasePhoneNum } if len(store.Tel1) > 0 { From 2dfadfa84378b16393494c5c782922cb2594003c Mon Sep 17 00:00:00 2001 From: richboo111 Date: Mon, 29 Jan 2024 17:50:00 +0800 Subject: [PATCH 3/3] 1 --- business/partner/purchase/mtwm/act.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/business/partner/purchase/mtwm/act.go b/business/partner/purchase/mtwm/act.go index 0204fb194..2061cda16 100644 --- a/business/partner/purchase/mtwm/act.go +++ b/business/partner/purchase/mtwm/act.go @@ -85,9 +85,11 @@ func isCreateOrUpdate(syncStatus int8) bool { func createOneShopAct(act *model.Act2, vendorStoreID string, actStoreSku []*model.ActStoreSku2) (failedList []*partner.StoreSkuInfoWithErr, err error) { actData := storeSku2ActData(act, actStoreSku, isCreateOrUpdate) + globals.SugarLogger.Debugf("test0129 actData=%s", utils.Format4Output(actData, false)) if len(actData) > 0 { if globals.EnableMtwmStoreWrite { actResult, faileInfoList, err2 := api.MtwmAPI.RetailDiscountBatchSave2(vendorStoreID, jxActType2Mtwm(act.Type), actData) + //actResult, faileInfoList, err2 := getAPI(act.VendorOrgCode, 0, vendorStoreID).RetailDiscountBatchSave2(vendorStoreID, jxActType2Mtwm(act.Type), actData) err = err2 // 忽略错误，都放在failedList里 // if err != nil { @@ -161,9 +163,12 @@ func getActStoreSkuFromTaskResult(taskReslt []interface{}) (list []*model.ActSto func createSkuAct(ctx *jxcontext.Context, parentTask tasksch.ITask, act *model.Act2, actStoreSku []*model.ActStoreSku2) (createdList []*model.ActStoreSku2, err error) { actStoreSkuListList := partner.SplitActStoreSku2List(actStoreSku) + globals.SugarLogger.Debugf("createSkuAct test0129 actStoreSkuListList=%s", utils.Format4Output(actStoreSkuListList, false)) task := tasksch.NewParallelTask("mtwm createSkuAct", nil, ctx, func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { list := batchItemList[0].([]*model.ActStoreSku2) + globals.SugarLogger.Debugf("createSkuAct test0129 list=%s", utils.Format4Output(list, false)) + failedList, err2 := createOneShopAct(act, list[0].VendorStoreID, list) if err = err2; err2 == nil { if len(failedList) > 0 {