改动在 OracleOrderBillMapper.toBillRequest,同步计费 / 计费任务走上游行时都会生效。本地「重新计费」仍用订单表已存的计费重,不会再回上游取
This commit is contained in:
@@ -47,8 +47,8 @@ public class OracleOrderBillMapper
|
|||||||
String countryName = firstStr(row, "COUNTRY_NAME", "COUNTRY_EINGTH_NAME", "COUNTRY");
|
String countryName = firstStr(row, "COUNTRY_NAME", "COUNTRY_EINGTH_NAME", "COUNTRY");
|
||||||
req.setCountryName(countryName);
|
req.setCountryName(countryName);
|
||||||
req.setDestPostcode(firstStr(row, "CONSIGNEE_POSTCODE"));
|
req.setDestPostcode(firstStr(row, "CONSIGNEE_POSTCODE"));
|
||||||
// TAB_ORDER.DIMENSIONAL_WEIGHT_FACTOR = billing weight -> quote weight / prc_order_bill.weight
|
// Prefer CONFIRM_WEIGHT (customer confirmed); fallback DIMENSIONAL_WEIGHT_FACTOR (charge weight).
|
||||||
BigDecimal weight = firstPositiveDecimal(row, "DIMENSIONAL_WEIGHT_FACTOR");
|
BigDecimal weight = firstPositiveDecimal(row, "CONFIRM_WEIGHT", "DIMENSIONAL_WEIGHT_FACTOR");
|
||||||
req.setWeight(weight);
|
req.setWeight(weight);
|
||||||
// TAB_ORDER.WEIGHT = receive weight (收货重)
|
// TAB_ORDER.WEIGHT = receive weight (收货重)
|
||||||
req.setReceiveWeight(firstDecimal(row, "WEIGHT"));
|
req.setReceiveWeight(firstDecimal(row, "WEIGHT"));
|
||||||
|
|||||||
Reference in New Issue
Block a user