From 15a0c914527e7a524d79df94a4f0234cef085989 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Wed, 12 Jul 2023 15:27:49 +0800 Subject: [PATCH 1/2] 1 --- business/jxcallback/orderman/order.go | 7 ++++--- business/partner/purchase/im/im.go | 4 +++- business/partner/purchase/im/im_model.go | 2 +- .../partner/purchase/tao_vegetable/act.go | 20 +++---------------- 4 files changed, 11 insertions(+), 22 deletions(-) diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go index 597581283..baa43797f 100644 --- a/business/jxcallback/orderman/order.go +++ b/business/jxcallback/orderman/order.go @@ -4,11 +4,12 @@ import ( "crypto/md5" "errors" "fmt" - "git.rosy.net.cn/baseapi/platformapi/tao_vegetable" "math" "strings" "time" + "git.rosy.net.cn/baseapi/platformapi/tao_vegetable" + "git.rosy.net.cn/jx-callback/business/authz/autils" "git.rosy.net.cn/jx-callback/business/jxutils/excel" "git.rosy.net.cn/jx-callback/business/jxutils/netprinter" @@ -2442,8 +2443,8 @@ func DelOrderSkuInfo(ctx *jxcontext.Context, vendorOrderID string, vendorID, id ` sqlParams := []interface{}{vendorOrderID} dao.GetRows(db, &orderSkus, sql, sqlParams) - if len(orderSkus) < 5 { - return 0, fmt.Errorf("商品数小于5，不允许删除！") + if len(orderSkus) < 3 { + return 0, fmt.Errorf("商品数小于3，不允许删除！") } if orderSkus[0].ID == int64(id) { //if orderSkus[0].JxSkuID == skuID { diff --git a/business/partner/purchase/im/im.go b/business/partner/purchase/im/im.go index 2b81cd64c..56ea0698f 100644 --- a/business/partner/purchase/im/im.go +++ b/business/partner/purchase/im/im.go @@ -359,8 +359,10 @@ var rel = map[int]string{ func DecryptIm(appID int, msg string) (string, error) { data, _ := base64.StdEncoding.DecodeString(msg) key := utils.LimitUTF8StringLen2(rel[appID], 16) - res, err := utils.AESCBC16Decrypt(data, []byte(key), []byte(key)) + res, err := utils.AESCBCDecpryt(data, []byte(key), []byte(key)) + globals.SugarLogger.Debugf("DecryptIm err=%v", err) if len(string(res)) > 0 && err == nil { + globals.SugarLogger.Debugf("DecryptIm res=%v", string(res)) return string(res), nil } return "", err diff --git a/business/partner/purchase/im/im_model.go b/business/partner/purchase/im/im_model.go index 4a6789c03..f5c9d193c 100644 --- a/business/partner/purchase/im/im_model.go +++ b/business/partner/purchase/im/im_model.go @@ -51,5 +51,5 @@ var ( ) const ( - ExpireTimeDay = 4 * time.Hour //redis过期时间 + ExpireTimeDay = 6 * time.Hour //redis过期时间 ) diff --git a/business/partner/purchase/tao_vegetable/act.go b/business/partner/purchase/tao_vegetable/act.go index 3ce9c6cc0..6d3b35479 100644 --- a/business/partner/purchase/tao_vegetable/act.go +++ b/business/partner/purchase/tao_vegetable/act.go @@ -77,7 +77,6 @@ func storeSku2ActData(act *model.Act2, actStoreSku []*model.ActStoreSku2, handle } for _, v := range actStoreSku { - globals.SugarLogger.Debugf("打印初始商品参数 sku=%s", utils.Format4Output(v, false)) if handler == nil || handler(v.SyncStatus) { stock := int64(0) if v.Stock > 0 { @@ -87,9 +86,6 @@ func storeSku2ActData(act *model.Act2, actStoreSku []*model.ActStoreSku2, handle actData = &domain.AlibabaRetailMarketingItemdiscountActivitySkuAddItemDiscountActivityElementOperateRequest{ SkuElements: &[]domain.AlibabaRetailMarketingItemdiscountActivitySkuAddSkuActivityElementDto{{ SkuCode: utils.String2Pointer(utils.Int2Str(v.SkuID)), - //FixPriceMoney: &fixPriceMoney, - //DiscountRate: &discountRate, - //DecreaseMoney: &decreaseMoney, Limit: &domain.AlibabaRetailMarketingItemdiscountActivitySkuAddLimitDto{ TotalLimitCnt: &stock, DailyTotalLimitCnt: &limitDaily, @@ -104,7 +100,6 @@ func storeSku2ActData(act *model.Act2, actStoreSku []*model.ActStoreSku2, handle } sType := actType2Txd(act.Type) - globals.SugarLogger.Debugf("sType=%d", sType) switch sType { case tao_vegetable.DiscountTypeDeductMoney: decreaseMoney = v.VendorPrice - v.ActualActPrice @@ -159,7 +154,6 @@ func actSku2Delete(actIDs []string, vendorOrgCode, vendorStoreID string) (map[st ) for _, v := range actIDs { i := utils.Str2Int64(v) - //if skus, err := api.TaoVegetableApi.ActivitySkuQuery(i); err == nil { if skus, err := getAPI(vendorOrgCode, 0, vendorStoreID).ActivitySkuQuery(i); err == nil { //查询商品 for _, sku := range skus { @@ -192,32 +186,28 @@ func createOneShopAct(act *model.Act2, vendorStoreID string, actStoreSku []*mode actData := act2TxdActivity(act) //2 活动商品详情 actSkuData := storeSku2ActData(act, actStoreSku, isCreateOrUpdate) - globals.SugarLogger.Debugf("进入获取活动参数,actData=%s,actSkuData=%s", utils.Format4Output(actData, false), utils.Format4Output(actSkuData, false)) if actData != nil && actSkuData != nil { if globals.EnableMtwmStoreWrite { - globals.SugarLogger.Debugf("进入创建活动") //创建活动 actData.StoreIds = &[]string{vendorStoreID} actID, err1 := getAPI(act.VendorOrgCode, 0, vendorStoreID).ActivityCreate(*actData) - globals.SugarLogger.Debugf("createOneShopAct actData=%s,err=%v", utils.Format4Output(actData, false), err1) if err1 != nil || actID == 0 { failedList = append(failedList, &partner.StoreSkuInfoWithErr{ VendoreID: model.VendorIDTaoVegetable, ErrMsg: fmt.Sprintf("%v", err1), StoreID: int(utils.Str2Int64WithDefault(vendorStoreID, 0)), }) - globals.SugarLogger.Debugf("我在failedList=%s", utils.Format4Output(failedList, false), err1) return failedList, err1 } //活动增加商品 actSkuData.ActId = &actID err3, successSkuCode, failSkuCode := getAPI(act.VendorOrgCode, 0, vendorStoreID).ActivitySkuCreate(*actSkuData) - globals.SugarLogger.Debugf("createOneShopAct actSkuData=%s,err3=%v", utils.Format4Output(actSkuData, false), err3) err = err3 if err != nil { //商品新增失败，回滚删除创建的活动 - err4 := getAPI(act.VendorOrgCode, 0, vendorStoreID).ActivityDelete(*actData.CreatorId, *actData.CreatorName, actID) - globals.SugarLogger.Debugf("createOneShopAct rollback delete act err=%v", err4) + if err4 := getAPI(act.VendorOrgCode, 0, vendorStoreID).ActivityDelete(*actData.CreatorId, *actData.CreatorName, actID); err != nil { + return nil, fmt.Errorf("活动创建但新增商品失败，删除活动错误：%v，请在淘鲜达平台删除此活动", err4) + } } actStoreSkuMap := make(map[int]*model.ActStoreSku2) for _, v := range actStoreSku { @@ -295,12 +285,9 @@ func createSkuAct(ctx *jxcontext.Context, parentTask tasksch.ITask, act *model.A task := tasksch.NewParallelTask("txd createSkuAct", nil, ctx, func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { list := batchItemList[0].([]*model.ActStoreSku2) - globals.SugarLogger.Debugf("我在这里4") failedList, err2 := createOneShopAct(act, list[0].VendorStoreID, list) - globals.SugarLogger.Debugf("我在这里6，failedList=%s, err2=%v", utils.Format4Output(failedList, false), err2) if err = err2; err2 == nil { if len(failedList) > 0 { - globals.SugarLogger.Debugf("我在这里5") failedMap := putils.StoreSkuInfoWithErrList2MapBySku(failedList) list = []*model.ActStoreSku2{} for _, v := range actStoreSku { @@ -356,7 +343,6 @@ func (c *PurchaseHandler) SyncAct(ctx *jxcontext.Context, parentTask tasksch.ITa updateItems = append(updateItems, partner.Act2Update(ctx, act, model.SyncFlagModifiedMask)) } } else if model.IsSyncStatusNew(act.SyncStatus) { - globals.SugarLogger.Debugf("我进入这里了createSkuAct") createdList, err2 := createSkuAct(ctx, nil, act, actStoreSkuList4Create) updateItems = append(updateItems, partner.ActStoreSku2Update(ctx, createdList, model.SyncFlagNewMask)...) if err = err2; err == nil { From 04f70bbb8343b5020d0aeb936edbeb87a0b0c222 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Wed, 12 Jul 2023 15:43:21 +0800 Subject: [PATCH 2/2] 1 --- business/partner/purchase/tao_vegetable/store.go | 11 +++++------ controllers/cms_store.go | 3 ++- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/business/partner/purchase/tao_vegetable/store.go b/business/partner/purchase/tao_vegetable/store.go index dac751604..a79194e69 100644 --- a/business/partner/purchase/tao_vegetable/store.go +++ b/business/partner/purchase/tao_vegetable/store.go @@ -12,8 +12,6 @@ import ( "git.rosy.net.cn/baseapi/utils/errlist" - "git.rosy.net.cn/jx-callback/globals/api" - "git.rosy.net.cn/baseapi/platformapi/mtwmapi" "git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/jx-callback/business/jxstore/event" @@ -85,12 +83,13 @@ type Point struct { } // UpdateTxdStore 单独更新淘鲜达门店营业时间/状态 销售范围 -func UpdateTxdStore(store TxdStore) (err error) { +func UpdateTxdStore(store TxdStore, vendorOrgCode string) (err error) { + a := getAPI(vendorOrgCode, 0, "") errList := errlist.New() for _, v := range store.Flag { switch v { case FlagStatus: - if err = api.TaoVegetableApi.ShopUpdateStatus(store.TxdStoreID, store.Status); err != nil { + if err = a.ShopUpdateStatus(store.TxdStoreID, store.Status); err != nil { errList.AddErr(fmt.Errorf("营业状态：%v", err)) } case FlagBusinessTime: @@ -98,7 +97,7 @@ func UpdateTxdStore(store TxdStore) (err error) { return errors.New("更新营业时间，时间必填") } if CheckBusinessTime(store.StartTime, store.EndTime) { - if err = api.TaoVegetableApi.ShopUpdateInfo(store.TxdStoreID, store.StartTime, store.EndTime); err != nil { + if err = a.ShopUpdateInfo(store.TxdStoreID, store.StartTime, store.EndTime); err != nil { errList.AddErr(fmt.Errorf("营业时间：%v", err)) } } @@ -107,7 +106,7 @@ func UpdateTxdStore(store TxdStore) (err error) { return errors.New("更新营业范围，坐标必填") } point := GetPoints(store.Points) - if err = api.TaoVegetableApi.ShopUpdateRange(store.TxdStoreID, point); err != nil { + if err = a.ShopUpdateRange(store.TxdStoreID, point); err != nil { errList.AddErr(fmt.Errorf("营业范围：%v", err)) } default: diff --git a/controllers/cms_store.go b/controllers/cms_store.go index 5b64b8bef..edf90c70e 100644 --- a/controllers/cms_store.go +++ b/controllers/cms_store.go @@ -1682,6 +1682,7 @@ func (c *StoreController) SingleBindTaoVegetable() { // @Title 更新淘鲜达门店信息 // @Description 更新淘鲜达门店信息 // @Param token header string true "认证token" +// @Param vendorOrgCode formData string true "平台账号" // @Param txdStores formData string true "TxdStore" // @Success 200 {object} controllers.CallResult // @Failure 200 {object} controllers.CallResult @@ -1692,7 +1693,7 @@ func (c *StoreController) UpdateTxdStore() { b := bytes.NewBufferString(params.TxdStores) decoder := json.NewDecoder(b) if err = decoder.Decode(&taoStore); err == nil { - err = tao_vegetable.UpdateTxdStore(taoStore) + err = tao_vegetable.UpdateTxdStore(taoStore, params.VendorOrgCode) } return nil, "", err })