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-09-03 17:43:35 +08:00
parent 9c458f1e02
commit 8a4c89c1a5
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
business/jxcallback/orderman/orderman_ext.go
View File

@@ -1205,9 +1205,6 @@ func (c *OrderManager) GetStoresOrderSaleInfoNew(ctx *jxcontext.Context, storeID
feeList, _ := dao.GetStoreServerFee(db, storeIDList, fromTime, toTime, statusList, true) feeList, _ := dao.GetStoreServerFee(db, storeIDList, fromTime, toTime, statusList, true)
// 门店账号支出 // 门店账号支出
fineList, _ := dao.StatisticsFineFee(db, fromTime, toTime, storeIDList) fineList, _ := dao.StatisticsFineFee(db, fromTime, toTime, storeIDList)
globals.SugarLogger.Debugf("-----feelist := %s", utils.Format4Output(feeList, false))
globals.SugarLogger.Debugf("-----fineList := %s", utils.Format4Output(fineList, false))
globals.SugarLogger.Debugf("-----saleInfoList := %s", utils.Format4Output(saleInfoList, false))
for _, v := range saleInfoList { for _, v := range saleInfoList {
for _, f := range feeList { for _, f := range feeList {
if v.StoreID == f.JxStoreID && v.VendorID == f.VendorID { if v.StoreID == f.JxStoreID && v.VendorID == f.VendorID {

3
business/partner/purchase/ebai/order.go
View File

@@ -431,6 +431,9 @@ func (p *PurchaseHandler) AcceptOrRefuseOrder(order *model.GoodsOrder, isAcceptI
func (p *PurchaseHandler) PickupGoods(order *model.GoodsOrder, isSelfDelivery bool, userName string) (err error) { func (p *PurchaseHandler) PickupGoods(order *model.GoodsOrder, isSelfDelivery bool, userName string) (err error) {
if globals.EnableEbaiStoreWrite { if globals.EnableEbaiStoreWrite {
if userName == "autoPickup" && !isSelfDelivery {
return nil
}
err = api.EbaiAPI.OrderPickComplete(order.VendorOrderID) err = api.EbaiAPI.OrderPickComplete(order.VendorOrderID)
} }
if err == nil { if err == nil {