|
@@ -270,12 +270,12 @@ namespace XYY.Service.Standard.Order.FBA
|
|
|
if (BillWeight / boxes.Sum(x => x.OpLength * x.OpWidth * x.OpHeight / 1000000) >= 300)
|
|
|
{
|
|
|
item.GoodsNames += ";-2/kg";
|
|
|
- await AddFbaHeavyCargoOtherFee(item.Id,item.CustomerConfirmBillWeight.Value*-2.0m);
|
|
|
+ await AddFbaHeavyCargoOtherFee(item.OrderId.Value,item.CustomerConfirmBillWeight.Value*-2.0m);
|
|
|
}
|
|
|
else if (BillWeight / boxes.Sum(x => x.OpLength * x.OpWidth * x.OpHeight / 1000000) >= 200)
|
|
|
{
|
|
|
item.GoodsNames += ";-1/kg";
|
|
|
- await AddFbaHeavyCargoOtherFee(item.Id, item.CustomerConfirmBillWeight.Value * -1.0m);
|
|
|
+ await AddFbaHeavyCargoOtherFee(item.OrderId.Value, item.CustomerConfirmBillWeight.Value * -1.0m);
|
|
|
}
|
|
|
}
|
|
|
//实重/体积立方>300 做 1:300标识-1
|
|
@@ -300,7 +300,7 @@ namespace XYY.Service.Standard.Order.FBA
|
|
|
{
|
|
|
string sql = $@"delete FBA_Incidental where OrderId={OrderId} and FBAOtherFeeId=(select SMPOtherFeeId from FBA_OtherFee(nolock) where Name='重货优惠' )
|
|
|
insert into FBA_Incidental(OrderId,CalculateType,Target,Fee,FBAOtherFeeId,CustomerRemark,JSRemark,SysncJS)
|
|
|
-select {OrderId},0,0,{otherFee},SMPOtherFeeId,CustomerRemark,JSRemark,SysncJS from FBA_OtherFee(nolock) where Name='重货优惠' ";
|
|
|
+select {OrderId},0,0,{otherFee},Id,CustomerRemark,JSRemark,SysncJS from FBA_OtherFee(nolock) where Name='重货优惠' ";
|
|
|
await _unitOfWork.ExecuteAsync(sql);
|
|
|
}
|
|
|
private void ExpressBillInfo(IEnumerable<Order_MpsOrder> orders, IEnumerable<Order_MpsOrderBox> boxes, List<string> remotZipCode)
|