Merge remote-tracking branch 'origin/score_shop' into score_shop

jyy

2021-04-09 4140a631bbcfa379b0b8206aa41d1b2453ffdb04

Merge remote-tracking branch 'origin/score_shop' into score_shop

 zq-erp/src/main/java/com/matrix/system/activity/dao/ActivitySignReceiveRecordDao.java

@@ -1,8 +1,6 @@
package com.matrix.system.activity.dao;


import org.apache.ibatis.annotations.Param;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -13,6 +11,7 @@
import com.matrix.system.activity.vo.CouponVo;
import com.matrix.system.activity.vo.GoodsVo;
import com.matrix.system.activity.vo.SignReceiveListVo;
import org.apache.ibatis.annotations.Param;

/**
 * @author yourName
@@ -27,4 +26,6 @@

    IPage<GoodsVo> selectGoodsList(Page<GoodsVo> page, @Param("record")GoodsDto goodsDto);

    int getSignAwardReceiveCount(@Param("userId")Long userId, @Param("companyId")Long companyId);

}

 zq-erp/src/main/java/com/matrix/system/shopXcx/api/vo/SignAwardListVO.java

New file
@@ -0,0 +1,14 @@
package com.matrix.system.shopXcx.api.vo;

import io.swagger.annotations.ApiModel;
import lombok.Data;

@Data
@ApiModel(value = "SignAwardListVO", description = "签到活动")
public class SignAwardListVO {
    /**
     * 主键
     */
    private Long  id;

}

 zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignReceiveRecordDao.xml

@@ -78,4 +78,18 @@
        </if>
    </select>

    <select id="getSignAwardReceiveCount" resultType="int">
        SELECT
            count(a.id)
        FROM
            activity_sign_receive_record a
        LEFT JOIN activity_sign_award_set b ON a.award_id = b.id
        where
              b.award_type = 1
              and a.state = 1
              and a.company_id = #{companyId}
            and a.user_id = #{userId}

    </select>

</mapper>