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 757bac807..12ab6f4c2 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 @@ -35,6 +35,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; +import java.text.ParseException; import java.util.List; @@ -168,6 +169,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); + try { + DateUtil.parse(shopUserAddDTO.getBirthDay(), "yyyy-MM-dd"); + } catch (Exception e) { + shopUser.setBirthDay(null); + } return shopUserService.save(shopUser); } 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 1cbdac610..7608b9d00 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(ParamCodeCst.System.WX_MINI_MSG_CALL_NEAR); CzgResult callCurrent = sysParamsService.getParamsByCode(ParamCodeCst.System.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(ParamCodeCst.System.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/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 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 d136f398d..791b7d0e6 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 @@ -57,7 +57,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);