diff --git a/business/jxstore/cms/sync_store_sku.go b/business/jxstore/cms/sync_store_sku.go index a315af49a..12cc5b303 100644 --- a/business/jxstore/cms/sync_store_sku.go +++ b/business/jxstore/cms/sync_store_sku.go @@ -237,11 +237,6 @@ func SyncStoreSkuNew2(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFla } case 1: 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 }, 2) diff --git a/business/partner/delivery/rider.go b/business/partner/delivery/rider.go index a33d8ffbc..93f2b2a6b 100644 --- a/business/partner/delivery/rider.go +++ b/business/partner/delivery/rider.go @@ -629,12 +629,18 @@ func LoadingStoreOrderSettleAmount(startTime, endTime int64, jxStoreId []int) er // 更新订单的结算信息 if so.PlatformSettlement > 0 { 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) } } // 更新订单的配送信息 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 = ? ` if _, err := dao.ExecuteSQL(db, wayBillSql, []interface{}{so.DeliveryFee, so.TimingFee, so.OrderId, so.OrderId}...); err != nil { globals.SugarLogger.Debugf("更新订单物流结算信息错误: %v", err)