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

修改渠道id

See merge request rays/pcloud-book!238

pcloud-service-book/src/main/java/com/pcloud/book/weixinclock/biz/impl/WeixinClockBizImpl.java

@@ -580,11 +580,13 @@ public class WeixinClockBizImpl implements WeixinClockBiz {
         WeixinClockDto weixinClockDto = weixinClockGroupClassifyDao.getClockBaseInfoByClassify(classifyQrcodeInfo.getClassifyId());
         WeixinClockMember clockMember = weixinClockMemberDao.getByWxUserId(wechatGroupId, userWxId);
         AppDto appDto = appConsr.getBaseById(weixinClockDto.getClockPrizeId());
-        Long channelId = null;
-        if(null == appDto) {
-            channelId = adviserConsr.getDefaultChannel(weixinClockDto.getCreateUser());
-        }else {
-            channelId = appDto.getChannelId();
+        Long channelId = classifyQrcodeInfo.getChannelId();
+        if (null == channelId) {
+            if (null == appDto) {
+                channelId = adviserConsr.getDefaultChannel(weixinClockDto.getCreateUser());
+            } else {
+                channelId = appDto.getChannelId();
+            }
         }
         Long wechatUserId = readerConsr.getWechatUserId(userWxId, channelId);
         GroupUserDTO groupUserDTO = wechatGroupConsr.getWxUserInfoByWxUserId(userWxId);