| @@ -194,4 +194,9 @@ public class WxVtwoActivityGrantExportTwo extends TenantEntity { | |||||
| */ | */ | ||||
| @TableField(value = "tax_amount") | @TableField(value = "tax_amount") | ||||
| private BigDecimal taxAmount; | private BigDecimal taxAmount; | ||||
| @TableField(exist = false) | |||||
| private Integer begin; | |||||
| @TableField(exist = false) | |||||
| private Integer limit; | |||||
| } | } | ||||
| @@ -25,7 +25,7 @@ public interface WxVtwoActivityGrantExportTwoService extends IService<WxVtwoActi | |||||
| List<WxVtwoActivityGrantExportTwo> findActivityGrantList(Long activityId, String tenantId); | List<WxVtwoActivityGrantExportTwo> findActivityGrantList(Long activityId, String tenantId); | ||||
| List<WxVtwoActivityPrizeDrawMainData> findActivityGrantExportList(Long activityId, String tenantId); | |||||
| List<WxVtwoActivityPrizeDrawMainData> findActivityGrantExportList(Long activityId, String tenantId,Integer begin,Integer limit); | |||||
| Integer selectMaxOrderGrantCount(Long activityId, String tenantId); | Integer selectMaxOrderGrantCount(Long activityId, String tenantId); | ||||
| @@ -253,10 +253,12 @@ public class WxVtwoActivityGrantExportTwoServiceImpl extends ServiceImpl<WxVtwoA | |||||
| } | } | ||||
| @Override | @Override | ||||
| public List<WxVtwoActivityPrizeDrawMainData> findActivityGrantExportList(Long activityId, String tenantId) { | |||||
| public List<WxVtwoActivityPrizeDrawMainData> findActivityGrantExportList(Long activityId, String tenantId,Integer begin,Integer limit) { | |||||
| WxVtwoActivityGrantExportTwo exportQ = new WxVtwoActivityGrantExportTwo(); | WxVtwoActivityGrantExportTwo exportQ = new WxVtwoActivityGrantExportTwo(); | ||||
| exportQ.setTenantId(tenantId); | exportQ.setTenantId(tenantId); | ||||
| exportQ.setActivityId(activityId); | exportQ.setActivityId(activityId); | ||||
| exportQ.setBegin(begin); | |||||
| exportQ.setLimit(limit); | |||||
| List<WxVtwoActivityGrantExportTwo> exportList = wxVtwoActivityGrantExportTwoMapper.findList(exportQ); | List<WxVtwoActivityGrantExportTwo> exportList = wxVtwoActivityGrantExportTwoMapper.findList(exportQ); | ||||
| List<WxVtwoActivityPrizeDrawMainData> retList = null; | List<WxVtwoActivityPrizeDrawMainData> retList = null; | ||||
| @@ -633,7 +633,7 @@ public class WxVtwoPrizeDrawActivityServiceImpl extends ServiceImpl<WxVtwoPrizeD | |||||
| if(activity == null){ | if(activity == null){ | ||||
| throw new MallinkException(Result.ERROR,"未查询到活动"); | throw new MallinkException(Result.ERROR,"未查询到活动"); | ||||
| } | } | ||||
| List<WxVtwoActivityPrizeDrawMainData> activityGrantExportList = wxVtwoActivityGrantExportTwoService.findActivityGrantExportList(activityGrant.getActivityId(),activityGrant.getTenantId()); | |||||
| List<WxVtwoActivityPrizeDrawMainData> activityGrantExportList = wxVtwoActivityGrantExportTwoService.findActivityGrantExportList(activityGrant.getActivityId(),activityGrant.getTenantId(),activityGrant.getBegin(),activityGrant.getLimit()); | |||||
| if(activityGrantExportList != null && !activityGrantExportList.isEmpty()){ | if(activityGrantExportList != null && !activityGrantExportList.isEmpty()){ | ||||
| for (int k = 0 ; k < activityGrantExportList.size(); k++) { | for (int k = 0 ; k < activityGrantExportList.size(); k++) { | ||||
| WxVtwoActivityPrizeDrawMainData aget = activityGrantExportList.get(k); | WxVtwoActivityPrizeDrawMainData aget = activityGrantExportList.get(k); | ||||
| @@ -81,6 +81,9 @@ | |||||
| <select id="findList" parameterType="com.iformall.domain.po.WxVtwoActivityGrantExportTwo" resultMap="BaseResultMap"> | <select id="findList" parameterType="com.iformall.domain.po.WxVtwoActivityGrantExportTwo" resultMap="BaseResultMap"> | ||||
| select <include refid="allColumns" /> from wx_vtwo_activity_grant_export_two | select <include refid="allColumns" /> from wx_vtwo_activity_grant_export_two | ||||
| <include refid="dynamicWhereConditions" /> | <include refid="dynamicWhereConditions" /> | ||||
| <if test=" null != begin "> | |||||
| limit #{begin}, #{limit} | |||||
| </if> | |||||
| </select> | </select> | ||||
| <select id="selectMaxOrderGrantCount" parameterType="com.iformall.domain.po.WxVtwoActivityGrantExportTwo" resultType="java.lang.Integer"> | <select id="selectMaxOrderGrantCount" parameterType="com.iformall.domain.po.WxVtwoActivityGrantExportTwo" resultType="java.lang.Integer"> | ||||
| select max(order_grant_count) from wx_vtwo_activity_grant_export_two | select max(order_grant_count) from wx_vtwo_activity_grant_export_two | ||||