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

Merge remote-tracking branch 'origin/mark' into don

Browse Source
This commit is contained in:
Rosy-zhudan
2019-07-30 15:37:30 +08:00
parent 17ce70be72 e7bad7dc25
commit 119c10a8d5
14 changed files with 142 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
controllers/cms_store_sku.go
View File

@@ -265,6 +265,7 @@ func (c *StoreSkuController) CopyStoreSkus() {
// @Param storeIDs formData string true "门店ID列表"
// @Param payload formData string true "json数据，StoreSkuBindSkuInfo对象数组"
// @Param isContinueWhenError formData bool false "单个同步失败是否继续，缺省false"
// @Param autoSaleAt formData string false "自动可售时间"
// @Param isAsync formData bool false "是否异步操作"
// @Success 200 {object} controllers.CallResult
// @Failure 200 {object} controllers.CallResult
@@ -276,7 +277,11 @@ func (c *StoreSkuController) UpdateStoresSkusSale() {
if err = jxutils.Strings2Objs(params.StoreIDs, &storeIDs, params.Payload, &skuBindSkuInfos); err != nil {
return retVal, "", err
}
retVal, err = cms.UpdateStoresSkusSale(params.Ctx, storeIDs, skuBindSkuInfos, params.Ctx.GetUserName(), params.IsAsync, params.IsContinueWhenError)
timeList, err := jxutils.BatchStr2Time(params.AutoSaleAt)
if err != nil {
return retVal, "", err
}
retVal, err = cms.UpdateStoresSkusSale(params.Ctx, storeIDs, skuBindSkuInfos, timeList[0], params.Ctx.GetUserName(), params.IsAsync, params.IsContinueWhenError)
return retVal, "", err
})
}

3
controllers/jx_order.go
View File

@@ -266,6 +266,7 @@ func (c *OrderController) ExportMTWaybills() {
// @Param keyword query string false "查询关键字"
// @Param fromDate query string false "开始日期（包含），格式（2006-01-02），如果订单号为空此项必须要求"
// @Param toDate query string false "结束日期（包含），格式（2006-01-02），如果订单号为空此项必须要求"
// @Param isDateFinish query bool false "是否fromDate与toDate指的是订单结束日期，缺省不是"
// @Param vendorIDs query string false "订单所属厂商列表[1,2,3]，缺省不限制"
// @Param waybillVendorIDs query string false "承运人所属厂商列表[1,2,3]，缺省不限制"
// @Param storeIDs query string false "京西门店ID列表[1,2,3]，缺省不限制"
@@ -279,7 +280,7 @@ func (c *OrderController) ExportMTWaybills() {
// @router /GetOrders [get]
func (c *OrderController) GetOrders() {
c.callGetOrders(func(params *tOrderGetOrdersParams) (retVal interface{}, errCode string, err error) {
retVal, err = orderman.FixedOrderManager.GetOrders(params.Ctx, params.FromDate, params.ToDate, params.MapData, params.Offset, params.PageSize)
retVal, err = orderman.FixedOrderManager.GetOrders(params.Ctx, params.FromDate, params.ToDate, params.IsDateFinish, params.MapData, params.Offset, params.PageSize)
return retVal, "", err
})
}