Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into sc...

Helius

2021-04-16 949e7e46086e034d747746d2b450d7c262c9a594

 zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShopActivitiesSignAction.java

@@ -19,7 +19,6 @@
import com.matrix.system.activity.entity.ActivitySignRecord;
import com.matrix.system.activity.entity.ActivitySignWriteoff;
import com.matrix.system.hive.bean.SysVipInfo;
import com.matrix.system.shopXcx.api.dto.ClickSignDTO;
import com.matrix.system.shopXcx.api.dto.SeeAwardTextDto;
import com.matrix.system.shopXcx.api.dto.SignAwardDto;
import com.matrix.system.shopXcx.api.vo.*;
@@ -73,7 +72,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 +87,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;
    }
@@ -106,11 +112,12 @@
   @ApiResponses({
         @ApiResponse(code = 200, message = "ok", response = SignSuccessVo.class)
   })
    @PostMapping(value = "/clickSign")

    @GetMapping(value = "/clickSign")
    @ResponseBody
    @Transactional
    public AjaxResult clickSign(@RequestBody ClickSignDTO clickSignDTO) {
    public AjaxResult clickSign(@PathVariable("actId") long actId) {
        SysVipInfo user = redisUserLoginUtils.getLoginUser(SysVipInfo.class);
        long actId = clickSignDTO.getActId();
        Long userId = user.getId();
        Long companyId = user.getCompanyId();
        /**