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-10-09 08:45:50 +08:00
parent 0079a04817 1c7edc4b86
commit aa6e94be89
20 changed files with 221 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
controllers/cms.go
View File

@@ -315,3 +315,18 @@ func (c *CmsController) CreateQrOrBarCode() {
return retVal, "", err
})
}
// @Title 查询当前系统中已有的城市中的银行支行
// @Description 查询当前系统中已有的城市中的银行支行
// @Param token header string true "认证token"
// @Param cityCode query int false "城市代码"
// @Param bankCode query string false "银行代码"
// @Success 200 {object} controllers.CallResult
// @Failure 200 {object} controllers.CallResult
// @router /GetCityBankBranches [get]
func (c *CmsController) GetCityBankBranches() {
c.callGetCityBankBranches(func(params *tCmsGetCityBankBranchesParams) (retVal interface{}, errCode string, err error) {
retVal, err = cms.GetCityBankBranches(params.Ctx, params.CityCode, params.BankCode)
return retVal, "", err
})
}

6
controllers/jx_order.go
View File

@@ -276,6 +276,7 @@ func (c *OrderController) ExportMTWaybills() {
// @Param cities query string false "城市code列表[1,2,3]，缺省不限制"
// @Param isIncludeFake query bool false "是否包括假订单"
// @Param skuIDs query string false "包含的skuID列表，或的关系"
// @Param isJxFirst query bool false "排序是否京西订单优先（缺省为否）"
// @Param offset query int false "结果起始序号（以0开始，缺省为0）"
// @Param pageSize query int false "结果页大小（缺省为50，-1表示全部）"
// @Success 200 {object} controllers.CallResult
@@ -285,7 +286,7 @@ func (c *OrderController) GetOrders() {
c.callGetOrders(func(params *tOrderGetOrdersParams) (retVal interface{}, errCode string, err error) {
var skuIDs []int
if err = jxutils.Strings2Objs(params.SkuIDs, &skuIDs); err == nil {
retVal, err = orderman.FixedOrderManager.GetOrders(params.Ctx, params.IsIncludeFake, params.FromDate, params.ToDate, params.IsDateFinish, skuIDs, params.MapData, params.Offset, params.PageSize)
retVal, err = orderman.FixedOrderManager.GetOrders(params.Ctx, params.IsIncludeFake, params.FromDate, params.ToDate, params.IsDateFinish, skuIDs, params.IsJxFirst, params.MapData, params.Offset, params.PageSize)
}
return retVal, "", err
})
@@ -519,7 +520,8 @@ func skuList2Map(skuList []*model.OrderSku) (skuCount int, skuMap map[int64]*mod
if sku.SkuID > 0 {
index := jxutils.Combine2Int(skuID, sku.StoreSubID)
if skuMap[index] == nil {
skuMap[index] = sku
tmpSku := *sku
skuMap[index] = &tmpSku
} else {
skuMap[index].Count += sku.Count
}