From 6fffe302801af22fbf530beabd4c0dc968ba0a36 Mon Sep 17 00:00:00 2001 From: chenlin Date: Fri, 29 Aug 2025 18:35:20 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BC=98=E5=8C=96=E9=9B=B6=E5=94=AE?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E3=80=81=E9=9B=B6=E5=94=AE=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3=EF=BC=8C=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E7=BA=BF=E4=B8=8A=E8=AE=A2=E5=8D=95=E7=B1=BB=E5=9E=8B=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/apis/basic/commodity.go | 27 ++++- app/admin/models/erp_order.go | 175 ++++++++++++++++++++++++++---- app/admin/models/mall.go | 51 ++++----- docs/docs.go | 26 +++-- docs/swagger.json | 26 +++-- docs/swagger.yaml | 23 ++-- 6 files changed, 253 insertions(+), 75 deletions(-) diff --git a/app/admin/apis/basic/commodity.go b/app/admin/apis/basic/commodity.go index 594099a..c212df3 100644 --- a/app/admin/apis/basic/commodity.go +++ b/app/admin/apis/basic/commodity.go @@ -175,8 +175,19 @@ func CommodityCreate(c *gin.Context) { return } - // (3) 提交事务 - if err := tx.Commit().Error; err != nil { + // (3) 更新 Goods.ErpCommodityId + if req.IsSyncedToMall == 1 { + if err = tx.Model(&models.Goods{}). + Where("goods_id = ?", goodsId). + Update("erp_commodity_id", commodity.ID).Error; err != nil { + tx.Rollback() + app.Error(c, http.StatusInternalServerError, err, "更新商城商品编号失败") + return + } + } + + // (4) 提交事务 + if err = tx.Commit().Error; err != nil { app.Error(c, http.StatusInternalServerError, err, "提交事务失败") return } @@ -779,6 +790,15 @@ func CommodityEdit(c *gin.Context) { return } commodity.GoodsId = goodsId + + //更新 Goods.ErpCommodityId + if err = begin.Model(&models.Goods{}). + Where("goods_id = ?", goodsId). + Update("erp_commodity_id", commodity.ID).Error; err != nil { + begin.Rollback() + app.Error(c, http.StatusInternalServerError, err, "更新商城商品编号失败") + return + } } } else { // 未同步到小程序商城 if catCommodity.GoodsId != 0 { // 之前同步了，现在不同步；则删除 @@ -809,7 +829,6 @@ func CommodityEdit(c *gin.Context) { err = begin.Commit().Error if err != nil { - begin.Rollback() logger.Error("commit err:", logger.Field("err", err)) app.Error(c, http.StatusInternalServerError, err, "操作失败") return @@ -877,7 +896,6 @@ func CommodityDel(c *gin.Context) { err = begin.Commit().Error if err != nil { - begin.Rollback() logger.Error("delete err:", logger.Field("err", err)) app.Error(c, http.StatusInternalServerError, err, "操作失败") return @@ -1074,7 +1092,6 @@ func CommodityBatchSaleStatus(c *gin.Context) { } if err := tx.Commit().Error; err != nil { - tx.Rollback() app.Error(c, http.StatusInternalServerError, err, "提交失败") return } diff --git a/app/admin/models/erp_order.go b/app/admin/models/erp_order.go index 6ced8b0..557ec24 100644 --- a/app/admin/models/erp_order.go +++ b/app/admin/models/erp_order.go @@ -29,8 +29,10 @@ const ( ErpOrderMemberTypeGeneral = "general" // 普通 ErpOrderMemberTypeMember = "member" // 会员 - RetailTypeSale = "sale" // 零售订单 - RetailTypeRejected = "rejected" // 零售退货订单 + RetailTypeSale = "sale" // 零售订单 + RetailTypeSaleOnline = "sale_online" // 零售订单(线上） + RetailTypeRejected = "rejected" // 零售退货订单 + RetailTypeRejectedOnline = "rejected_online" // 零售退货订单（线上） NoCreatePayOrder = 0 // 未创建 WaitForPaying = 1 // 待支付 @@ -54,7 +56,8 @@ type ErpOrder struct { Model BillSn string `json:"bill_sn" gorm:"index"` // 单据编号 - RetailType string `json:"retail_type"` // 销售类型:sale 零售销售； rejected 零售退货 + RetailType string `json:"retail_type"` // 销售类型:sale 零售销售； rejected 零售退货；sale_online 零售销售（线上）；rejected_online零售退货（线上） + GoodsOrderId uint32 `json:"goods_order_id" gorm:"index"` // 小程序商城订单id Uid int `json:"uid"` // 用户id UserType int `json:"user_type"` // 会员类别：1-普通会员 2-黄金会员 4-白金会员 5-黑金会员 6-尊享会员 7-黄金&尊享 8-白金&尊享 9-黑金&尊享 Tel string `json:"tel" gorm:"index"` // 客户手机号 @@ -199,9 +202,10 @@ type ErpOrderCreateReq struct { type ErpOrderListReq struct { ScanCode string `json:"scan_code"` // 扫码枪扫码数据：串码 BillSn string `json:"bill_sn"` // 单据编号 - RetailType string `json:"retail_type"` // 销售类型：sale 零售销售； rejected 零售退货 + RetailType string `json:"retail_type"` // 销售类型：sale 零售销售； rejected 零售退货；sale_online 零售销售（线上）；rejected_online零售退货（线上） CommodityName string `json:"commodity_name"` // 商品名称 Uid int `json:"uid"` // 用户ID + GoodsOrderId uint32 `json:"goods_order_id"` // 小程序商城订单id Tel string `json:"tel"` // 客户手机号 Salesman uint32 `json:"salesman"` // 销售人员ID StoreId uint32 `json:"store_id"` // 门店ID @@ -292,7 +296,7 @@ type StoreManageData struct { // ErpOrderRetailMarginReq 查询商品零售毛利汇总入参 type ErpOrderRetailMarginReq struct { StoreId []uint32 `json:"store_id"` // 门店ID - RetailType []string `json:"retail_type"` // 销售类型:sale 零售销售； rejected 零售退货 + RetailType []string `json:"retail_type"` // 销售类型:sale 零售销售； rejected 零售退货；sale_online 零售销售（线上）；rejected_online零售退货（线上） ErpCommodityName []string `json:"erp_commodity_name"` // 商品名称 ErpCategoryId []uint32 `json:"erp_category_id" gorm:"index"` // 分类id StartTime string `json:"start_time"` // 开始时间 @@ -323,7 +327,7 @@ type ErpOrderRetailMarginResp struct { type RetailMarginData struct { StoreId uint32 `json:"store_id" gorm:"index"` // 门店id StoreName string `json:"store_name"` // 门店名称 - RetailType string `json:"retail_type"` // 销售类型:sale 零售销售； rejected 零售退货 + RetailType string `json:"retail_type"` // 销售类型:sale 零售销售； rejected 零售退货；sale_online 零售销售（线上）；rejected_online零售退货（线上） ErpCommodityId uint32 `json:"erp_commodity_id" gorm:"index"` // 商品id ErpCommodityName string `json:"erp_commodity_name"` // 商品名称 ErpCategoryId uint32 `json:"erp_category_id" gorm:"index"` // 分类id @@ -341,7 +345,7 @@ type RetailMarginData struct { // ErpOrderRetailDetailReq 零售明细汇总入参 type ErpOrderRetailDetailReq struct { BillSn string `json:"bill_sn"` // 单据编号 - RetailType string `json:"retail_type"` // 销售类型：sale 零售销售； rejected 零售退货 + RetailType string `json:"retail_type"` // 销售类型:sale 零售销售； rejected 零售退货；sale_online 零售销售（线上）；rejected_online零售退货（线上） Uid int `json:"uid"` // 用户ID Tel string `json:"tel"` // 客户手机号 StoreId []uint32 `json:"store_id"` // 门店ID @@ -558,9 +562,23 @@ func (m *ErpOrderListReq) List(c *gin.Context) (*ErpOrderListResp, error) { } if m.BillSn != "" { qs = qs.Where("bill_sn=?", m.BillSn) + } else if m.GoodsOrderId != 0 { + qs = qs.Where("goods_order_id=?", m.GoodsOrderId) } else { if m.RetailType != "" { - qs = qs.Where("retail_type=?", m.RetailType) + switch m.RetailType { + case RetailTypeSaleOnline: + // 线上销售 → 实际查线下销售 + 有订单号 + qs = qs.Where("retail_type = ? AND goods_order_id != 0", RetailTypeSale) + + case RetailTypeRejectedOnline: + // 线上退货 → 实际查线下退货 + 有订单号 + qs = qs.Where("retail_type = ? AND goods_order_id != 0", RetailTypeRejected) + + default: + // 其他类型 → 按原值匹配 + qs = qs.Where("retail_type = ?", m.RetailType) + } } if m.Uid != 0 { qs = qs.Where("uid=?", m.Uid) @@ -1440,6 +1458,16 @@ func (m *ErpOrder) SetBankTrxNo() { } m.BankTrxNo = orderPayWay.BankTrxNo + switch m.RetailType { // 转换订单类型，增加线上类型 + case RetailTypeSale: + if m.GoodsOrderId != 0 { + m.RetailType = RetailTypeSaleOnline + } + case RetailTypeRejected: + if m.GoodsOrderId != 0 { + m.RetailType = RetailTypeRejectedOnline + } + } } // ErpOrderRetailDetailSetCommodity 添加零售明细中订单的商品信息 @@ -3335,7 +3363,29 @@ func QueryRetailMargin(req *ErpOrderRetailMarginReq, c *gin.Context) (*ErpOrderR qs.Where("erp_order.store_id in ?", req.StoreId) } if len(req.RetailType) != 0 { - qs.Where("erp_order.retail_type in ?", req.RetailType) + //qs.Where("erp_order.retail_type in ?", req.RetailType) + if len(req.RetailType) != 0 { + var conditions []string + var args []interface{} + + for _, rt := range req.RetailType { + switch rt { + case RetailTypeSaleOnline: + conditions = append(conditions, "(erp_order.retail_type = ? AND goods_order_id != 0)") + args = append(args, RetailTypeSale) + + case RetailTypeRejectedOnline: + conditions = append(conditions, "(erp_order.retail_type = ? AND goods_order_id != 0)") + args = append(args, RetailTypeRejected) + + default: + conditions = append(conditions, "erp_order.retail_type = ?") + args = append(args, rt) + } + } + + qs = qs.Where(strings.Join(conditions, " OR "), args...) + } } if len(req.ErpCommodityName) != 0 { qs.Where("erp_order_commodity.erp_commodity_name in ?", req.ErpCommodityName) @@ -4747,10 +4797,32 @@ func queryRetailDetailByJoin(req *ErpOrderRetailDetailReq, c *gin.Context) (*Erp rejectedOrderSumQs = rejectedOrderSumQs.Where("oc.erp_commodity_name = ?", req.ErpCommodityName) } if req.RetailType != "" { // 销售类型 - qs = qs.Where("erp_order.retail_type=?", req.RetailType) - es = es.Where("erp_order.retail_type=?", req.RetailType) - orderSumQs = orderSumQs.Where("eo.retail_type=?", req.RetailType) - rejectedOrderSumQs = rejectedOrderSumQs.Where("eo.retail_type=?", req.RetailType) + //qs = qs.Where("erp_order.retail_type=?", req.RetailType) + //es = es.Where("erp_order.retail_type=?", req.RetailType) + //orderSumQs = orderSumQs.Where("eo.retail_type=?", req.RetailType) + //rejectedOrderSumQs = rejectedOrderSumQs.Where("eo.retail_type=?", req.RetailType) + if req.RetailType != "" { + switch req.RetailType { + case RetailTypeSaleOnline: + // 线上销售 → 实际查线下销售 + 有订单号 + qs = qs.Where("erp_order.retail_type = ? AND goods_order_id != 0", RetailTypeSale) + es = es.Where("erp_order.retail_type = ? AND goods_order_id != 0", RetailTypeSale) + orderSumQs = orderSumQs.Where("eo.retail_type=? AND goods_order_id != 0", RetailTypeSale) + rejectedOrderSumQs = rejectedOrderSumQs.Where("eo.retail_type=? AND goods_order_id != 0", RetailTypeSale) + case RetailTypeRejectedOnline: + // 线上退货 → 实际查线下退货 + 有订单号 + qs = qs.Where("erp_order.retail_type = ? AND goods_order_id != 0", RetailTypeRejected) + es = es.Where("erp_order.retail_type = ? AND goods_order_id != 0", RetailTypeRejected) + orderSumQs = orderSumQs.Where("eo.retail_type=? AND goods_order_id != 0", RetailTypeRejected) + rejectedOrderSumQs = rejectedOrderSumQs.Where("eo.retail_type=? AND goods_order_id != 0", RetailTypeRejected) + default: + // 其他类型 → 按原值匹配 + qs = qs.Where("erp_order.retail_type = ?", req.RetailType) + es = es.Where("erp_order.retail_type=?", req.RetailType) + orderSumQs = orderSumQs.Where("eo.retail_type=?", req.RetailType) + rejectedOrderSumQs = rejectedOrderSumQs.Where("eo.retail_type=?", req.RetailType) + } + } } if req.Uid != 0 { // 用户ID qs = qs.Where("erp_order.uid=?", req.Uid) @@ -5242,8 +5314,27 @@ func queryRetailDetailCommon(req *ErpOrderRetailDetailReq, c *gin.Context) (*Erp totalPerQs = totalPerQs.Where("bill_sn=?", req.BillSn) } else { if req.RetailType != "" { // 销售类型 - qs = qs.Where("retail_type=?", req.RetailType) - totalPerQs = totalPerQs.Where("retail_type=?", req.RetailType) + //qs = qs.Where("retail_type=?", req.RetailType) + //totalPerQs = totalPerQs.Where("retail_type=?", req.RetailType) + + if req.RetailType != "" { + switch req.RetailType { + case RetailTypeSaleOnline: + // 线上销售 → 实际查线下销售 + 有订单号 + qs = qs.Where("retail_type = ? AND goods_order_id != 0", RetailTypeSale) + totalPerQs = totalPerQs.Where("retail_type = ? AND goods_order_id != 0", RetailTypeSale) + + case RetailTypeRejectedOnline: + // 线上退货 → 实际查线下退货 + 有订单号 + qs = qs.Where("retail_type = ? AND goods_order_id != 0", RetailTypeRejected) + totalPerQs = totalPerQs.Where("retail_type = ? AND goods_order_id != 0", RetailTypeRejected) + + default: + // 其他类型 → 按原值匹配 + qs = qs.Where("retail_type = ?", req.RetailType) + totalPerQs = totalPerQs.Where("retail_type=?", req.RetailType) + } + } } if req.Uid != 0 { // 用户ID qs = qs.Where("erp_order.uid=?", req.Uid) @@ -7512,7 +7603,7 @@ func containsCategorySalesData(categoryDataList []CategorySalesData, categoryId // ErpOrderSaleDetailReq 销售明细汇总入参 type ErpOrderSaleDetailReq struct { BillSn string `json:"bill_sn"` // 单据编号 - RetailType string `json:"retail_type"` // 销售类型：sale 零售销售； rejected 零售退货 + RetailType string `json:"retail_type"` // 销售类型:sale 零售销售； rejected 零售退货；sale_online 零售销售（线上）；rejected_online零售退货（线上） UserType []uint32 `json:"user_type"` // 会员类别：0-未注册 1-普通会员 2-黄金会员 4-白金会员 5-黑金会员 6-尊享会员 7-黄金&尊享 8-白金&尊享 9-黑金&尊享 Uid int `json:"uid"` // 用户ID Tel string `json:"tel"` // 客户手机号 @@ -7613,10 +7704,32 @@ func querySaleDetailByJoin(req *ErpOrderSaleDetailReq, c *gin.Context) (*ErpOrde rejectedOrderSumQs = rejectedOrderSumQs.Where("oc.erp_commodity_name = ?", req.ErpCommodityName) } if req.RetailType != "" { // 销售类型 - qs = qs.Where("erp_order.retail_type=?", req.RetailType) - es = es.Where("erp_order.retail_type=?", req.RetailType) - orderSumQs = orderSumQs.Where("eo.retail_type=?", req.RetailType) - rejectedOrderSumQs = rejectedOrderSumQs.Where("eo.retail_type=?", req.RetailType) + //qs = qs.Where("erp_order.retail_type=?", req.RetailType) + //es = es.Where("erp_order.retail_type=?", req.RetailType) + //orderSumQs = orderSumQs.Where("eo.retail_type=?", req.RetailType) + //rejectedOrderSumQs = rejectedOrderSumQs.Where("eo.retail_type=?", req.RetailType) + if req.RetailType != "" { + switch req.RetailType { + case RetailTypeSaleOnline: + // 线上销售 → 实际查线下销售 + 有订单号 + qs = qs.Where("erp_order.retail_type = ? AND goods_order_id != 0", RetailTypeSale) + es = es.Where("erp_order.retail_type = ? AND goods_order_id != 0", RetailTypeSale) + orderSumQs = orderSumQs.Where("eo.retail_type=? AND goods_order_id != 0", RetailTypeSale) + rejectedOrderSumQs = rejectedOrderSumQs.Where("eo.retail_type=? AND goods_order_id != 0", RetailTypeSale) + case RetailTypeRejectedOnline: + // 线上退货 → 实际查线下退货 + 有订单号 + qs = qs.Where("erp_order.retail_type = ? AND goods_order_id != 0", RetailTypeRejected) + es = es.Where("erp_order.retail_type = ? AND goods_order_id != 0", RetailTypeRejected) + orderSumQs = orderSumQs.Where("eo.retail_type=? AND goods_order_id != 0", RetailTypeRejected) + rejectedOrderSumQs = rejectedOrderSumQs.Where("eo.retail_type=? AND goods_order_id != 0", RetailTypeRejected) + default: + // 其他类型 → 按原值匹配 + qs = qs.Where("erp_order.retail_type = ?", req.RetailType) + es = es.Where("erp_order.retail_type=?", req.RetailType) + orderSumQs = orderSumQs.Where("eo.retail_type=?", req.RetailType) + rejectedOrderSumQs = rejectedOrderSumQs.Where("eo.retail_type=?", req.RetailType) + } + } } if req.Uid != 0 { // 用户ID qs = qs.Where("erp_order.uid=?", req.Uid) @@ -7858,8 +7971,26 @@ func querySaleDetailCommon(req *ErpOrderSaleDetailReq, c *gin.Context) (*ErpOrde totalPerQs = totalPerQs.Where("bill_sn=?", req.BillSn) } else { if req.RetailType != "" { // 销售类型 - qs = qs.Where("retail_type=?", req.RetailType) - totalPerQs = totalPerQs.Where("retail_type=?", req.RetailType) + //qs = qs.Where("retail_type=?", req.RetailType) + //totalPerQs = totalPerQs.Where("retail_type=?", req.RetailType) + if req.RetailType != "" { + switch req.RetailType { + case RetailTypeSaleOnline: + // 线上销售 → 实际查线下销售 + 有订单号 + qs = qs.Where("retail_type = ? AND goods_order_id != 0", RetailTypeSale) + totalPerQs = totalPerQs.Where("retail_type = ? AND goods_order_id != 0", RetailTypeSale) + + case RetailTypeRejectedOnline: + // 线上退货 → 实际查线下退货 + 有订单号 + qs = qs.Where("retail_type = ? AND goods_order_id != 0", RetailTypeRejected) + totalPerQs = totalPerQs.Where("retail_type = ? AND goods_order_id != 0", RetailTypeRejected) + + default: + // 其他类型 → 按原值匹配 + qs = qs.Where("retail_type = ?", req.RetailType) + totalPerQs = totalPerQs.Where("retail_type=?", req.RetailType) + } + } } if req.Uid != 0 { // 用户ID qs = qs.Where("erp_order.uid=?", req.Uid) diff --git a/app/admin/models/mall.go b/app/admin/models/mall.go index e0ef5bd..edbeff6 100644 --- a/app/admin/models/mall.go +++ b/app/admin/models/mall.go @@ -47,34 +47,31 @@ const ( type Goods struct { Model - GoodsId uint32 `json:"goods_id" gorm:"unique_index"` - SerialNo string `json:"serial_no" gorm:"unique_index"` // 序列号 - CatId uint32 `json:"cat_id" gorm:"index"` // 分类 - Name string `json:"name"` // 名称 - Title string `json:"title"` // 标题 - MainImage string `json:"main_image"` // 主图 - Images string `json:"images"` // 图片列表，用,隔开 - Detail string `json:"detail" gorm:"type:text;"` // 详情, 富文本 - - SoldCount uint32 `json:"sold_count"` // 已销售数量 - SaleStatus uint32 `json:"sale_status"` // 在售状态 1-在售 2-下架 - CatSort uint32 `json:"cat_sort"` // 分类排序 - Sort uint32 `json:"sort"` // 商品排序 - - SpecList string `json:"spec_list" gorm:"type:text;"` // 属性json数据 - DiscountList string `json:"discount_list" gorm:"type:text;"` // 折扣 - SpecIndex string `json:"spec_index" gorm:"index"` // 1,3 - - PriceOriginal uint32 `json:"price_original"` // 市场价 - DeliveryFee uint32 `json:"delivery_fee"` // 邮费 - DealType uint32 `json:"deal_type"` // 1-积分兑换 2-购买 3-抵扣 - VersionId uint64 `json:"version_id"` // 乐观锁 - - PriceVm uint32 `json:"price_vm"` // 积分价格 - PriceRm uint32 `json:"price_rm"` // 人民币价格 + GoodsId uint32 `json:"goods_id" gorm:"unique_index"` + ErpCommodityId uint32 `json:"erp_commodity_id" gorm:"index"` // ERP商品id + SerialNo string `json:"serial_no" gorm:"unique_index"` // 序列号 + CatId uint32 `json:"cat_id" gorm:"index"` // 分类 + Name string `json:"name"` // 名称 + Title string `json:"title"` // 标题 + MainImage string `json:"main_image"` // 主图 + Images string `json:"images"` // 图片列表，用,隔开 + Detail string `json:"detail" gorm:"type:text;"` // 详情, 富文本 + SoldCount uint32 `json:"sold_count"` // 已销售数量 + SaleStatus uint32 `json:"sale_status"` // 在售状态 1-在售 2-下架 + CatSort uint32 `json:"cat_sort"` // 分类排序 + Sort uint32 `json:"sort"` // 商品排序 + SpecList string `json:"spec_list" gorm:"type:text;"` // 属性json数据 + DiscountList string `json:"discount_list" gorm:"type:text;"` // 折扣 + SpecIndex string `json:"spec_index" gorm:"index"` // 1,3 + PriceOriginal uint32 `json:"price_original"` // 市场价 + DeliveryFee uint32 `json:"delivery_fee"` // 邮费 + DealType uint32 `json:"deal_type"` // 1-积分兑换 2-购买 3-抵扣 + VersionId uint64 `json:"version_id"` // 乐观锁 + PriceVm uint32 `json:"price_vm"` // 积分价格 + PriceRm uint32 `json:"price_rm"` // 人民币价格 + ShowDiscount int8 `json:"show_discount"` // 是否展示折扣价 + GoodsAccountNum uint32 `json:"goods_account_num"` // 收款账户编号 1 明慧；2 迪为 //Stock uint32 `json:"stock"` // 库存 - ShowDiscount int8 `json:"show_discount"` // 是否展示折扣价 - GoodsAccountNum uint32 `json:"goods_account_num"` // 收款账户编号 1 明慧；2 迪为 GoodsCat *GoodsCat `json:"goods_cat" gorm:"-"` GoodsDiscount *GoodsDiscount `json:"goods_discount" gorm:"-"` diff --git a/docs/docs.go b/docs/docs.go index 4bd67e1..c34550b 100644 --- a/docs/docs.go +++ b/docs/docs.go @@ -12937,6 +12937,10 @@ const docTemplate = `{ "description": "创建时间", "type": "string" }, + "goods_order_id": { + "description": "小程序商城订单id", + "type": "integer" + }, "id": { "description": "数据库记录编号", "type": "integer" @@ -12986,7 +12990,7 @@ const docTemplate = `{ "type": "integer" }, "retail_type": { - "description": "销售类型:sale 零售销售； rejected 零售退货", + "description": "销售类型:sale 零售销售； rejected 零售退货；sale_online 零售销售（线上）；rejected_online零售退货（线上）", "type": "string" }, "sale_order_id": { @@ -13458,6 +13462,10 @@ const docTemplate = `{ "description": "商品名称", "type": "string" }, + "goods_order_id": { + "description": "小程序商城订单id", + "type": "integer" + }, "make_time_end": { "description": "制单结束时间", "type": "string" @@ -13479,7 +13487,7 @@ const docTemplate = `{ "type": "integer" }, "retail_type": { - "description": "销售类型：sale 零售销售； rejected 零售退货", + "description": "销售类型：sale 零售销售； rejected 零售退货；sale_online 零售销售（线上）；rejected_online零售退货（线上）", "type": "string" }, "salesman": { @@ -13705,7 +13713,7 @@ const docTemplate = `{ "type": "integer" }, "retail_type": { - "description": "销售类型：sale 零售销售； rejected 零售退货", + "description": "销售类型:sale 零售销售； rejected 零售退货；sale_online 零售销售（线上）；rejected_online零售退货（线上）", "type": "string" }, "salesman": { @@ -13803,7 +13811,7 @@ const docTemplate = `{ "type": "integer" }, "retail_type": { - "description": "销售类型:sale 零售销售； rejected 零售退货", + "description": "销售类型:sale 零售销售； rejected 零售退货；sale_online 零售销售（线上）；rejected_online零售退货（线上）", "type": "array", "items": { "type": "string" @@ -13923,7 +13931,7 @@ const docTemplate = `{ "type": "integer" }, "retail_type": { - "description": "销售类型：sale 零售销售； rejected 零售退货", + "description": "销售类型:sale 零售销售； rejected 零售退货；sale_online 零售销售（线上）；rejected_online零售退货（线上）", "type": "string" }, "salesman": { @@ -17346,6 +17354,10 @@ const docTemplate = `{ "description": "折扣", "type": "string" }, + "erp_commodity_id": { + "description": "ERP商品id", + "type": "integer" + }, "goods_account_num": { "description": "收款账户编号 1 明慧；2 迪为", "type": "integer" @@ -17396,7 +17408,7 @@ const docTemplate = `{ "type": "string" }, "show_discount": { - "description": "Stock uint32 ` + "`" + `json:\"stock\"` + "`" + ` // 库存", + "description": "是否展示折扣价", "type": "integer" }, "sold_count": { @@ -22586,7 +22598,7 @@ const docTemplate = `{ "type": "string" }, "retail_type": { - "description": "销售类型:sale 零售销售； rejected 零售退货", + "description": "销售类型:sale 零售销售； rejected 零售退货；sale_online 零售销售（线上）；rejected_online零售退货（线上）", "type": "string" }, "sales_amount": { diff --git a/docs/swagger.json b/docs/swagger.json index 701e318..1099c58 100644 --- a/docs/swagger.json +++ b/docs/swagger.json @@ -12926,6 +12926,10 @@ "description": "创建时间", "type": "string" }, + "goods_order_id": { + "description": "小程序商城订单id", + "type": "integer" + }, "id": { "description": "数据库记录编号", "type": "integer" @@ -12975,7 +12979,7 @@ "type": "integer" }, "retail_type": { - "description": "销售类型:sale 零售销售； rejected 零售退货", + "description": "销售类型:sale 零售销售； rejected 零售退货；sale_online 零售销售（线上）；rejected_online零售退货（线上）", "type": "string" }, "sale_order_id": { @@ -13447,6 +13451,10 @@ "description": "商品名称", "type": "string" }, + "goods_order_id": { + "description": "小程序商城订单id", + "type": "integer" + }, "make_time_end": { "description": "制单结束时间", "type": "string" @@ -13468,7 +13476,7 @@ "type": "integer" }, "retail_type": { - "description": "销售类型：sale 零售销售； rejected 零售退货", + "description": "销售类型：sale 零售销售； rejected 零售退货；sale_online 零售销售（线上）；rejected_online零售退货（线上）", "type": "string" }, "salesman": { @@ -13694,7 +13702,7 @@ "type": "integer" }, "retail_type": { - "description": "销售类型：sale 零售销售； rejected 零售退货", + "description": "销售类型:sale 零售销售； rejected 零售退货；sale_online 零售销售（线上）；rejected_online零售退货（线上）", "type": "string" }, "salesman": { @@ -13792,7 +13800,7 @@ "type": "integer" }, "retail_type": { - "description": "销售类型:sale 零售销售； rejected 零售退货", + "description": "销售类型:sale 零售销售； rejected 零售退货；sale_online 零售销售（线上）；rejected_online零售退货（线上）", "type": "array", "items": { "type": "string" @@ -13912,7 +13920,7 @@ "type": "integer" }, "retail_type": { - "description": "销售类型：sale 零售销售； rejected 零售退货", + "description": "销售类型:sale 零售销售； rejected 零售退货；sale_online 零售销售（线上）；rejected_online零售退货（线上）", "type": "string" }, "salesman": { @@ -17335,6 +17343,10 @@ "description": "折扣", "type": "string" }, + "erp_commodity_id": { + "description": "ERP商品id", + "type": "integer" + }, "goods_account_num": { "description": "收款账户编号 1 明慧；2 迪为", "type": "integer" @@ -17385,7 +17397,7 @@ "type": "string" }, "show_discount": { - "description": "Stock uint32 `json:\"stock\"` // 库存", + "description": "是否展示折扣价", "type": "integer" }, "sold_count": { @@ -22575,7 +22587,7 @@ "type": "string" }, "retail_type": { - "description": "销售类型:sale 零售销售； rejected 零售退货", + "description": "销售类型:sale 零售销售； rejected 零售退货；sale_online 零售销售（线上）；rejected_online零售退货（线上）", "type": "string" }, "sales_amount": { diff --git a/docs/swagger.yaml b/docs/swagger.yaml index 8204a22..30adba7 100644 --- a/docs/swagger.yaml +++ b/docs/swagger.yaml @@ -3022,6 +3022,9 @@ definitions: createdAt: description: 创建时间 type: string + goods_order_id: + description: 小程序商城订单id + type: integer id: description: 数据库记录编号 type: integer @@ -3059,7 +3062,7 @@ definitions: description: 订单总退货数量 type: integer retail_type: - description: 销售类型:sale 零售销售； rejected 零售退货 + description: 销售类型:sale 零售销售； rejected 零售退货；sale_online 零售销售（线上）；rejected_online零售退货（线上） type: string sale_order_id: description: 销售订单id @@ -3405,6 +3408,9 @@ definitions: commodity_name: description: 商品名称 type: string + goods_order_id: + description: 小程序商城订单id + type: integer make_time_end: description: 制单结束时间 type: string @@ -3421,7 +3427,7 @@ definitions: description: 支付状态 0-未创建 ；1-待支付； 2-已支付 type: integer retail_type: - description: 销售类型：sale 零售销售； rejected 零售退货 + description: 销售类型：sale 零售销售； rejected 零售退货；sale_online 零售销售（线上）；rejected_online零售退货（线上） type: string salesman: description: 销售人员ID @@ -3585,7 +3591,7 @@ definitions: description: 页面条数 type: integer retail_type: - description: 销售类型：sale 零售销售； rejected 零售退货 + description: 销售类型:sale 零售销售； rejected 零售退货；sale_online 零售销售（线上）；rejected_online零售退货（线上） type: string salesman: description: 销售人员ID @@ -3654,7 +3660,7 @@ definitions: description: 页面条数 type: integer retail_type: - description: 销售类型:sale 零售销售； rejected 零售退货 + description: 销售类型:sale 零售销售； rejected 零售退货；sale_online 零售销售（线上）；rejected_online零售退货（线上） items: type: string type: array @@ -3741,7 +3747,7 @@ definitions: description: 页面条数 type: integer retail_type: - description: 销售类型：sale 零售销售； rejected 零售退货 + description: 销售类型:sale 零售销售； rejected 零售退货；sale_online 零售销售（线上）；rejected_online零售退货（线上） type: string salesman: description: 销售人员ID @@ -6211,6 +6217,9 @@ definitions: discount_list: description: 折扣 type: string + erp_commodity_id: + description: ERP商品id + type: integer goods_account_num: description: 收款账户编号 1 明慧；2 迪为 type: integer @@ -6248,7 +6257,7 @@ definitions: description: 序列号 type: string show_discount: - description: Stock uint32 `json:"stock"` // 库存 + description: 是否展示折扣价 type: integer sold_count: description: 已销售数量 @@ -10000,7 +10009,7 @@ definitions: description: 销售毛利率:销售毛利/销售/退货金额 type: string retail_type: - description: 销售类型:sale 零售销售； rejected 零售退货 + description: 销售类型:sale 零售销售； rejected 零售退货；sale_online 零售销售（线上）；rejected_online零售退货（线上） type: string sales_amount: description: 销售/退货金额