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-03-24 15:40:41 +08:00
parent 4be0560888
commit c71d4f241f
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
business/jxstore/cms/sync_store_sku.go
View File

@@ -237,11 +237,6 @@ func SyncStoreSkuNew2(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFla
} }
case 1: case 1:
err = syncStoreSkuNew(ctx, task, causeFlag, false, vendorID, storeID, vendorOrgCode, nameIDs, skuIDs, excludeSkuIDs, useVendorPriceDirectly, isContinueWhenError) err = syncStoreSkuNew(ctx, task, causeFlag, false, vendorID, storeID, vendorOrgCode, nameIDs, skuIDs, excludeSkuIDs, useVendorPriceDirectly, isContinueWhenError)
//if vendorID == model.VendorIDJD {
// _, err = SyncSkus(ctx, nil, []int{model.VendorIDJD}, []string{vendorOrgCode}, nil, skuIDs, true)
//} else {
// err = syncStoreSkuNew(ctx, task, causeFlag, false, vendorID, storeID, vendorOrgCode, nameIDs, skuIDs, excludeSkuIDs, useVendorPriceDirectly, isContinueWhenError)
//}
} }
return result, err return result, err
}, 2) }, 2)

8
business/partner/delivery/rider.go
View File

@@ -629,12 +629,18 @@ func LoadingStoreOrderSettleAmount(startTime, endTime int64, jxStoreId []int) er
// 更新订单的结算信息 // 更新订单的结算信息
if so.PlatformSettlement > 0 { if so.PlatformSettlement > 0 {
goodsOrderSql := `UPDATE goods_order g SET g.total_shop_money = ? WHERE g.vendor_order_id = ? ` goodsOrderSql := `UPDATE goods_order g SET g.total_shop_money = ? WHERE g.vendor_order_id = ? `
if _, err := dao.ExecuteSQL(db, goodsOrderSql, []interface{}{so.PlatformSettlement + so.TimingFee + so.DeliveryFee, so.OrderId}...); err != nil { if _, err := dao.ExecuteSQL(db, goodsOrderSql, []interface{}{so.PlatformSettlement, so.OrderId}...); err != nil {
globals.SugarLogger.Debugf("更新订单结算信息错误: %v", err) globals.SugarLogger.Debugf("更新订单结算信息错误: %v", err)
} }
} }
// 更新订单的配送信息 // 更新订单的配送信息
if so.TimingFee != 0 || so.DeliveryFee != 0 { if so.TimingFee != 0 || so.DeliveryFee != 0 {
if so.TimingFee < 0 {
so.TimingFee = so.TimingFee * -1
}
if so.DeliveryFee < 0 {
so.DeliveryFee = so.DeliveryFee * -1
}
wayBillSql := `UPDATE waybill w SET w.desired_fee = ?,w.punctual_fee = ? WHERE w.vendor_order_id = ? AND w.vendor_waybill_id = ? ` wayBillSql := `UPDATE waybill w SET w.desired_fee = ?,w.punctual_fee = ? WHERE w.vendor_order_id = ? AND w.vendor_waybill_id = ? `
if _, err := dao.ExecuteSQL(db, wayBillSql, []interface{}{so.DeliveryFee, so.TimingFee, so.OrderId, so.OrderId}...); err != nil { if _, err := dao.ExecuteSQL(db, wayBillSql, []interface{}{so.DeliveryFee, so.TimingFee, so.OrderId, so.OrderId}...); err != nil {
globals.SugarLogger.Debugf("更新订单物流结算信息错误: %v", err) globals.SugarLogger.Debugf("更新订单物流结算信息错误: %v", err)