blame | history | patch | commit | commitdiff | ignore whitespace
Helius
2021-04-15 63f4c14d15e6656bfd1833f3eb3804d00c4af051 
 zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShopActivitiesSignAction.java


@@ -73,7 +73,14 @@


      Long userId = loginUser.getId();


      //获取签到活动的信息


        SignBasicInfoVo signBasicInfoVo = new SignBasicInfoVo();


        AjaxResult ajaxResult = new AjaxResult();




        ShopActivities shopActivities = shopActivitiesDao.selectOneByCompanyIdAndActTypeAndActStatus(companyId,ShopActivities.ACTIVITIES_TYPE_SIGN,ShopActivities.ACTSTATUS_STATUS_ING);


        if(ObjectUtil.isEmpty(shopActivities)){


            ajaxResult = AjaxResult.buildFailInstance("活动还没有开始");


            ajaxResult.setData(signBasicInfoVo);


            return ajaxResult;


        }


        Long actId = shopActivities.getId();


        signBasicInfoVo.setActName(shopActivities.getActName());


        signBasicInfoVo.setActCode(shopActivities.getActCode());


@@ -81,19 +88,19 @@


        String actContent = shopActivities.getActContent();


        SignBasicInfoJsonVo signBasicInfoJsonVo = JSON.parseObject(actContent, SignBasicInfoJsonVo.class);


        signBasicInfoVo.setSignBasicInfoJsonVo(signBasicInfoJsonVo);


        


      List<ActivitySignAwardSetVo> activitySignAwardSetVos = activitySignAwardSetDao


            .selectListByActIDAndCompanyId(actId,companyId,ActivitySignAwardSet.AWARDSTATE_WORK);


      signBasicInfoVo.setActivitySignAwardSetVos(activitySignAwardSetVos);




      //今日是否已经参与


        List<ActivitySignAwardSetVo> activitySignAwardSetVos = activitySignAwardSetDao


                .selectListByActIDAndCompanyId(actId,companyId,ActivitySignAwardSet.AWARDSTATE_WORK);


        signBasicInfoVo.setActivitySignAwardSetVos(activitySignAwardSetVos);




        //今日是否已经参与


        ActivitySignRecord activitySignRecord = activitySignRecordDao.selectOneByActIdAndUserIdLikesignTime(actId,userId,new Date());


        if(ObjectUtil.isNotEmpty(activitySignRecord)) {


           signBasicInfoVo.setJoinState(SignBasicInfoVo.JOINSTATE_SIGN);


            signBasicInfoVo.setJoinState(SignBasicInfoVo.JOINSTATE_SIGN);


        }else {


           signBasicInfoVo.setJoinState(SignBasicInfoVo.JOINSTATE_NOTSIGN);


            signBasicInfoVo.setJoinState(SignBasicInfoVo.JOINSTATE_NOTSIGN);


        }


        AjaxResult ajaxResult = AjaxResult.buildSuccessInstance("");


        ajaxResult = AjaxResult.buildSuccessInstance("");


        ajaxResult.setData(signBasicInfoVo);


        return ajaxResult;


    }