- 线下提号创建表单扩展:增加「操作人」、「第三方单号」、「下单金额」、「押金金额」字段,重构弹窗布局为紧凑双列/三列金额卡片排布,消除过度垂直滚动并默认预填操作人 - 店铺管理 CRUD:新增 pickup_shops 配置表与配套 API,支持在提号页面直接管理店铺(增删改查、启用/禁用、筛选),下拉选项自动优先加载活跃配置店铺并兼顾历史店铺 - 列表时间范围筛选:增加精确到秒的「日期+时间」时间范围选择器,支持快捷时段与后端时间范围过滤 - 生产环境数据核查:只读提取线上全部 61 项历史提号店铺名称与单量分布,完整整理沉淀至实施文档供后续映射规则参考 - 验证方式:执行并通过全套端到端代码门禁(scripts/check.sh:SQL约束、go vet、go build、MySQL真实测试库单元测试及覆盖率、vue大小检查、prettier、eslint、vue-tsc及vite构建)
109 lines
2.4 KiB
Go
109 lines
2.4 KiB
Go
package pickup
|
|
|
|
import (
|
|
"strconv"
|
|
"strings"
|
|
"time"
|
|
|
|
"hfb_sys/backend/internal/middleware"
|
|
"hfb_sys/backend/pkg/response"
|
|
|
|
"github.com/gin-gonic/gin"
|
|
)
|
|
|
|
func currentAdminID(c *gin.Context) (uint64, bool) {
|
|
value, ok := c.Get(middleware.ContextAdminID)
|
|
if !ok {
|
|
return 0, false
|
|
}
|
|
adminID, ok := value.(uint64)
|
|
return adminID, ok
|
|
}
|
|
|
|
func currentUserID(c *gin.Context) (uint64, bool) {
|
|
value, ok := c.Get(middleware.ContextUserID)
|
|
if !ok {
|
|
return 0, false
|
|
}
|
|
userID, ok := value.(uint64)
|
|
return userID, ok
|
|
}
|
|
|
|
func parseID(c *gin.Context) (uint64, bool) {
|
|
id, err := strconv.ParseUint(c.Param("id"), 10, 64)
|
|
if err != nil || id == 0 {
|
|
response.BadRequest(c, "ID 不正确")
|
|
return 0, false
|
|
}
|
|
return id, true
|
|
}
|
|
|
|
func parsePagination(c *gin.Context) (int, int) {
|
|
page, _ := strconv.Atoi(c.DefaultQuery("page", "1"))
|
|
pageSize, _ := strconv.Atoi(c.DefaultQuery("page_size", "20"))
|
|
if page < 1 {
|
|
page = 1
|
|
}
|
|
if pageSize < 1 {
|
|
pageSize = 20
|
|
}
|
|
if pageSize > 100 {
|
|
pageSize = 100
|
|
}
|
|
return page, pageSize
|
|
}
|
|
|
|
func parseFlexibleTime(val string) *time.Time {
|
|
val = strings.TrimSpace(val)
|
|
if val == "" {
|
|
return nil
|
|
}
|
|
layouts := []string{
|
|
"2006-01-02 15:04:05",
|
|
time.RFC3339,
|
|
"2006-01-02T15:04:05",
|
|
"2006-01-02",
|
|
}
|
|
loc := time.Local
|
|
for _, layout := range layouts {
|
|
if t, err := time.ParseInLocation(layout, val, loc); err == nil {
|
|
return &t
|
|
}
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func parseAdminQuery(c *gin.Context) AdminPickupQuery {
|
|
page, pageSize := parsePagination(c)
|
|
return AdminPickupQuery{
|
|
Page: page,
|
|
PageSize: pageSize,
|
|
Keyword: c.Query("keyword"),
|
|
Status: c.Query("status"),
|
|
ShopName: c.Query("shop_name"),
|
|
AccountSource: c.Query("account_source"),
|
|
OfflineSettlementStatus: c.Query("offline_settlement_status"),
|
|
Operator: c.Query("operator"),
|
|
ThirdPartyOrderNo: c.Query("third_party_order_no"),
|
|
StartTime: parseFlexibleTime(c.Query("start_time")),
|
|
EndTime: parseFlexibleTime(c.Query("end_time")),
|
|
}
|
|
}
|
|
|
|
func parsePickupShopQuery(c *gin.Context) PickupShopQuery {
|
|
return PickupShopQuery{
|
|
Keyword: c.Query("keyword"),
|
|
Platform: c.Query("platform"),
|
|
Status: c.Query("status"),
|
|
}
|
|
}
|
|
|
|
func parseSellerQuery(c *gin.Context) SellerPickupQuery {
|
|
page, pageSize := parsePagination(c)
|
|
return SellerPickupQuery{
|
|
Page: page,
|
|
PageSize: pageSize,
|
|
Status: c.Query("status"),
|
|
}
|
|
}
|