This commit is contained in:
邹宗楠
2022-04-02 15:58:23 +08:00
parent 7c62fdd8e1
commit d8e408e13d
2 changed files with 8 additions and 11 deletions

View File

@@ -8,6 +8,7 @@ import (
"git.rosy.net.cn/jx-callback/business/model" "git.rosy.net.cn/jx-callback/business/model"
"git.rosy.net.cn/jx-callback/business/model/dao" "git.rosy.net.cn/jx-callback/business/model/dao"
"git.rosy.net.cn/jx-callback/business/partner" "git.rosy.net.cn/jx-callback/business/partner"
"git.rosy.net.cn/jx-callback/globals"
"git.rosy.net.cn/jx-callback/globals/api" "git.rosy.net.cn/jx-callback/globals/api"
) )
@@ -169,15 +170,11 @@ func (c *DeliveryHandler) OnStoreStatus(msg *fnpsapi.ChainstoreStatusNotify) (re
getAuditStatus(status), getAuditStatus(status),
utils.Interface2String(msg.Param.Remark), utils.Interface2String(msg.Param.Remark),
) )
if err != nil {
globals.SugarLogger.Debugf("FNPS OnStoreStatus callback fail :[%s]", err)
}
retVal = fnpsapi.Err2CallbackResponse(err, "fn ps OnStoreStatus") retVal = fnpsapi.Err2CallbackResponse(err, "fn ps OnStoreStatus")
return retVal return retVal
} }
type ChainstoreParam struct {
MerchantId string `json:"merchant_id"` // 商户id
ChainStoreId string `json:"chain_store_id"` // 蜂鸟门店id
OutShopCode string `json:"out_shop_code"` // 外部门店编码
Status string `json:"status"` // 门店认证状态
ModifyStatus string `json:"modify_status"` // 门店修改状态
Remark string `json:"remark "` // 门店认证、修改等驳回时返回原因
}

View File

@@ -188,10 +188,10 @@ func (c *DeliveryHandler) GetWaybillFee(order *model.GoodsOrder) (deliveryFeeInf
// 订单状态 // 订单状态
func OnWaybillMsg(msg *fnpsapi.OrderStatusNottify) (resp *fnpsapi.CallbackResponse) { func OnWaybillMsg(msg *fnpsapi.OrderStatusNottify) (resp *fnpsapi.CallbackResponse) {
cc := &fnpsapi.OrderCallbackParam{} cc := &fnpsapi.OrderCallbackParam{}
if err := utils.Map2StructByJson(msg.Param, cc, true); err != nil { if err := utils.Map2StructByJson(msg.Param, cc, true); err != nil {
fmt.Println("==========err:=", err) globals.SugarLogger.Debugf("FNPS strconv.Atoi fail :[%s]", err)
return fnpsapi.Err2CallbackResponse(err, "")
} }
order := &model.Waybill{ order := &model.Waybill{