aa
This commit is contained in:
@@ -1229,7 +1229,7 @@ func CheckJdDeliveryWeight(ctx *jxcontext.Context) (err error) {
|
|||||||
return retVal, err
|
return retVal, err
|
||||||
}
|
}
|
||||||
if waybill.DeliveryID == deliveryOrder.VendorWaybillID {
|
if waybill.DeliveryID == deliveryOrder.VendorWaybillID {
|
||||||
deliveryOrder.IsWeight = 1
|
deliveryOrder.IsWeight = 1 //合格
|
||||||
if waybill.Weight > 3 && math.Floor(deliveryOrder.Weight) < math.Floor(waybill.Weight) {
|
if waybill.Weight > 3 && math.Floor(deliveryOrder.Weight) < math.Floor(waybill.Weight) {
|
||||||
diffPrice := (math.Floor(waybill.Weight) - math.Floor(deliveryOrder.Weight)) * waybillKgPrice
|
diffPrice := (math.Floor(waybill.Weight) - math.Floor(deliveryOrder.Weight)) * waybillKgPrice
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -1238,7 +1238,7 @@ func CheckJdDeliveryWeight(ctx *jxcontext.Context) (err error) {
|
|||||||
if err = financial.AddExpendUpdateAccount(db, userBill, model.BillTypeJdWaybillOverWeight, utils.Float64TwoInt(diffPrice), 2); err != nil {
|
if err = financial.AddExpendUpdateAccount(db, userBill, model.BillTypeJdWaybillOverWeight, utils.Float64TwoInt(diffPrice), 2); err != nil {
|
||||||
return retVal, err
|
return retVal, err
|
||||||
}
|
}
|
||||||
deliveryOrder.IsWeight = 2
|
deliveryOrder.IsWeight = 2 //超重
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
deliveryOrder.ActualWeight = waybill.Weight
|
deliveryOrder.ActualWeight = waybill.Weight
|
||||||
|
|||||||
Reference in New Issue
Block a user