From 84020f7d8628703cf3c0d8a907cfd2342e1076f1 Mon Sep 17 00:00:00 2001 From: gong <1157756119@qq.com> Date: Mon, 22 Dec 2025 16:32:15 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9F=AD=E4=BF=A1?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/czg/service/account/util/WechatMiniMsgUtil.java | 4 ++-- .../com/czg/service/system/service/impl/SmsServiceImpl.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/util/WechatMiniMsgUtil.java b/cash-service/account-service/src/main/java/com/czg/service/account/util/WechatMiniMsgUtil.java index c9ba35790..f569bf739 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/util/WechatMiniMsgUtil.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/util/WechatMiniMsgUtil.java @@ -87,7 +87,7 @@ public class WechatMiniMsgUtil { CzgResult callNear = sysParamsService.getParamsByCode("wx_mini_msg_call_near"); CzgResult callCurrent = sysParamsService.getParamsByCode("wx_mini_msg_call_current"); - Map data = new HashMap() {{ + Map data = new HashMap<>() {{ put("thing1", new HashMap() {{ put("value", shopName); }}); @@ -114,7 +114,7 @@ public class WechatMiniMsgUtil { public void sendPassCallMsg(String shopName, String state, String callNum, String currentNum, String note, String openId) { CzgResult callPass = sysParamsService.getParamsByCode("wx_mini_msg_call_pass"); - Map data = new HashMap() {{ + Map data = new HashMap<>() {{ put("thing1", new HashMap() {{ put("value", shopName); }}); diff --git a/cash-service/system-service/src/main/java/com/czg/service/system/service/impl/SmsServiceImpl.java b/cash-service/system-service/src/main/java/com/czg/service/system/service/impl/SmsServiceImpl.java index c4e71de2b..80f4307ce 100644 --- a/cash-service/system-service/src/main/java/com/czg/service/system/service/impl/SmsServiceImpl.java +++ b/cash-service/system-service/src/main/java/com/czg/service/system/service/impl/SmsServiceImpl.java @@ -63,7 +63,7 @@ public class SmsServiceImpl implements SmsService { Client client = createClient(); // 1.发送短信 com.aliyun.dysmsapi20170525.models.SendSmsRequest sendSmsRequest = new com.aliyun.dysmsapi20170525.models.SendSmsRequest() - .setSignName("银收客") + .setSignName("陕西超掌柜科技") .setTemplateCode(templateCode) .setTemplateParam("{\"code\":" + "'" + checkCode + "'" + "}") .setPhoneNumbers(phone); From 696e1778460f59a66c4a8a3613d71f4193c162c2 Mon Sep 17 00:00:00 2001 From: gong <1157756119@qq.com> Date: Mon, 22 Dec 2025 16:42:38 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9D=83=E9=99=90?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/SysMenuMapper.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cash-service/account-service/src/main/resources/mapper/SysMenuMapper.xml b/cash-service/account-service/src/main/resources/mapper/SysMenuMapper.xml index aac89845c..0711b96ae 100644 --- a/cash-service/account-service/src/main/resources/mapper/SysMenuMapper.xml +++ b/cash-service/account-service/src/main/resources/mapper/SysMenuMapper.xml @@ -11,7 +11,9 @@ left join sys_menu as c on c.menu_id = b.menu_id where a.user_id = #{userId} and c.menu_id is not null - and b.type=#{type} + + and b.type = #{type} + order by menu_sort desc From e8855faf3d6a3524ec5f9a99bb3a39452311349a Mon Sep 17 00:00:00 2001 From: gong <1157756119@qq.com> Date: Mon, 22 Dec 2025 16:55:11 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E4=B8=8D=E4=BC=A0?= =?UTF-8?q?=E7=94=9F=E6=97=A5=E6=8A=A5=E9=94=99=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/account/service/impl/AShopUserServiceImpl.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/AShopUserServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/AShopUserServiceImpl.java index b4a484e92..3378f6b07 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/AShopUserServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/AShopUserServiceImpl.java @@ -172,6 +172,11 @@ public class AShopUserServiceImpl implements AShopUserService { shopUser.setUserId(userInfo.getId()); shopUser.setMainShopId(shopInfoService.getMainIdByShopId(shopId)); shopUser.setJoinTime(shopUser.getIsVip() != null && shopUser.getIsVip() == 1 ? DateUtil.date().toLocalDateTime() : null); + if (StrUtil.isBlank(shopUserAddDTO.getBirthDay())) { + shopUser.setBirthDay(null); + } else { + shopUser.setBirthDay(shopUserAddDTO.getBirthDay()); + } return shopUserService.save(shopUser); } From 566db778a612d2b28c8635ecbd5a19bfc172dbac Mon Sep 17 00:00:00 2001 From: gong <1157756119@qq.com> Date: Mon, 22 Dec 2025 17:01:06 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E4=B8=8D=E4=BC=A0?= =?UTF-8?q?=E7=94=9F=E6=97=A5=E6=8A=A5=E9=94=99=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/account/service/impl/AShopUserServiceImpl.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/AShopUserServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/AShopUserServiceImpl.java index 3378f6b07..a82725d91 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/AShopUserServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/AShopUserServiceImpl.java @@ -39,6 +39,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; +import java.text.ParseException; import java.util.List; @@ -172,10 +173,10 @@ public class AShopUserServiceImpl implements AShopUserService { shopUser.setUserId(userInfo.getId()); shopUser.setMainShopId(shopInfoService.getMainIdByShopId(shopId)); shopUser.setJoinTime(shopUser.getIsVip() != null && shopUser.getIsVip() == 1 ? DateUtil.date().toLocalDateTime() : null); - if (StrUtil.isBlank(shopUserAddDTO.getBirthDay())) { + try { + DateUtil.parse(shopUserAddDTO.getBirthDay(), "yyyy-MM-dd"); + } catch (Exception e) { shopUser.setBirthDay(null); - } else { - shopUser.setBirthDay(shopUserAddDTO.getBirthDay()); } return shopUserService.save(shopUser); }