diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go index b957a9cce..acef14448 100644 --- a/business/jxcallback/orderman/order.go +++ b/business/jxcallback/orderman/order.go @@ -1303,7 +1303,7 @@ func MergeJdsOrders(ctx *jxcontext.Context, vendorOrderIDs []string) (vendorOrde order.SalePrice = salePrice order.ShopPrice = shopPrice order.TotalShopMoney = totalShop - order.VendorOrderID = utils.Int64ToStr(utils.Str2Int64(orders[0].VendorOrderID2)*1000000) + utils.Int2Str(time.Now().Second()) + order.VendorOrderID = utils.Int64ToStr(utils.Str2Int64(orders[0].VendorOrderID2)*10000000) + utils.Int2Str(time.Now().Second()) if len(order.VendorOrderID) < 18 { order.VendorOrderID = order.VendorOrderID + "0" } @@ -1486,7 +1486,7 @@ func TransferJdsOrder(ctx *jxcontext.Context, vendorOrderID string, storeID int) if len(order.VendorOrderID2) > 18 { order.VendorOrderID2 = order.VendorOrderID2[0:12] } - order.VendorOrderID = utils.Int64ToStr(utils.Str2Int64(order.VendorOrderID2)*1000000) + utils.Int2Str(time.Now().Second()) + order.VendorOrderID = utils.Int64ToStr(utils.Str2Int64(order.VendorOrderID2)*10000000) + utils.Int2Str(time.Now().Second()) if len(order.VendorOrderID) < 18 { order.VendorOrderID = order.VendorOrderID + "0" } diff --git a/business/jxstore/report/report.go b/business/jxstore/report/report.go index ac00af658..7efcb9022 100644 --- a/business/jxstore/report/report.go +++ b/business/jxstore/report/report.go @@ -702,3 +702,7 @@ func RefreshJDMembers(ctx *jxcontext.Context) (err error) { task.GetID() return err } + +func UserMemberReport(ctx *jxcontext.Context, vendorID int, keyword string, offset, pageSize int) (page *model.PagedInfo, err error) { + return dao.UserMemberReport(dao.GetDB(), vendorID, keyword, offset, pageSize) +} diff --git a/business/model/dao/report.go b/business/model/dao/report.go index e00f65c45..591c9f260 100644 --- a/business/model/dao/report.go +++ b/business/model/dao/report.go @@ -374,3 +374,34 @@ func DeletePriceReferHistory(db *DaoDB, snapDate time.Time) (num int64, err erro } return ExecuteSQL(db, sql, sqlParams...) } + +func UserMemberReport(db *DaoDB, vendorID int, keyword string, offset, pageSize int) (page *model.PagedInfo, err error) { + sql := ` + SELECT SQL_CALC_FOUND_ROWS DISTINCT a.mobile, IF(a.vendor_id = ?, c.name, b.consignee_name) name + FROM user_member a + LEFT JOIN goods_order b ON a.mobile = b.consignee_mobile2 AND b.status <> ? + LEFT JOIN user c ON c.mobile = a.mobile + GROUP BY + ` + sqlParams := []interface{}{ + model.VendorIDJX, model.OrderStatusCanceled, + } + if vendorID != -1 { + + } + if keyword != "" { + + } + sql += "LIMIT ? OFFSET ?" + pageSize = jxutils.FormalizePageSize(pageSize) + sqlParams = append(sqlParams, pageSize, offset) + txDB, _ := Begin(db) + defer Commit(db, txDB) + if err = GetRowsTx(txDB, &page, sql, sqlParams...); err == nil { + return &model.PagedInfo{ + TotalCount: GetLastTotalRowCount2(db, txDB), + Data: page, + }, nil + } + return page, err +} diff --git a/controllers/jx_report.go b/controllers/jx_report.go index 582972f92..0cea0e90e 100644 --- a/controllers/jx_report.go +++ b/controllers/jx_report.go @@ -137,3 +137,19 @@ func (c *ReportController) GetStoreManageState() { return retVal, "", err }) } + +// @Title 统计会员信息 +// @Description 统计会员信息 +// @Param token header string true "认证token" +// @Param vendorID query int false "平台ID" +// @Param keyword 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 /UserMemberReport [get] +func (c *ReportController) UserMemberReport() { + c.callUserMemberReport(func(params *tReportUserMemberReportParams) (retVal interface{}, errCode string, err error) { + return retVal, "", err + }) +} diff --git a/routers/commentsRouter_controllers.go b/routers/commentsRouter_controllers.go index 16a14c22a..c4c43ccdb 100644 --- a/routers/commentsRouter_controllers.go +++ b/routers/commentsRouter_controllers.go @@ -1647,6 +1647,15 @@ func init() { Filters: nil, Params: nil}) + web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:ReportController"] = append(web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:ReportController"], + web.ControllerComments{ + Method: "UserMemberReport", + Router: `/UserMemberReport`, + AllowHTTPMethods: []string{"get"}, + MethodParams: param.Make(), + Filters: nil, + Params: nil}) + web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:ReportController"] = append(web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:ReportController"], web.ControllerComments{ Method: "PriceRefer",