Merge remote-tracking branch 'origin/score_shop' into score_shop

jyy

2021-04-20 f50e081f650eb067cce44fce3db64a237fde145b

 zq-erp/src/main/java/com/matrix/system/activity/service/ActivitySignAwardSetService.java

@@ -53,6 +53,9 @@
      //获取当前登录人员信息
        SysUsers user = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
        Long companyId = user.getCompanyId();
        /**
         * todo签到活动的唯一性
         */
        
        //新增活动主表信息
        ShopActivities shopActivities = new ShopActivities();
@@ -189,7 +192,7 @@
      //获取当前登录人员信息
        QueryUtil.setQueryLimitCom(updateSignAwardSetDto);
        SysUsers user = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
        Long actId = updateSignAwardSetDto.getActId();
        Long actId = updateSignAwardSetDto.getActMainId();
        Long companyId = user.getCompanyId();
        ShopActivities shopActivity = shopActivitiesDao.selectById(actId);
        //更新活动主表信息
@@ -234,8 +237,10 @@
               activitySignAwardSetUpdate.setUpdateBy(user.getSuName());
               activitySignAwardSetUpdate.setCompanyId(companyId);
               activitySignAwardSetUpdate.setActivityId(actId);
               activitySignAwardSetUpdate.setAwardState(ActivitySignAwardSet.AWARDSTATE_WORK);
               activitySignAwardSetDao.insert(activitySignAwardSetUpdate);
            }else {
               activitySignAwardSetUpdate.setAwardState(ActivitySignAwardSet.AWARDSTATE_WORK);
               activitySignAwardSetDao.updateById(activitySignAwardSetUpdate);
               arrayListUpdate.add(actSubid);
            }