Merge branch 'master' of git.oa00.com:supply-chain/service

customer/user/user.go

@@ -1,9 +1,10 @@
 package user
 
 type User struct {
-	Deposit      deposit      // 充值
+	Deposit       deposit       // 充值
-	DepositAudit depositAudit // 充值审核
+	DepositAudit  depositAudit  // 充值审核
-	Wallet       wallet       // 钱包
+	Wallet        wallet        // 钱包
-	Cash         cash         // 余额提现
+	Cash          cash          // 余额提现
-	Message      message      // 消息
+	Message       message       // 消息
+	WalletHistory walletHistory // 消费记录
 }

customer/user/walletHistory.go

@@ -0,0 +1,57 @@
+package user
+
+import (
+	"context"
+	"git.oa00.com/supply-chain/service/client"
+	"git.oa00.com/supply-chain/service/lib/bean"
+	"github.com/shopspring/decimal"
+)
+
+type walletHistory struct {
+}
+
+const (
+	WalletHistoryOrderIdAsc  = 1 // 排序 id正序
+	WalletHistoryOrderIdDesc = 2 // 排序 id 倒序
+)
+
+type ArgsWalletHistoryLists struct {
+	Search WalletHistorySearch
+	Page   bean.Page
+	Orders []uint
+}
+
+type WalletHistorySearch struct {
+	StartTime string // 格式 2006-01-02 15:04:05 开始时间
+	EndTime   string // 格式 2006-01-02 15:04:05 截止时间
+}
+
+type ReplyWalletHistoryList struct {
+	Lists []WalletHistoryItem `json:"lists"`
+	Total int64               `json:"total"`
+}
+type WalletHistoryItem struct {
+	Id            uint            `json:"id"`
+	UserId        uint            `json:"userId"`
+	UserName      string          `json:"userName"`
+	Type          uint            `json:"type"`
+	Title         string          `json:"title"`
+	BeforeAmount  decimal.Decimal `json:"beforeAmount"`
+	Amount        decimal.Decimal `json:"amount"`
+	AfterAmount   decimal.Decimal `json:"afterAmount"`
+	TradeChannel  string          `json:"tradeChannel"`
+	TradeSerialSn string          `json:"tradeSerialSn"`
+	Remark        string          `json:"remark"`
+	ServiceId     uint            `json:"serviceId"`
+	CreatedAt     int64           `json:"createdAt"`
+}
+
+// Lists @Title 消费记录
+func (w *walletHistory) Lists(ctx context.Context, args ArgsWalletHistoryLists) (reply ReplyWalletHistoryList, err error) {
+	xClient, err := client.GetClient(w)
+	if err != nil {
+		return
+	}
+	err = xClient.Call(ctx, "Lists", args, &reply)
+	return
+}

supply/order.go

@@ -140,18 +140,18 @@ type RetailOrderSearch struct {
 
 type RetailOrderItem struct {
 	Id             uint            `json:"id"`
-	OrderSubSn     string          `json:"orderSubSn"`
+	OrderSubSn     string          `json:"orderSubSn"`     // 订单号
-	SourceOrderSn  string          `json:"sourceOrderSn"`
+	SourceOrderSn  string          `json:"sourceOrderSn"`  // 供应商订单号
-	SourceName     string          `json:"sourceName"`
+	SourceName     string          `json:"sourceName"`     // 供应商名称
-	CustomerName   string          `json:"customerName"`
+	CustomerName   string          `json:"customerName"`   // 客户名称
-	OrderStatus    uint            `json:"orderStatus"`
+	OrderStatus    uint            `json:"orderStatus"`    // 订单状态
-	OrderFee       decimal.Decimal `json:"orderFee"`
+	OrderFee       decimal.Decimal `json:"orderFee"`       // 订单金额
-	FreightFee     decimal.Decimal `json:"freightFee"`
+	FreightFee     decimal.Decimal `json:"freightFee"`     // 运费
-	SupplyOrderFee decimal.Decimal `json:"supplyOrderFee"`
+	SupplyOrderFee decimal.Decimal `json:"supplyOrderFee"` // 供应商订单金额
-	PayTime        int64           `json:"payTime"`
+	PayTime        int64           `json:"payTime"`        // 支付时间
-	FinishAt       int64           `json:"finishAt"`
+	FinishAt       int64           `json:"finishAt"`       // 完成时间
-	CloseAt        int64           `json:"closeAt"`
+	CloseAt        int64           `json:"closeAt"`        // 关闭时间
-	StockOutAt     int64           `json:"stockOutAt"`
+	StockOutAt     int64           `json:"stockOutAt"`     // 发货时间
 }
 
 type ReplyRetailOrderLists struct {

supply/sku.go

@@ -198,6 +198,7 @@ type SkuEsSearch struct {
 	SkuId              uint            // Sku编码
 	SupplySkuId        uint            // 供应商Sku编码
 	SkuName            string          // 商品名称
+	SkuNameVague       string          // 商品名称-模糊查询
 	UpcCode            string          // 商品条码
 	BrandId            uint            // 品牌id
 	BrandName          string          // 品牌名称 全词匹配

wholesale/channel/mq.go

@@ -7,8 +7,13 @@ import (
 )
 
 const (
-	MqSubscribeNameSkuPriceChange = "sku_price_change" // sku价格变动
+	MqSubscribeNameSkuPriceChange  = "sku_price_change"  // sku价格变动
-	MqSubscribeNameSkuChange      = "sku_change"       // sku信息变动
+	MqSubscribeNameSkuChange       = "sku_change"        // sku信息变动
+	MqSubscribeNameOrderFreightFee = "order_freight_fee" // 运费处理完成
+	MqSubscribeNameOrderSplit      = "order_split"       // 拆单
+	MqSubscribeNameOrderStockOut   = "order_stock_out"   // 订单出库
+	MqSubscribeNameOrderFinish     = "order_finish"      // 订单完成
+	MqSubscribeNameOrderCancel     = "order_cancel"      // 订单取消
 )
 
 type mq struct {