liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
邹宗楠
2025-07-21 17:42:06 +08:00
parent d9cd7833c7
commit 8d8c2d3f7a
4 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
business/lakala/lakala_incoming.go
View File

@@ -837,6 +837,8 @@ func UploadAttachmentImg(orgCode, attType, attExtName, attContext string) (*laka
AttExtName: attExtName, AttExtName: attExtName,
AttContext: attContext, AttContext: attContext,
} }
//base64DecryData, _ := base64.StdEncoding.DecodeString(attContext)
return api.LaKaLaApi.AttachmentUpload(parameter) return api.LaKaLaApi.AttachmentUpload(parameter)
} }

2
business/model/lakala.go
View File

@@ -71,7 +71,7 @@ type LakalaIncoming struct {
OrderID string `orm:"column(order_id);size(32)" json:"orderId"` // 当前事件ID OrderID string `orm:"column(order_id);size(32)" json:"orderId"` // 当前事件ID
ApplyID string `orm:"column(apply_id);size(32)" json:"applyId"` // 申请id ApplyID string `orm:"column(apply_id);size(32)" json:"applyId"` // 申请id
ThingType int `orm:"column(thong_type);size(2)" json:"thingType"` // 事件类型[1-分账门店/2-分账接收方] 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"` // 操作所处状态 OperateStatus string `orm:"column(operate_status);size(2)" json:"operateStatus"` // 操作所处状态
TotalAmt string `orm:"column(total_amt);size(10)" json:"totalAmt"` // 总分账金额 TotalAmt string `orm:"column(total_amt);size(10)" json:"totalAmt"` // 总分账金额
CanAmt string `orm:"column(can_amt);size(10)" json:"canAmt"` // 可分账金额 CanAmt string `orm:"column(can_amt);size(10)" json:"canAmt"` // 可分账金额

26
business/partner/purchase/ebai/order_afs.go
View File

@@ -185,19 +185,19 @@ func (c *PurchaseHandler) onAfsOrderMsg(msg *ebaiapi.CallbackMsg) (retVal *ebaia
dao.UpdateEntity(db, afs, "Status", "VendorStatus", "Flag") dao.UpdateEntity(db, afs, "Status", "VendorStatus", "Flag")
} }
if orderStatus.Status == model.AfsOrderStatusFinished { //if orderStatus.Status == model.AfsOrderStatusFinished {
goodsOrder, _ := partner.CurOrderManager.LoadOrder(orderStatus.RefVendorOrderID, model.VendorIDEBAI) // goodsOrder, _ := partner.CurOrderManager.LoadOrder(orderStatus.RefVendorOrderID, model.VendorIDEBAI)
afsSkuList, _ := dao.GetOrderRefundSkuList(db, []string{goodsOrder.VendorOrderID}) // afsSkuList, _ := dao.GetOrderRefundSkuList(db, []string{goodsOrder.VendorOrderID})
var afsSku int = 0 // var afsSku int = 0
for _, v := range afsSkuList { // for _, v := range afsSkuList {
afsSku += v.Count // afsSku += v.Count
} // }
if afsSku == goodsOrder.GoodsCount && goodsOrder.GoodsCount != 0 { // if afsSku == goodsOrder.GoodsCount && goodsOrder.GoodsCount != 0 {
goodsOrder.Status = model.OrderStatusCanceled // goodsOrder.Status = model.OrderStatusCanceled
goodsOrder.VendorStatus = orderStatus.VendorStatus // goodsOrder.VendorStatus = orderStatus.VendorStatus
dao.UpdateEntity(db, goodsOrder, "Status", "VendorStatus") // dao.UpdateEntity(db, goodsOrder, "Status", "VendorStatus")
} // }
} //}
retVal = api.EbaiAPI.Err2CallbackResponse(msg.Cmd, err, nil) retVal = api.EbaiAPI.Err2CallbackResponse(msg.Cmd, err, nil)
} }

6
business/partner/purchase/jd/order.go
View File

@@ -124,6 +124,10 @@ func (c *PurchaseHandler) onOrderMsg(a *jdapi.API, msg *jdapi.CallbackOrderMsg)
retVal = jdapi.Err2CallbackResponse(err, status.VendorStatus) 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 return retVal
} }
@@ -700,5 +704,5 @@ func (c *PurchaseHandler) GetPlatformLogisticsFee(order *model.GoodsOrder) (int6
// ApplyCompensationOrder 订单索赔 // ApplyCompensationOrder 订单索赔
func (c *PurchaseHandler) ApplyCompensationOrder(order *model.GoodsOrder) (string, error) { func (c *PurchaseHandler) ApplyCompensationOrder(order *model.GoodsOrder) (string, error) {
return "",nil return "", nil
} }