ruiling/tachybase_todo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 产品赔偿费用无计算结果 fix #481

Browse Source
This commit is contained in:
lyx 2024-03-25 17:39:48 +08:00
parent aa2542b706
commit 91f273660d
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/plugins/@hera/plugin-rental/src/client/custom-components/RecordFeeConverted.tsx
View File

@ -100,9 +100,9 @@ export const RecordFeeConvertedAmount: CustomFunctionComponent = () => {
} else if (feeRule.conversion_logic_id === ConversionLogics.ProductWeight) { } else if (feeRule.conversion_logic_id === ConversionLogics.ProductWeight) {
calcValue = calcValue * productData.weight; calcValue = calcValue * productData.weight;
} else { } else {
const weightItem = feeRule.conversion_logic?.weight_items.find((item) => { const weightItem = feeRule.conversion_logic?.weight_items.find(
item.product_id - 99999 === category.id || item.product_id === productData.id; (item) => item.product_id - 99999 === category.id || item.product_id === productData.id,
}); );
if (!weightItem) return; if (!weightItem) return;
if (weightItem.conversion_logic_id === ConversionLogics.Keep) { if (weightItem.conversion_logic_id === ConversionLogics.Keep) {
calcValue = calcValue * weightItem.weight; calcValue = calcValue * weightItem.weight;

6
packages/plugins/@hera/plugin-rental/src/client/custom-components/RecordFeeConvertedRead.tsx
View File

@ -95,9 +95,9 @@ export const ReadFeeConvertedAmount: CustomFunctionComponent = () => {
} else if (feeRule.conversion_logic_id === ConversionLogics.ProductWeight) { } else if (feeRule.conversion_logic_id === ConversionLogics.ProductWeight) {
calcValue = calcValue * productData.weight; calcValue = calcValue * productData.weight;
} else { } else {
const weightItem = feeRule.conversion_logic.weight_items.find((item) => { const weightItem = feeRule.conversion_logic.weight_items.find(
item.product_id - 99999 === category.id || item.product_id === productData.id; (item) => item.product_id - 99999 === category.id || item.product_id === productData.id,
}); );
if (!weightItem) return; if (!weightItem) return;
if (weightItem.conversion_logic_id === ConversionLogics.Keep) { if (weightItem.conversion_logic_id === ConversionLogics.Keep) {
calcValue = calcValue * weightItem.weight; calcValue = calcValue * weightItem.weight;