|
@@ -560,6 +560,8 @@ class OrderGoodsList extends PureComponent {
|
|
orderCartData[i].amount =
|
|
orderCartData[i].amount =
|
|
parseFloat(orderCartData[i].salePrice || "0") *
|
|
parseFloat(orderCartData[i].salePrice || "0") *
|
|
parseFloat(orderCartData[i].mainNum || "0");
|
|
parseFloat(orderCartData[i].mainNum || "0");
|
|
|
|
+
|
|
|
|
+
|
|
// 计算促销后金额:促销价 * 主数量 - 均摊促销金额(整单降价均摊)
|
|
// 计算促销后金额:促销价 * 主数量 - 均摊促销金额(整单降价均摊)
|
|
const afterPromAmount =
|
|
const afterPromAmount =
|
|
parseFloat(orderCartData[i].promPrice || "0") *
|
|
parseFloat(orderCartData[i].promPrice || "0") *
|
|
@@ -568,6 +570,9 @@ class OrderGoodsList extends PureComponent {
|
|
afterPromAmount - parseFloat(orderCartData[i].promAmount || "0");
|
|
afterPromAmount - parseFloat(orderCartData[i].promAmount || "0");
|
|
totalDealAmount +=
|
|
totalDealAmount +=
|
|
afterPromAmount - parseFloat(orderCartData[i].promAmount || "0");
|
|
afterPromAmount - parseFloat(orderCartData[i].promAmount || "0");
|
|
|
|
+
|
|
|
|
+ orderCartData[i].ext09 = orderCartData[i].salePrice || "0";
|
|
|
|
+ orderCartData[i].ext10 = afterPromAmount - parseFloat(orderCartData[i].promAmount || "0");;
|
|
}
|
|
}
|
|
// 冲抵费用均摊
|
|
// 冲抵费用均摊
|
|
const offsetAmount = parseFloat(nextProps.offsetAmount || "0");
|
|
const offsetAmount = parseFloat(nextProps.offsetAmount || "0");
|
|
@@ -942,6 +947,7 @@ class OrderGoodsList extends PureComponent {
|
|
let newAllWeight = 0; // 总重量
|
|
let newAllWeight = 0; // 总重量
|
|
let newAllVolume = 0; // 总体积
|
|
let newAllVolume = 0; // 总体积
|
|
let newTotalNum = 0; // 总数量(订货数量)
|
|
let newTotalNum = 0; // 总数量(订货数量)
|
|
|
|
+ let ext04 = 0;
|
|
for (let i = 0; i < orderCartData.length; i++) {
|
|
for (let i = 0; i < orderCartData.length; i++) {
|
|
newTotalAmount +=
|
|
newTotalAmount +=
|
|
parseFloat(orderCartData[i].salePrice || "0") *
|
|
parseFloat(orderCartData[i].salePrice || "0") *
|
|
@@ -953,13 +959,17 @@ class OrderGoodsList extends PureComponent {
|
|
newAllWeight += parseFloat(orderCartData[i].rowWeight);
|
|
newAllWeight += parseFloat(orderCartData[i].rowWeight);
|
|
newAllVolume += parseFloat(orderCartData[i].rowVolume);
|
|
newAllVolume += parseFloat(orderCartData[i].rowVolume);
|
|
newTotalNum += parseFloat(orderCartData[i].orderNum);
|
|
newTotalNum += parseFloat(orderCartData[i].orderNum);
|
|
|
|
+ ext04 += parseFloat(orderCartData[i].promPrice || "0") *
|
|
|
|
+ parseFloat(orderCartData[i].mainNum || "0") -
|
|
|
|
+ parseFloat(orderCartData[i].promAmount || "0")
|
|
}
|
|
}
|
|
this.fillGiftWeightAndVolume({
|
|
this.fillGiftWeightAndVolume({
|
|
newTotalAmount,
|
|
newTotalAmount,
|
|
newTotalDealAmount,
|
|
newTotalDealAmount,
|
|
newAllWeight,
|
|
newAllWeight,
|
|
newAllVolume,
|
|
newAllVolume,
|
|
- newTotalNum
|
|
|
|
|
|
+ newTotalNum,
|
|
|
|
+ ext04
|
|
});
|
|
});
|
|
}
|
|
}
|
|
// 如果有赠品,补充赠品体积重量
|
|
// 如果有赠品,补充赠品体积重量
|
|
@@ -968,6 +978,7 @@ class OrderGoodsList extends PureComponent {
|
|
const { selectedGiftProms } = this.state;
|
|
const { selectedGiftProms } = this.state;
|
|
const newTotalAmount = value.newTotalAmount;
|
|
const newTotalAmount = value.newTotalAmount;
|
|
const newTotalDealAmount = value.newTotalDealAmount;
|
|
const newTotalDealAmount = value.newTotalDealAmount;
|
|
|
|
+ const ext04 = value.ext04;
|
|
// 累加赠品数量、体积、重量
|
|
// 累加赠品数量、体积、重量
|
|
let newTotalNum = value.newTotalNum;
|
|
let newTotalNum = value.newTotalNum;
|
|
let newAllWeight = value.newAllWeight || 0;
|
|
let newAllWeight = value.newAllWeight || 0;
|
|
@@ -989,7 +1000,8 @@ class OrderGoodsList extends PureComponent {
|
|
newTotalDealAmount,
|
|
newTotalDealAmount,
|
|
newAllWeight,
|
|
newAllWeight,
|
|
newAllVolume,
|
|
newAllVolume,
|
|
- newTotalNum
|
|
|
|
|
|
+ newTotalNum,
|
|
|
|
+ ext04
|
|
});
|
|
});
|
|
}
|
|
}
|
|
// 删除商品
|
|
// 删除商品
|