czg_team/cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/test' into test

Browse Source
This commit is contained in:
wangw
2025-12-22 17:06:44 +08:00
parent 004cf75e22 566db778a6
commit 938e7d69ce
4 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cash-service/account-service/src/main/java/com/czg/service/account/service/impl/AShopUserServiceImpl.java
View File

@@ -35,6 +35,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.text.ParseException;
import java.util.List; import java.util.List;
@@ -168,6 +169,11 @@ public class AShopUserServiceImpl implements AShopUserService {
shopUser.setUserId(userInfo.getId()); shopUser.setUserId(userInfo.getId());
shopUser.setMainShopId(shopInfoService.getMainIdByShopId(shopId)); shopUser.setMainShopId(shopInfoService.getMainIdByShopId(shopId));
shopUser.setJoinTime(shopUser.getIsVip() != null && shopUser.getIsVip() == 1 ? DateUtil.date().toLocalDateTime() : null); 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); return shopUserService.save(shopUser);
} }

4
cash-service/account-service/src/main/java/com/czg/service/account/util/WechatMiniMsgUtil.java
View File

@@ -87,7 +87,7 @@ public class WechatMiniMsgUtil {
CzgResult<SysParamsDTO> callNear = sysParamsService.getParamsByCode(ParamCodeCst.System.WX_MINI_MSG_CALL_NEAR); CzgResult<SysParamsDTO> callNear = sysParamsService.getParamsByCode(ParamCodeCst.System.WX_MINI_MSG_CALL_NEAR);
CzgResult<SysParamsDTO> callCurrent = sysParamsService.getParamsByCode(ParamCodeCst.System.WX_MINI_MSG_CALL_CURRENT); CzgResult<SysParamsDTO> callCurrent = sysParamsService.getParamsByCode(ParamCodeCst.System.WX_MINI_MSG_CALL_CURRENT);
Map<String, Object> data = new HashMap<String, Object>() {{ Map<String, Object> data = new HashMap<>() {{
put("thing1", new HashMap<String, Object>() {{ put("thing1", new HashMap<String, Object>() {{
put("value", shopName); 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) { public void sendPassCallMsg(String shopName, String state, String callNum, String currentNum, String note, String openId) {
CzgResult<SysParamsDTO> callPass = sysParamsService.getParamsByCode(ParamCodeCst.System.WX_MINI_MSG_CALL_PASS); CzgResult<SysParamsDTO> callPass = sysParamsService.getParamsByCode(ParamCodeCst.System.WX_MINI_MSG_CALL_PASS);
Map<String, Object> data = new HashMap<String, Object>() {{ Map<String, Object> data = new HashMap<>() {{
put("thing1", new HashMap<String, Object>() {{ put("thing1", new HashMap<String, Object>() {{
put("value", shopName); put("value", shopName);
}}); }});

4
cash-service/account-service/src/main/resources/mapper/SysMenuMapper.xml
View File

@@ -11,7 +11,9 @@
left join sys_menu as c on c.menu_id = b.menu_id 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 where a.user_id = #{userId} and c.menu_id is not null
<if test="type != null"> <if test="type != null">
and b.type=#{type} <if test="type == 0">
and b.type = #{type}
</if>
</if> </if>
order by menu_sort desc order by menu_sort desc
</select> </select>

2
cash-service/system-service/src/main/java/com/czg/service/system/service/impl/SmsServiceImpl.java
View File

@@ -57,7 +57,7 @@ public class SmsServiceImpl implements SmsService {
Client client = createClient(); Client client = createClient();
// 1.发送短信 // 1.发送短信
com.aliyun.dysmsapi20170525.models.SendSmsRequest sendSmsRequest = new com.aliyun.dysmsapi20170525.models.SendSmsRequest() com.aliyun.dysmsapi20170525.models.SendSmsRequest sendSmsRequest = new com.aliyun.dysmsapi20170525.models.SendSmsRequest()
.setSignName("银收客") .setSignName("陕西超掌柜科技")
.setTemplateCode(templateCode) .setTemplateCode(templateCode)
.setTemplateParam("{\"code\":" + "'" + checkCode + "'" + "}") .setTemplateParam("{\"code\":" + "'" + checkCode + "'" + "}")
.setPhoneNumbers(phone); .setPhoneNumbers(phone);