Helius
2021-04-12 b8d50f6ad9d1ab407e5b2a6867cf47bc4640a43c
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());