修改相关bug

admin

2021-01-15 5405154d6979f1b50ce2d881bb164b1acca80b6d

 service-lucky/src/main/java/com/ks/lucky/service/impl/remote/LuckyActivityJoinAssistServiceImpl.java

@@ -45,7 +45,6 @@
    private LuckyActivityMapper luckyActivityMapper;

    @Transactional(rollbackFor = Exception.class)
    @Validated
    @Override
    public void assist(Long activityId, Long appId, String uid, String targetUid, ActivityJoinAssistEvent eventKey, int weight) throws LuckyActivityException, LuckyActivityJoinAssistException {

@@ -95,7 +94,7 @@
        luckyActivityJoinAssistMapper.insertSelective(assist);


        LuckyActivityUserWeightRecord weightRecord = LuckyActivityUserWeightRecordFactory.createAssist(activityId, appId, uid, eventKey, weight);
        LuckyActivityUserWeightRecord weightRecord = LuckyActivityUserWeightRecordFactory.createAssist(activityId, appId, targetUid, eventKey, weight);
        try {
            luckyActivityUserWeightRecordManager.addRecord(weightRecord);
        } catch (ParamsException e) {
@@ -103,11 +102,11 @@
        }

        //助力消息
        CMQManager.getInstance().publishActivityAssistMsg(new ActivityAssistMsgDTO(activityId, appId, uid, targetUid, true, assist.getCreateTime()));
        CMQManager.getInstance().publishActivityAssistMsg(new ActivityAssistMsgDTO(activityId, appId, uid, targetUid, true, assist.getCreateTime(),eventKey));
    }

    @Override
    public boolean isAssisted(@NotNull Long joinId, @NotEmpty Long appId, @NotEmpty String uid, @NotNull ActivityJoinAssistEvent eventKey) {
    public boolean isAssisted(@NotNull Long joinId, @NotNull Long appId, @NotEmpty String uid, @NotNull ActivityJoinAssistEvent eventKey) {
        ActivityJoinAssistQuery query = new ActivityJoinAssistQuery();
        query.joinId = joinId;
        query.appId = appId;
@@ -117,18 +116,31 @@
    }

    @Override
    public LuckyActivityJoinAssist getRecord(@NotNull Long joinId, @NotEmpty Long appId, @NotEmpty String uid, @NotNull ActivityJoinAssistEvent eventKey) {
        ActivityJoinAssistQuery query = new ActivityJoinAssistQuery();
        query.joinId = joinId;
        query.appId = appId;
        query.uid = uid;
        query.eventKey = eventKey;
        query.count = 1;
        List<LuckyActivityJoinAssist> assistList = luckyActivityJoinAssistMapper.list(query);
        if (assistList == null || assistList.size() == 0) {
            return null;
    public LuckyActivityJoinAssist getRecord(Long joinId, Long activityId, @NotNull Long appId, @NotEmpty String uid, @NotNull ActivityJoinAssistEvent eventKey) {
        if (joinId != null) {
            ActivityJoinAssistQuery query = new ActivityJoinAssistQuery();
            query.joinId = joinId;
            query.appId = appId;
            query.uid = uid;
            query.eventKey = eventKey;
            query.count = 1;
            List<LuckyActivityJoinAssist> assistList = luckyActivityJoinAssistMapper.list(query);
            if (assistList == null || assistList.size() == 0) {
                return null;
            }
            return assistList.get(0);
        } else {
            ActivityJoinAssistQuery query = new ActivityJoinAssistQuery();
            query.appId = appId;
            query.uid = uid;
            query.eventKey = eventKey;
            query.count = 1;
            List<LuckyActivityJoinAssist> assistList = luckyActivityJoinAssistMapper.listByActivityId(query, activityId);
            if (assistList == null || assistList.size() == 0) {
                return null;
            }
            return assistList.get(0);
        }
        return assistList.get(0);
    }

    @Override