diff --git a/business/lakala/lakala_incoming.go b/business/lakala/lakala_incoming.go index 223d1c311..f51bb500e 100644 --- a/business/lakala/lakala_incoming.go +++ b/business/lakala/lakala_incoming.go @@ -837,6 +837,8 @@ func UploadAttachmentImg(orgCode, attType, attExtName, attContext string) (*laka AttExtName: attExtName, AttContext: attContext, } + //base64DecryData, _ := base64.StdEncoding.DecodeString(attContext) + return api.LaKaLaApi.AttachmentUpload(parameter) } diff --git a/business/model/lakala.go b/business/model/lakala.go index fd8505834..084d363b1 100644 --- a/business/model/lakala.go +++ b/business/model/lakala.go @@ -71,7 +71,7 @@ type LakalaIncoming struct { OrderID string `orm:"column(order_id);size(32)" json:"orderId"` // 当前事件ID ApplyID string `orm:"column(apply_id);size(32)" json:"applyId"` // 申请id ThingType int `orm:"column(thong_type);size(2)" json:"thingType"` // 事件类型[1-分账门店/2-分账接收方] - Operate string `orm:"column(operate);size(2)" json:"operate"` // 操作类型[创建/修改/绑定/解绑] + Operate string `orm:"column(operate);size(16)" json:"operate"` // 操作类型[创建/修改/绑定/解绑] OperateStatus string `orm:"column(operate_status);size(2)" json:"operateStatus"` // 操作所处状态 TotalAmt string `orm:"column(total_amt);size(10)" json:"totalAmt"` // 总分账金额 CanAmt string `orm:"column(can_amt);size(10)" json:"canAmt"` // 可分账金额 diff --git a/business/partner/purchase/ebai/order_afs.go b/business/partner/purchase/ebai/order_afs.go index 9fa2db4ea..3267fdeec 100644 --- a/business/partner/purchase/ebai/order_afs.go +++ b/business/partner/purchase/ebai/order_afs.go @@ -185,19 +185,19 @@ func (c *PurchaseHandler) onAfsOrderMsg(msg *ebaiapi.CallbackMsg) (retVal *ebaia dao.UpdateEntity(db, afs, "Status", "VendorStatus", "Flag") } - if orderStatus.Status == model.AfsOrderStatusFinished { - goodsOrder, _ := partner.CurOrderManager.LoadOrder(orderStatus.RefVendorOrderID, model.VendorIDEBAI) - afsSkuList, _ := dao.GetOrderRefundSkuList(db, []string{goodsOrder.VendorOrderID}) - var afsSku int = 0 - for _, v := range afsSkuList { - afsSku += v.Count - } - if afsSku == goodsOrder.GoodsCount && goodsOrder.GoodsCount != 0 { - goodsOrder.Status = model.OrderStatusCanceled - goodsOrder.VendorStatus = orderStatus.VendorStatus - dao.UpdateEntity(db, goodsOrder, "Status", "VendorStatus") - } - } + //if orderStatus.Status == model.AfsOrderStatusFinished { + // goodsOrder, _ := partner.CurOrderManager.LoadOrder(orderStatus.RefVendorOrderID, model.VendorIDEBAI) + // afsSkuList, _ := dao.GetOrderRefundSkuList(db, []string{goodsOrder.VendorOrderID}) + // var afsSku int = 0 + // for _, v := range afsSkuList { + // afsSku += v.Count + // } + // if afsSku == goodsOrder.GoodsCount && goodsOrder.GoodsCount != 0 { + // goodsOrder.Status = model.OrderStatusCanceled + // goodsOrder.VendorStatus = orderStatus.VendorStatus + // dao.UpdateEntity(db, goodsOrder, "Status", "VendorStatus") + // } + //} retVal = api.EbaiAPI.Err2CallbackResponse(msg.Cmd, err, nil) } diff --git a/business/partner/purchase/jd/order.go b/business/partner/purchase/jd/order.go index 237d0aaf7..6947bd595 100644 --- a/business/partner/purchase/jd/order.go +++ b/business/partner/purchase/jd/order.go @@ -124,6 +124,10 @@ func (c *PurchaseHandler) onOrderMsg(a *jdapi.API, msg *jdapi.CallbackOrderMsg) retVal = jdapi.Err2CallbackResponse(err, status.VendorStatus) } } + if status.Status == model.OrderStatusFinished { + c.OnFinancialMsg(msg) + jdapi.Err2CallbackResponse(c.updateOrderFinancialInfo(a, msg.BillID), status.VendorStatus) + } } return retVal } @@ -700,5 +704,5 @@ func (c *PurchaseHandler) GetPlatformLogisticsFee(order *model.GoodsOrder) (int6 // ApplyCompensationOrder 订单索赔 func (c *PurchaseHandler) ApplyCompensationOrder(order *model.GoodsOrder) (string, error) { - return "",nil + return "", nil }