935090232@qq.com
2022-02-22 bbe0a2fd03063316e50cf141986bda984599bbda
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShopActivitiesSignAction.java
@@ -1,13 +1,15 @@
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;
import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.matrix.component.redis.RedisUserLoginUtils;
import com.matrix.system.common.init.UserCacheManager;
import com.matrix.core.pojo.AjaxResult;
import com.matrix.core.tools.StringUtils;
import com.matrix.system.activity.dao.ActivitySignAwardSetDao;
@@ -18,12 +20,17 @@
import com.matrix.system.activity.entity.ActivitySignReceiveRecord;
import com.matrix.system.activity.entity.ActivitySignRecord;
import com.matrix.system.activity.entity.ActivitySignWriteoff;
import com.matrix.system.common.constance.AppConstance;
import com.matrix.system.hive.bean.SysVipInfo;
import com.matrix.system.score.entity.ScoreVipDetail;
import com.matrix.system.score.service.ScoreVipDetailService;
import com.matrix.system.shopXcx.api.dto.SeeAwardTextDto;
import com.matrix.system.shopXcx.api.dto.SignAwardDto;
import com.matrix.system.shopXcx.api.service.WxShopLogisticsQueryService;
import com.matrix.system.shopXcx.api.tools.WxShopCouponUtil;
import com.matrix.system.shopXcx.api.vo.*;
import com.matrix.system.shopXcx.bean.ShopActivities;
import com.matrix.system.shopXcx.dao.ShopActivitiesDao;
import com.matrix.system.shopXcx.bean.*;
import com.matrix.system.shopXcx.dao.*;
import com.matrix.system.shopXcx.vo.SalesOrderVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -34,6 +41,9 @@
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
import java.util.List;
@@ -46,7 +56,7 @@
    private ShopActivitiesDao shopActivitiesDao;
   
   @Autowired
    private RedisUserLoginUtils redisUserLoginUtils;
    private UserCacheManager userCacheManager;
   
   @Autowired
   private ActivitySignAwardSetDao activitySignAwardSetDao;
@@ -60,6 +70,25 @@
   @Autowired
   private ActivitySignRecordDao activitySignRecordDao;
   
    @Autowired
    ShopDeliveryInfoDao shopDeliveryInfoDao;
    @Autowired
    private ShopLogisticsInfoDao shopLogisticsInfoDao;
    @Autowired
    private ShopReceiveAddressDao shopReceiveAddressDao;
    @Autowired
    private WxShopLogisticsQueryService wxShopLogisticsQueryService;
    @Autowired
    private ScoreVipDetailService scoreVipDetailService;
    @Autowired
    private ShopCouponDao shopCouponDao;
    @Autowired
    private WxShopCouponUtil wxShopCouponUtil;
    @Autowired
    private ShopCouponRecordDao shopCouponRecordDao;
   @ApiOperation(value = "获取签到基本信息", notes = "")
   @ApiResponses({
         @ApiResponse(code = 200, message = "ok", response = SignBasicInfoVo.class)
@@ -67,7 +96,7 @@
    @GetMapping(value = "/getSignBasicInfo")
    public AjaxResult getSignBasicInfo() {
      //获取登录人信息
      SysVipInfo loginUser = redisUserLoginUtils.getLoginUser(SysVipInfo.class);
      SysVipInfo loginUser = userCacheManager.getLoginUser();
      Long companyId = loginUser.getCompanyId();
      Long userId = loginUser.getId();
      //获取签到活动的信息
@@ -99,12 +128,129 @@
        }else {
            signBasicInfoVo.setJoinState(SignBasicInfoVo.JOINSTATE_NOTSIGN);
        }
        /**
         * 默认获取当前月份
         *      获取当前月份的天数
         */
        List<ActivitySignRecordVo> activitySignRecordVos = new ArrayList<>();
        //获取当前月的第一天是星期几
        DateTime dateTime = DateUtil.beginOfMonth(DateUtil.date());
        int i = DateUtil.dayOfWeek(dateTime);
        for(int j = 1;j<i;j++){
            ActivitySignRecordVo activitySignRecordVoNull = new ActivitySignRecordVo();
            activitySignRecordVos.add(activitySignRecordVoNull);
        }
        List<String> monthFullDays = getMonthFullDay(DateUtil.year(DateUtil.date()), DateUtil.month(DateUtil.date()) + 1);
        for(String monthFullDay : monthFullDays){
            ActivitySignRecordVo activitySignRecordVo = new ActivitySignRecordVo();
            activitySignRecordVo.setSignTime(monthFullDay);
            activitySignRecordVo.setActivityId(actId);
            activitySignRecordVo.setCompanyId(companyId);
            //对应日期是否已签到
            Date date = DateUtil.parse(monthFullDay);
            ActivitySignRecord activitySignRecordDone = activitySignRecordDao.selectOneByActIdAndUserIdLikesignTime(actId,userId,date);
            if(ObjectUtil.isNotEmpty(activitySignRecordDone)){
                activitySignRecordVo.setState(1);
            }else{
                activitySignRecordVo.setState(2);
            }
            activitySignRecordVos.add(activitySignRecordVo);
        }
        signBasicInfoVo.setActivitySignRecords(activitySignRecordVos);
        //累计签到日期
        int cumulativeDay = getCumulativeDay(actId, userId, DateUtil.date(), 0);
        signBasicInfoVo.setActAumulativeDay(cumulativeDay);
        ajaxResult = AjaxResult.buildSuccessInstance("");
        ajaxResult.setData(signBasicInfoVo);
        return ajaxResult;
    }
   /**
    /**
     * 查看历史签到记录
     *
     * @param
     * @return
     */
    @ApiOperation(value = "查看历史签到记录", notes = "")
    @GetMapping(value = "getSignRecord/{actId}/{month}")
    @ResponseBody
    public AjaxResult getSignRecord(@PathVariable("actId") long actId,@PathVariable("month") String dateStr) {
        //获取登录人信息
        SysVipInfo loginUser = userCacheManager.getLoginUser();
        Long companyId = loginUser.getCompanyId();
        Long userId = loginUser.getId();
        Date date = DateUtil.parse(dateStr);
        /**
         * 默认获取当前月份
         *      获取当前月份的天数
         */
        List<ActivitySignRecordVo> activitySignRecordVos = new ArrayList<>();
        //获取当前月的第一天是星期几
        DateTime dateTime = DateUtil.beginOfMonth(date);
        int i = DateUtil.dayOfWeek(dateTime);
        for(int j = 1;j<i;j++){
            ActivitySignRecordVo activitySignRecordVoNull = new ActivitySignRecordVo();
            activitySignRecordVos.add(activitySignRecordVoNull);
        }
        List<String> monthFullDays = getMonthFullDay(DateUtil.year(dateTime), DateUtil.month(dateTime) + 1);
        for(String monthFullDay : monthFullDays){
            ActivitySignRecordVo activitySignRecordVo = new ActivitySignRecordVo();
            activitySignRecordVo.setSignTime(monthFullDay);
            activitySignRecordVo.setActivityId(actId);
            activitySignRecordVo.setCompanyId(companyId);
            //对应日期是否已签到
            Date dateSign = DateUtil.parse(monthFullDay);
            ActivitySignRecord activitySignRecordDone = activitySignRecordDao.selectOneByActIdAndUserIdLikesignTime(actId,userId,dateSign);
            if(ObjectUtil.isNotEmpty(activitySignRecordDone)){
                activitySignRecordVo.setState(1);
            }else{
                activitySignRecordVo.setState(2);
            }
            activitySignRecordVos.add(activitySignRecordVo);
        }
        AjaxResult ajaxResult = new AjaxResult();
        ajaxResult = AjaxResult.buildSuccessInstance("");
        ajaxResult.setData(activitySignRecordVos);
        return ajaxResult;
    }
    /**
     *  java 获取 获取某年某月 所有日期(yyyy-mm-dd格式字符串)
     * @param year
     * @param month
     * @return
     */
    public List<String> getMonthFullDay(int year , int month){
        SimpleDateFormat dateFormatYYYYMMDD = new SimpleDateFormat("yyyy-MM-dd");
        List<String> fullDayList = new ArrayList<>(32);
        // 获得当前日期对象
        Calendar cal = Calendar.getInstance();
        cal.clear();// 清除信息
        cal.set(Calendar.YEAR, year);
        // 1月从0开始
        cal.set(Calendar.MONTH, month-1 );
        // 当月1号
        cal.set(Calendar.DAY_OF_MONTH,1);
        int count = cal.getActualMaximum(Calendar.DAY_OF_MONTH);
        for (int j = 1; j <= count ; j++) {
            fullDayList.add(dateFormatYYYYMMDD.format(cal.getTime()));
            cal.add(Calendar.DAY_OF_MONTH,1);
        }
        return fullDayList;
    }
    /**
     * 获取当月的 天数
     * */
    public static int getCurrentMonthDay(Date date) {
        Date beginOfMonth = DateUtil.beginOfMonth(date);
        Date endOfMonth = DateUtil.endOfMonth(date);
        long betweenDay = DateUtil.between(beginOfMonth, endOfMonth, DateUnit.DAY);
        return Integer.parseInt(String.valueOf(betweenDay))+1;
    }
    /**
     * 点击签到
     *
     */
@@ -113,11 +259,11 @@
         @ApiResponse(code = 200, message = "ok", response = SignSuccessVo.class)
   })
    @GetMapping(value = "/clickSign")
    @GetMapping(value = "/clickSign/{actId}")
    @ResponseBody
    @Transactional
    public AjaxResult clickSign(@PathVariable("actId") long actId) {
        SysVipInfo user = redisUserLoginUtils.getLoginUser(SysVipInfo.class);
        SysVipInfo user = userCacheManager.getLoginUser();
        Long userId = user.getId();
        Long companyId = user.getCompanyId();
        /**
@@ -152,9 +298,9 @@
        ActivitySignRecord activitySignRecordOld = activitySignRecordDao.selectOneByActIdAndUserIdLikesignTime(actId,userId,offsetDay);
        ActivitySignRecord activitySignRecordAdd = new ActivitySignRecord();
        activitySignRecordAdd.setCompanyId(companyId);
        activitySignRecordAdd.setCreateBy(user.getName());
        activitySignRecordAdd.setCreateBy(user.getVipName());
        activitySignRecordAdd.setCreateTime(new Date());
        activitySignRecordAdd.setUpdateBy(user.getName());
        activitySignRecordAdd.setUpdateBy(user.getVipName());
        activitySignRecordAdd.setUpdateTime(new Date());
        activitySignRecordAdd.setActivityId(actId);
        activitySignRecordAdd.setSignTime(date);
@@ -172,7 +318,7 @@
       * 查询是否有签到奖品
        *       日常奖励和自定义奖品
        */
        SignSuccessVo signSuccessVo = new SignSuccessVo();
      List<SignSuccessVo> signSuccessVos = new ArrayList<>();
        //日常奖励,新增奖品领取记录
        QueryWrapper<ActivitySignAwardSet> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("award_rule",ActivitySignAwardSet.AWARDRULE_NORMAL);
@@ -187,14 +333,60 @@
           activitySignReceiveRecord.setState(ActivitySignReceiveRecord.STATE_DONE);
           activitySignReceiveRecord.setActivityId(actId);
           activitySignReceiveRecord.setCompanyId(companyId);
           activitySignReceiveRecord.setCreateBy(user.getName());
           activitySignReceiveRecord.setCreateBy(user.getVipName());
           activitySignReceiveRecord.setCreateTime(new Date());
           activitySignReceiveRecord.setUpdateBy(user.getName());
           activitySignReceiveRecord.setUpdateBy(user.getVipName());
           activitySignReceiveRecord.setUpdateTime(new Date());
           activitySignReceiveRecordDao.insert(activitySignReceiveRecord);
           signSuccessVo.setNormalAwardName(activitySignAwardSetNormal.getAwardName());
           signSuccessVo.setNormalAwardImg(activitySignAwardSetNormal.getIntroduceImg());
            SignSuccessVo signSuccessVo = new SignSuccessVo();
            signSuccessVo.setType(1);
            signSuccessVo.setScoreCnt(activitySignAwardSetNormal.getScoreCnt());
           signSuccessVo.setAwardName(activitySignAwardSetNormal.getAwardName());
           signSuccessVo.setAwardImg(activitySignAwardSetNormal.getIntroduceImg());
            signSuccessVos.add(signSuccessVo);
            //日常奖励积分,对应用户积分加减
            int awardType = activitySignAwardSetNormal.getAwardType();
            if(ActivitySignAwardSet.AWARDTYPE_SCORE == awardType){
                int scoreCnt = activitySignAwardSetNormal.getScoreCnt();
                if(scoreCnt > 0){
                    scoreVipDetailService.addScore(userId,null,null,scoreCnt,
                            activitySignReceiveRecord.getId(), ScoreVipDetail.SCORE_VIP_TYPE_JOIN_ACTIVE,"签到积分");
                }
            }
            //获取优惠券
            if(ActivitySignAwardSet.AWARDTYPE_COUPON == awardType){
                //获取优惠券
                int couponId = Integer.parseInt(activitySignAwardSetNormal.getCouponId());
                ShopCoupon shopCoupon = shopCouponDao.selectById(couponId);
                // 如果没有找到该优惠券
                if (shopCoupon == null) {
                    return new AjaxResult(AjaxResult.STATUS_FAIL, "没有找到该优惠券!");
                }
                // 如果优惠券有数量限制并且已经领完
                if (shopCoupon.getMaxQuantity() >= 0 && (shopCoupon.getMaxQuantity() <= shopCoupon.getQuantityReceive())) {
                    return new AjaxResult(AjaxResult.STATUS_FAIL, "优惠券已领完!");
                }
                boolean newPeople = wxShopCouponUtil.verifyIsNewPeople(userId);
                // 如果改券是新人专属且当前用户不是新人
                if (AppConstance.COUPON_GET_LIMT_NEW.equals(shopCoupon.getGetLimit()) && !newPeople) {
                    return new AjaxResult(AjaxResult.STATUS_FAIL, "该优惠券为新人专享优惠券!");
                }
                ShopCouponRecord insertRecord = new ShopCouponRecord();
                insertRecord.setCreateBy(AppConstance.SYSTEM_USER);
                insertRecord.setUpdateBy(AppConstance.SYSTEM_USER);
                insertRecord.setCId(couponId);
                insertRecord.setUserId(userId);
                insertRecord.setIsUsing(2);
                int i = shopCouponRecordDao.insert(insertRecord);
                // 如果插入领取记录表失败
                if (i < 0) {
                    return new AjaxResult(AjaxResult.STATUS_FAIL, "优惠券领取失败!");
                }
                shopCoupon.setQuantityReceive(shopCoupon.getQuantityReceive() + 1);
                shopCouponDao.updateByModel(shopCoupon);
            }
        }
        //获取当前累计天数
        int cumulativeDay = getCumulativeDay(actId, userId, date, 0);
@@ -204,108 +396,156 @@
        queryWrapperCumulativeDay.eq("cumulative_day",cumulativeDay);
        queryWrapperCumulativeDay.eq("company_id",companyId);
        queryWrapperCumulativeDay.eq("activity_id",actId);
        ActivitySignAwardSet activitySignAwardSetCumulativeDay = activitySignAwardSetDao.selectOne(queryWrapperCumulativeDay);
        if(ObjectUtil.isNotEmpty(activitySignAwardSetCumulativeDay)) {
           //是否已领取
           Long id = activitySignAwardSetCumulativeDay.getId();
           QueryWrapper<ActivitySignReceiveRecord> queryWrapperActivitySignReceiveRecord = new QueryWrapper<>();
           queryWrapperActivitySignReceiveRecord.eq("award_id", id);
           queryWrapperActivitySignReceiveRecord.eq("company_id", companyId);
           queryWrapperActivitySignReceiveRecord.eq("activity_id", actId);
           queryWrapperActivitySignReceiveRecord.eq("user_id", userId);
           ActivitySignReceiveRecord activitySignReceiveRecordDone = activitySignReceiveRecordDao.selectOne(queryWrapperActivitySignReceiveRecord);
           if (ObjectUtil.isNotEmpty(activitySignReceiveRecordDone)) {
              String awardNameCumulativeDay = activitySignAwardSetCumulativeDay.getAwardName();
              AjaxResult ajaxResult = AjaxResult.buildSuccessInstance(awardNameCumulativeDay+"已经领取过了");
                ajaxResult.setData(signSuccessVo);
                return ajaxResult;
//        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();
                    QueryWrapper<ActivitySignReceiveRecord> queryWrapperActivitySignReceiveRecord = new QueryWrapper<>();
                    queryWrapperActivitySignReceiveRecord.eq("award_id", id);
                    queryWrapperActivitySignReceiveRecord.eq("company_id", companyId);
                    queryWrapperActivitySignReceiveRecord.eq("activity_id", actId);
                    queryWrapperActivitySignReceiveRecord.eq("user_id", userId);
                    ActivitySignReceiveRecord activitySignReceiveRecordDone = activitySignReceiveRecordDao.selectOne(queryWrapperActivitySignReceiveRecord);
                    if (ObjectUtil.isNotEmpty(activitySignReceiveRecordDone)) {
                        String awardNameCumulativeDay = activitySignAwardSetCumulativeDay.getAwardName();
                        AjaxResult ajaxResult = AjaxResult.buildSuccessInstance(awardNameCumulativeDay+"已经领取过了");
                        ajaxResult.setData(signSuccessVos);
                        return ajaxResult;
                    }
                    SignSuccessVo signSuccessVo = new SignSuccessVo();
                    signSuccessVo.setType(2);
                    signSuccessVo.setAwardType(activitySignAwardSetCumulativeDay.getAwardType());
                    signSuccessVo.setAwardName(activitySignAwardSetCumulativeDay.getAwardName());
                    signSuccessVo.setAwardImg(activitySignAwardSetCumulativeDay.getIntroduceImg());
                    signSuccessVo.setAwardState(activitySignAwardSetCumulativeDay.getAwardState());
                    //新增奖品领取记录
                    ActivitySignReceiveRecord activitySignReceiveRecord = new ActivitySignReceiveRecord();
                    activitySignReceiveRecord.setUserId(userId);
                    activitySignReceiveRecord.setReceiveTime(date);
                    activitySignReceiveRecord.setAwardId(activitySignAwardSetCumulativeDay.getId());
                    activitySignReceiveRecord.setActivityId(actId);
                    activitySignReceiveRecord.setCompanyId(companyId);
                    activitySignReceiveRecord.setState(ActivitySignReceiveRecord.STATE_DONE);
                    activitySignReceiveRecord.setCreateBy(user.getVipName());
                    activitySignReceiveRecord.setCreateTime(new Date());
                    activitySignReceiveRecord.setUpdateBy(user.getVipName());
                    activitySignReceiveRecord.setUpdateTime(new Date());
                    /**
                     * 奖项类型(1:自定义产品2:积分3:优惠券4:店铺商品)
                     *
                     * todo:4:店铺商品
                     */
                    //1:自定义产品
                    if(ActivitySignAwardSet.AWARDTYPE_CUSTOMIZE == activitySignAwardSetCumulativeDay.getAwardType()) {
                        activitySignReceiveRecord.setState(ActivitySignReceiveRecord.STATE_ING);
                        String randomString = StringUtils.getRandomString(8);
                        activitySignReceiveRecord.setWriteOffCode(randomString);
                        /**
                         * 获取对应奖品的领取方式(兑奖方式(1:线下兑换2:物流配送3:客服兑换)
                         */
                        signSuccessVo.setWriteOffCode(randomString);
                        signSuccessVo.setAwardWay(activitySignAwardSetCumulativeDay.getAwardWay());
                        //2:物流配送
                        signSuccessVo.setOperationTip(activitySignAwardSetCumulativeDay.getOperationTip());
                        //1:线下兑换
                        if(ActivitySignAwardSet.AWARDWAY_ONE == activitySignAwardSetCumulativeDay.getAwardWay()) {
                            signSuccessVo.setIntroduceTip(activitySignAwardSetCumulativeDay.getIntroduceTip());
                            signSuccessVo.setPrizeAddress(activitySignAwardSetCumulativeDay.getPrizeAddress());
                            signSuccessVo.setPrizeStartTime(activitySignAwardSetCumulativeDay.getPrizeStartTime());
                            signSuccessVo.setPrizeEndTime(activitySignAwardSetCumulativeDay.getPrizeEndTime());
                        }
                        //3:客服兑换
                        if(ActivitySignAwardSet.AWARDWAY_THREE == activitySignAwardSetCumulativeDay.getAwardWay()) {
                            signSuccessVo.setWechatImg(activitySignAwardSetCumulativeDay.getWechatImg());
                            signSuccessVo.setPrizeStartTime(activitySignAwardSetCumulativeDay.getPrizeStartTime());
                            signSuccessVo.setPrizeEndTime(activitySignAwardSetCumulativeDay.getPrizeEndTime());
                        }
                    }
                    //2:积分
                    if(ActivitySignAwardSet.AWARDTYPE_SCORE == activitySignAwardSetCumulativeDay.getAwardType()) {
                        signSuccessVo.setScoreCnt(activitySignAwardSetCumulativeDay.getScoreCnt());
                    }
                    //3:优惠券
                    if(ActivitySignAwardSet.AWARDTYPE_COUPON == activitySignAwardSetCumulativeDay.getAwardType()) {
                        signSuccessVo.setCouponName(activitySignAwardSetCumulativeDay.getCouponName());
                        //获取优惠券
                        int couponId = Integer.parseInt(activitySignAwardSetCumulativeDay.getCouponId());
                        ShopCoupon shopCoupon = shopCouponDao.selectById(couponId);
                        // 如果没有找到该优惠券
                        if (shopCoupon == null) {
                            return new AjaxResult(AjaxResult.STATUS_FAIL, "没有找到该优惠券!");
                        }
                        // 如果优惠券有数量限制并且已经领完
                        if (shopCoupon.getMaxQuantity() >= 0 && (shopCoupon.getMaxQuantity() <= shopCoupon.getQuantityReceive())) {
                            return new AjaxResult(AjaxResult.STATUS_FAIL, "优惠券已领完!");
                        }
                        boolean newPeople = wxShopCouponUtil.verifyIsNewPeople(userId);
                        // 如果改券是新人专属且当前用户不是新人
                        if (AppConstance.COUPON_GET_LIMT_NEW.equals(shopCoupon.getGetLimit()) && !newPeople) {
                            return new AjaxResult(AjaxResult.STATUS_FAIL, "该优惠券为新人专享优惠券!");
                        }
                        ShopCouponRecord insertRecord = new ShopCouponRecord();
                        insertRecord.setCreateBy(AppConstance.SYSTEM_USER);
                        insertRecord.setUpdateBy(AppConstance.SYSTEM_USER);
                        insertRecord.setCId(couponId);
                        insertRecord.setUserId(userId);
                        insertRecord.setIsUsing(2);
                        int i = shopCouponRecordDao.insert(insertRecord);
                        // 如果插入领取记录表失败
                        if (i < 0) {
                            return new AjaxResult(AjaxResult.STATUS_FAIL, "优惠券领取失败!");
                        }
                        shopCoupon.setQuantityReceive(shopCoupon.getQuantityReceive() + 1);
                        shopCouponDao.updateByModel(shopCoupon);
                    }
                    activitySignReceiveRecordDao.insert(activitySignReceiveRecord);
                    //累计奖励积分,对应用户积分加减
                    if(ActivitySignAwardSet.AWARDTYPE_SCORE == activitySignAwardSetCumulativeDay.getAwardType()) {
                        int awardType = activitySignAwardSetCumulativeDay.getAwardType();
                        if(ActivitySignAwardSet.AWARDTYPE_SCORE == awardType){
                            int scoreCnt = activitySignAwardSetCumulativeDay.getScoreCnt();
                            if(scoreCnt > 0){
                                scoreVipDetailService.addScore(userId,null,null,scoreCnt,
                                        activitySignReceiveRecord.getId(), ScoreVipDetail.SCORE_VIP_TYPE_JOIN_ACTIVE,"签到积分");
                            }
                        }
                    }
                    //生成核销记录
                    if(ActivitySignAwardSet.AWARDTYPE_CUSTOMIZE == activitySignAwardSetCumulativeDay.getAwardType()) {
                        ActivitySignWriteoff activitySignWriteoff = new ActivitySignWriteoff();
                        //线下兑换和客服兑换
                        if(ActivitySignAwardSet.AWARDWAY_ONE == activitySignAwardSetCumulativeDay.getAwardWay()
                                || ActivitySignAwardSet.AWARDWAY_THREE == activitySignAwardSetCumulativeDay.getAwardWay()) {
                            activitySignWriteoff.setWriteoffCode(activitySignReceiveRecord.getWriteOffCode());
                        }
                        activitySignWriteoff.setActId(actId);
                        activitySignWriteoff.setAwardId(activitySignAwardSetCumulativeDay.getId());
                        activitySignWriteoff.setWinTime(date);
                        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());
                        activitySignWriteoff.setCreateBy(user.getVipName());
                        activitySignWriteoff.setCreateTime(new Date());
                        activitySignWriteoff.setUpdateBy(user.getVipName());
                        activitySignWriteoff.setUpdateTime(new Date());
                        activitySignWriteoffDao.insert(activitySignWriteoff);
                    }
                    signSuccessVos.add(signSuccessVo);
                }
            }
           //新增奖品领取记录
           ActivitySignReceiveRecord activitySignReceiveRecord = new ActivitySignReceiveRecord();
           activitySignReceiveRecord.setUserId(userId);
           activitySignReceiveRecord.setReceiveTime(date);
           activitySignReceiveRecord.setAwardId(activitySignAwardSetCumulativeDay.getId());
           activitySignReceiveRecord.setActivityId(actId);
           activitySignReceiveRecord.setCompanyId(companyId);
           activitySignReceiveRecord.setState(ActivitySignReceiveRecord.STATE_DONE);
           activitySignReceiveRecord.setCreateBy(user.getName());
           activitySignReceiveRecord.setCreateTime(new Date());
           activitySignReceiveRecord.setUpdateBy(user.getName());
           activitySignReceiveRecord.setUpdateTime(new Date());
           /**
            * 奖项类型(1:自定义产品2:积分3:优惠券4:店铺商品)
            *
            * todo:4:店铺商品
            */
           //1:自定义产品
           if(ActivitySignAwardSet.AWARDTYPE_CUSTOMIZE == activitySignAwardSetCumulativeDay.getAwardType()) {
               activitySignReceiveRecord.setState(ActivitySignReceiveRecord.STATE_ING);
               String randomString = StringUtils.getRandomString(8);
               activitySignReceiveRecord.setWriteOffCode(randomString);
               /**
                * 获取对应奖品的领取方式(兑奖方式(1:线下兑换2:物流配送3:客服兑换)
                */
               signSuccessVo.setWriteOffCode(randomString);
               signSuccessVo.setAwardType(activitySignAwardSetCumulativeDay.getAwardType());
               signSuccessVo.setAwardName(activitySignAwardSetCumulativeDay.getAwardName());
               signSuccessVo.setAwardImg(activitySignAwardSetCumulativeDay.getIntroduceImg());
               signSuccessVo.setAwardWay(activitySignAwardSetCumulativeDay.getAwardWay());
            signSuccessVo.setAwardState(activitySignAwardSetCumulativeDay.getAwardState());
            //2:物流配送
               signSuccessVo.setOperationTip(activitySignAwardSetCumulativeDay.getOperationTip());
               //1:线下兑换
               if(ActivitySignAwardSet.AWARDWAY_ONE == activitySignAwardSetCumulativeDay.getAwardWay()) {
                  signSuccessVo.setIntroduceTip(activitySignAwardSetCumulativeDay.getIntroduceTip());
                  signSuccessVo.setPrizeAddress(activitySignAwardSetCumulativeDay.getPrizeAddress());
                  signSuccessVo.setPrizeStartTime(activitySignAwardSetCumulativeDay.getPrizeStartTime());
                  signSuccessVo.setPrizeEndTime(activitySignAwardSetCumulativeDay.getPrizeEndTime());
               }
               //3:客服兑换
               if(ActivitySignAwardSet.AWARDWAY_THREE == activitySignAwardSetCumulativeDay.getAwardWay()) {
                  signSuccessVo.setWechatImg(activitySignAwardSetCumulativeDay.getWechatImg());
                  signSuccessVo.setPrizeStartTime(activitySignAwardSetCumulativeDay.getPrizeStartTime());
                  signSuccessVo.setPrizeEndTime(activitySignAwardSetCumulativeDay.getPrizeEndTime());
               }
           }
           //2:积分
           if(ActivitySignAwardSet.AWARDTYPE_SCORE == activitySignAwardSetCumulativeDay.getAwardType()) {
               signSuccessVo.setScoreCnt(activitySignAwardSetCumulativeDay.getScoreCnt());
           }
           //3:优惠券
           if(ActivitySignAwardSet.AWARDTYPE_COUPON == activitySignAwardSetCumulativeDay.getAwardType()) {
              signSuccessVo.setCouponName(activitySignAwardSetCumulativeDay.getCouponName());
           }
           activitySignReceiveRecordDao.insert(activitySignReceiveRecord);
           //生成核销记录
           if(ActivitySignAwardSet.AWARDTYPE_CUSTOMIZE == activitySignAwardSetCumulativeDay.getAwardType()) {
              ActivitySignWriteoff activitySignWriteoff = new ActivitySignWriteoff();
              //线下兑换和客服兑换
              if(ActivitySignAwardSet.AWARDWAY_ONE == activitySignAwardSetCumulativeDay.getAwardWay()
                    || ActivitySignAwardSet.AWARDWAY_THREE == activitySignAwardSetCumulativeDay.getAwardWay()) {
                 activitySignWriteoff.setWriteoffCode(activitySignReceiveRecord.getWriteOffCode());
              }
              activitySignWriteoff.setActId(actId);
              activitySignWriteoff.setAwardId(activitySignAwardSetCumulativeDay.getId());
              activitySignWriteoff.setWinTime(date);
              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());
              activitySignWriteoff.setCreateBy(user.getName());
              activitySignWriteoff.setCreateTime(new Date());
              activitySignWriteoff.setUpdateBy(user.getName());
              activitySignWriteoff.setUpdateTime(new Date());
              activitySignWriteoffDao.insert(activitySignWriteoff);
           }
        }
        AjaxResult ajaxResult = AjaxResult.buildSuccessInstance("签到成功");
        ajaxResult.setData(signSuccessVo);
        ajaxResult.setData(signSuccessVos);
        return ajaxResult;
    }
   /**
@@ -324,7 +564,8 @@
        DateTime offsetDay = DateUtil.offsetDay(date, -i);
        return getCumulativeDay(actId,userId,offsetDay,i);
    }
    /**
     * 获取累计的签到奖品
     *
@@ -336,7 +577,7 @@
            @ApiResponse(code = 200, message = "ok", response = SignAwardListVo.class)
    })
    public AjaxResult getSignAwardList(@RequestBody @Validated SignAwardDto signAwardDto) {
        SysVipInfo loginUser = redisUserLoginUtils.getLoginUser(SysVipInfo.class);
        SysVipInfo loginUser = userCacheManager.getLoginUser();
        Page<SalesOrderVo> page=new Page<>(signAwardDto.getPageNum(),signAwardDto.getPageSize());
        if(StringUtils.isBlank(signAwardDto.getSort())){
           signAwardDto.setSort("create_time");
@@ -345,7 +586,7 @@
        signAwardDto.setUserId(loginUser.getId());
        signAwardDto.setCompanyId(loginUser.getCompanyId());
        IPage<SignAwardListVo> signAwardListVos = activitySignReceiveRecordDao.selectSignAwardList(page,signAwardDto);
        AjaxResult result=AjaxResult.buildSuccessInstance(signAwardListVos.getRecords());
        AjaxResult result=AjaxResult.buildSuccessInstance(signAwardListVos);
        return result;
    }
    
@@ -360,7 +601,7 @@
            @ApiResponse(code = 200, message = "ok", response = SeeAwardTextVo.class)
    })
    public AjaxResult seeAwardText(@RequestBody @Validated SeeAwardTextDto seeAwardTextDto) {
        SysVipInfo loginUser = redisUserLoginUtils.getLoginUser(SysVipInfo.class);
        SysVipInfo loginUser = userCacheManager.getLoginUser();
        seeAwardTextDto.setUserId(loginUser.getId());
        seeAwardTextDto.setCompanyId(loginUser.getCompanyId());
        SeeAwardTextVo seeAwardTextVO = activitySignReceiveRecordDao.selectSeeAwardTextVOById(seeAwardTextDto);
@@ -369,23 +610,89 @@
    }
    
    /**
     * 物流配送确认
     * 物流配送信息查看
     *
     * @return
     */
    @ApiOperation(value = "查看劵码", notes = "")
    @ApiOperation(value = "物流配送信息查看", notes = "")
    @PostMapping(value = "/logisticsInsure")
    @ApiResponses({
            @ApiResponse(code = 200, message = "ok", response = SeeAwardTextVo.class)
    })
    public AjaxResult logisticsInsure(@RequestBody @Validated SeeAwardTextDto seeAwardTextDto) {
        SysVipInfo loginUser = redisUserLoginUtils.getLoginUser(SysVipInfo.class);
        SysVipInfo loginUser = userCacheManager.getLoginUser();
        seeAwardTextDto.setUserId(loginUser.getId());
        seeAwardTextDto.setCompanyId(loginUser.getCompanyId());
        SeeAwardTextVo seeAwardTextVO = activitySignReceiveRecordDao.selectSeeAwardTextVOById(seeAwardTextDto);
        if(ObjectUtil.isEmpty(seeAwardTextVO)){
            return AjaxResult.buildFailInstance("奖品无法查看物流配送信息");
        }
        long receiveId = seeAwardTextVO.getId();
        //获取核销记录的ID
        ActivitySignWriteoff activitySignWriteoff = activitySignWriteoffDao.selectActivitySignWriteoffByUserIDAndReceiveId(loginUser.getId(),receiveId);
        if(ObjectUtil.isNotEmpty(activitySignWriteoff)){
            Integer logisticsId = activitySignWriteoff.getLogisticsId();
            ShopDeliveryInfo shopDeliveryInfo = shopDeliveryInfoDao.selectById(logisticsId);
            if(ObjectUtil.isNotEmpty(shopDeliveryInfo)){
                //查看物流信息
                wxShopLogisticsQueryService.selectLogisticsInfo(shopDeliveryInfo);
                List<ShopLogisticsInfo> shopLogisticsInfos = shopLogisticsInfoDao.selectByDelieryId(shopDeliveryInfo.getId());
                seeAwardTextVO.setShopLogisticsInfos(shopLogisticsInfos);
            }
        }
        AjaxResult result=AjaxResult.buildSuccessInstance(seeAwardTextVO);
        return result;
    }
    /**
     * 物流配送收货地址保存
     *
     * @param
     * @return
     */
    @ApiOperation(value = "物流配送收货地址保存", notes = "")
    @GetMapping(value = "logisticsInsureAddress/{addressId}/{receiveId}")
    @ResponseBody
    public AjaxResult logisticsInsureAddress(@PathVariable("addressId") int addressId,@PathVariable("receiveId") long receiveId) {
        ShopReceiveAddress shopReceiveAddress = shopReceiveAddressDao.selectById(addressId);
        if(ObjectUtil.isEmpty(shopReceiveAddress)){
            return AjaxResult.buildFailInstance("收货地址无效");
        }
        ActivitySignReceiveRecord activitySignReceiveRecord = activitySignReceiveRecordDao.selectById(receiveId);
        //该奖品不是待领取状态
        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());
        activitySignReceiveRecord.setConsigneePhone(shopReceiveAddress.getAddrTelephone());
        activitySignReceiveRecord.setState(ActivitySignReceiveRecord.STATE_THREE);
        activitySignReceiveRecordDao.updateById(activitySignReceiveRecord);
        return new AjaxResult(AjaxResult.STATUS_SUCCESS, "设置成功!");
    }
    /**
     * 物流配送确认收货
     *
     * @param
     * @return
     */
    @ApiOperation(value = "物流配送确认收货", notes = "")
    @GetMapping(value = "logisticsInsureById/{receiveId}")
    @ResponseBody
    public AjaxResult logisticsInsureById(@PathVariable("receiveId") long receiveId) {
        ActivitySignReceiveRecord activitySignReceiveRecord = activitySignReceiveRecordDao.selectById(receiveId);
        //如果不是待收货状态
        if (ActivitySignReceiveRecord.STATE_FOUR != activitySignReceiveRecord.getState()) {
            return AjaxResult.buildFailInstance("该奖品不是待收货状态");
        }
        activitySignReceiveRecord.setState(ActivitySignReceiveRecord.STATE_DONE);
        activitySignReceiveRecordDao.updateById(activitySignReceiveRecord);
        return new AjaxResult(AjaxResult.STATUS_SUCCESS, "收货成功!");
    }