Browse Source

修复bug

v1
前端-胡立永 3 weeks ago
parent
commit
960ad4a93a
5 changed files with 12065 additions and 12018 deletions
  1. BIN
      admin-pc/dist.zip
  2. +46
    -8
      admin-pc/package-lock.json
  3. +12018
    -12008
      admin-pc/yarn.lock
  4. +0
    -1
      module-common/src/main/java/org/jeecg/api/controller/AppletIndexController.java
  5. +1
    -1
      module-common/src/main/java/org/jeecg/api/service/impl/AppletMoneyLogServiceImpl.java

BIN
admin-pc/dist.zip View File


+ 46
- 8
admin-pc/package-lock.json View File

@ -2400,6 +2400,7 @@
"resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz",
"integrity": "sha512-Ajr4IcMXq/2QmMkEmSvxqfLN5zGmJ92gHXAeOXq1OekoH2rfDNsgdDoL2f7QaRCy7G/E6TpxBVdRuNraMztGHw==",
"dev": true,
"optional": true,
"dependencies": {
"co": "^4.6.0",
"fast-deep-equal": "^1.0.0",
@ -2412,6 +2413,7 @@
"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz",
"integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==",
"dev": true,
"optional": true,
"engines": {
"node": ">=4"
}
@ -2442,6 +2444,7 @@
"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
"integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
"dev": true,
"optional": true,
"dependencies": {
"ms": "^2.1.1"
}
@ -2452,6 +2455,7 @@
"integrity": "sha512-bT3/1x1EbZB7phzYu7vCr1v3ONuzDtX8WjuM9c0iYxe+cq+pwcKEoQjl7zd3RpC6YOLgnSy3cTN58M2jcoPDIQ==",
"deprecated": "This version is no longer supported. Please see https://eslint.org/version-support for other options.",
"dev": true,
"optional": true,
"dependencies": {
"ajv": "^5.3.0",
"babel-code-frame": "^6.22.0",
@ -2520,6 +2524,7 @@
"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-3.7.3.tgz",
"integrity": "sha512-W+B0SvF4gamyCTmUc+uITPY0989iXVfKvhwtmJocTaYoc/3khEHmEmvfY/Gn9HA9VV75jrQECsHizkNw1b68FA==",
"dev": true,
"optional": true,
"dependencies": {
"esrecurse": "^4.1.0",
"estraverse": "^4.1.1"
@ -2532,7 +2537,8 @@
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz",
"integrity": "sha512-fueX787WZKCV0Is4/T2cyAdM4+x1S3MXXOAhavE1ys/W42SHAPacLTQhucja22QBYrfGw50M2sRiXPtTGv9Ymw==",
"dev": true
"dev": true,
"optional": true
},
"node_modules/@vue/cli-plugin-eslint/node_modules/globby": {
"version": "9.2.0",
@ -2566,13 +2572,15 @@
"version": "0.3.1",
"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
"integrity": "sha512-4JD/Ivzg7PoW8NzdrBSr3UFwC9mHgvI7Z6z3QGBsSHgKaRTUDmyZAAKJo2UbG1kUVfS9WS8bi36N49U1xw43DA==",
"dev": true
"dev": true,
"optional": true
},
"node_modules/@vue/cli-plugin-eslint/node_modules/ms": {
"version": "2.1.3",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
"integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
"dev": true
"dev": true,
"optional": true
},
"node_modules/@vue/cli-plugin-eslint/node_modules/pify": {
"version": "4.0.1",
@ -2588,6 +2596,7 @@
"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
"integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
"dev": true,
"optional": true,
"bin": {
"semver": "bin/semver"
}
@ -2606,6 +2615,7 @@
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
"integrity": "sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==",
"dev": true,
"optional": true,
"dependencies": {
"ansi-regex": "^3.0.0"
},
@ -3790,6 +3800,7 @@
"resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-3.0.1.tgz",
"integrity": "sha512-AU7pnZkguthwBjKgCg6998ByQNIMjbuDQZ8bb78QAFZwPfmKia8AIzgY/gWgqCjnht8JLdXmB4YxA0KaV60ncQ==",
"dev": true,
"optional": true,
"dependencies": {
"acorn": "^3.0.4"
}
@ -3799,6 +3810,7 @@
"resolved": "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz",
"integrity": "sha512-OLUyIIZ7mF5oaAUT1w0TFqQS81q3saT46x8t7ukpPjMNk+nbs4ZHhs7ToV8EWnLYLepjETXd4XaCE4uxkMeqUw==",
"dev": true,
"optional": true,
"bin": {
"acorn": "bin/acorn"
},
@ -6153,6 +6165,7 @@
"resolved": "https://registry.npmjs.org/caller-path/-/caller-path-0.1.0.tgz",
"integrity": "sha512-UJiE1otjXPF5/x+T3zTnSFiTOEmJoGTD9HmBoxnCUwho61a2eSNn/VwtwuIBDAo2SEOv1AJ7ARI5gCmohFLu/g==",
"dev": true,
"optional": true,
"dependencies": {
"callsites": "^0.2.0"
},
@ -6165,6 +6178,7 @@
"resolved": "https://registry.npmjs.org/callsites/-/callsites-0.2.0.tgz",
"integrity": "sha512-Zv4Dns9IbXXmPkgRRUjAaJQgfN4xX5p6+RQFhWUqscdvvK2xK/ZL8b3IXIJsj+4sD+f24NwnWy2BY8AJ82JB0A==",
"dev": true,
"optional": true,
"engines": {
"node": ">=0.10.0"
}
@ -6283,7 +6297,8 @@
"version": "0.4.2",
"resolved": "https://registry.npmjs.org/chardet/-/chardet-0.4.2.tgz",
"integrity": "sha512-j/Toj7f1z98Hh2cYo2BVr85EpIRWqUi7rtRSGxh/cqUjqrnJe9l9UE7IUGd2vQ2p+kSHLkSzObQPZPLUC6TQwg==",
"dev": true
"dev": true,
"optional": true
},
"node_modules/charenc": {
"version": "0.0.2",
@ -6396,7 +6411,8 @@
"resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.3.3.tgz",
"integrity": "sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A==",
"deprecated": "CircularJSON is in maintenance only, flatted is its successor.",
"dev": true
"dev": true,
"optional": true
},
"node_modules/clap": {
"version": "1.2.3",
@ -10322,6 +10338,7 @@
"resolved": "https://registry.npmjs.org/espree/-/espree-3.5.4.tgz",
"integrity": "sha512-yAcIQxtmMiB/jL32dzEp2enBeidsB7xWPLNiw3IIkpVds1P+h7qF9YwJq1yUNzp2OKXgAprs4F61ih66UsoD1A==",
"dev": true,
"optional": true,
"dependencies": {
"acorn": "^5.5.0",
"acorn-jsx": "^3.0.0"
@ -10335,6 +10352,7 @@
"resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.4.tgz",
"integrity": "sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg==",
"dev": true,
"optional": true,
"bin": {
"acorn": "bin/acorn"
},
@ -10656,6 +10674,7 @@
"resolved": "https://registry.npmjs.org/external-editor/-/external-editor-2.2.0.tgz",
"integrity": "sha512-bSn6gvGxKt+b7+6TKEv1ZycHleA7aHhRHyAqJyp5pbUFuYYNIzpZnQDk7AsYckyWdEnTeAnay0aCy2aV6iTk9A==",
"dev": true,
"optional": true,
"dependencies": {
"chardet": "^0.4.0",
"iconv-lite": "^0.4.17",
@ -10886,6 +10905,7 @@
"resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-2.0.0.tgz",
"integrity": "sha512-uXP/zGzxxFvFfcZGgBIwotm+Tdc55ddPAzF7iHshP4YGaXMww7rSF9peD9D1sui5ebONg5UobsZv+FfgEpGv/w==",
"dev": true,
"optional": true,
"dependencies": {
"flat-cache": "^1.2.1",
"object-assign": "^4.0.1"
@ -11020,6 +11040,7 @@
"resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.3.4.tgz",
"integrity": "sha512-VwyB3Lkgacfik2vhqR4uv2rvebqmDvFu4jlN/C1RzWoJEo8I7z4Q404oiqYCkq41mni8EzQnm95emU9seckwtg==",
"dev": true,
"optional": true,
"dependencies": {
"circular-json": "^0.3.1",
"graceful-fs": "^4.1.2",
@ -11036,6 +11057,7 @@
"integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
"deprecated": "Rimraf versions prior to v4 are no longer supported",
"dev": true,
"optional": true,
"dependencies": {
"glob": "^7.1.3"
},
@ -12246,6 +12268,7 @@
"resolved": "https://registry.npmjs.org/inquirer/-/inquirer-3.3.0.tgz",
"integrity": "sha512-h+xtnyk4EwKvFWHrUYsWErEVR+igKtLdchu+o0Z1RL7VU/jVMFbYir2bp6bAj8efFNxWqHX0dIss6fJQ+/+qeQ==",
"dev": true,
"optional": true,
"dependencies": {
"ansi-escapes": "^3.0.0",
"chalk": "^2.0.0",
@ -12268,6 +12291,7 @@
"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz",
"integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==",
"dev": true,
"optional": true,
"engines": {
"node": ">=4"
}
@ -12277,6 +12301,7 @@
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
"integrity": "sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==",
"dev": true,
"optional": true,
"dependencies": {
"ansi-regex": "^3.0.0"
},
@ -15250,6 +15275,7 @@
"resolved": "https://registry.npmjs.org/pluralize/-/pluralize-7.0.0.tgz",
"integrity": "sha512-ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow==",
"dev": true,
"optional": true,
"engines": {
"node": ">=4"
}
@ -18256,6 +18282,7 @@
"resolved": "https://registry.npmjs.org/regexpp/-/regexpp-1.1.0.tgz",
"integrity": "sha512-LOPw8FpgdQF9etWMaAfG/WRthIdXJGYp4mJ2Jgn/2lpkbod9jPn0t9UqN7AxBOKNfzRbYyVfgc7Vk4t/MpnXgw==",
"dev": true,
"optional": true,
"engines": {
"node": ">=4.0.0"
}
@ -18525,6 +18552,7 @@
"resolved": "https://registry.npmjs.org/require-uncached/-/require-uncached-1.0.3.tgz",
"integrity": "sha512-Xct+41K3twrbBHdxAgMoOS+cNcoqIjfM2/VxBF4LL2hVph7YsF8VSKyQ3BDFZwEVbok9yeDl2le/qo0S77WG2w==",
"dev": true,
"optional": true,
"dependencies": {
"caller-path": "^0.1.0",
"resolve-from": "^1.0.0"
@ -18538,6 +18566,7 @@
"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-1.0.1.tgz",
"integrity": "sha512-kT10v4dhrlLNcnO084hEjvXCI1wUG9qZLoz2RogxqDQQYy7IxjI/iMUkOtQTNEh6rzHxvdQWHsJyel1pKOVCxg==",
"dev": true,
"optional": true,
"engines": {
"node": ">=0.10.0"
}
@ -18802,13 +18831,15 @@
"version": "4.0.8",
"resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-4.0.8.tgz",
"integrity": "sha512-Cun9QucwK6MIrp3mry/Y7hqD1oFqTYLQ4pGxaHTjIdaFDWRGGLikqp6u8LcWJnzpoALg9hap+JGk8sFIUuEGNA==",
"dev": true
"dev": true,
"optional": true
},
"node_modules/rx-lite-aggregates": {
"version": "4.0.8",
"resolved": "https://registry.npmjs.org/rx-lite-aggregates/-/rx-lite-aggregates-4.0.8.tgz",
"integrity": "sha512-3xPNZGW93oCjiO7PtKxRK6iOVYBWBvtf9QHDfU23Oc+dLIQmAV//UnyXV/yihv81VS/UqoQPk4NegS8EFi55Hg==",
"dev": true,
"optional": true,
"dependencies": {
"rx-lite": "*"
}
@ -19199,6 +19230,7 @@
"resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-1.0.0.tgz",
"integrity": "sha512-POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg==",
"dev": true,
"optional": true,
"dependencies": {
"is-fullwidth-code-point": "^2.0.0"
},
@ -20056,6 +20088,7 @@
"resolved": "https://registry.npmjs.org/table/-/table-4.0.2.tgz",
"integrity": "sha512-UUkEAPdSGxtRpiV9ozJ5cMTtYiqz7Ni1OGqLXRCynrvzdtR1p+cfOWe2RJLwvUG8hNanaSRjecIqwOjqeatDsA==",
"dev": true,
"optional": true,
"dependencies": {
"ajv": "^5.2.3",
"ajv-keywords": "^2.1.0",
@ -20070,6 +20103,7 @@
"resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz",
"integrity": "sha512-Ajr4IcMXq/2QmMkEmSvxqfLN5zGmJ92gHXAeOXq1OekoH2rfDNsgdDoL2f7QaRCy7G/E6TpxBVdRuNraMztGHw==",
"dev": true,
"optional": true,
"dependencies": {
"co": "^4.6.0",
"fast-deep-equal": "^1.0.0",
@ -20082,6 +20116,7 @@
"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-2.1.1.tgz",
"integrity": "sha512-ZFztHzVRdGLAzJmpUT9LNFLe1YiVOEylcaNpEutM26PVTCtOD919IMfD01CgbRouB42Dd9atjx1HseC15DgOZA==",
"dev": true,
"optional": true,
"peerDependencies": {
"ajv": "^5.0.0"
}
@ -20090,13 +20125,15 @@
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz",
"integrity": "sha512-fueX787WZKCV0Is4/T2cyAdM4+x1S3MXXOAhavE1ys/W42SHAPacLTQhucja22QBYrfGw50M2sRiXPtTGv9Ymw==",
"dev": true
"dev": true,
"optional": true
},
"node_modules/table/node_modules/json-schema-traverse": {
"version": "0.3.1",
"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
"integrity": "sha512-4JD/Ivzg7PoW8NzdrBSr3UFwC9mHgvI7Z6z3QGBsSHgKaRTUDmyZAAKJo2UbG1kUVfS9WS8bi36N49U1xw43DA==",
"dev": true
"dev": true,
"optional": true
},
"node_modules/tapable": {
"version": "1.1.3",
@ -22480,6 +22517,7 @@
"resolved": "https://registry.npmjs.org/write/-/write-0.2.1.tgz",
"integrity": "sha512-CJ17OoULEKXpA5pef3qLj5AxTJ6mSt7g84he2WIskKwqFO4T97d5V7Tadl0DYDk7qyUOQD5WlUlOMChaYrhxeA==",
"dev": true,
"optional": true,
"dependencies": {
"mkdirp": "^0.5.1"
},


+ 12018
- 12008
admin-pc/yarn.lock
File diff suppressed because it is too large
View File


+ 0
- 1
module-common/src/main/java/org/jeecg/api/controller/AppletIndexController.java View File

@ -40,7 +40,6 @@ public class AppletIndexController {
}
//查询回收商品分类品类
@ApiOperation(value="查询回收商品分类品类", notes="查询回收商品分类品类")
@GetMapping(value = "/getClassList")


+ 1
- 1
module-common/src/main/java/org/jeecg/api/service/impl/AppletMoneyLogServiceImpl.java View File

@ -132,7 +132,7 @@ public class AppletMoneyLogServiceImpl implements AppletMoneyLogService {
request.transferSceneId = map.get("transferSceneId").toString();
request.openid = map.get("openid").toString();
request.userName = client.encrypt(map.get("userName").toString());
request.transferAmount = commonMoneyLog.getMoney().longValue()*100;//单位为分
request.transferAmount = commonMoneyLog.getMoney().multiply(new BigDecimal(100)).longValue();//单位为分
request.transferRemark = map.get("transferRemark").toString();
request.notifyUrl = map.get("notifyUrl").toString();
request.userRecvPerception = map.get("userRecvPerception").toString();


Loading…
Cancel
Save