utiller 1.0.167 → 1.0.170

package/lib/utiller/index.js

@@ -1414,6 +1414,11 @@ var Utiller = /*#__PURE__*/function () {
     value: function getECPayCurrentTimeFormat(ts) {
       return (0, _moment["default"])(ts ? ts : undefined).format("YYYY/MM/DD HH:mm:ss");
     }
+  }, {
+    key: "getCurrentTimeFormatV2",
+    value: function getCurrentTimeFormatV2(ts) {
+      return (0, _moment["default"])(ts ? ts : undefined).format("YYYY/MM/DD HH:mm:ss");
+    }
     /** 取得 YYY-MM-DD-HH-mm-ss */
 
   }, {
@@ -1454,25 +1459,29 @@ var Utiller = /*#__PURE__*/function () {
     */
 
   }, {
-    key: "getTimeStampAfterCondition",
-    value: function getTimeStampAfterCondition() {
-      var target = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : this.getCurrentTimeStamp();
-      var param = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {
+    key: "getTimeStampWithConditions",
+    value: function getTimeStampWithConditions() {
+      var param = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {
         days: 0,
         months: 0,
         years: 0,
         minutes: 0,
         seconds: 0
       };
+      var target = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : this.getCurrentTimeStamp();
       var base = (0, _moment["default"])(target);
 
       for (var each in param) {
         var number = param[each];
         var unit = each;
 
-        if (number !== 0) {
+        if (number > 0) {
           base = base.add(number, unit);
         }
+
+        if (number < 0) {
+          base = base.subtract(Math.abs(number), unit);
+        }
       }
 
       return base.valueOf();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "utiller",
-  "version": "1.0.167",
+  "version": "1.0.170",
   "description": "",
   "main": "index.js",
   "scripts": {

package/template/sample.package.json

@@ -11,7 +11,7 @@
   "license": "ISC",
   "dependencies": {
     "configerer": "^1.0.11",
-    "utiller": "^1.0.166",
+    "utiller": "^1.0.169",
     "linepayer": "^1.0.4",
     "databazer": "^1.0.11",
     "lodash": "^4.17.20",