From 197dfadb0b6498d71b364e8a4b2b81480f11eca8 Mon Sep 17 00:00:00 2001 From: Guoqs <123@jsowell.com> Date: Wed, 10 Jul 2024 15:49:42 +0800 Subject: [PATCH 1/6] =?UTF-8?q?update=20=E4=BF=AE=E6=94=B9=E7=BB=93?= =?UTF-8?q?=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...YKCBusinessServiceImpl.java => YKCBusinessServiceImpl2.java} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename jsowell-netty/src/main/java/com/jsowell/netty/service/electricbicycles/impl/{YKCBusinessServiceImpl.java => YKCBusinessServiceImpl2.java} (97%) diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/service/electricbicycles/impl/YKCBusinessServiceImpl.java b/jsowell-netty/src/main/java/com/jsowell/netty/service/electricbicycles/impl/YKCBusinessServiceImpl2.java similarity index 97% rename from jsowell-netty/src/main/java/com/jsowell/netty/service/electricbicycles/impl/YKCBusinessServiceImpl.java rename to jsowell-netty/src/main/java/com/jsowell/netty/service/electricbicycles/impl/YKCBusinessServiceImpl2.java index 13893aad0..8317640c7 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/service/electricbicycles/impl/YKCBusinessServiceImpl.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/service/electricbicycles/impl/YKCBusinessServiceImpl2.java @@ -21,7 +21,7 @@ import org.springframework.stereotype.Service; @Slf4j @Service -public class YKCBusinessServiceImpl implements YKCBusinessService { +public class YKCBusinessServiceImpl2 implements YKCBusinessService { @Autowired private PileMsgRecordService pileMsgRecordService; From 2fb77c27f7f1cc087c4920ccc1ce2258f093cbae Mon Sep 17 00:00:00 2001 From: Guoqs <123@jsowell.com> Date: Wed, 10 Jul 2024 16:38:21 +0800 Subject: [PATCH 2/6] =?UTF-8?q?pre=E7=8E=AF=E5=A2=83=E5=9B=9E=E8=B0=83?= =?UTF-8?q?=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jsowell-admin/src/main/resources/application-pre.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jsowell-admin/src/main/resources/application-pre.yml b/jsowell-admin/src/main/resources/application-pre.yml index 24ecbd3b9..1f86a2067 100644 --- a/jsowell-admin/src/main/resources/application-pre.yml +++ b/jsowell-admin/src/main/resources/application-pre.yml @@ -150,7 +150,7 @@ wechat: #异步接收微信支付结果通知的回调地址 callback: https://api.jsowellcloud.com/uniapp/pay/wechatPayCallback #异步接收微信退款结果通知的回调地址 - refundCallback: https://api.jsowellcloud.com/uniapp/pay/wechatPayRefundCallback + refundCallback: https://apitest.jsowellcloud.com/uniapp/pay/wechatPayRefundCallback #商户证书私钥路径 key: path: /usr/local/1632405339_20221125_cert/apiclient_key.pem @@ -160,7 +160,7 @@ wechat: adapay: debugFlag: false prodMode: true - callback: http://api.jsowellcloud.com/uniapp/pay/adapayCallback + callback: http://apitest.jsowellcloud.com/uniapp/pay/adapayCallback jsowell: apiKey: api_live_b9bff039-0598-4491-88e7-06ca6dc7289e mockApiKey: api_test_15662261-8123-4b51-95d9-ad0af60eab53 From 70b568f4b6c224422b837d28916aeb97fe7d9fde Mon Sep 17 00:00:00 2001 From: Guoqs <123@jsowell.com> Date: Thu, 11 Jul 2024 09:16:04 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E9=A2=84=E7=BA=A6=E5=90=AF=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pile/service/impl/PileReservationInfoServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileReservationInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileReservationInfoServiceImpl.java index ec08ba362..9c68eabdf 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileReservationInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileReservationInfoServiceImpl.java @@ -108,7 +108,7 @@ public class PileReservationInfoServiceImpl implements PileReservationInfoServic } /** - * 启用预约 + * 启用预约/开启预约/启动预约 */ @Override public void activateReserved(PileReservationDTO dto) { @@ -141,7 +141,7 @@ public class PileReservationInfoServiceImpl implements PileReservationInfoServic } // 如果 vinCodes 的数量少于 3，用 "0" 补足 while (vinCodes.size() < 3) { - vinCodes.add("0"); + vinCodes.add(""); } String type = StringUtils.equals(pileReservationInfo.getReservationType(), "single") ? "00" : "01"; From 924298633d1f320245b19e2d7ca3f08c4fc5a91a Mon Sep 17 00:00:00 2001 From: Guoqs <123@jsowell.com> Date: Thu, 11 Jul 2024 14:57:38 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jsowell-ui/src/views/system/user/index.vue | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/jsowell-ui/src/views/system/user/index.vue b/jsowell-ui/src/views/system/user/index.vue index 48a78e42d..59aa8ab92 100644 --- a/jsowell-ui/src/views/system/user/index.vue +++ b/jsowell-ui/src/views/system/user/index.vue @@ -29,10 +29,10 @@ - + - + @@ -207,6 +207,13 @@ + + + + + + + From 4cb02202b99b9d06330974acfb72fbd590882e89 Mon Sep 17 00:00:00 2001 From: Guoqs <123@jsowell.com> Date: Thu, 11 Jul 2024 16:01:08 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E8=B4=A6=E5=8F=B7=E4=B8=BA=20=E6=89=8B=E6=9C=BA=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pile/service/impl/PileMerchantInfoServiceImpl.java | 8 ++++---- jsowell-ui/src/views/pile/merchant/index.vue | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMerchantInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMerchantInfoServiceImpl.java index edc2d9dc1..744a451b5 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMerchantInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMerchantInfoServiceImpl.java @@ -173,12 +173,12 @@ public class PileMerchantInfoServiceImpl implements PileMerchantInfoService { int i = pileMerchantInfoMapper.insertPileMerchantInfo(pileMerchantInfo); // 3 创建运营商管理员 - if (StringUtils.isNotBlank(dto.getUserName())) { + if (StringUtils.isNotBlank(dto.getManagerPhone())) { SysUser user = new SysUser(); user.setDeptId(deptId); - user.setUserName(dto.getUserName()); - user.setNickName(dto.getUserName() + "运营商管理员"); - user.setPassword(dto.getPassword()); + user.setUserName(dto.getManagerPhone()); + user.setNickName(dto.getMerchantName() + "-管理员"); + user.setPassword("a" + dto.getManagerPhone()); user.setStatus(Constants.ZERO); user.setPostIds(new Long[]{}); user.setRoleIds(new Long[]{3L}); diff --git a/jsowell-ui/src/views/pile/merchant/index.vue b/jsowell-ui/src/views/pile/merchant/index.vue index c8135b14e..6dcb758f1 100644 --- a/jsowell-ui/src/views/pile/merchant/index.vue +++ b/jsowell-ui/src/views/pile/merchant/index.vue @@ -295,6 +295,7 @@ export default { message: "请输入负责人电话号码", trigger: "blur", }, + { pattern: /^1[3456789]\d{9}$/, message: '手机号码格式不正确', trigger: 'blur' } ], servicePhone: [ { From b507b28c89f96c4931058828e65c5f853ab0b8f2 Mon Sep 17 00:00:00 2001 From: Guoqs <123@jsowell.com> Date: Thu, 11 Jul 2024 16:24:02 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E8=B4=A6=E5=8F=B7=E4=B8=BA=20=E6=89=8B=E6=9C=BA=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jsowell-ui/src/views/pile/merchant/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jsowell-ui/src/views/pile/merchant/index.vue b/jsowell-ui/src/views/pile/merchant/index.vue index 6dcb758f1..dbce136f0 100644 --- a/jsowell-ui/src/views/pile/merchant/index.vue +++ b/jsowell-ui/src/views/pile/merchant/index.vue @@ -153,7 +153,7 @@ - + 第三方小程序登录拼接授权链接