Skip to content

M
midjourney-proxy
Commit 14d9faea by 阮思源
Options

Merge branch 'feat-zdw-1001921' into 'master' 

修改渠道id

See merge request rays/pcloud-book!238
parents e06f5ca3 f62a075a
Showing with 7 additions and 5 deletions
pcloud-service-book/src/main/java/com/pcloud/book/weixinclock/biz/impl/WeixinClockBizImpl.java
...@@ -580,11 +580,13 @@ public class WeixinClockBizImpl implements WeixinClockBiz { ...@@ -580,11 +580,13 @@ public class WeixinClockBizImpl implements WeixinClockBiz {
WeixinClockDto weixinClockDto = weixinClockGroupClassifyDao.getClockBaseInfoByClassify(classifyQrcodeInfo.getClassifyId()); WeixinClockDto weixinClockDto = weixinClockGroupClassifyDao.getClockBaseInfoByClassify(classifyQrcodeInfo.getClassifyId());
WeixinClockMember clockMember = weixinClockMemberDao.getByWxUserId(wechatGroupId, userWxId); WeixinClockMember clockMember = weixinClockMemberDao.getByWxUserId(wechatGroupId, userWxId);
AppDto appDto = appConsr.getBaseById(weixinClockDto.getClockPrizeId()); AppDto appDto = appConsr.getBaseById(weixinClockDto.getClockPrizeId());
Long channelId = null; Long channelId = classifyQrcodeInfo.getChannelId();
if(null == appDto) { if (null == channelId) {
channelId = adviserConsr.getDefaultChannel(weixinClockDto.getCreateUser()); if (null == appDto) {
}else { channelId = adviserConsr.getDefaultChannel(weixinClockDto.getCreateUser());
channelId = appDto.getChannelId(); } else {
channelId = appDto.getChannelId();
}
} }
Long wechatUserId = readerConsr.getWechatUserId(userWxId, channelId); Long wechatUserId = readerConsr.getWechatUserId(userWxId, channelId);
GroupUserDTO groupUserDTO = wechatGroupConsr.getWxUserInfoByWxUserId(userWxId); GroupUserDTO groupUserDTO = wechatGroupConsr.getWxUserInfoByWxUserId(userWxId);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment