yeawood_consts 1.0.27 → 1.0.29

package/index.js

@@ -15,6 +15,10 @@ exports.EMAIL_PATTERN = '^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,}$'
 // 手机号正则
 exports.PHONE_PATTERN = '^1(3\\d|4[5-9]|5[0-35-9]|6[2567]|7[0-8]|8\\d|9[0-35-9])\\d{8}$'
 
+// 发送HTTP请求时头部中的browser参数
+exports.BROWSER =
+  'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/133.0.0.0 Safari/537.36'
+
 // MongoDB事务参数
 exports.TRANSACTION_OPTIONS = (options = {}) =>
   _.extend(
@@ -144,9 +148,20 @@ exports.TENDER_CEE_PROJECT_STATE_CALCULATOR = (
   }
 }
 
+/**
+ *
+ * @param price - 最新价格
+ * @param places_ - 小数位数
+ * @param delayCount - 延时次数
+ * @param decreaseType - 调价方式：固定金额调价、百分比调价
+ * @param decreaseDelay - 延时增幅，一般是百分比
+ * @param decreaseBasic - 基础增幅，需要结合decreaseType来确定每次报价是按照什么方式调价多少
+ * @returns {{price: *, step: *, ratio: *}|{price: string, step: string, ratio: string}}
+ * @constructor
+ */
 exports.TENDER_CEE_PACKAGE_LEADER_PRICE_CALCULATOR = (
   price,
-  places,
+  places_,
   delayCount,
   decreaseType,
   decreaseDelay,
@@ -154,22 +169,27 @@ exports.TENDER_CEE_PACKAGE_LEADER_PRICE_CALCULATOR = (
 ) => {
   let step = new big(0)
 
-  const delayDecreases = new big(decreaseDelay).times(delayCount).times(0.01)
-  const totalDecreases = new big(decreaseBasic).times(0.01).add(delayDecreases)
+  const formatter = (number, option = 0) =>
+    new big(Math.max(parseFloat(number) || option, 0))
+
+  const delayDecreases = formatter(decreaseDelay).times(formatter(delayCount)).times(0.01)
+  const totalDecreases = formatter(decreaseBasic).times(0.01).add(delayDecreases)
 
   switch (decreaseType) {
     case 'fixed':
-      step = new big(price).times(delayDecreases).add(decreaseBasic)
+      step = formatter(price).times(delayDecreases).add(formatter(decreaseBasic))
       break
     case 'ratio':
-      step = new big(price).times(totalDecreases)
+      step = formatter(price).times(totalDecreases)
       break
   }
 
+  const places = formatter(places_).round().toNumber()
+
   return {
     step: step.toFixed(places, 3),
-    ratio: step.div(price).times(100).toFixed(places),
-    price: price.minus(step.toFixed(places, 3)).toFixed(places, 0)
+    ratio: step.div(formatter(price, 1)).times(100).toFixed(places),
+    price: formatter(price).minus(step.toFixed(places, 3)).toFixed(places, 0)
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yeawood_consts",
-  "version": "1.0.27",
+  "version": "1.0.29",
   "description": "",
   "main": "index.js",
   "scripts": {},