修复业绩bug

jyy

2021-06-19 756e16e090b15c7fd8648f55f5451367face6abc

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

@@ -53,10 +53,12 @@
      //获取当前登录人员信息
        SysUsers user = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
        Long companyId = user.getCompanyId();
        /**
         * todo签到活动的唯一性
         */
        
        //签到活动的唯一性
      List<ShopActivities> shopActivitiesDone = shopActivitiesDao.selectOneByCompanyIdAndActType(companyId,ShopActivities.ACTIVITIES_TYPE_SIGN);
      if(CollUtil.isNotEmpty(shopActivitiesDone)){
         return new AjaxResult(AjaxResult.STATUS_FAIL, "签到活动只能创建一次");
      }

        //新增活动主表信息
        ShopActivities shopActivities = new ShopActivities();
        shopActivities.setActName(addSignAwardSetDto.getActName());
@@ -109,11 +111,8 @@
        if(ObjectUtil.isEmpty(shopActivity)) {
           return AjaxResult.buildFailInstance("网络不通畅，请刷新页面");
        }
        /**
         * 未发布状态即使达到活动时间也不进入进行中状态
         */
        //未发布状态点击发布，状态变成未开始，且是开启状态
        shopActivity.setActStatus(ShopActivities.ACTSTATUS_STATUS_READY);
        //未发布状态点击发布，状态变成进行中，且是开启状态
        shopActivity.setActStatus(ShopActivities.ACTSTATUS_STATUS_ING);
        shopActivity.setIsStart(ShopActivities.ACTIVITIES_STATUS_OPEN);
        shopActivitiesDao.updateByModel(shopActivity);
      return AjaxResult.buildSuccessInstance("操作成功");
@@ -237,8 +236,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);
            }