liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accept Merge Request #206: (qidongsheng -> jdshop)

Browse Source 
Merge Request: 修改差异查询功能调用名称和地址
Created By: @漆东升
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/206
This commit is contained in:
苏尹岚
2020-06-22 09:51:33 +08:00
parent c4f6200de1 3fc8250bd3
commit d7acbbc951
2 changed files with 2809 additions and 2828 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
controllers/temp_op.go
View File

@@ -299,8 +299,8 @@ func (c *TempOpController) CheckSkuDiffBetweenJxAndVendor() {
// @Param storeIDs formData string false "京西门店ID列表" // @Param storeIDs formData string false "京西门店ID列表"
// @Success 200 {object} controllers.CallResult // @Success 200 {object} controllers.CallResult
// @Failure 404 User not found // @Failure 404 User not found
// @router /StaticBlock [post] // @router /StoreSkuCheckDiff [post]
func (c *TempOpController) StaticBlock() { func (c *TempOpController) StoreSkuCheckDiff() {
c.callCheckSkuDiffBetweenJxAndVendor(func(params *tTempopCheckSkuDiffBetweenJxAndVendorParams) (retVal interface{}, errCode string, err error) { c.callCheckSkuDiffBetweenJxAndVendor(func(params *tTempopCheckSkuDiffBetweenJxAndVendorParams) (retVal interface{}, errCode string, err error) {
var vendorIDList []int var vendorIDList []int
var storeIDList []int var storeIDList []int

41
routers/commentsRouter_controllers.go
View File

@@ -461,7 +461,7 @@ func init() {
beego.ControllerComments{ beego.ControllerComments{
Method: "SendFilesToStores", Method: "SendFilesToStores",
Router: `/SendFilesToStores`, Router: `/SendFilesToStores`,
AllowHTTPMethods: []string{"post","get"}, AllowHTTPMethods: []string{"post", "get"},
MethodParams: param.Make(), MethodParams: param.Make(),
Filters: nil, Filters: nil,
Params: nil}) Params: nil})
@@ -985,7 +985,7 @@ func init() {
beego.ControllerComments{ beego.ControllerComments{
Method: "GetAfsOrders", Method: "GetAfsOrders",
Router: `/GetAfsOrders`, Router: `/GetAfsOrders`,
AllowHTTPMethods: []string{"get","post"}, AllowHTTPMethods: []string{"get", "post"},
MethodParams: param.Make(), MethodParams: param.Make(),
Filters: nil, Filters: nil,
Params: nil}) Params: nil})
@@ -1066,7 +1066,7 @@ func init() {
beego.ControllerComments{ beego.ControllerComments{
Method: "GetOrders", Method: "GetOrders",
Router: `/GetOrders`, Router: `/GetOrders`,
AllowHTTPMethods: []string{"get","post"}, AllowHTTPMethods: []string{"get", "post"},
MethodParams: param.Make(), MethodParams: param.Make(),
Filters: nil, Filters: nil,
Params: nil}) Params: nil})
@@ -1224,15 +1224,6 @@ func init() {
Filters: nil, Filters: nil,
Params: nil}) Params: nil})
beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:OrderController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:OrderController"],
beego.ControllerComments{
Method: "SaveJdsOrders",
Router: `/SaveJdsOrders`,
AllowHTTPMethods: []string{"post"},
MethodParams: param.Make(),
Filters: nil,
Params: nil})
beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:OrderController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:OrderController"], beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:OrderController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:OrderController"],
beego.ControllerComments{ beego.ControllerComments{
Method: "SelfDelivered", Method: "SelfDelivered",
@@ -1444,7 +1435,7 @@ func init() {
beego.ControllerComments{ beego.ControllerComments{
Method: "GetSkuNames", Method: "GetSkuNames",
Router: `/GetSkuNames`, Router: `/GetSkuNames`,
AllowHTTPMethods: []string{"get","post"}, AllowHTTPMethods: []string{"get", "post"},
MethodParams: param.Make(), MethodParams: param.Make(),
Filters: nil, Filters: nil,
Params: nil}) Params: nil})
@@ -1548,15 +1539,6 @@ func init() {
Filters: nil, Filters: nil,
Params: nil}) Params: nil})
beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:SkuController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:SkuController"],
beego.ControllerComments{
Method: "UpdateSkuExinfoMap",
Router: `/UpdateSkuExinfoMap`,
AllowHTTPMethods: []string{"put"},
MethodParams: param.Make(),
Filters: nil,
Params: nil})
beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:SkuController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:SkuController"], beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:SkuController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:SkuController"],
beego.ControllerComments{ beego.ControllerComments{
Method: "UpdateSkuName", Method: "UpdateSkuName",
@@ -1741,7 +1723,7 @@ func init() {
beego.ControllerComments{ beego.ControllerComments{
Method: "GetStores", Method: "GetStores",
Router: `/GetStores`, Router: `/GetStores`,
AllowHTTPMethods: []string{"get","post"}, AllowHTTPMethods: []string{"get", "post"},
MethodParams: param.Make(), MethodParams: param.Make(),
Filters: nil, Filters: nil,
Params: nil}) Params: nil})
@@ -2002,7 +1984,7 @@ func init() {
beego.ControllerComments{ beego.ControllerComments{
Method: "GetStoresSkus", Method: "GetStoresSkus",
Router: `/GetStoresSkus`, Router: `/GetStoresSkus`,
AllowHTTPMethods: []string{"get","post"}, AllowHTTPMethods: []string{"get", "post"},
MethodParams: param.Make(), MethodParams: param.Make(),
Filters: nil, Filters: nil,
Params: nil}) Params: nil})
@@ -2317,7 +2299,7 @@ func init() {
beego.ControllerComments{ beego.ControllerComments{
Method: "SyncSkuNames", Method: "SyncSkuNames",
Router: `/SyncSkuNames`, Router: `/SyncSkuNames`,
AllowHTTPMethods: []string{"put","post"}, AllowHTTPMethods: []string{"put", "post"},
MethodParams: param.Make(), MethodParams: param.Make(),
Filters: nil, Filters: nil,
Params: nil}) Params: nil})
@@ -2362,7 +2344,7 @@ func init() {
beego.ControllerComments{ beego.ControllerComments{
Method: "UploadFakeJdThingMap", Method: "UploadFakeJdThingMap",
Router: `/UploadFakeJdThingMap`, Router: `/UploadFakeJdThingMap`,
AllowHTTPMethods: []string{"post","get"}, AllowHTTPMethods: []string{"post", "get"},
MethodParams: param.Make(), MethodParams: param.Make(),
Filters: nil, Filters: nil,
Params: nil}) Params: nil})
@@ -2522,8 +2504,8 @@ func init() {
beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:TempOpController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:TempOpController"], beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:TempOpController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:TempOpController"],
beego.ControllerComments{ beego.ControllerComments{
Method: "StaticBlock", Method: "StoreSkuCheckDiff",
Router: `/StaticBlock`, Router: `/StoreSkuCheckDiff`,
AllowHTTPMethods: []string{"post"}, AllowHTTPMethods: []string{"post"},
MethodParams: param.Make(), MethodParams: param.Make(),
Filters: nil, Filters: nil,
@@ -2821,7 +2803,7 @@ func init() {
beego.ControllerComments{ beego.ControllerComments{
Method: "LoadExcelByYongHui", Method: "LoadExcelByYongHui",
Router: `/LoadExcelByYongHui`, Router: `/LoadExcelByYongHui`,
AllowHTTPMethods: []string{"post","get"}, AllowHTTPMethods: []string{"post", "get"},
MethodParams: param.Make(), MethodParams: param.Make(),
Filters: nil, Filters: nil,
Params: nil}) Params: nil})
@@ -2834,5 +2816,4 @@ func init() {
MethodParams: param.Make(), MethodParams: param.Make(),
Filters: nil, Filters: nil,
Params: nil}) Params: nil})
} }