diff --git a/fuintAdmin/src/views/member/userInfoOrder/growthValueRecord.vue b/fuintAdmin/src/views/member/userInfoOrder/growthValueRecord.vue index 9a282f24d..b65e0c6d8 100644 --- a/fuintAdmin/src/views/member/userInfoOrder/growthValueRecord.vue +++ b/fuintAdmin/src/views/member/userInfoOrder/growthValueRecord.vue @@ -34,7 +34,8 @@ export default { } }, created() { - this.userId = this.pUserId; + // this.userId = this.pUserId; + this.userId = this.$route.query.id; }, methods:{ getList(){ diff --git a/fuintAdmin/src/views/member/userInfoOrder/refuelMoneyRecord.vue b/fuintAdmin/src/views/member/userInfoOrder/refuelMoneyRecord.vue index 1b87e17cf..d976112ec 100644 --- a/fuintAdmin/src/views/member/userInfoOrder/refuelMoneyRecord.vue +++ b/fuintAdmin/src/views/member/userInfoOrder/refuelMoneyRecord.vue @@ -35,7 +35,8 @@ export default { } }, created() { - this.userId = this.pUserId; + // this.userId = this.pUserId; + this.userId = this.$route.query.id; }, methods:{ getList(){ diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeExchange/service/impl/ActiveExchangeServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeExchange/service/impl/ActiveExchangeServiceImpl.java index c1a42a4a0..388d94b4b 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeExchange/service/impl/ActiveExchangeServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeExchange/service/impl/ActiveExchangeServiceImpl.java @@ -637,7 +637,7 @@ public class ActiveExchangeServiceImpl implements ActiveExchangeService { BigDecimal bigDecimal1 = BigDecimal.valueOf(oilPriceById); String oilTypebyId = oilNameMapper.getOilTypebyId(oilId); - String gradeId = ljUserGradeMapper.selectByUserId(paymentActiveDTO.getStoreId(), userId); + String gradeId = paymentActiveDTO.getMtUserLevel().toString(); if (StringUtils.isNotEmpty(gradeId)){ LJUserGrade ljUserGrade = ljUserGradeMapper.selectAllByGradeId(gradeId); if (ObjectUtils.isNotEmpty(ljUserGrade)){ diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/LJUserGradeServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/LJUserGradeServiceImpl.java index 3631e9017..72b2f1dfc 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/LJUserGradeServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/LJUserGradeServiceImpl.java @@ -218,15 +218,15 @@ public class LJUserGradeServiceImpl extends ServiceImpl ljUserGrades = this.selectUserGradeByChainStoreId(store.getChainStoreId()); for (LJUserGrade ljUserGrade : ljUserGrades) { - if (ljUserGrade.getGrade().equals(userGrade.getGrade()) && ljUserGrade.getId()!=userGrade.getId()){ + if (ljUserGrade.getGrade().equals(userGrade.getGrade()) && !ljUserGrade.getId().equals(userGrade.getId())){ row = 2; flag = true; } - if (ljUserGrade.getName().equals(userGrade.getName()) && ljUserGrade.getId()!=userGrade.getId()){ + if (ljUserGrade.getName().equals(userGrade.getName()) && !ljUserGrade.getId().equals(userGrade.getId())){ row = 3; flag = true; } - if (ljUserGrade.getGrowthValue().equals(userGrade.getGrowthValue()) && ljUserGrade.getId()!=userGrade.getId()){ + if (ljUserGrade.getGrowthValue().equals(userGrade.getGrowthValue()) && !ljUserGrade.getId().equals(userGrade.getId())){ row = 4; flag = true; } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/module/AlipayApi/service/impl/AlipayServiceImpl1.java b/fuintBackend/fuint-application/src/main/java/com/fuint/module/AlipayApi/service/impl/AlipayServiceImpl1.java index 6dfa53e59..31e10c78d 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/module/AlipayApi/service/impl/AlipayServiceImpl1.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/module/AlipayApi/service/impl/AlipayServiceImpl1.java @@ -73,8 +73,7 @@ public class AlipayServiceImpl1 implements AlipayService1 { //1. 获取验签和解密所需要的参数 Map openapiResult = JSON.parseObject(encryptedData, - new TypeReference>() { - }, Feature.OrderedField); + new TypeReference>() {}, Feature.OrderedField); String signType = "RSA2"; String charset = "UTF-8"; String encryptType = "AES"; @@ -90,8 +89,7 @@ public class AlipayServiceImpl1 implements AlipayService1 { // String signVeriKey = "你的小程序对应的支付宝公钥(为扩展考虑建议用appId+signType做密钥存储隔离)"; String signVeriKey = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnwDxxSNpBKL8xjtU3leNBy9mIOMYOr0WgxGbCxTMfhUPka9nr8Hbt0GN+7ylNBmxCYvW8kmge4dCOLUPqseM9+HyF9R1NrWBB3zQPVqnD0mKCYr9cEgtx6/eU7oIK1FqAl0G+jNIT3IKWMSXEX09yPKJWS6zk7+FRzOzn11vShTFjmrqWdrisJgRsQ54PHhPkQz7xFojDRqIunlpICWUVA8GwUg02hm5ZEhxpMHEWoJZ6Dj1wPH2Vh4CpIT/mjtD+SvssCpT0/XOEDPajcMRfgoV8fyyN0JNQDVZdMZgSO4aRHQqhC3X5CBXSuv40hHnwjcDjsPcbVav5BtaPp3wPQIDAQAB"; // String decryptKey = "你的小程序对应的加解密密钥(为扩展考虑建议用appId+encryptType做密钥存储隔离)" - String decryptKey = "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCJJM2nlUCidns6anNtGUiCL+J83kNL1nrr6hNktHkrX9bhR8LiBU3qBX+MkGDY4snlbdz+anGWu8YkcMlfBlAr82AsdIS9UTHh3lgsIAZTBZHgzZrxn7vwHfHI6Kw7uGZJbZ320JEG3s0KyvGiW0eqGuWI4BW+sD7b6JoLtNfBq+yF9ObOcs76rNCWz+04BmhCH7i6d8arK8NKgEiI9EjBThGjLRDFK1ryacKpz4UVvIXgxEW5w0MTjo/Q7gp2VLpwE/4jc8QfDFwmGU75L+nhK0rr1l0wwSo7svWFAXvberzMCGyuuLomuh2ldDfERJbIjg/qU66gx0EML1tgpVtFAgMBAAECggEARTArDJuwswXBH3Rq7SRvPza3NbXQD6eR9gjuZcTiyG4ecyMH/40bhK/nbFu+cEzh/HxTnIrI6Xmr+eBoxybhNXsgDu1ttjELUF8i7oftiN7rfJVd0P58CySgQXKYybw65lqF8enA8M1gdkxyYS1Z10igelBKyBwUak9LwBIpM0wrPIFrLhoxIEJC6QJ8EDnm6lKbytvcCa2mMZmtWs8oFxNA/SLRWtdEgHk4hslQVqq4R8B/xUy9Cu4kjdnVMHG2MqFXOiTas3gyKZLGN1ACBfpxxtyw0RAfX294ChV4SIvp10s1VqBFudcQeXeV5ph0NXP1eNt/8o3HIu0vjc0jAQKBgQD5ZtOR19M5vAcxJykh5u01CPdfz2LztqdinCpkBIpFviceW/k1euQFaWbOKdYFUrPnuLgX7Ds6dhSrkoL1+1RiVKUR6AtqIMa4fZJIMJWEPNNYWl8s6u6j11Dkd0B10g5+KV/kKLSlwFuBQnDyHw1ND+WKHqj9vkkzimzfcwedBQKBgQCMxao2IKX8CNjXDuryGkmXac0wxql0nN8AFHjCQGm16GPwlp805nAwsHKfJK45ACeixnWH9Cn6sje3yOUpCw6KG4OougRkrQEkQpoPVrZuXEcZ4j4Wg64VgW9tUAVH/WOV0VDnOBpsM8mbKsLLglb1H9Bx7813IX1pmhm93a0ZQQKBgD6U48/75T/eg7t8xSCBrtIZDuHWy1C2a6gd4bE5Rm0buvsuPwmBbchB248uBktNpmEmA+PU3kPcL3GiEQSibVlDPiyRGpQl51eSAuvkbRBCpxHLk4hU507rj5vUpLMr44Ea5rn80N+qtgtoXakTy6WjsIiJCwSpA/tP5+PmHGn1AoGASY/VhZmEA3OAFMnX3pH8GOKR9kYqMST0p28LN78/Pm7lIskjAxrUT601CJK7dE/vZnE848Gk2judQC38CnmbrHH6WAZ020NI0HD5XsCabotMIGuItG01YEmWN9JUIC16h8Ss+Vbo/9gEJ1CuIHjJBikM3S1J+lIG3lNH1l7r4MECgYEA2eAV0x55cmjC6VIMk3EAVUFbJ1LY1U9irmI6B5e7k/OVcdRksJfMRJwcquYVSfAk4hDrl7x0Qy36XELGvMe/hx07HxeAOXON8gL1b3UHP1zxvXb90YLHseHn9lssABsXS6Enyv3nrzqUi/uzBvpdDE2SRVS6nUr7Yyui6Yl+UPA=" - ; + String decryptKey = "5k9tQMrXq1JEpVucLwvO7A=="; //如果是加密的报文则需要在密文的前后添加双引号 if (isDataEncrypted) { signContent = "\"" + signContent + "\""; diff --git a/gasStation-uni/pages/refuel/refuel.vue b/gasStation-uni/pages/refuel/refuel.vue index c5288b8ec..134a55d47 100644 --- a/gasStation-uni/pages/refuel/refuel.vue +++ b/gasStation-uni/pages/refuel/refuel.vue @@ -121,7 +121,7 @@ return { appltType:uni.getStorageSync("appltType"), value: '', - liters:"", + liters:0, show: false, pic: 0, hindex: 0,