@pisell/private-materials 6.6.68 → 6.6.69

package/es/components/booking/info2/service/editService/index.js

@@ -787,7 +787,20 @@ var Info = function Info(_, ref) {
         }
         var origin_total = _total;
         if (item.discount_amount) {
+          var _item$_extend14, _item$_extend15;
           origin_total = getProductOriginTotalPrice(cacheItem);
+          var previousOriginTotal = Number((item === null || item === void 0 || (_item$_extend14 = item._extend) === null || _item$_extend14 === void 0 ? void 0 : _item$_extend14.origin_total) || 0);
+          var previousTotal = Number((item === null || item === void 0 || (_item$_extend15 = item._extend) === null || _item$_extend15 === void 0 ? void 0 : _item$_extend15.total) || 0);
+          var productAllDiscountList = getProductAllDiscountList(item);
+          var hasNonManualDiscount = productAllDiscountList.some(function (discountItem) {
+            return (discountItem === null || discountItem === void 0 ? void 0 : discountItem.type) !== 'product';
+          });
+          if (previousOriginTotal > 0 && Number.isFinite(previousOriginTotal) && Number.isFinite(previousTotal) && !hasNonManualDiscount) {
+            // 手动折扣编辑套餐时只延续旧折后比例，不改子商品单价，避免后续重复折扣。
+            var sellingRatio = new Decimal(previousTotal).div(previousOriginTotal);
+            _total = new Decimal(origin_total).mul(sellingRatio).toDecimalPlaces(2, Decimal.ROUND_HALF_UP).toNumber();
+            cacheItem._extend.total = _total;
+          }
         }
 
         // 用于储存原价

package/es/components/eftposPay/hooks.d.ts

@@ -19,7 +19,7 @@ export declare const useStoreRef: <T extends {
     readonly netRef: React.MutableRefObject<boolean | undefined>;
     readonly symbolRef: React.MutableRefObject<string>;
     readonly amountRef: React.MutableRefObject<string | number>;
-    readonly eftposRef: React.MutableRefObject<"stripe" | "tyro" | "windcave" | "mx51" | "payo" | "linkly" | "huifu">;
+    readonly eftposRef: React.MutableRefObject<"stripe" | "tyro" | "mx51" | "payo" | "windcave" | "linkly" | "huifu">;
     readonly clientRef: React.MutableRefObject<ClientEnum>;
     readonly dataRef: React.MutableRefObject<import("./store").State>;
 };

package/es/components/eftposPay/store/index.d.ts

@@ -299,8 +299,8 @@ export declare const backUpFree: (payload: Partial<State>) => {
         amount?: string | number | undefined;
         mode?: "pay" | "refund" | "fullPay" | "query" | undefined;
         order_id?: string | number | undefined;
-        eftpos?: "stripe" | "tyro" | "windcave" | "mx51" | "payo" | "linkly" | "huifu" | undefined;
-        action?: "amount" | "pay" | "deviceList" | undefined;
+        eftpos?: "stripe" | "tyro" | "mx51" | "payo" | "windcave" | "linkly" | "huifu" | undefined;
+        action?: "pay" | "amount" | "deviceList" | undefined;
         key?: number | undefined;
         step?: number | undefined;
         title?: string | undefined;

package/lib/components/booking/info2/service/editService/index.js

@@ -542,7 +542,7 @@ var Info = (_, ref) => {
         }
       },
       callback: (e2, extension_type, detail) => {
-        var _a3, _b3, _c3, _d3, _e3, _f3, _g3, _h3, _i2, _j2, _k2, _l2, _m2, _n2, _o2, _p2, _q2;
+        var _a3, _b3, _c3, _d3, _e3, _f3, _g3, _h3, _i2, _j2, _k2, _l2, _m2, _n2, _o2, _p2, _q2, _r2, _s2;
         isEditedRef.current = true;
         const _detail = detail || item;
         let other = JSON.parse(JSON.stringify(e2));
@@ -613,9 +613,20 @@ var Info = (_, ref) => {
         let origin_total = _total;
         if (item.discount_amount) {
           origin_total = (0, import_utils6.getProductOriginTotalPrice)(cacheItem);
+          const previousOriginTotal = Number(((_p2 = item == null ? void 0 : item._extend) == null ? void 0 : _p2.origin_total) || 0);
+          const previousTotal = Number(((_q2 = item == null ? void 0 : item._extend) == null ? void 0 : _q2.total) || 0);
+          const productAllDiscountList = (0, import_utils8.getProductAllDiscountList)(item);
+          const hasNonManualDiscount = productAllDiscountList.some(
+            (discountItem) => (discountItem == null ? void 0 : discountItem.type) !== "product"
+          );
+          if (previousOriginTotal > 0 && Number.isFinite(previousOriginTotal) && Number.isFinite(previousTotal) && !hasNonManualDiscount) {
+            const sellingRatio = new import_decimal.default(previousTotal).div(previousOriginTotal);
+            _total = new import_decimal.default(origin_total).mul(sellingRatio).toDecimalPlaces(2, import_decimal.default.ROUND_HALF_UP).toNumber();
+            cacheItem._extend.total = _total;
+          }
         }
         cacheItem._extend.origin_total = origin_total;
-        (((_p2 = cacheItem._extend) == null ? void 0 : _p2.items) || []).forEach((item2) => item2._extend.origin_total = origin_total);
+        (((_r2 = cacheItem._extend) == null ? void 0 : _r2.items) || []).forEach((item2) => item2._extend.origin_total = origin_total);
         dispatch({
           type: "setService",
           payload: {
@@ -624,7 +635,7 @@ var Info = (_, ref) => {
         });
         form.setFieldsValue({
           total: _total,
-          capacity: (_q2 = cacheItem._extend) == null ? void 0 : _q2.capacity,
+          capacity: (_s2 = cacheItem._extend) == null ? void 0 : _s2.capacity,
           quantity: (e2 == null ? void 0 : e2.quantity) || (values == null ? void 0 : values.quantity) || 1
         });
       }

package/lib/components/eftposPay/hooks.d.ts

@@ -19,7 +19,7 @@ export declare const useStoreRef: <T extends {
     readonly netRef: React.MutableRefObject<boolean | undefined>;
     readonly symbolRef: React.MutableRefObject<string>;
     readonly amountRef: React.MutableRefObject<string | number>;
-    readonly eftposRef: React.MutableRefObject<"stripe" | "tyro" | "windcave" | "mx51" | "payo" | "linkly" | "huifu">;
+    readonly eftposRef: React.MutableRefObject<"stripe" | "tyro" | "mx51" | "payo" | "windcave" | "linkly" | "huifu">;
     readonly clientRef: React.MutableRefObject<ClientEnum>;
     readonly dataRef: React.MutableRefObject<import("./store").State>;
 };

package/lib/components/eftposPay/store/index.d.ts

@@ -299,8 +299,8 @@ export declare const backUpFree: (payload: Partial<State>) => {
         amount?: string | number | undefined;
         mode?: "pay" | "refund" | "fullPay" | "query" | undefined;
         order_id?: string | number | undefined;
-        eftpos?: "stripe" | "tyro" | "windcave" | "mx51" | "payo" | "linkly" | "huifu" | undefined;
-        action?: "amount" | "pay" | "deviceList" | undefined;
+        eftpos?: "stripe" | "tyro" | "mx51" | "payo" | "windcave" | "linkly" | "huifu" | undefined;
+        action?: "pay" | "amount" | "deviceList" | undefined;
         key?: number | undefined;
         step?: number | undefined;
         title?: string | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.6.68",
+  "version": "6.6.69",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -63,8 +63,8 @@
     "@use-gesture/react": "^10.3.1",
     "@pisell/utils": "3.0.2",
     "@pisell/materials": "6.6.17",
-    "@pisell/icon": "0.0.11",
-    "@pisell/date-picker": "3.0.7"
+    "@pisell/date-picker": "3.0.7",
+    "@pisell/icon": "0.0.11"
   },
   "peerDependencies": {
     "react": "^18.0.0",