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

- 注释掉价格审核相关的一些代码

Browse Source
This commit is contained in:
gazebo
2019-08-30 14:07:25 +08:00
parent 46527e139e
commit d428a0334a
5 changed files with 60 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
business/jxstore/cms/store_sku.go
View File

@@ -1111,9 +1111,9 @@ func updateStoresSkusWithoutSync(ctx *jxcontext.Context, db *dao.DaoDB, storeIDs
// if err = checkStoresSkusSaleCity(ctx, db, storeIDs, skuBindInfos); err != nil { // if err = checkStoresSkusSaleCity(ctx, db, storeIDs, skuBindInfos); err != nil {
// return nil, err // return nil, err
// } // }
if storeIDs, skuBindInfos, err = filterStorePriceChange(ctx, storeIDs, skuBindInfos); err != nil { // if storeIDs, skuBindInfos, err = filterStorePriceChange(ctx, storeIDs, skuBindInfos); err != nil {
return nil, err // return nil, err
} // }
// globals.SugarLogger.Debugf("updateStoresSkusWithoutSync2, storeIDs:%v, skuBindInfos:%s", storeIDs, utils.Format4Output(skuBindInfos, false)) // globals.SugarLogger.Debugf("updateStoresSkusWithoutSync2, storeIDs:%v, skuBindInfos:%s", storeIDs, utils.Format4Output(skuBindInfos, false))
userName := ctx.GetUserName() userName := ctx.GetUserName()

2
conf/app.conf
View File

@@ -31,8 +31,6 @@ enableElmStoreWrite = false
enableMtwmStoreWrite = false enableMtwmStoreWrite = false
enableWscStoreWrite = false enableWscStoreWrite = false
enablePendingChange = false
aliKey = "LTAI6xJUGaP6WdMQ" aliKey = "LTAI6xJUGaP6WdMQ"
aliSecret = "CLmx5T93Bgi89EGAxWM4RTAXUsiHbM" aliSecret = "CLmx5T93Bgi89EGAxWM4RTAXUsiHbM"

113
controllers/cms_store_sku.go
View File

@@ -1,7 +1,6 @@
package controllers package controllers
import ( import (
"fmt"
"math" "math"
"time" "time"
@@ -321,63 +320,63 @@ func (c *StoreSkuController) GetStoresSkusSaleInfo() {
}) })
} }
// @Title 得到商家商品修改价格请求信息 // // @Title 得到商家商品修改价格请求信息
// @Description 得到商家商品修改价格请求信息 // // @Description 得到商家商品修改价格请求信息
// @Param token header string true "认证token" // // @Param token header string true "认证token"
// @Param fromTime query string false "申请开始时间" // // @Param fromTime query string false "申请开始时间"
// @Param toTime query string false "申请结束时间" // // @Param toTime query string false "申请结束时间"
// @Param keyword query string false "查询关键字（可以为空，为空表示不限制）" // // @Param keyword query string false "查询关键字（可以为空，为空表示不限制）"
// @Param storeIDs query string false "门店ID列表" // // @Param storeIDs query string false "门店ID列表"
// @Param itemIDs query string false "id列表对象，当前指skuname id" // // @Param itemIDs query string false "id列表对象，当前指skuname id"
// @Param types query string false "类型列表对象" // // @Param types query string false "类型列表对象"
// @Param statuss query string false "状态列表对象" // // @Param statuss query string false "状态列表对象"
// @Param offset query int false "门店列表起始序号（以0开始，缺省为0）" // // @Param offset query int false "门店列表起始序号（以0开始，缺省为0）"
// @Param pageSize query int false "门店列表页大小（缺省为50，-1表示全部）" // // @Param pageSize query int false "门店列表页大小（缺省为50，-1表示全部）"
// @Success 200 {object} controllers.CallResult // // @Success 200 {object} controllers.CallResult
// @Failure 200 {object} controllers.CallResult // // @Failure 200 {object} controllers.CallResult
// @router /GetStoreOpRequests [get] // // @router /GetStoreOpRequests [get]
func (c *StoreSkuController) GetStoreOpRequests() { // func (c *StoreSkuController) GetStoreOpRequests() {
c.callGetStoreOpRequests(func(params *tStoreSkuGetStoreOpRequestsParams) (retVal interface{}, errCode string, err error) { // c.callGetStoreOpRequests(func(params *tStoreSkuGetStoreOpRequestsParams) (retVal interface{}, errCode string, err error) {
var ( // var (
timeList []time.Time // timeList []time.Time
storeIDs, typeList, statusList, itemIDs []int // storeIDs, typeList, statusList, itemIDs []int
) // )
if timeList, err = jxutils.BatchStr2Time(params.FromTime, params.ToTime); err != nil { // if timeList, err = jxutils.BatchStr2Time(params.FromTime, params.ToTime); err != nil {
return retVal, "", err // return retVal, "", err
} // }
if err = jxutils.Strings2Objs(params.StoreIDs, &storeIDs, params.Types, &typeList, params.Statuss, &statusList, params.ItemIDs, &itemIDs); err != nil { // if err = jxutils.Strings2Objs(params.StoreIDs, &storeIDs, params.Types, &typeList, params.Statuss, &statusList, params.ItemIDs, &itemIDs); err != nil {
return retVal, "", err // return retVal, "", err
} // }
retVal, err = cms.GetStoreOpRequests(params.Ctx, timeList[0], timeList[1], params.Keyword, storeIDs, itemIDs, typeList, statusList, params.Offset, params.PageSize) // retVal, err = cms.GetStoreOpRequests(params.Ctx, timeList[0], timeList[1], params.Keyword, storeIDs, itemIDs, typeList, statusList, params.Offset, params.PageSize)
return retVal, "", err // return retVal, "", err
}) // })
} // }
// @Title 处理商家商品价格申请 // // @Title 处理商家商品价格申请
// @Description 处理商家商品价格申请 // // @Description 处理商家商品价格申请
// @Param token header string true "认证token" // // @Param token header string true "认证token"
// @Param reqIDs formData string true "请求ID列表对象" // // @Param reqIDs formData string true "请求ID列表对象"
// @Param handleType formData int true "-1拒绝，1批准" // // @Param handleType formData int true "-1拒绝，1批准"
// @Param rejectReason formData string false "拒绝理由，拒绝时要求" // // @Param rejectReason formData string false "拒绝理由，拒绝时要求"
// @Success 200 {object} controllers.CallResult // // @Success 200 {object} controllers.CallResult
// @Failure 200 {object} controllers.CallResult // // @Failure 200 {object} controllers.CallResult
// @router /HandleStoreOpRequest [put] // // @router /HandleStoreOpRequest [put]
func (c *StoreSkuController) HandleStoreOpRequest() { // func (c *StoreSkuController) HandleStoreOpRequest() {
c.callHandleStoreOpRequest(func(params *tStoreSkuHandleStoreOpRequestParams) (retVal interface{}, errCode string, err error) { // c.callHandleStoreOpRequest(func(params *tStoreSkuHandleStoreOpRequestParams) (retVal interface{}, errCode string, err error) {
var reqIDs []int // var reqIDs []int
if err = jxutils.Strings2Objs(params.ReqIDs, &reqIDs); err != nil { // if err = jxutils.Strings2Objs(params.ReqIDs, &reqIDs); err != nil {
return retVal, "", err // return retVal, "", err
} // }
if params.HandleType == 1 { // if params.HandleType == 1 {
err = cms.AcceptStoreOpRequests(params.Ctx, reqIDs) // err = cms.AcceptStoreOpRequests(params.Ctx, reqIDs)
} else if params.HandleType == -1 { // } else if params.HandleType == -1 {
err = cms.RejectStoreOpRequests(params.Ctx, reqIDs, params.RejectReason) // err = cms.RejectStoreOpRequests(params.Ctx, reqIDs, params.RejectReason)
} else { // } else {
err = fmt.Errorf("handleType=%d是非法值", params.HandleType) // err = fmt.Errorf("handleType=%d是非法值", params.HandleType)
} // }
return retVal, "", err // return retVal, "", err
}) // })
} // }
// @Title 根据厂家门店商品信息相应刷新本地数据 // @Title 根据厂家门店商品信息相应刷新本地数据
// @Description 根据厂家门店商品信息相应刷新本地数据 // @Description 根据厂家门店商品信息相应刷新本地数据

2
globals/globals.go
View File

@@ -73,7 +73,7 @@ func Init() {
EnableElmStoreWrite = EnableStoreWrite && beego.AppConfig.DefaultBool("enableElmStoreWrite", false) EnableElmStoreWrite = EnableStoreWrite && beego.AppConfig.DefaultBool("enableElmStoreWrite", false)
EnableMtwmStoreWrite = EnableStoreWrite && beego.AppConfig.DefaultBool("enableMtwmStoreWrite", false) EnableMtwmStoreWrite = EnableStoreWrite && beego.AppConfig.DefaultBool("enableMtwmStoreWrite", false)
EnableWscStoreWrite = EnableStoreWrite && beego.AppConfig.DefaultBool("enableWscStoreWrite", false) EnableWscStoreWrite = EnableStoreWrite && beego.AppConfig.DefaultBool("enableWscStoreWrite", false)
EnablePendingChange = beego.AppConfig.DefaultBool("enablePendingChange", false) // EnablePendingChange = beego.AppConfig.DefaultBool("enablePendingChange", false)
QiniuBucket = beego.AppConfig.String("qiniuBucket") QiniuBucket = beego.AppConfig.String("qiniuBucket")

18
routers/commentsRouter_controllers.go
View File

@@ -1375,15 +1375,6 @@ func init() {
Filters: nil, Filters: nil,
Params: nil}) Params: nil})
beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:StoreSkuController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:StoreSkuController"],
beego.ControllerComments{
Method: "GetStoreOpRequests",
Router: `/GetStoreOpRequests`,
AllowHTTPMethods: []string{"get"},
MethodParams: param.Make(),
Filters: nil,
Params: nil})
beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:StoreSkuController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:StoreSkuController"], beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:StoreSkuController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:StoreSkuController"],
beego.ControllerComments{ beego.ControllerComments{
Method: "GetStoreSkus", Method: "GetStoreSkus",
@@ -1420,15 +1411,6 @@ func init() {
Filters: nil, Filters: nil,
Params: nil}) Params: nil})
beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:StoreSkuController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:StoreSkuController"],
beego.ControllerComments{
Method: "HandleStoreOpRequest",
Router: `/HandleStoreOpRequest`,
AllowHTTPMethods: []string{"put"},
MethodParams: param.Make(),
Filters: nil,
Params: nil})
beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:StoreSkuController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:StoreSkuController"], beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:StoreSkuController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:StoreSkuController"],
beego.ControllerComments{ beego.ControllerComments{
Method: "RefreshStoresSkuByVendor", Method: "RefreshStoresSkuByVendor",