diff --git a/platformapi/jcqapi/jcqapi.go b/platformapi/jcqapi/jcqapi.go index df60761c..1c0a318d 100644 --- a/platformapi/jcqapi/jcqapi.go +++ b/platformapi/jcqapi/jcqapi.go @@ -36,7 +36,7 @@ const ( var ( TopicList = []string{ "open_message_order_order_pay", //订单付款 - // "open_message_pop_order_out", //POP订单出库 + "open_message_pop_order_out", //POP订单出库 // "open_message_pop_order_create", //POP订单创建 // "open_message_pop_order_change", //POP订单变更消息 // "open_message_order_order_finish", //订单完成 diff --git a/platformapi/jcqapi/jcqapi_test.go b/platformapi/jcqapi/jcqapi_test.go index 1363936b..509d4e54 100644 --- a/platformapi/jcqapi/jcqapi_test.go +++ b/platformapi/jcqapi/jcqapi_test.go @@ -3,7 +3,8 @@ package jcqapi import ( "fmt" "testing" - "time" + + "git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/baseapi" "go.uber.org/zap" @@ -22,5 +23,5 @@ func init() { } func TestConsumeInfo(t *testing.T) { - fmt.Println(time.Now().Second()) + fmt.Println(utils.Str2Float64("2.60")) } diff --git a/platformapi/jdshopapi/callback.go b/platformapi/jdshopapi/callback.go index 6a744c0c..2c906420 100644 --- a/platformapi/jdshopapi/callback.go +++ b/platformapi/jdshopapi/callback.go @@ -28,6 +28,7 @@ type CallBackResult struct { Pin string `json:"pin"` IDSopShipmenttype string `json:"idSopShipmenttype"` ScDT string `json:"scDT"` + SellerDiscount string `json:"sellerDiscount"` ConsigneeInfo *CallBackConsigneeInfo `json:"consigneeInfo"` ItemInfoList []*CallBackItemInfoList `json:"itemInfoList"` } diff --git a/platformapi/jdshopapi/order.go b/platformapi/jdshopapi/order.go index 07588cdc..abbcc6ff 100644 --- a/platformapi/jdshopapi/order.go +++ b/platformapi/jdshopapi/order.go @@ -99,6 +99,7 @@ type GetOrderResult struct { Pin string `json:"pin"` IDSopShipmenttype string `json:"idSopShipmenttype"` ScDT string `json:"scDT"` + SellerDiscount string `json:"sellerDiscount"` } //查询单个订单 @@ -109,7 +110,7 @@ func (a *API) GetOrder(orderID int64, isStatus bool) (getOrderResult *GetOrderRe params["optional_fields"] = `orderType,payType,orderTotalPrice,orderSellerPrice, orderPayment,freightPrice,orderState,orderStateRemark, orderStartTime,orderEndTime,orderRemark,consigneeInfo, - itemInfoList,pauseBizInfo,pin,idSopShipmenttype,scDT` + itemInfoList,pauseBizInfo,pin,idSopShipmenttype,scDT,sellerDiscount` if isStatus { params["order_state"] = "WAIT_SELLER_STOCK_OUT,TRADE_CANCELED,PAUSE" }