1
This commit is contained in:
@@ -47,6 +47,7 @@ var (
|
||||
102114997: true,
|
||||
102641826: true,
|
||||
102651220: true,
|
||||
156976863: true,
|
||||
// 果园啊
|
||||
6572945: true,
|
||||
6772759: true,
|
||||
|
||||
@@ -174,7 +174,7 @@ type IPurchasePlatformStoreSkuHandler interface {
|
||||
// UploadInvoice 发票回复
|
||||
UploadInvoice(param *model.InvoiceMsg, base64 string) ([]string, []string, error)
|
||||
// UploadPickingImg 上传订单拣货图片
|
||||
UploadPickingImg(order *model.GoodsOrder, imgList []string) error
|
||||
UploadPickingImg(order *model.GoodsOrder, imgList interface{}) error
|
||||
}
|
||||
|
||||
type ISingleStoreStoreSkuHandler interface {
|
||||
|
||||
@@ -1095,6 +1095,6 @@ func (c *PurchaseHandler) UploadInvoice(param *model.InvoiceMsg, base64 string)
|
||||
}
|
||||
|
||||
// UploadPickingImg 上传拣货图片
|
||||
func (c *PurchaseHandler) UploadPickingImg(order *model.GoodsOrder, imgList []string) error {
|
||||
func (c *PurchaseHandler) UploadPickingImg(order *model.GoodsOrder, imgList interface{}) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
@@ -361,6 +361,6 @@ func (c *PurchaseHandler) UploadInvoice(param *model.InvoiceMsg) ([]string, []st
|
||||
}
|
||||
|
||||
// UploadPickingImg 上传拣货图片
|
||||
func (c *PurchaseHandler) UploadPickingImg(order *model.GoodsOrder, imgList []string) error {
|
||||
func (c *PurchaseHandler) UploadPickingImg(order *model.GoodsOrder, imgList interface{}) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
@@ -736,6 +736,6 @@ func (c *PurchaseHandler) UploadInvoice(param *model.InvoiceMsg, base64 string)
|
||||
}
|
||||
|
||||
// UploadPickingImg 上传拣货图片
|
||||
func (c *PurchaseHandler) UploadPickingImg(order *model.GoodsOrder, imgList []string) error {
|
||||
func (c *PurchaseHandler) UploadPickingImg(order *model.GoodsOrder, imgList interface{}) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
@@ -350,6 +350,6 @@ func (c *PurchaseHandler) UploadInvoice(param *model.InvoiceMsg, base64 string)
|
||||
}
|
||||
|
||||
// UploadPickingImg 上传拣货图片
|
||||
func (c *PurchaseHandler) UploadPickingImg(order *model.GoodsOrder, imgList []string) error {
|
||||
func (c *PurchaseHandler) UploadPickingImg(order *model.GoodsOrder, imgList interface{}) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
@@ -178,6 +178,6 @@ func (c *PurchaseHandler) UploadInvoice(param *model.InvoiceMsg) ([]string, []st
|
||||
}
|
||||
|
||||
// UploadPickingImg 上传拣货图片
|
||||
func (c *PurchaseHandler) UploadPickingImg(order *model.GoodsOrder, imgList []string) error {
|
||||
func (c *PurchaseHandler) UploadPickingImg(order *model.GoodsOrder, imgList interface{}) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
@@ -188,6 +188,13 @@ func (p *PurchaseHandler) Map2Order(orderData map[string]interface{}) (order *mo
|
||||
if openUID > 0 {
|
||||
order.VendorUserID = utils.Int64ToStr(openUID)
|
||||
}
|
||||
|
||||
// 当此数值为1时需要强制返图
|
||||
if utils.MustInterface2Int64(result["force_require_picture"]) == 1 {
|
||||
order.ForceRequirePicture = 1
|
||||
} else {
|
||||
order.ForceRequirePicture = 0
|
||||
}
|
||||
// 不设置最晚拣货时间,以缺省值为准
|
||||
// if utils.IsTimeZero(order.PickDeadline) && !utils.IsTimeZero(order.StatusTime) {
|
||||
// order.PickDeadline = order.StatusTime.Add(pickupOrderDelay) // 美团外卖要求在5分钟内拣货,不然订单会被取消
|
||||
@@ -1077,6 +1084,11 @@ func (c *PurchaseHandler) UploadInvoice(param *model.InvoiceMsg, base64 string)
|
||||
}
|
||||
|
||||
// UploadPickingImg 上传拣货图片
|
||||
func (c *PurchaseHandler) UploadPickingImg(order *model.GoodsOrder, imgList []string) error {
|
||||
func (c *PurchaseHandler) UploadPickingImg(order *model.GoodsOrder, imgList interface{}) error {
|
||||
return getAPI(order.VendorOrgCode, jxutils.GetSaleStoreIDFromOrder(order), order.VendorStoreID).UploadMediaToOrder(order.VendorOrderID, imgList)
|
||||
}
|
||||
|
||||
func GetVendorDetail(order *model.GoodsOrder) (map[string]interface{}, error) {
|
||||
result, err := getAPI(order.VendorOrgCode, jxutils.GetSaleStoreIDFromOrder(order), order.VendorStoreID).OrderGetOrderDetail(utils.Str2Int64(order.VendorOrderID), true)
|
||||
return result, err
|
||||
}
|
||||
|
||||
@@ -1005,6 +1005,6 @@ func (c *PurchaseHandler) UploadInvoice(param *model.InvoiceMsg, base64 string)
|
||||
}
|
||||
|
||||
// UploadPickingImg 上传拣货图片
|
||||
func (c *PurchaseHandler) UploadPickingImg(order *model.GoodsOrder, imgList []string) error {
|
||||
func (c *PurchaseHandler) UploadPickingImg(order *model.GoodsOrder, imgList interface{}) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
@@ -1123,6 +1123,6 @@ func (c *PurchaseHandler) UploadInvoice(param *model.InvoiceMsg, base64 string)
|
||||
}
|
||||
|
||||
// UploadPickingImg 上传拣货图片
|
||||
func (c *PurchaseHandler) UploadPickingImg(order *model.GoodsOrder, imgList []string) error {
|
||||
func (c *PurchaseHandler) UploadPickingImg(order *model.GoodsOrder, imgList interface{}) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
@@ -324,6 +324,6 @@ func (c *PurchaseHandler) ApplyCompensationOrder(order *model.GoodsOrder) (strin
|
||||
}
|
||||
|
||||
// UploadPickingImg 上传拣货图片
|
||||
func (c *PurchaseHandler) UploadPickingImg(order *model.GoodsOrder, imgList []string) error {
|
||||
func (c *PurchaseHandler) UploadPickingImg(order *model.GoodsOrder, imgList interface{}) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
@@ -129,6 +129,6 @@ func (c *PurchaseHandler) UploadInvoice(param *model.InvoiceMsg, base64 string)
|
||||
}
|
||||
|
||||
// UploadPickingImg 上传拣货图片
|
||||
func (c *PurchaseHandler) UploadPickingImg(order *model.GoodsOrder, imgList []string) error {
|
||||
func (c *PurchaseHandler) UploadPickingImg(order *model.GoodsOrder, imgList interface{}) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user