Ver código fonte

fix

release_toaliyun_real
winter 7 meses atrás
pai
commit
8887d54a35
5 arquivos alterados com 13 adições e 3 exclusões
  1. +5
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxVtwoActivityGrantExportTwo.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/service/WxVtwoActivityGrantExportTwoService.java
  3. +3
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxVtwoActivityGrantExportTwoServiceImpl.java
  4. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxVtwoPrizeDrawActivityServiceImpl.java
  5. +3
    -0
      mallinkService/src/main/resources/mapper/WxVtwoActivityGrantExportTwoMapper.xml

+ 5
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxVtwoActivityGrantExportTwo.java Ver arquivo

@@ -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;
} }

+ 1
- 1
mallinkService/src/main/java/com/iformall/service/WxVtwoActivityGrantExportTwoService.java Ver arquivo

@@ -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);




+ 3
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxVtwoActivityGrantExportTwoServiceImpl.java Ver arquivo

@@ -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;


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxVtwoPrizeDrawActivityServiceImpl.java Ver arquivo

@@ -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);


+ 3
- 0
mallinkService/src/main/resources/mapper/WxVtwoActivityGrantExportTwoMapper.xml Ver arquivo

@@ -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


Carregando…
Cancelar
Salvar