From 3d1cb2ef2b41eaa95581cb0f8cce6cef474444c4 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Wed, 27 Sep 2023 10:54:33 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E2=80=9C1=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxstore/cms/store.go | 16 ++++++++++++++++ business/partner/im/im.go | 5 ----- controllers/cms_store.go | 16 ++++++++++++++++ routers/commentsRouter_controllers.go | 9 +++++++++ 4 files changed, 41 insertions(+), 5 deletions(-) diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index fc6b5aa9e..cb5508556 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -6334,6 +6334,22 @@ func SetStoreAutoCallRider(vendorOrgCode string, openIDs, closeIDs []int64) (str return "", nil } +// CreateDDWarehouse 创建抖音门店区域仓 +func CreateDDWarehouse(vendorOrgCode string, vendorStoreID, storeID int64) error { + bind, err := tiktok_store.GetWarehouseByStore(vendorOrgCode, vendorStoreID) + if err == nil && bind[utils.Int64ToStr(storeID)][0].WarehouseId > 0 { + return nil + } + if warehouseID, err := tiktok_store.CreateWarehouse(vendorOrgCode, storeID); err != nil || warehouseID == 0 { + return fmt.Errorf("门店(%d) 创建仓库失败:%v", storeID, err) + } else { + if err = tiktok_store.BindStoreWarehouse(vendorOrgCode, utils.Int64ToStr(storeID), vendorStoreID); err != nil { //仓库绑定通过自定义外部ID + return fmt.Errorf("门店(%d) 绑定仓库%d 失败:%v", storeID, warehouseID, err) + } + } + return err +} + type MtRelInfo struct { PoiCode string `json:"poi_code"` PicUrl string `json:"pic_url"` diff --git a/business/partner/im/im.go b/business/partner/im/im.go index f57fee5ff..8d95a7a9e 100644 --- a/business/partner/im/im.go +++ b/business/partner/im/im.go @@ -83,11 +83,9 @@ func ReadMsgFromClient(vendorID int, elmAppID string, msg interface{}) error { LatestTime: pushContent.Cts, OrderID: "", } - globals.SugarLogger.Debugf("ReadMsgFromClient pushContent.OrderID=%d", pushContent.OrderID) if pushContent.OrderID != 0 { userList.OrderID = utils.Int2Str(pushContent.OrderID) } - globals.SugarLogger.Debugf("ReadMsgFromClient userList=%s", utils.Format4Output(userList, false)) } if vendorID == VendorIDELM { var ElmData = ebaiapi.ImMessageSend{} @@ -147,13 +145,10 @@ func ReadMsgFromVendor(vendorID int, elmAppID string, msg []byte) error { LatestTime: PushContentReq.Cts, OrderID: "", } - globals.SugarLogger.Debugf("ReadMsgFromVendor PushContentReq.OrderID=%d", PushContentReq.OrderID) - vendorStoreID = PushContentReq.AppPoiCode if PushContentReq.OrderID != 0 { userList.OrderID = utils.Int2Str(PushContentReq.OrderID) } - globals.SugarLogger.Debugf("ReadMsgFromVendor userList=%s", utils.Format4Output(userList, false)) } if vendorID == VendorIDELM { var ElmData = ebaiapi.ImMessageSend{} diff --git a/controllers/cms_store.go b/controllers/cms_store.go index 2971d074f..0ae947335 100644 --- a/controllers/cms_store.go +++ b/controllers/cms_store.go @@ -1593,6 +1593,22 @@ func (c *StoreController) GetStoreAutoCallRiderInfo() { }) } +// @Title 创建绑定抖音区域仓 +// @Description 创建绑定抖音区域仓 +// @Param token header string true "认证token" +// @Param vendorOrgCode formData string true "抖音门店总账号" +// @Param vendorStoreID formData int64 true "抖音门店总账号" +// @Param storeID formData int64 true "抖音门店ID" +// @Success 200 {object} controllers.CallResult +// @Failure 200 {object} controllers.CallResult +// @router /CreateDDWarehouse [post] +func (c *StoreController) CreateDDWarehouse() { + c.callCreateDDWarehouse(func(params *tStoreCreateDDWarehouseParams) (interface{}, string, error) { + err := cms.CreateDDWarehouse(params.VendorOrgCode, int64(params.VendorStoreID), int64(params.StoreID)) + return nil, "", err + }) +} + // @Title 打印机获取授权账号再京西菜市的绑定关系(其实就是根据平台门店id获取绑定门店id) // @Description 打印机获取授权账号再京西菜市的绑定关系 // @Param token header string true "认证token" diff --git a/routers/commentsRouter_controllers.go b/routers/commentsRouter_controllers.go index 27bdc75b6..fad04c1b9 100644 --- a/routers/commentsRouter_controllers.go +++ b/routers/commentsRouter_controllers.go @@ -3125,6 +3125,15 @@ func init() { Filters: nil, Params: nil}) + web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:StoreController"] = append(web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:StoreController"], + web.ControllerComments{ + Method: "CreateDDWarehouse", + Router: `/CreateDDWarehouse`, + AllowHTTPMethods: []string{"post"}, + MethodParams: param.Make(), + Filters: nil, + Params: nil}) + // 打印机管理系统绑定打印机授权时,检查账号是否已经授权过 web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:StoreController"] = append(web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:StoreController"], web.ControllerComments{ From 72e70aa45ad119a623dcc0c9cfc1f46e18b3e827 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Wed, 27 Sep 2023 11:04:20 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E2=80=9C1=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxstore/cms/store.go | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index cb5508556..266d0706b 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -6336,18 +6336,19 @@ func SetStoreAutoCallRider(vendorOrgCode string, openIDs, closeIDs []int64) (str // CreateDDWarehouse 创建抖音门店区域仓 func CreateDDWarehouse(vendorOrgCode string, vendorStoreID, storeID int64) error { + var errList errlist.ErrList bind, err := tiktok_store.GetWarehouseByStore(vendorOrgCode, vendorStoreID) if err == nil && bind[utils.Int64ToStr(storeID)][0].WarehouseId > 0 { return nil } - if warehouseID, err := tiktok_store.CreateWarehouse(vendorOrgCode, storeID); err != nil || warehouseID == 0 { - return fmt.Errorf("门店(%d) 创建仓库失败:%v", storeID, err) - } else { - if err = tiktok_store.BindStoreWarehouse(vendorOrgCode, utils.Int64ToStr(storeID), vendorStoreID); err != nil { //仓库绑定通过自定义外部ID - return fmt.Errorf("门店(%d) 绑定仓库%d 失败:%v", storeID, warehouseID, err) - } + warehouseID, err := tiktok_store.CreateWarehouse(vendorOrgCode, storeID) + if err != nil || warehouseID == 0 { + errList.AddErr(fmt.Errorf("门店(%d) 创建仓库失败:%v", storeID, err)) } - return err + if err = tiktok_store.BindStoreWarehouse(vendorOrgCode, utils.Int64ToStr(storeID), vendorStoreID); err != nil { //仓库绑定通过自定义外部ID + errList.AddErr(fmt.Errorf("门店(%d) 绑定仓库%d 失败:%v", storeID, warehouseID, err)) + } + return errList.GetErrListAsOne() } type MtRelInfo struct { From b075af159eef01c70129fdc8400606ec8942da81 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Wed, 27 Sep 2023 11:11:04 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E2=80=9C1=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 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 8d95a7a9e..9ac083ec7 100644 --- a/business/partner/im/im.go +++ b/business/partner/im/im.go @@ -357,6 +357,7 @@ func SetJxMsgRead(appID, vendorStoreID, vendorID, userID string) error { temp = UserMessageList{ VendorID: v.VendorID, UserID: v.UserID, + OrderID: v.OrderID, NewMessageNum: 0, LatestMsg: v.LatestMsg, LatestTime: v.LatestTime, From 8f3d934aedd15e5cee7254291b6c05be891b3364 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Wed, 27 Sep 2023 11:24:53 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E2=80=9C1=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxstore/cms/store.go | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index 266d0706b..c3c763fae 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -6338,15 +6338,17 @@ func SetStoreAutoCallRider(vendorOrgCode string, openIDs, closeIDs []int64) (str func CreateDDWarehouse(vendorOrgCode string, vendorStoreID, storeID int64) error { var errList errlist.ErrList bind, err := tiktok_store.GetWarehouseByStore(vendorOrgCode, vendorStoreID) + globals.SugarLogger.Debugf("CreateDDWarehouse bind=%s", utils.Format4Output(bind, false)) if err == nil && bind[utils.Int64ToStr(storeID)][0].WarehouseId > 0 { return nil } - warehouseID, err := tiktok_store.CreateWarehouse(vendorOrgCode, storeID) - if err != nil || warehouseID == 0 { - errList.AddErr(fmt.Errorf("门店(%d) 创建仓库失败:%v", storeID, err)) + warehouseID, err1 := tiktok_store.CreateWarehouse(vendorOrgCode, storeID) + if err1 != nil || warehouseID == 0 { + errList.AddErr(fmt.Errorf("门店(%d) 创建仓库失败:%v", storeID, err1)) } - if err = tiktok_store.BindStoreWarehouse(vendorOrgCode, utils.Int64ToStr(storeID), vendorStoreID); err != nil { //仓库绑定通过自定义外部ID - errList.AddErr(fmt.Errorf("门店(%d) 绑定仓库%d 失败:%v", storeID, warehouseID, err)) + err1 = tiktok_store.BindStoreWarehouse(vendorOrgCode, utils.Int64ToStr(storeID), vendorStoreID) + if err1 != nil { //仓库绑定通过自定义外部ID + errList.AddErr(fmt.Errorf("门店(%d) 绑定仓库%d 失败:%v", storeID, warehouseID, err1)) } return errList.GetErrListAsOne() } From bfe5cbce3fcb7c25ac1d25e6974b95a7393a8e1a Mon Sep 17 00:00:00 2001 From: richboo111 Date: Wed, 27 Sep 2023 11:30:40 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E2=80=9C1=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxstore/cms/store.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index c3c763fae..4fa2d39f7 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -6339,7 +6339,7 @@ func CreateDDWarehouse(vendorOrgCode string, vendorStoreID, storeID int64) error var errList errlist.ErrList bind, err := tiktok_store.GetWarehouseByStore(vendorOrgCode, vendorStoreID) globals.SugarLogger.Debugf("CreateDDWarehouse bind=%s", utils.Format4Output(bind, false)) - if err == nil && bind[utils.Int64ToStr(storeID)][0].WarehouseId > 0 { + if err == nil && bind[utils.Int64ToStr(vendorStoreID)][0].WarehouseId > 0 { return nil } warehouseID, err1 := tiktok_store.CreateWarehouse(vendorOrgCode, storeID) From 6aa051811ec2bcbfebd572bc9a30e19c544bf1c8 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Wed, 27 Sep 2023 15:57:41 +0800 Subject: [PATCH 6/6] 1 --- controllers/cms_store.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/controllers/cms_store.go b/controllers/cms_store.go index 0ae947335..e6c06538f 100644 --- a/controllers/cms_store.go +++ b/controllers/cms_store.go @@ -1597,8 +1597,8 @@ func (c *StoreController) GetStoreAutoCallRiderInfo() { // @Description 创建绑定抖音区域仓 // @Param token header string true "认证token" // @Param vendorOrgCode formData string true "抖音门店总账号" -// @Param vendorStoreID formData int64 true "抖音门店总账号" -// @Param storeID formData int64 true "抖音门店ID" +// @Param vendorStoreID formData int64 true "抖音门店id" +// @Param storeID formData int64 true "京西门店ID" // @Success 200 {object} controllers.CallResult // @Failure 200 {object} controllers.CallResult // @router /CreateDDWarehouse [post]