20210412 tqq环境

xiaoyong931011

2021-04-12 a13a93a493e7e94e28b2225c26e7e13b52d3288c

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

@@ -5,6 +5,8 @@
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.core.pojo.AjaxResult;
import com.matrix.core.tools.StringUtils;
@@ -18,15 +20,19 @@
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.dto.SeeAwardTextDto;
import com.matrix.system.shopXcx.api.dto.SignAwardDto;
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.vo.SalesOrderVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiResponse;
import io.swagger.annotations.ApiResponses;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

import java.util.Date;
@@ -312,25 +318,67 @@
        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;
//    }
    /**
     * 获取累计的签到奖品
     *
     * @return
     */
    @ApiOperation(value = "获取累计的签到奖品", notes = "")
    @PostMapping(value = "/getSignAwardList")
    @ApiResponses({
            @ApiResponse(code = 200, message = "ok", response = SignAwardListVo.class)
    })
    public AjaxResult getSignAwardList(@RequestBody @Validated SignAwardDto signAwardDto) {
        SysVipInfo loginUser = redisUserLoginUtils.getLoginUser(SysVipInfo.class);
        Page<SalesOrderVo> page=new Page<>(signAwardDto.getPageNum(),signAwardDto.getPageSize());
        if(StringUtils.isBlank(signAwardDto.getSort())){
           signAwardDto.setSort("create_time");
           signAwardDto.setOrder("desc");
        }
        signAwardDto.setUserId(loginUser.getId());
        signAwardDto.setCompanyId(loginUser.getCompanyId());
        IPage<SignAwardListVo> signAwardListVos = activitySignReceiveRecordDao.selectSignAwardList(page,signAwardDto);
        AjaxResult result=AjaxResult.buildSuccessInstance(signAwardListVos.getRecords());
        return result;
    }
    
    /**
     * 查看劵码
     *
     * @return
     */
    @ApiOperation(value = "查看劵码", notes = "")
    @PostMapping(value = "/seeAwardText")
    @ApiResponses({
            @ApiResponse(code = 200, message = "ok", response = SeeAwardTextVo.class)
    })
    public AjaxResult seeAwardText(@RequestBody @Validated SeeAwardTextDto seeAwardTextDto) {
        SysVipInfo loginUser = redisUserLoginUtils.getLoginUser(SysVipInfo.class);
        seeAwardTextDto.setUserId(loginUser.getId());
        seeAwardTextDto.setCompanyId(loginUser.getCompanyId());
        SeeAwardTextVo seeAwardTextVO = activitySignReceiveRecordDao.selectSeeAwardTextVOById(seeAwardTextDto);
        AjaxResult result=AjaxResult.buildSuccessInstance(seeAwardTextVO);
        return result;
    }
    
    /**
     * 物流配送确认
     *
     * @return
     */
    @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);
        seeAwardTextDto.setUserId(loginUser.getId());
        seeAwardTextDto.setCompanyId(loginUser.getCompanyId());
        SeeAwardTextVo seeAwardTextVO = activitySignReceiveRecordDao.selectSeeAwardTextVOById(seeAwardTextDto);
        AjaxResult result=AjaxResult.buildSuccessInstance(seeAwardTextVO);
        return result;
    }