20210409 获取未领取的奖品

xiaoyong931011

2021-04-09 3ada3a6e740b3c4b60a43d1a1a67dba072181dbd

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

@@ -188,7 +188,7 @@
           signSuccessVo.setNormalAwardImg(activitySignAwardSetNormal.getIntroduceImg());
        }
        //获取当前累计天数
        int cumulativeDay = getCumulativeDay(actId, userId, date, 1);
        int cumulativeDay = getCumulativeDay(actId, userId, date, 0);
        //自定义奖励
        QueryWrapper<ActivitySignAwardSet> queryWrapperCumulativeDay = new QueryWrapper<>();
        queryWrapperCumulativeDay.eq("award_rule",ActivitySignAwardSet.AWARDRULE_CUMULATIVEDAY);
@@ -279,7 +279,11 @@
              activitySignWriteoff.setActId(actId);
              activitySignWriteoff.setAwardId(activitySignAwardSetCumulativeDay.getId());
              activitySignWriteoff.setWinTime(date);
              activitySignWriteoff.setState(ActivitySignWriteoff.STATE_ONE);
              if(ActivitySignAwardSet.AWARDWAY_TWO == activitySignAwardSetCumulativeDay.getAwardWay()) {
                 activitySignWriteoff.setState(ActivitySignWriteoff.STATE_TWO);
              }else {
                 activitySignWriteoff.setState(ActivitySignWriteoff.STATE_ONE);
              }
              activitySignWriteoff.setUserId(userId);
              activitySignWriteoff.setCompanyId(companyId);
              activitySignWriteoff.setReceiveId(activitySignReceiveRecord.getId());