liulei/baseapi
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

变量初始化

Browse Source
This commit is contained in:
邹宗楠
2022-03-30 14:06:45 +08:00
parent afd25fe8a4
commit 3973a6a606
3 changed files with 28 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
platformapi/fnpsapi/fnps_v3.go
View File

@@ -451,3 +451,16 @@ type OrderClaimSkuDto struct {
//#endregion //#endregion
//#endregion //#endregion
type GetStoreResult struct {
ChainStoreCode string `json:"chain_store_code"`
ChainStoreName string `json:"chain_store_name"`
Address string `json:"address"`
Latitude string `json:"latitude"`
Longitude string `json:"longitude"`
PositionSource int `json:"position_source"`
City string `json:"city"`
ContactPhone string `json:"contact_phone"`
ServiceCode string `json:"service_code"`
Status int `json:"status"` //1关店，2开店
}

85
platformapi/fnpsapi/order.go
View File

@@ -33,71 +33,6 @@ const (
OrderStatusException = 5 //异常 OrderStatusException = 5 //异常
) )
//
//type CreateOrderParam struct {
// PartnerRemark string `json:"partner_remark,omitempty"`
// PartnerOrderCode string `json:"partner_order_code,omitempty"`
// NotifyURL string `json:"notify_url,omitempty"`
// OrderType int `json:"order_type,omitempty"`
// ChainStoreCode string `json:"chain_store_code,omitempty"`
// TransportInfo *TransportInfo `json:"transport_info,omitempty"`
// OrderAddTime int64 `json:"order_add_time,omitempty"`
// OrderTotalAmount float64 `json:"order_total_amount,omitempty"`
// OrderActualAmount float64 `json:"order_actual_amount,omitempty"`
// OrderWeight float64 `json:"order_weight,omitempty"`
// OrderRemark string `json:"order_remark,omitempty"`
// IsInvoiced int `json:"is_invoiced"`
// Invoice string `json:"invoice,omitempty"`
// OrderPaymentStatus int `json:"order_payment_status,omitempty"`
// OrderPaymentMethod int `json:"order_payment_method,omitempty"`
// IsAgentPayment int `json:"is_agent_payment"`
// RequirePaymentPay float64 `json:"require_payment_pay,omitempty"`
// GoodsCount int `json:"goods_count,omitempty"`
// RequireReceiveTime int64 `json:"require_receive_time,omitempty"`
// SerialNumber string `json:"serial_number,omitempty"`
// ReceiverInfo *ReceiverInfo `json:"receiver_info,omitempty"`
// ItemsJSON []*ItemsJSON `json:"items_json,omitempty"`
// OrderSource string `json:"order_source,omitempty"` //饿百订单传109
// ChannelOrderCode string `json:"channel_order_code,omitempty"`
// CookingTime int64 `json:"cooking_time,omitempty"`
// PlatformPaidTime int64 `json:"platform_paid_time,omitempty"`
// PlatformCreatedTime int64 `json:"platform_created_time,omitempty"`
// MerchantCode string `json:"merchant_code,omitempty"`
//}
//
//type ReceiverInfo struct {
// ReceiverName string `json:"receiver_name,omitempty"`
// ReceiverPrimaryPhone string `json:"receiver_primary_phone,omitempty"`
// ReceiverSecondPhone string `json:"receiver_second_phone,omitempty"`
// ReceiverAddress string `json:"receiver_address,omitempty"`
// ReceiverLongitude float64 `json:"receiver_longitude,omitempty"`
// ReceiverLatitude float64 `json:"receiver_latitude,omitempty"`
// PositionSource int `json:"position_source,omitempty"`
//}
//
//type TransportInfo struct {
// TransportName string `json:"transport_name,omitempty"`
// TransportAddress string `json:"transport_address,omitempty"`
// TransportLongitude float64 `json:"transport_longitude,omitempty"`
// TransportLatitude float64 `json:"transport_latitude,omitempty"`
// PositionSource int `json:"position_source,omitempty"`
// TransportTel string `json:"transport_tel,omitempty"`
// TransportRemark string `json:"transport_remark,omitempty"`
//}
//
//type ItemsJSON struct {
// ItemID string `json:"item_id,omitempty"`
// ItemName string `json:"item_name,omitempty"`
// ItemQuantity int `json:"item_quantity,omitempty"`
// ItemPrice float64 `json:"item_price"`
// ItemActualPrice float64 `json:"item_actual_price"`
// ItemSize int `json:"item_size,omitempty"`
// ItemRemark string `json:"item_remark,omitempty"`
// IsNeedPackage int `json:"is_need_package"`
// IsAgentPurchase int `json:"is_agent_purchase"`
// AgentPurchasePrice float64 `json:"agent_purchase_price,omitempty"`
//}
// 蜂鸟预下单 // 蜂鸟预下单
func (a *API) PreCreateByShopFn(basicParams *PreCreateOrder) (deliveryFee, baseDeliveryFee int64, err error) { func (a *API) PreCreateByShopFn(basicParams *PreCreateOrder) (deliveryFee, baseDeliveryFee int64, err error) {
preOrder := a.MakeFnRequestHead() preOrder := a.MakeFnRequestHead()
@@ -118,19 +53,21 @@ func (a *API) PreCreateByShopFn(basicParams *PreCreateOrder) (deliveryFee, baseD
} }
// 返回所有可选的商品列表，每项包含当前使用该商品下单时对应的价格等信息，(其中不可用的商品会返回不可用原因) 可挑选其中一个可用的商品进行正式下单。 // 返回所有可选的商品列表，每项包含当前使用该商品下单时对应的价格等信息，(其中不可用的商品会返回不可用原因) 可挑选其中一个可用的商品进行正式下单。
var deliveryFeeFn int64
var baseDeliveryFeeFn int64
for _, v := range preOrderResult.GoodsInfos { for _, v := range preOrderResult.GoodsInfos {
if v.IsValid != 1 { if v.IsValid != 1 {
continue continue
} }
deliveryFee = v.ActualDeliveryAmountCent deliveryFeeFn = v.ActualDeliveryAmountCent
baseDeliveryFee = v.TotalDeliveryAmountCent baseDeliveryFeeFn = v.TotalDeliveryAmountCent
} }
// 异常检测 // 异常检测
if deliveryFee == 0 && baseDeliveryFee == 0 { if deliveryFeeFn == 0 && baseDeliveryFeeFn == 0 {
err = errors.New("门店数据异常") err = errors.New("门店数据异常")
} }
return deliveryFee, baseDeliveryFee, nil return deliveryFeeFn, baseDeliveryFeeFn, nil
} }
// 蜂鸟正式下单 // 蜂鸟正式下单
@@ -253,11 +190,12 @@ func (a *API) QueryOrder(partnerOrderCode string) (result *GetOrderDetailRes, er
return nil, err return nil, err
} }
if err := json.Unmarshal([]byte(data["business_data"].(string)), &result); err != nil { fnReuslt := &GetOrderDetailRes{}
if err := json.Unmarshal([]byte(data["business_data"].(string)), &fnReuslt); err != nil {
return nil, err return nil, err
} }
return return fnReuslt, nil
} }
// 查询骑手信息 // 查询骑手信息
@@ -278,10 +216,11 @@ func (a *API) GetKnightInfo(req *GetOrderDetailReq) (result *GetKnightInfoRes, e
return nil, err return nil, err
} }
if err := json.Unmarshal([]byte(utils.Interface2String(data["business_data"])), &result); err != nil { fnReuslt := &GetKnightInfoRes{}
if err := json.Unmarshal([]byte(utils.Interface2String(data["business_data"])), &fnReuslt); err != nil {
return nil, err return nil, err
} }
return return fnReuslt, nil
} }
// 余额查询 // 余额查询

19
platformapi/fnpsapi/store.go
View File

@@ -60,19 +60,6 @@ func (a *API) UpdateStore(updateStore *UpdateStoreParam) (err error) {
return return
} }
type GetStoreResult struct {
ChainStoreCode string `json:"chain_store_code"`
ChainStoreName string `json:"chain_store_name"`
Address string `json:"address"`
Latitude string `json:"latitude"`
Longitude string `json:"longitude"`
PositionSource int `json:"position_source"`
City string `json:"city"`
ContactPhone string `json:"contact_phone"`
ServiceCode string `json:"service_code"`
Status int `json:"status"` //1关店，2开店
}
func (a *API) GetStore(storeID string) (getStoreResult *GetStoreResult, err error) { func (a *API) GetStore(storeID string) (getStoreResult *GetStoreResult, err error) {
params := GetOneStoreParam{ params := GetOneStoreParam{
BaseInfo: BaseInfo{ BaseInfo: BaseInfo{
@@ -102,15 +89,15 @@ func (a *API) GetStore(storeID string) (getStoreResult *GetStoreResult, err erro
return nil, fmt.Errorf("%s", result["msg"]) return nil, fmt.Errorf("%s", result["msg"])
} }
fmt.Println("fn_getStoreDATA======", result["business_data"]) fnResult := &GetStoreResult{}
if storeData, ok := result["business_data"]; ok { if storeData, ok := result["business_data"]; ok {
if err := json.Unmarshal([]byte(utils.Interface2String(storeData)), &getStoreResult); err != nil { if err := json.Unmarshal([]byte(utils.Interface2String(storeData)), fnResult); err != nil {
return nil, err return nil, err
} }
} else { } else {
err = fmt.Errorf(result["msg"].(string)) err = fmt.Errorf(result["msg"].(string))
} }
return getStoreResult, err return fnResult, err
} }
func IsErrShopNotExist(err error) bool { func IsErrShopNotExist(err error) bool {