diff --git a/business/jxstore/cms/store_sku.go b/business/jxstore/cms/store_sku.go index f3fb4bfb2..8b0cbe12b 100644 --- a/business/jxstore/cms/store_sku.go +++ b/business/jxstore/cms/store_sku.go @@ -1111,9 +1111,9 @@ func updateStoresSkusWithoutSync(ctx *jxcontext.Context, db *dao.DaoDB, storeIDs // if err = checkStoresSkusSaleCity(ctx, db, storeIDs, skuBindInfos); err != nil { // return nil, err // } - if storeIDs, skuBindInfos, err = filterStorePriceChange(ctx, storeIDs, skuBindInfos); err != nil { - return nil, err - } + // if storeIDs, skuBindInfos, err = filterStorePriceChange(ctx, storeIDs, skuBindInfos); err != nil { + // return nil, err + // } // globals.SugarLogger.Debugf("updateStoresSkusWithoutSync2, storeIDs:%v, skuBindInfos:%s", storeIDs, utils.Format4Output(skuBindInfos, false)) userName := ctx.GetUserName() diff --git a/conf/app.conf b/conf/app.conf index 98da0ecf8..a0e40f04d 100644 --- a/conf/app.conf +++ b/conf/app.conf @@ -31,8 +31,6 @@ enableElmStoreWrite = false enableMtwmStoreWrite = false enableWscStoreWrite = false -enablePendingChange = false - aliKey = "LTAI6xJUGaP6WdMQ" aliSecret = "CLmx5T93Bgi89EGAxWM4RTAXUsiHbM" diff --git a/controllers/cms_store_sku.go b/controllers/cms_store_sku.go index 4b1d44889..f58053f15 100644 --- a/controllers/cms_store_sku.go +++ b/controllers/cms_store_sku.go @@ -1,7 +1,6 @@ package controllers import ( - "fmt" "math" "time" @@ -321,63 +320,63 @@ func (c *StoreSkuController) GetStoresSkusSaleInfo() { }) } -// @Title 得到商家商品修改价格请求信息 -// @Description 得到商家商品修改价格请求信息 -// @Param token header string true "认证token" -// @Param fromTime query string false "申请开始时间" -// @Param toTime query string false "申请结束时间" -// @Param keyword query string false "查询关键字(可以为空,为空表示不限制)" -// @Param storeIDs query string false "门店ID列表" -// @Param itemIDs query string false "id列表对象,当前指skuname id" -// @Param types query string false "类型列表对象" -// @Param statuss query string false "状态列表对象" -// @Param offset query int false "门店列表起始序号(以0开始,缺省为0)" -// @Param pageSize query int false "门店列表页大小(缺省为50,-1表示全部)" -// @Success 200 {object} controllers.CallResult -// @Failure 200 {object} controllers.CallResult -// @router /GetStoreOpRequests [get] -func (c *StoreSkuController) GetStoreOpRequests() { - c.callGetStoreOpRequests(func(params *tStoreSkuGetStoreOpRequestsParams) (retVal interface{}, errCode string, err error) { - var ( - timeList []time.Time - storeIDs, typeList, statusList, itemIDs []int - ) - if timeList, err = jxutils.BatchStr2Time(params.FromTime, params.ToTime); err != nil { - return retVal, "", err - } - if err = jxutils.Strings2Objs(params.StoreIDs, &storeIDs, params.Types, &typeList, params.Statuss, &statusList, params.ItemIDs, &itemIDs); err != nil { - return retVal, "", err - } - retVal, err = cms.GetStoreOpRequests(params.Ctx, timeList[0], timeList[1], params.Keyword, storeIDs, itemIDs, typeList, statusList, params.Offset, params.PageSize) - return retVal, "", err - }) -} +// // @Title 得到商家商品修改价格请求信息 +// // @Description 得到商家商品修改价格请求信息 +// // @Param token header string true "认证token" +// // @Param fromTime query string false "申请开始时间" +// // @Param toTime query string false "申请结束时间" +// // @Param keyword query string false "查询关键字(可以为空,为空表示不限制)" +// // @Param storeIDs query string false "门店ID列表" +// // @Param itemIDs query string false "id列表对象,当前指skuname id" +// // @Param types query string false "类型列表对象" +// // @Param statuss query string false "状态列表对象" +// // @Param offset query int false "门店列表起始序号(以0开始,缺省为0)" +// // @Param pageSize query int false "门店列表页大小(缺省为50,-1表示全部)" +// // @Success 200 {object} controllers.CallResult +// // @Failure 200 {object} controllers.CallResult +// // @router /GetStoreOpRequests [get] +// func (c *StoreSkuController) GetStoreOpRequests() { +// c.callGetStoreOpRequests(func(params *tStoreSkuGetStoreOpRequestsParams) (retVal interface{}, errCode string, err error) { +// var ( +// timeList []time.Time +// storeIDs, typeList, statusList, itemIDs []int +// ) +// if timeList, err = jxutils.BatchStr2Time(params.FromTime, params.ToTime); err != nil { +// return retVal, "", err +// } +// if err = jxutils.Strings2Objs(params.StoreIDs, &storeIDs, params.Types, &typeList, params.Statuss, &statusList, params.ItemIDs, &itemIDs); err != nil { +// return retVal, "", err +// } +// retVal, err = cms.GetStoreOpRequests(params.Ctx, timeList[0], timeList[1], params.Keyword, storeIDs, itemIDs, typeList, statusList, params.Offset, params.PageSize) +// return retVal, "", err +// }) +// } -// @Title 处理商家商品价格申请 -// @Description 处理商家商品价格申请 -// @Param token header string true "认证token" -// @Param reqIDs formData string true "请求ID列表对象" -// @Param handleType formData int true "-1拒绝,1批准" -// @Param rejectReason formData string false "拒绝理由,拒绝时要求" -// @Success 200 {object} controllers.CallResult -// @Failure 200 {object} controllers.CallResult -// @router /HandleStoreOpRequest [put] -func (c *StoreSkuController) HandleStoreOpRequest() { - c.callHandleStoreOpRequest(func(params *tStoreSkuHandleStoreOpRequestParams) (retVal interface{}, errCode string, err error) { - var reqIDs []int - if err = jxutils.Strings2Objs(params.ReqIDs, &reqIDs); err != nil { - return retVal, "", err - } - if params.HandleType == 1 { - err = cms.AcceptStoreOpRequests(params.Ctx, reqIDs) - } else if params.HandleType == -1 { - err = cms.RejectStoreOpRequests(params.Ctx, reqIDs, params.RejectReason) - } else { - err = fmt.Errorf("handleType=%d是非法值", params.HandleType) - } - return retVal, "", err - }) -} +// // @Title 处理商家商品价格申请 +// // @Description 处理商家商品价格申请 +// // @Param token header string true "认证token" +// // @Param reqIDs formData string true "请求ID列表对象" +// // @Param handleType formData int true "-1拒绝,1批准" +// // @Param rejectReason formData string false "拒绝理由,拒绝时要求" +// // @Success 200 {object} controllers.CallResult +// // @Failure 200 {object} controllers.CallResult +// // @router /HandleStoreOpRequest [put] +// func (c *StoreSkuController) HandleStoreOpRequest() { +// c.callHandleStoreOpRequest(func(params *tStoreSkuHandleStoreOpRequestParams) (retVal interface{}, errCode string, err error) { +// var reqIDs []int +// if err = jxutils.Strings2Objs(params.ReqIDs, &reqIDs); err != nil { +// return retVal, "", err +// } +// if params.HandleType == 1 { +// err = cms.AcceptStoreOpRequests(params.Ctx, reqIDs) +// } else if params.HandleType == -1 { +// err = cms.RejectStoreOpRequests(params.Ctx, reqIDs, params.RejectReason) +// } else { +// err = fmt.Errorf("handleType=%d是非法值", params.HandleType) +// } +// return retVal, "", err +// }) +// } // @Title 根据厂家门店商品信息相应刷新本地数据 // @Description 根据厂家门店商品信息相应刷新本地数据 diff --git a/globals/globals.go b/globals/globals.go index 8580982e0..80e17da46 100644 --- a/globals/globals.go +++ b/globals/globals.go @@ -73,7 +73,7 @@ func Init() { EnableElmStoreWrite = EnableStoreWrite && beego.AppConfig.DefaultBool("enableElmStoreWrite", false) EnableMtwmStoreWrite = EnableStoreWrite && beego.AppConfig.DefaultBool("enableMtwmStoreWrite", 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") diff --git a/routers/commentsRouter_controllers.go b/routers/commentsRouter_controllers.go index 5c1efe789..1bfd13eee 100644 --- a/routers/commentsRouter_controllers.go +++ b/routers/commentsRouter_controllers.go @@ -1375,15 +1375,6 @@ func init() { 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.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.ControllerComments{ Method: "GetStoreSkus", @@ -1420,15 +1411,6 @@ func init() { 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.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.ControllerComments{ Method: "RefreshStoresSkuByVendor",