修复bug7

jyy

2021-04-12 1b2f30bf6e23dd06bb6b667fe0297646d6606960

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

@@ -11,15 +11,14 @@
import com.matrix.system.activity.dao.ActivitySignAwardSetDao;
import com.matrix.system.activity.dao.ActivitySignReceiveRecordDao;
import com.matrix.system.activity.dao.ActivitySignRecordDao;
import com.matrix.system.activity.dao.ActivitySignWriteoffDao;
import com.matrix.system.activity.entity.ActivitySignAwardSet;
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.hive.bean.SysVipInfo;
import com.matrix.system.shopXcx.api.dto.ClickSignDTO;
import com.matrix.system.shopXcx.api.vo.ActivitySignAwardSetVo;
import com.matrix.system.shopXcx.api.vo.SignBasicInfoJsonVo;
import com.matrix.system.shopXcx.api.vo.SignBasicInfoVo;
import com.matrix.system.shopXcx.api.vo.SignSuccessVo;
import com.matrix.system.shopXcx.api.vo.*;
import com.matrix.system.shopXcx.bean.ShopActivities;
import com.matrix.system.shopXcx.dao.ShopActivitiesDao;
import io.swagger.annotations.Api;
@@ -30,7 +29,6 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;

import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;

@@ -50,6 +48,9 @@
   
   @Autowired
   private ActivitySignReceiveRecordDao activitySignReceiveRecordDao;
	
   @Autowired
   private ActivitySignWriteoffDao activitySignWriteoffDao;
   
   @Autowired
   private ActivitySignRecordDao activitySignRecordDao;
@@ -115,6 +116,7 @@
         * 是否已领取
         * 查询是否有签到奖品
         *       日常奖励和自定义奖品
         *          生成核销记录
         */
        //活动是否存在
        ShopActivities shopActivities = shopActivitiesDao.selectById(actId);
@@ -182,7 +184,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);
@@ -262,6 +264,31 @@
              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("签到成功");
@@ -285,6 +312,26 @@
        return getCumulativeDay(actId,userId,offsetDay,i);
    }
    
//    /**
//     * 获取累计的签到奖品数量
//     *
//     * @return
//     */
//    @ApiOperation(value = "获取累计的签到奖品列表", notes = "")
//   @ApiResponses({
//         @ApiResponse(code = 200, message = "ok", response = SignAwardListVO.class)
//   })
//    @GetMapping(value = "/getSignAwardList")
//    @PostMapping(value = "/getSignAwardList")
//    public AjaxResult getSignAwardList(@RequestBody SignAwardListVO signAwardListVO) {
//       SysVipInfo user = redisUserLoginUtils.getLoginUser(SysVipInfo.class);
//        Long userId = user.getId();
//        Long companyId = user.getCompanyId();
//        int size = activitySignReceiveRecordDao.getSignAwardReceiveCount(userId, companyId);
//        AjaxResult ajaxResult = AjaxResult.buildSuccessInstance(size);
//        return ajaxResult;
//    }