czg_team
/
wx-cashier-service
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'lyf' of https://e.coding.net/g-cphe0354/shouyinjixitong/wx-cashier-service into lyf

This commit is contained in:
韩鹏辉 2024-06-21 13:57:10 +08:00
parent 4567c8ab4a 94f769e091
commit 14b75d982d
3 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/chaozhanggui/system/cashierservice/netty/PushToClientChannelHandlerAdapter.java
View File

@ -113,6 +113,10 @@ public class PushToClientChannelHandlerAdapter extends NettyChannelHandlerAdapte
this.shopId=shopId;
if (webSocketMap.containsKey(shopId)) {
ConcurrentHashMap<String, ChannelHandlerContext> clientSocketMap = webSocketMap.get(shopId);
ChannelHandlerContext channelHandlerContext = clientSocketMap.get(clientId);
if (channelHandlerContext != null) {
channelHandlerContext.close();
}
clientSocketMap.put(clientId, ctx);
} else {
ConcurrentHashMap<String, ChannelHandlerContext> clientSocketMap = new ConcurrentHashMap<>();

2
src/main/java/com/chaozhanggui/system/cashierservice/service/HomePageService.java
View File

@ -22,10 +22,8 @@ import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.ExecutionException;
/**
* @author lyf

8
src/main/java/com/chaozhanggui/system/cashierservice/service/LoginService.java
View File

@ -116,16 +116,10 @@ public class LoginService {
tbUserInfoMapper.updateByPrimaryKeySelective(userInfo);
List<TbShopUser> tbShopUsers = tbShopUserMapper.selectAllByUserId(userInfo.getId().toString());
for (TbShopUser tbShopUser : tbShopUsers) {
tbShopUser.setUserId("");
tbShopUser.setUserId(null);
tbShopUser.setUpdatedAt(System.currentTimeMillis());
tbShopUserMapper.upUserBYId(tbShopUser);
}
List<TbShopUser> tbShopUsers1 = tbShopUserMapper.selectByPhone(telephone);
for (TbShopUser tbShopUser : tbShopUsers1) {
tbShopUser.setUpdatedAt(System.currentTimeMillis());
tbShopUser.setUserId(userInfo.getId().toString());
tbShopUserMapper.upUserBYId(tbShopUser);
}
}
}
}