dimorder-orderapp-lib 0.1.269 → 0.1.270
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"calculateLocalOrder.d.ts","sourceRoot":"","sources":["../../src/libs/calculateLocalOrder.ts"],"names":[],"mappings":"AAOA,MAAM,CAAC,OAAO,UAAU,mBAAmB,CAAE,KAAK,EAAE,SAAS,EAAE,aAAa,GAAE,MAAU,EAAE,gBAAgB,GAAE,MAAU,EAAE,QAAQ,GAAE,cAAmC,GAAG,SAAS,
|
|
1
|
+
{"version":3,"file":"calculateLocalOrder.d.ts","sourceRoot":"","sources":["../../src/libs/calculateLocalOrder.ts"],"names":[],"mappings":"AAOA,MAAM,CAAC,OAAO,UAAU,mBAAmB,CAAE,KAAK,EAAE,SAAS,EAAE,aAAa,GAAE,MAAU,EAAE,gBAAgB,GAAE,MAAU,EAAE,QAAQ,GAAE,cAAmC,GAAG,SAAS,CAiLhL"}
|
|
@@ -57,7 +57,6 @@ function calculateLocalOrder(order, promoDiscount = 0, riceCoinDiscount = 0, rou
|
|
|
57
57
|
const diffTotal = total - newTotal;
|
|
58
58
|
// 累計折扣金額
|
|
59
59
|
calculatedDiscountTotal += diffTotal;
|
|
60
|
-
console.log('[calculateLocalOrder] calculatedDiscountTotal +', diffTotal);
|
|
61
60
|
// 更新 total
|
|
62
61
|
total = newTotal;
|
|
63
62
|
}
|
|
@@ -155,12 +154,10 @@ function calculateLocalOrder(order, promoDiscount = 0, riceCoinDiscount = 0, rou
|
|
|
155
154
|
shippingFeeTotal = newShippingFeeTotal;
|
|
156
155
|
return Object.assign(Object.assign({}, modifier), { calculatedAmount });
|
|
157
156
|
});
|
|
158
|
-
console.log('[calculateLocalOrder] modifiers filtered', modifiers);
|
|
159
157
|
total += Math.max(shippingFeeTotal, 0);
|
|
160
158
|
if (total < 0) {
|
|
161
159
|
total = 0;
|
|
162
160
|
}
|
|
163
|
-
console.log('[calculateLocalOrder] itemtotalDiscount', itemtotalDiscount);
|
|
164
161
|
calculatedDiscountTotal += itemtotalDiscount;
|
|
165
162
|
order.originalTotal = fixPrecision_1.default(originalTotal);
|
|
166
163
|
order.subtotal = fixPrecision_1.default(subtotal);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"calculateLocalOrder.js","sourceRoot":"","sources":["../../src/libs/calculateLocalOrder.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"calculateLocalOrder.js","sourceRoot":"","sources":["../../src/libs/calculateLocalOrder.ts"],"names":[],"mappings":"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"}
|