Merge branch 'fixbug/fixmerge' into 'master'

bug: [none] fixUserCount

See merge request rays/pcloud-book!1080

pcloud-service-book/src/main/java/com/pcloud/book/applet/biz/impl/AppletUserBookcaseBizImpl.java

@@ -55,6 +55,7 @@ import com.pcloud.common.utils.ListUtils;
 import com.pcloud.common.utils.cache.redis.JedisClusterUtils;
 import com.pcloud.common.utils.string.StringUtil;
 import com.pcloud.readercenter.common.enums.YesOrNoNumEnum;
+import com.pcloud.readercenter.rmall.enums.MoneyReceiveTypeEnum;
 import com.pcloud.usercenter.party.adviser.dto.AdviserBaseInfoDto;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.MapUtils;
@@ -151,7 +152,7 @@ public class AppletUserBookcaseBizImpl implements AppletUserBookcaseBiz {
             RMALL_SIGN_IN.execute(()->{
                 //收藏埋点
                 RmallBookMoneyRecord rmallBookMoneyRecord = new RmallBookMoneyRecord();
-                rmallBookMoneyRecord.setWechatUserId(serveCollect.getWechatUserId());
+                rmallBookMoneyRecord.setWechatUserId(wechatUserId);
                 rmallBookMoneyRecord.setRecordType(MoneyReceiveTypeEnum.NEW_BOOK.key);
                 rmallBookMoneyRecordService.insert(rmallBookMoneyRecord);
             });