20210421 签到

xiaoyong931011

2021-04-21 1c818cf3788678695426e4002865604ceb50bdc0

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

@@ -1,5 +1,6 @@
package com.matrix.system.shopXcx.api.action;

import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUnit;
import cn.hutool.core.date.DateUtil;
@@ -186,7 +187,7 @@
            ActivitySignRecordVo activitySignRecordVoNull = new ActivitySignRecordVo();
            activitySignRecordVos.add(activitySignRecordVoNull);
        }
        List<String> monthFullDays = getMonthFullDay(DateUtil.year(DateUtil.date()), DateUtil.month(DateUtil.date()) + 1);
        List<String> monthFullDays = getMonthFullDay(DateUtil.year(dateTime), DateUtil.month(dateTime) + 1);
        for(String monthFullDay : monthFullDays){
            ActivitySignRecordVo activitySignRecordVo = new ActivitySignRecordVo();
            activitySignRecordVo.setSignTime(monthFullDay);
@@ -344,7 +345,10 @@
        queryWrapperCumulativeDay.eq("cumulative_day",cumulativeDay);
        queryWrapperCumulativeDay.eq("company_id",companyId);
        queryWrapperCumulativeDay.eq("activity_id",actId);
        ActivitySignAwardSet activitySignAwardSetCumulativeDay = activitySignAwardSetDao.selectOne(queryWrapperCumulativeDay);
//        ActivitySignAwardSet activitySignAwardSetCumulativeDay = activitySignAwardSetDao.selectOne(queryWrapperCumulativeDay);
        List<ActivitySignAwardSet> activitySignAwardSetCumulativeDays = activitySignAwardSetDao.selectList(queryWrapperCumulativeDay);
        if(CollUtil.isNotEmpty(activitySignAwardSetCumulativeDays)){
            for(ActivitySignAwardSet activitySignAwardSetCumulativeDay : activitySignAwardSetCumulativeDays){
        if(ObjectUtil.isNotEmpty(activitySignAwardSetCumulativeDay)) {
           //是否已领取
           Long id = activitySignAwardSetCumulativeDay.getId();
@@ -443,7 +447,8 @@
              activitySignWriteoffDao.insert(activitySignWriteoff);
           }
        }
        
            }
        }
        AjaxResult ajaxResult = AjaxResult.buildSuccessInstance("签到成功");
        ajaxResult.setData(signSuccessVo);
        return ajaxResult;
@@ -560,8 +565,10 @@
        }
        ActivitySignReceiveRecord activitySignReceiveRecord = activitySignReceiveRecordDao.selectById(receiveId);
        //该奖品不是待领取状态
        if (ActivitySignReceiveRecord.STATE_ING != activitySignReceiveRecord.getState()) {
            return AjaxResult.buildFailInstance("该奖品不是待领取状态");
        if (ActivitySignReceiveRecord.STATE_DONE == activitySignReceiveRecord.getState()
                || ActivitySignReceiveRecord.STATE_FOUR == activitySignReceiveRecord.getState()
                || ActivitySignReceiveRecord.STATE_FIVE == activitySignReceiveRecord.getState()) {
            return AjaxResult.buildFailInstance("无法修改收货信息");
        }
        activitySignReceiveRecord.setConsigneeAddress(shopReceiveAddress.getAddrRegion()+"-"+shopReceiveAddress.getAddrDetailaddr()+"-"+shopReceiveAddress.getDormitory());
        activitySignReceiveRecord.setConsignee(shopReceiveAddress.getAddrLiaisonman());