diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxVtwoCashBackActivityController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxVtwoCashBackActivityController.java index ddef39978..fd5e69c3a 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxVtwoCashBackActivityController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxVtwoCashBackActivityController.java @@ -49,6 +49,9 @@ public class WxVtwoCashBackActivityController extends BaseController { @Autowired private WxVtwoActivityOrderService wxVtwoActivityOrderService; + @Autowired + private WxVtwoCashBackGrantService wxVtwoCashBackGrantService; + @ApiVersion(group = SwaggerConstant.V_A_2_0) @ApiOperation("分页列表接口") @@ -289,6 +292,21 @@ public class WxVtwoCashBackActivityController extends BaseController { } } + @ApiVersion(group = SwaggerConstant.V_A_2_0) + @ApiOperation("活动发放历史") + @PostMapping("grantAwardHistory") + public ResultData grantAwardHistory(@RequestBody WxVtwoCashBackGrant activityGrant) { + TenantEntity tenantEntity = getTenantInfo(); + activityGrant.updateTenantInfo(tenantEntity); + if(activityGrant.getActivityId() == null){ + return new ResultData(Result.ERROR,"活动ID为空"); + } + if(StringUtils.isBlank(activityGrant.getCusPhone())){ + throw new MallinkException(Result.ERROR,"请输入用户手机号"); + } + return new ResultData(wxVtwoCashBackGrantService.getGrantAwardHistory(activityGrant)); + } + @ApiVersion(group = SwaggerConstant.V_A_2_0) @ApiOperation("活动发放") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxVtwoActivityGrantOrder.java b/mallinkService/src/main/java/com/iformall/domain/po/WxVtwoActivityGrantOrder.java index c4518e9fd..bf702ca1c 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxVtwoActivityGrantOrder.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxVtwoActivityGrantOrder.java @@ -37,6 +37,8 @@ public class WxVtwoActivityGrantOrder extends TenantEntity { */ @TableField(value = "order_id") private Long orderId; + @TableField(exist = false) + private String orderNo; /** * 是否参与总金额计算 diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxVtwoCashBackGrant.java b/mallinkService/src/main/java/com/iformall/domain/po/WxVtwoCashBackGrant.java index 3be121d84..335a7614e 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxVtwoCashBackGrant.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxVtwoCashBackGrant.java @@ -205,4 +205,7 @@ public class WxVtwoCashBackGrant extends TenantEntity { @TableField(exist = false) private List orderList; + @TableField(exist = false) + private List grantOrderList; + } \ No newline at end of file diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxVtwoActivityGrantOrderMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxVtwoActivityGrantOrderMapper.java index b3b283049..ef5320edd 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxVtwoActivityGrantOrderMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxVtwoActivityGrantOrderMapper.java @@ -16,6 +16,8 @@ import java.util.List; public interface WxVtwoActivityGrantOrderMapper extends CommonMapper { void insertList(@Param("grantOrderList")List grantOrderList); + + List findOrderNoList(@Param("grantId")Long grantId, @Param("tenantId")String tenantId); } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxVtwoCashBackGrantMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxVtwoCashBackGrantMapper.java index edc071318..114164a9b 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxVtwoCashBackGrantMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxVtwoCashBackGrantMapper.java @@ -18,6 +18,8 @@ public interface WxVtwoCashBackGrantMapper extends CommonMapper activityAwardStatisticsChart(WxVtwoCashBackGrant wxVtwoCashBackGrant); + + List findList(WxVtwoCashBackGrant activityGrant); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxVtwoCashBackActivityService.java b/mallinkService/src/main/java/com/iformall/service/WxVtwoCashBackActivityService.java index 4de303038..e705ac84f 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxVtwoCashBackActivityService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxVtwoCashBackActivityService.java @@ -1,6 +1,7 @@ package com.iformall.service; import com.github.pagehelper.PageInfo; +import com.iformall.common.ResultData; import com.iformall.domain.po.*; import com.baomidou.mybatisplus.extension.service.IService; import com.iformall.domain.po.base.TenantEntity; @@ -28,4 +29,5 @@ public interface WxVtwoCashBackActivityService extends IService activityAwardStatisticsChart(WxVtwoActivityStatisticsVo statisticsVo); + + List getGrantAwardHistory(WxVtwoCashBackGrant activityGrant); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxVtwoCashBackGrantServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxVtwoCashBackGrantServiceImpl.java index a932286d0..70cd6e572 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxVtwoCashBackGrantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxVtwoCashBackGrantServiceImpl.java @@ -5,11 +5,14 @@ import com.aliyun.openservices.shade.org.apache.commons.lang3.StringUtils; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.iformall.common.IdWorker; import com.iformall.domain.po.WxVtwoActivityGrant; +import com.iformall.domain.po.WxVtwoActivityGrantOrder; import com.iformall.domain.po.WxVtwoActivityOrder; import com.iformall.domain.po.WxVtwoCashBackGrant; +import com.iformall.domain.po.base.BaseEntity; import com.iformall.domain.vo.WxVtwoActivityStatisticsVo; import com.iformall.domain.vo.WxVtwoAwardStatistics; import com.iformall.enums.EnumYesOrNo; +import com.iformall.mapper.WxVtwoActivityGrantOrderMapper; import com.iformall.service.WxVtwoCashBackGrantService; import com.iformall.mapper.WxVtwoCashBackGrantMapper; import org.springframework.beans.factory.annotation.Autowired; @@ -33,6 +36,9 @@ public class WxVtwoCashBackGrantServiceImpl extends ServiceImpl orderList, boolean isGrant) { activityGrant.setOrderList(orderList); @@ -101,6 +107,21 @@ public class WxVtwoCashBackGrantServiceImpl extends ServiceImpl getGrantAwardHistory(WxVtwoCashBackGrant activityGrant) { + activityGrant.setStatus(EnumYesOrNo.YES.getCode()); + activityGrant.setSortColumns(BaseEntity.SortField.CreateDate_DESC); + List cashBackGrantList = wxVtwoCashBackGrantMapper.findList(activityGrant); + if(cashBackGrantList != null && !cashBackGrantList.isEmpty()){ + cashBackGrantList.forEach(wxVtwoCashBackGrant -> { + List orderNoList = wxVtwoActivityGrantOrderMapper.findOrderNoList(wxVtwoCashBackGrant.getId(), wxVtwoCashBackGrant.getTenantId()); + wxVtwoCashBackGrant.setGrantOrderList(orderNoList); + }); + return cashBackGrantList; + } + return Collections.emptyList(); + } } diff --git a/mallinkService/src/main/resources/mapper/WxVtwoActivityGrantOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxVtwoActivityGrantOrderMapper.xml index 3dceb1350..dfedb3e98 100644 --- a/mallinkService/src/main/resources/mapper/WxVtwoActivityGrantOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxVtwoActivityGrantOrderMapper.xml @@ -60,6 +60,13 @@ + +