| @@ -83,7 +83,7 @@ public class WxVtwoActivityOrderController extends BaseController { | |||||
| TenantEntity tenantInfo = getTenantInfo(); | TenantEntity tenantInfo = getTenantInfo(); | ||||
| activityOrder.updateTenantInfo(tenantInfo); | activityOrder.updateTenantInfo(tenantInfo); | ||||
| activityOrder.setSortColumns(SortField.CreateDate_DESC); | activityOrder.setSortColumns(SortField.CreateDate_DESC); | ||||
| wxVtwoActivityOrderService.exportData(request,response,activityOrder); | |||||
| wxVtwoActivityOrderService.exportData(request,response,activityOrder,null); | |||||
| } | } | ||||
| @ApiVersion(group = SwaggerConstant.V_A_2_0) | @ApiVersion(group = SwaggerConstant.V_A_2_0) | ||||
| @@ -6,26 +6,32 @@ import com.iformall.common.Result; | |||||
| import com.iformall.common.ResultData; | import com.iformall.common.ResultData; | ||||
| import com.iformall.constant.SwaggerConstant; | import com.iformall.constant.SwaggerConstant; | ||||
| import com.iformall.controller.base.BaseController; | import com.iformall.controller.base.BaseController; | ||||
| import com.iformall.domain.po.WxVtwoActivityAward; | |||||
| import com.iformall.domain.po.WxVtwoAmountGiftActivity; | |||||
| import com.iformall.domain.po.WxVtwoPrizeDrawActivity; | |||||
| import com.iformall.domain.po.*; | |||||
| import com.iformall.domain.po.base.BaseEntity.SortField; | import com.iformall.domain.po.base.BaseEntity.SortField; | ||||
| import com.iformall.domain.po.base.TenantEntity; | import com.iformall.domain.po.base.TenantEntity; | ||||
| import com.iformall.enums.EnumOfflineActivityAwardsMoneyRule; | import com.iformall.enums.EnumOfflineActivityAwardsMoneyRule; | ||||
| import com.iformall.enums.EnumOfflineActivityMerchantType; | import com.iformall.enums.EnumOfflineActivityMerchantType; | ||||
| import com.iformall.enums.EnumOfflineActivityStatus; | import com.iformall.enums.EnumOfflineActivityStatus; | ||||
| import com.iformall.exception.MallinkException; | |||||
| import com.iformall.service.WxVtwoActivityOrderService; | |||||
| import com.iformall.service.WxVtwoAmountGiftActivityService; | import com.iformall.service.WxVtwoAmountGiftActivityService; | ||||
| import com.iformall.service.WxVtwoPrizeDrawActivityService; | import com.iformall.service.WxVtwoPrizeDrawActivityService; | ||||
| import io.swagger.annotations.Api; | import io.swagger.annotations.Api; | ||||
| import io.swagger.annotations.ApiImplicitParam; | import io.swagger.annotations.ApiImplicitParam; | ||||
| import io.swagger.annotations.ApiImplicitParams; | import io.swagger.annotations.ApiImplicitParams; | ||||
| import io.swagger.annotations.ApiOperation; | import io.swagger.annotations.ApiOperation; | ||||
| import org.apache.commons.lang3.StringUtils; | |||||
| import org.slf4j.Logger; | import org.slf4j.Logger; | ||||
| import org.slf4j.LoggerFactory; | import org.slf4j.LoggerFactory; | ||||
| import org.springframework.beans.factory.annotation.Autowired; | import org.springframework.beans.factory.annotation.Autowired; | ||||
| import org.springframework.web.bind.annotation.*; | import org.springframework.web.bind.annotation.*; | ||||
| import javax.servlet.http.HttpServletRequest; | |||||
| import javax.servlet.http.HttpServletResponse; | |||||
| import java.math.BigDecimal; | import java.math.BigDecimal; | ||||
| import java.util.HashMap; | |||||
| import java.util.List; | |||||
| import java.util.Map; | |||||
| /** | /** | ||||
| * @author alascor | * @author alascor | ||||
| @@ -40,6 +46,9 @@ public class WxVtwoAmountGiftActivityController extends BaseController { | |||||
| @Autowired | @Autowired | ||||
| private WxVtwoAmountGiftActivityService wxVtwoAmountGiftActivityService; | private WxVtwoAmountGiftActivityService wxVtwoAmountGiftActivityService; | ||||
| @Autowired | |||||
| private WxVtwoActivityOrderService wxVtwoActivityOrderService; | |||||
| @ApiVersion(group = SwaggerConstant.V_A_2_0) | @ApiVersion(group = SwaggerConstant.V_A_2_0) | ||||
| @ApiOperation("分页列表接口") | @ApiOperation("分页列表接口") | ||||
| @GetMapping("list") | @GetMapping("list") | ||||
| @@ -135,4 +144,87 @@ public class WxVtwoAmountGiftActivityController extends BaseController { | |||||
| return new ResultData(amountGiftActivity); | return new ResultData(amountGiftActivity); | ||||
| } | } | ||||
| @ApiVersion(group = SwaggerConstant.V_A_2_0) | |||||
| @ApiOperation("参加活动用户订单统计") | |||||
| @GetMapping("orderStatistics") | |||||
| public ResultData orderStatistics(@ModelAttribute WxVtwoActivityOrder activityOrder) { | |||||
| if(activityOrder.getActivityId() == null){ | |||||
| return new ResultData(Result.ERROR,"活动ID 为空"); | |||||
| } | |||||
| if(StringUtils.isBlank(activityOrder.getCusPhone())){ | |||||
| return new ResultData(Result.ERROR,"请输入用户手机号"); | |||||
| } | |||||
| TenantEntity tenantInfo = getTenantInfo(); | |||||
| WxVtwoAmountGiftActivity activity = wxVtwoAmountGiftActivityService.getById(activityOrder.getActivityId(), tenantInfo.getTenantId()); | |||||
| if(activity == null){ | |||||
| return new ResultData(Result.ERROR,"未查询到活动"); | |||||
| } | |||||
| activityOrder.updateTenantInfo(tenantInfo); | |||||
| activityOrder.setCreateDateBegin(activity.getStartTime()); | |||||
| activityOrder.setCreateDateEnd(activity.getEndTime()); | |||||
| WxVtwoActivityOrder orderOne = wxVtwoActivityOrderService.getlimitOne(activityOrder); | |||||
| if(orderOne == null){ | |||||
| Map<String,Object> result = new HashMap<>(); | |||||
| result.put("cus_name","查无此人"); | |||||
| result.put("cus_phone",activityOrder.getCusPhone()); | |||||
| return new ResultData(result); | |||||
| } | |||||
| Map<String,Object> statisticsMap = wxVtwoActivityOrderService.getStatistics(activityOrder); | |||||
| statisticsMap.put("cus_name",orderOne.getCusName()); | |||||
| statisticsMap.put("cus_phone",orderOne.getCusPhone()); | |||||
| return new ResultData(statisticsMap); | |||||
| } | |||||
| @ApiVersion(group = SwaggerConstant.V_A_2_0) | |||||
| @ApiOperation("参加活动用户订单列表") | |||||
| @GetMapping("orderList") | |||||
| @ApiImplicitParams({}) | |||||
| public ResultData orderList(@ModelAttribute WxVtwoActivityOrder activityOrder) { | |||||
| if(activityOrder.getActivityId() == null){ | |||||
| return new ResultData(Result.ERROR,"活动ID 为空"); | |||||
| } | |||||
| if(StringUtils.isBlank(activityOrder.getCusPhone())){ | |||||
| return new ResultData(Result.ERROR,"请输入用户手机号"); | |||||
| } | |||||
| TenantEntity tenantInfo = getTenantInfo(); | |||||
| WxVtwoAmountGiftActivity activity = wxVtwoAmountGiftActivityService.getById(activityOrder.getActivityId(), tenantInfo.getTenantId()); | |||||
| if(activity == null){ | |||||
| return new ResultData(Result.ERROR,"未查询到活动"); | |||||
| } | |||||
| activityOrder.updateTenantInfo(tenantInfo); | |||||
| activityOrder.setCreateDateBegin(activity.getStartTime()); | |||||
| activityOrder.setCreateDateEnd(activity.getEndTime());; | |||||
| activityOrder.setSortColumns(SortField.CreateDate_DESC); | |||||
| List<WxVtwoActivityOrder> orderList = wxVtwoActivityOrderService.findList(activityOrder,activity.getId()); | |||||
| return new ResultData(orderList); | |||||
| } | |||||
| @ApiVersion(group = SwaggerConstant.V_A_2_0) | |||||
| @ApiOperation("参加活动用户订单导出") | |||||
| @GetMapping("/orderExport") | |||||
| public void orderExport(@ModelAttribute WxVtwoActivityOrder activityOrder, HttpServletRequest request, HttpServletResponse response) { | |||||
| if(activityOrder.getActivityId() == null){ | |||||
| throw new MallinkException(Result.ERROR,"活动ID 为空"); | |||||
| } | |||||
| if(StringUtils.isBlank(activityOrder.getCusPhone())){ | |||||
| throw new MallinkException(Result.ERROR,"请输入用户手机号"); | |||||
| } | |||||
| TenantEntity tenantInfo = getTenantInfo(); | |||||
| WxVtwoAmountGiftActivity activity = wxVtwoAmountGiftActivityService.getById(activityOrder.getActivityId(), tenantInfo.getTenantId()); | |||||
| if(activity == null){ | |||||
| throw new MallinkException(Result.ERROR,"未查询到活动"); | |||||
| } | |||||
| activityOrder.updateTenantInfo(tenantInfo); | |||||
| activityOrder.setCreateDateBegin(activity.getStartTime()); | |||||
| activityOrder.setCreateDateEnd(activity.getEndTime());; | |||||
| activityOrder.setSortColumns(SortField.CreateDate_DESC); | |||||
| wxVtwoActivityOrderService.exportData(request,response,activityOrder,activity.getId()); | |||||
| } | |||||
| } | } | ||||
| @@ -6,27 +6,32 @@ import com.iformall.common.Result; | |||||
| import com.iformall.common.ResultData; | import com.iformall.common.ResultData; | ||||
| import com.iformall.constant.SwaggerConstant; | import com.iformall.constant.SwaggerConstant; | ||||
| import com.iformall.controller.base.BaseController; | import com.iformall.controller.base.BaseController; | ||||
| import com.iformall.domain.po.WxVtwoActivityAward; | |||||
| import com.iformall.domain.po.WxVtwoAmountGiftActivity; | |||||
| import com.iformall.domain.po.WxVtwoCashBackActivity; | |||||
| import com.iformall.domain.po.WxVtwoCashBackAward; | |||||
| import com.iformall.domain.po.*; | |||||
| import com.iformall.domain.po.base.BaseEntity.SortField; | import com.iformall.domain.po.base.BaseEntity.SortField; | ||||
| import com.iformall.domain.po.base.TenantEntity; | import com.iformall.domain.po.base.TenantEntity; | ||||
| import com.iformall.enums.EnumOfflineActivityAwardsMoneyRule; | import com.iformall.enums.EnumOfflineActivityAwardsMoneyRule; | ||||
| import com.iformall.enums.EnumOfflineActivityMerchantType; | import com.iformall.enums.EnumOfflineActivityMerchantType; | ||||
| import com.iformall.enums.EnumOfflineActivityStatus; | import com.iformall.enums.EnumOfflineActivityStatus; | ||||
| import com.iformall.exception.MallinkException; | |||||
| import com.iformall.service.WxVtwoActivityOrderService; | |||||
| import com.iformall.service.WxVtwoAmountGiftActivityService; | import com.iformall.service.WxVtwoAmountGiftActivityService; | ||||
| import com.iformall.service.WxVtwoCashBackActivityService; | import com.iformall.service.WxVtwoCashBackActivityService; | ||||
| import io.swagger.annotations.Api; | import io.swagger.annotations.Api; | ||||
| import io.swagger.annotations.ApiImplicitParam; | import io.swagger.annotations.ApiImplicitParam; | ||||
| import io.swagger.annotations.ApiImplicitParams; | import io.swagger.annotations.ApiImplicitParams; | ||||
| import io.swagger.annotations.ApiOperation; | import io.swagger.annotations.ApiOperation; | ||||
| import org.apache.commons.lang3.StringUtils; | |||||
| import org.slf4j.Logger; | import org.slf4j.Logger; | ||||
| import org.slf4j.LoggerFactory; | import org.slf4j.LoggerFactory; | ||||
| import org.springframework.beans.factory.annotation.Autowired; | import org.springframework.beans.factory.annotation.Autowired; | ||||
| import org.springframework.web.bind.annotation.*; | import org.springframework.web.bind.annotation.*; | ||||
| import javax.servlet.http.HttpServletRequest; | |||||
| import javax.servlet.http.HttpServletResponse; | |||||
| import java.math.BigDecimal; | import java.math.BigDecimal; | ||||
| import java.util.HashMap; | |||||
| import java.util.List; | |||||
| import java.util.Map; | |||||
| /** | /** | ||||
| * @author alascor | * @author alascor | ||||
| @@ -41,6 +46,9 @@ public class WxVtwoCashBackActivityController extends BaseController { | |||||
| @Autowired | @Autowired | ||||
| private WxVtwoCashBackActivityService wxVtwoCashBackActivityService; | private WxVtwoCashBackActivityService wxVtwoCashBackActivityService; | ||||
| @Autowired | |||||
| private WxVtwoActivityOrderService wxVtwoActivityOrderService; | |||||
| @ApiVersion(group = SwaggerConstant.V_A_2_0) | @ApiVersion(group = SwaggerConstant.V_A_2_0) | ||||
| @ApiOperation("分页列表接口") | @ApiOperation("分页列表接口") | ||||
| @GetMapping("list") | @GetMapping("list") | ||||
| @@ -158,4 +166,87 @@ public class WxVtwoCashBackActivityController extends BaseController { | |||||
| return new ResultData(cashBackActivity); | return new ResultData(cashBackActivity); | ||||
| } | } | ||||
| @ApiVersion(group = SwaggerConstant.V_A_2_0) | |||||
| @ApiOperation("参加活动用户订单统计") | |||||
| @GetMapping("orderStatistics") | |||||
| public ResultData orderStatistics(@ModelAttribute WxVtwoActivityOrder activityOrder) { | |||||
| if(activityOrder.getActivityId() == null){ | |||||
| return new ResultData(Result.ERROR,"活动ID 为空"); | |||||
| } | |||||
| if(StringUtils.isBlank(activityOrder.getCusPhone())){ | |||||
| return new ResultData(Result.ERROR,"请输入用户手机号"); | |||||
| } | |||||
| TenantEntity tenantInfo = getTenantInfo(); | |||||
| WxVtwoCashBackActivity activity = wxVtwoCashBackActivityService.getById(activityOrder.getActivityId(), tenantInfo.getTenantId()); | |||||
| if(activity == null){ | |||||
| return new ResultData(Result.ERROR,"未查询到活动"); | |||||
| } | |||||
| activityOrder.updateTenantInfo(tenantInfo); | |||||
| activityOrder.setCreateDateBegin(activity.getStartTime()); | |||||
| activityOrder.setCreateDateEnd(activity.getEndTime()); | |||||
| WxVtwoActivityOrder orderOne = wxVtwoActivityOrderService.getlimitOne(activityOrder); | |||||
| if(orderOne == null){ | |||||
| Map<String,Object> result = new HashMap<>(); | |||||
| result.put("cus_name","查无此人"); | |||||
| result.put("cus_phone",activityOrder.getCusPhone()); | |||||
| return new ResultData(result); | |||||
| } | |||||
| Map<String,Object> statisticsMap = wxVtwoActivityOrderService.getStatistics(activityOrder); | |||||
| statisticsMap.put("cus_name",orderOne.getCusName()); | |||||
| statisticsMap.put("cus_phone",orderOne.getCusPhone()); | |||||
| return new ResultData(statisticsMap); | |||||
| } | |||||
| @ApiVersion(group = SwaggerConstant.V_A_2_0) | |||||
| @ApiOperation("参加活动用户订单列表") | |||||
| @GetMapping("orderList") | |||||
| @ApiImplicitParams({}) | |||||
| public ResultData orderList(@ModelAttribute WxVtwoActivityOrder activityOrder) { | |||||
| if(activityOrder.getActivityId() == null){ | |||||
| return new ResultData(Result.ERROR,"活动ID 为空"); | |||||
| } | |||||
| if(StringUtils.isBlank(activityOrder.getCusPhone())){ | |||||
| return new ResultData(Result.ERROR,"请输入用户手机号"); | |||||
| } | |||||
| TenantEntity tenantInfo = getTenantInfo(); | |||||
| WxVtwoCashBackActivity activity = wxVtwoCashBackActivityService.getById(activityOrder.getActivityId(), tenantInfo.getTenantId()); | |||||
| if(activity == null){ | |||||
| return new ResultData(Result.ERROR,"未查询到活动"); | |||||
| } | |||||
| activityOrder.updateTenantInfo(tenantInfo); | |||||
| activityOrder.setCreateDateBegin(activity.getStartTime()); | |||||
| activityOrder.setCreateDateEnd(activity.getEndTime());; | |||||
| activityOrder.setSortColumns(SortField.CreateDate_DESC); | |||||
| List<WxVtwoActivityOrder> orderList = wxVtwoActivityOrderService.findList(activityOrder,activity.getId()); | |||||
| return new ResultData(orderList); | |||||
| } | |||||
| @ApiVersion(group = SwaggerConstant.V_A_2_0) | |||||
| @ApiOperation("参加活动用户订单导出") | |||||
| @GetMapping("/orderExport") | |||||
| public void orderExport(@ModelAttribute WxVtwoActivityOrder activityOrder, HttpServletRequest request, HttpServletResponse response) { | |||||
| if(activityOrder.getActivityId() == null){ | |||||
| throw new MallinkException(Result.ERROR,"活动ID 为空"); | |||||
| } | |||||
| if(StringUtils.isBlank(activityOrder.getCusPhone())){ | |||||
| throw new MallinkException(Result.ERROR,"请输入用户手机号"); | |||||
| } | |||||
| TenantEntity tenantInfo = getTenantInfo(); | |||||
| WxVtwoCashBackActivity activity = wxVtwoCashBackActivityService.getById(activityOrder.getActivityId(), tenantInfo.getTenantId()); | |||||
| if(activity == null){ | |||||
| throw new MallinkException(Result.ERROR,"未查询到活动"); | |||||
| } | |||||
| activityOrder.updateTenantInfo(tenantInfo); | |||||
| activityOrder.setCreateDateBegin(activity.getStartTime()); | |||||
| activityOrder.setCreateDateEnd(activity.getEndTime());; | |||||
| activityOrder.setSortColumns(SortField.CreateDate_DESC); | |||||
| wxVtwoActivityOrderService.exportData(request,response,activityOrder,activity.getId()); | |||||
| } | |||||
| } | } | ||||
| @@ -15,11 +15,13 @@ import com.iformall.enums.*; | |||||
| import com.iformall.exception.MallinkException; | import com.iformall.exception.MallinkException; | ||||
| import com.iformall.service.WxOfflineActivityGrantAwardService; | import com.iformall.service.WxOfflineActivityGrantAwardService; | ||||
| import com.iformall.service.WxOfflineActivityService; | import com.iformall.service.WxOfflineActivityService; | ||||
| import com.iformall.service.WxVtwoActivityOrderService; | |||||
| import com.iformall.service.WxVtwoPrizeDrawActivityService; | import com.iformall.service.WxVtwoPrizeDrawActivityService; | ||||
| import io.swagger.annotations.Api; | import io.swagger.annotations.Api; | ||||
| import io.swagger.annotations.ApiImplicitParam; | import io.swagger.annotations.ApiImplicitParam; | ||||
| import io.swagger.annotations.ApiImplicitParams; | import io.swagger.annotations.ApiImplicitParams; | ||||
| import io.swagger.annotations.ApiOperation; | import io.swagger.annotations.ApiOperation; | ||||
| import org.apache.commons.lang3.StringUtils; | |||||
| import org.slf4j.Logger; | import org.slf4j.Logger; | ||||
| import org.slf4j.LoggerFactory; | import org.slf4j.LoggerFactory; | ||||
| import org.springframework.beans.factory.annotation.Autowired; | import org.springframework.beans.factory.annotation.Autowired; | ||||
| @@ -28,6 +30,9 @@ import org.springframework.web.bind.annotation.*; | |||||
| import javax.servlet.http.HttpServletRequest; | import javax.servlet.http.HttpServletRequest; | ||||
| import javax.servlet.http.HttpServletResponse; | import javax.servlet.http.HttpServletResponse; | ||||
| import java.math.BigDecimal; | import java.math.BigDecimal; | ||||
| import java.util.HashMap; | |||||
| import java.util.List; | |||||
| import java.util.Map; | |||||
| /** | /** | ||||
| * @author alascor | * @author alascor | ||||
| @@ -42,6 +47,9 @@ public class WxVtwoPrizeDrawActivityController extends BaseController { | |||||
| @Autowired | @Autowired | ||||
| private WxVtwoPrizeDrawActivityService wxVtwoPrizeDrawActivityService; | private WxVtwoPrizeDrawActivityService wxVtwoPrizeDrawActivityService; | ||||
| @Autowired | |||||
| private WxVtwoActivityOrderService wxVtwoActivityOrderService; | |||||
| @ApiVersion(group = SwaggerConstant.V_A_2_0) | @ApiVersion(group = SwaggerConstant.V_A_2_0) | ||||
| @ApiOperation("分页列表接口") | @ApiOperation("分页列表接口") | ||||
| @GetMapping("list") | @GetMapping("list") | ||||
| @@ -137,4 +145,87 @@ public class WxVtwoPrizeDrawActivityController extends BaseController { | |||||
| return new ResultData(prizeDrawActivity); | return new ResultData(prizeDrawActivity); | ||||
| } | } | ||||
| @ApiVersion(group = SwaggerConstant.V_A_2_0) | |||||
| @ApiOperation("参加活动用户订单统计") | |||||
| @GetMapping("orderStatistics") | |||||
| public ResultData orderStatistics(@ModelAttribute WxVtwoActivityOrder activityOrder) { | |||||
| if(activityOrder.getActivityId() == null){ | |||||
| return new ResultData(Result.ERROR,"活动ID 为空"); | |||||
| } | |||||
| if(StringUtils.isBlank(activityOrder.getCusPhone())){ | |||||
| return new ResultData(Result.ERROR,"请输入用户手机号"); | |||||
| } | |||||
| TenantEntity tenantInfo = getTenantInfo(); | |||||
| WxVtwoPrizeDrawActivity activity = wxVtwoPrizeDrawActivityService.getById(activityOrder.getActivityId(), tenantInfo.getTenantId()); | |||||
| if(activity == null){ | |||||
| return new ResultData(Result.ERROR,"未查询到活动"); | |||||
| } | |||||
| activityOrder.updateTenantInfo(tenantInfo); | |||||
| activityOrder.setCreateDateBegin(activity.getStartTime()); | |||||
| activityOrder.setCreateDateEnd(activity.getEndTime()); | |||||
| WxVtwoActivityOrder orderOne = wxVtwoActivityOrderService.getlimitOne(activityOrder); | |||||
| if(orderOne == null){ | |||||
| Map<String,Object> result = new HashMap<>(); | |||||
| result.put("cus_name","查无此人"); | |||||
| result.put("cus_phone",activityOrder.getCusPhone()); | |||||
| return new ResultData(result); | |||||
| } | |||||
| Map<String,Object> statisticsMap = wxVtwoActivityOrderService.getStatistics(activityOrder); | |||||
| statisticsMap.put("cus_name",orderOne.getCusName()); | |||||
| statisticsMap.put("cus_phone",orderOne.getCusPhone()); | |||||
| return new ResultData(statisticsMap); | |||||
| } | |||||
| @ApiVersion(group = SwaggerConstant.V_A_2_0) | |||||
| @ApiOperation("参加活动用户订单列表") | |||||
| @GetMapping("orderList") | |||||
| @ApiImplicitParams({}) | |||||
| public ResultData orderList(@ModelAttribute WxVtwoActivityOrder activityOrder) { | |||||
| if(activityOrder.getActivityId() == null){ | |||||
| return new ResultData(Result.ERROR,"活动ID 为空"); | |||||
| } | |||||
| if(StringUtils.isBlank(activityOrder.getCusPhone())){ | |||||
| return new ResultData(Result.ERROR,"请输入用户手机号"); | |||||
| } | |||||
| TenantEntity tenantInfo = getTenantInfo(); | |||||
| WxVtwoPrizeDrawActivity activity = wxVtwoPrizeDrawActivityService.getById(activityOrder.getActivityId(), tenantInfo.getTenantId()); | |||||
| if(activity == null){ | |||||
| return new ResultData(Result.ERROR,"未查询到活动"); | |||||
| } | |||||
| activityOrder.updateTenantInfo(tenantInfo); | |||||
| activityOrder.setCreateDateBegin(activity.getStartTime()); | |||||
| activityOrder.setCreateDateEnd(activity.getEndTime());; | |||||
| activityOrder.setSortColumns(SortField.CreateDate_DESC); | |||||
| List<WxVtwoActivityOrder> orderList = wxVtwoActivityOrderService.findList(activityOrder,activity.getId()); | |||||
| return new ResultData(orderList); | |||||
| } | |||||
| @ApiVersion(group = SwaggerConstant.V_A_2_0) | |||||
| @ApiOperation("参加活动用户订单导出") | |||||
| @GetMapping("/orderExport") | |||||
| public void orderExport(@ModelAttribute WxVtwoActivityOrder activityOrder, HttpServletRequest request, HttpServletResponse response) { | |||||
| if(activityOrder.getActivityId() == null){ | |||||
| throw new MallinkException(Result.ERROR,"活动ID 为空"); | |||||
| } | |||||
| if(StringUtils.isBlank(activityOrder.getCusPhone())){ | |||||
| throw new MallinkException(Result.ERROR,"请输入用户手机号"); | |||||
| } | |||||
| TenantEntity tenantInfo = getTenantInfo(); | |||||
| WxVtwoPrizeDrawActivity activity = wxVtwoPrizeDrawActivityService.getById(activityOrder.getActivityId(), tenantInfo.getTenantId()); | |||||
| if(activity == null){ | |||||
| throw new MallinkException(Result.ERROR,"未查询到活动"); | |||||
| } | |||||
| activityOrder.updateTenantInfo(tenantInfo); | |||||
| activityOrder.setCreateDateBegin(activity.getStartTime()); | |||||
| activityOrder.setCreateDateEnd(activity.getEndTime());; | |||||
| activityOrder.setSortColumns(SortField.CreateDate_DESC); | |||||
| wxVtwoActivityOrderService.exportData(request,response,activityOrder,activity.getId()); | |||||
| } | |||||
| } | } | ||||
| @@ -97,7 +97,7 @@ public class WxVtwoActivityOrderController extends BaseController { | |||||
| TenantEntity tenantInfo = getTenantInfo(); | TenantEntity tenantInfo = getTenantInfo(); | ||||
| activityOrder.updateTenantInfo(tenantInfo); | activityOrder.updateTenantInfo(tenantInfo); | ||||
| activityOrder.setMerchantId(getLoginBUser().getMerchantId()); | activityOrder.setMerchantId(getLoginBUser().getMerchantId()); | ||||
| Map<String,Integer> statisticsMap = wxVtwoActivityOrderService.getStatistics(activityOrder); | |||||
| Map<String,Object> statisticsMap = wxVtwoActivityOrderService.getStatistics(activityOrder); | |||||
| return new ResultData(statisticsMap); | return new ResultData(statisticsMap); | ||||
| } | } | ||||
| @@ -26,6 +26,12 @@ public class WxVtwoActivityGrantOrder extends TenantEntity { | |||||
| @TableField(value = "grant_id") | @TableField(value = "grant_id") | ||||
| private Long grantId; | private Long grantId; | ||||
| /** | |||||
| * 活动id | |||||
| */ | |||||
| @TableField(value = "activity_id") | |||||
| private Long activityId; | |||||
| /** | /** | ||||
| * 订单id | * 订单id | ||||
| */ | */ | ||||
| @@ -248,4 +248,7 @@ public class WxVtwoActivityOrder extends TenantEntity { | |||||
| */ | */ | ||||
| @TableField(value = "update_date") | @TableField(value = "update_date") | ||||
| private Date updateDate; | private Date updateDate; | ||||
| @TableField(exist = false) | |||||
| private Long activityId; | |||||
| } | } | ||||
| @@ -10,7 +10,6 @@ import java.util.Date; | |||||
| import java.util.List; | import java.util.List; | ||||
| import com.iformall.domain.vo.WxVtwoActivityCreditRule; | import com.iformall.domain.vo.WxVtwoActivityCreditRule; | ||||
| import com.iformall.enums.EnumYesOrNo; | |||||
| import lombok.Data; | import lombok.Data; | ||||
| /** | /** | ||||
| @@ -0,0 +1,36 @@ | |||||
| package com.iformall.enums; | |||||
| /** | |||||
| * Created by Stormeye on 2018/08/09. | |||||
| */ | |||||
| public enum EnumVtwoActivityGrantStatus { | |||||
| VALID(1, "有效"), | |||||
| NOT_VALID(0, "无效") | |||||
| ; | |||||
| public static EnumVtwoActivityGrantStatus getEnum(Integer code) { | |||||
| for (EnumVtwoActivityGrantStatus value : values()) { | |||||
| if (value.getCode().equals(code)) { | |||||
| return value; | |||||
| } | |||||
| } | |||||
| return null; | |||||
| } | |||||
| private Integer code; | |||||
| private String message; | |||||
| EnumVtwoActivityGrantStatus(Integer code, String message) { | |||||
| this.code = code; | |||||
| this.message = message; | |||||
| } | |||||
| public Integer getCode() { | |||||
| return code; | |||||
| } | |||||
| public String getMessage() { | |||||
| return message; | |||||
| } | |||||
| } | |||||
| @@ -19,12 +19,12 @@ public interface WxVtwoActivityOrderService extends IService<WxVtwoActivityOrder | |||||
| PageInfo<WxVtwoActivityOrder> listAsPage(WxVtwoActivityOrder record, Integer pageNum, Integer pageSize); | PageInfo<WxVtwoActivityOrder> listAsPage(WxVtwoActivityOrder record, Integer pageNum, Integer pageSize); | ||||
| void handlerList(TenantEntity tenantEntity, List<WxVtwoActivityOrder> recordList); | |||||
| List<WxVtwoActivityOrder> findList(WxVtwoActivityOrder record, Long activityId); | |||||
| WxVtwoActivityOrder getById(Long id, String tenantId); | WxVtwoActivityOrder getById(Long id, String tenantId); | ||||
| WxVtwoActivityOrder getInfoById(Long id, String tenantId); | WxVtwoActivityOrder getInfoById(Long id, String tenantId); | ||||
| Map<String, Integer> getStatistics(WxVtwoActivityOrder record); | |||||
| Map<String, Object> getStatistics(WxVtwoActivityOrder record); | |||||
| void auditRecord(WxVtwoActivityOrder record, Long userId); | void auditRecord(WxVtwoActivityOrder record, Long userId); | ||||
| @@ -32,8 +32,10 @@ public interface WxVtwoActivityOrderService extends IService<WxVtwoActivityOrder | |||||
| Map<String, Object> orderStatistics(TenantEntity tenantInfo); | Map<String, Object> orderStatistics(TenantEntity tenantInfo); | ||||
| void exportData(HttpServletRequest request, HttpServletResponse response, WxVtwoActivityOrder record); | |||||
| void exportData(HttpServletRequest request, HttpServletResponse response, WxVtwoActivityOrder record, Long activityId); | |||||
| Integer getWaitAudiCount(TenantEntity tenantInfo); | Integer getWaitAudiCount(TenantEntity tenantInfo); | ||||
| WxVtwoActivityOrder getlimitOne(WxVtwoActivityOrder activityOrder); | |||||
| } | } | ||||
| @@ -3,6 +3,7 @@ package com.iformall.service; | |||||
| import com.github.pagehelper.PageInfo; | import com.github.pagehelper.PageInfo; | ||||
| import com.iformall.domain.po.WxVtwoAmountGiftActivity; | import com.iformall.domain.po.WxVtwoAmountGiftActivity; | ||||
| import com.baomidou.mybatisplus.extension.service.IService; | import com.baomidou.mybatisplus.extension.service.IService; | ||||
| import com.iformall.domain.po.WxVtwoCashBackActivity; | |||||
| import com.iformall.domain.po.WxVtwoPrizeDrawActivity; | import com.iformall.domain.po.WxVtwoPrizeDrawActivity; | ||||
| /** | /** | ||||
| @@ -16,4 +17,5 @@ public interface WxVtwoAmountGiftActivityService extends IService<WxVtwoAmountGi | |||||
| WxVtwoAmountGiftActivity getInfoById(Long id, String tenantId); | WxVtwoAmountGiftActivity getInfoById(Long id, String tenantId); | ||||
| WxVtwoAmountGiftActivity getById(Long id, String tenantId); | |||||
| } | } | ||||
| @@ -4,6 +4,7 @@ import com.github.pagehelper.PageInfo; | |||||
| import com.iformall.domain.po.WxVtwoAmountGiftActivity; | import com.iformall.domain.po.WxVtwoAmountGiftActivity; | ||||
| import com.iformall.domain.po.WxVtwoCashBackActivity; | import com.iformall.domain.po.WxVtwoCashBackActivity; | ||||
| import com.baomidou.mybatisplus.extension.service.IService; | import com.baomidou.mybatisplus.extension.service.IService; | ||||
| import com.iformall.domain.po.WxVtwoPrizeDrawActivity; | |||||
| /** | /** | ||||
| * @author xiaohu | * @author xiaohu | ||||
| @@ -16,4 +17,5 @@ public interface WxVtwoCashBackActivityService extends IService<WxVtwoCashBackAc | |||||
| WxVtwoCashBackActivity getInfoById(Long id, String tenantId); | WxVtwoCashBackActivity getInfoById(Long id, String tenantId); | ||||
| WxVtwoCashBackActivity getById(Long id, String tenantId); | |||||
| } | } | ||||
| @@ -1,9 +1,14 @@ | |||||
| package com.iformall.service; | package com.iformall.service; | ||||
| import com.github.pagehelper.PageInfo; | import com.github.pagehelper.PageInfo; | ||||
| import com.iformall.domain.po.WxVtwoActivityOrder; | |||||
| import com.iformall.domain.po.WxVtwoPrizeDrawActivity; | import com.iformall.domain.po.WxVtwoPrizeDrawActivity; | ||||
| import com.baomidou.mybatisplus.extension.service.IService; | import com.baomidou.mybatisplus.extension.service.IService; | ||||
| import javax.servlet.http.HttpServletRequest; | |||||
| import javax.servlet.http.HttpServletResponse; | |||||
| import java.util.List; | |||||
| /** | /** | ||||
| * @author xiaohu | * @author xiaohu | ||||
| * @description 针对表【wx_vtwo_prize_draw_activity(线下抽奖活动)】的数据库操作Service | * @description 针对表【wx_vtwo_prize_draw_activity(线下抽奖活动)】的数据库操作Service | ||||
| @@ -14,4 +19,7 @@ public interface WxVtwoPrizeDrawActivityService extends IService<WxVtwoPrizeDraw | |||||
| PageInfo<WxVtwoPrizeDrawActivity> listAsPage(WxVtwoPrizeDrawActivity prizeDrawActivity, Integer pageNum, Integer pageSize); | PageInfo<WxVtwoPrizeDrawActivity> listAsPage(WxVtwoPrizeDrawActivity prizeDrawActivity, Integer pageNum, Integer pageSize); | ||||
| WxVtwoPrizeDrawActivity getInfoById(Long id, String tenantId); | WxVtwoPrizeDrawActivity getInfoById(Long id, String tenantId); | ||||
| WxVtwoPrizeDrawActivity getById(Long id, String tenantId); | |||||
| } | } | ||||
| @@ -7,8 +7,6 @@ import com.iformall.domain.po.WxMerchant; | |||||
| import com.iformall.domain.po.WxOfflineActivityMerchant; | import com.iformall.domain.po.WxOfflineActivityMerchant; | ||||
| import com.iformall.domain.po.WxVtwoActivityMerchant; | import com.iformall.domain.po.WxVtwoActivityMerchant; | ||||
| import com.iformall.domain.po.base.TenantEntity; | import com.iformall.domain.po.base.TenantEntity; | ||||
| import com.iformall.enums.EnumOfflineActivityMerchantType; | |||||
| import com.iformall.enums.EnumYesOrNo; | |||||
| import com.iformall.service.WxMerchantService; | import com.iformall.service.WxMerchantService; | ||||
| import com.iformall.service.WxVtwoActivityMerchantService; | import com.iformall.service.WxVtwoActivityMerchantService; | ||||
| import com.iformall.mapper.WxVtwoActivityMerchantMapper; | import com.iformall.mapper.WxVtwoActivityMerchantMapper; | ||||
| @@ -1,11 +1,13 @@ | |||||
| package com.iformall.service.impl; | package com.iformall.service.impl; | ||||
| import com.aliyun.openservices.shade.org.apache.commons.lang3.StringUtils; | import com.aliyun.openservices.shade.org.apache.commons.lang3.StringUtils; | ||||
| import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; | |||||
| import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; | import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; | ||||
| import com.github.pagehelper.PageHelper; | import com.github.pagehelper.PageHelper; | ||||
| import com.github.pagehelper.PageInfo; | import com.github.pagehelper.PageInfo; | ||||
| import com.iformall.common.IdWorker; | import com.iformall.common.IdWorker; | ||||
| import com.iformall.domain.po.*; | import com.iformall.domain.po.*; | ||||
| import com.iformall.domain.po.base.BaseEntity; | |||||
| import com.iformall.domain.po.base.TenantEntity; | import com.iformall.domain.po.base.TenantEntity; | ||||
| import com.iformall.domain.vo.*; | import com.iformall.domain.vo.*; | ||||
| import com.iformall.enums.*; | import com.iformall.enums.*; | ||||
| @@ -38,6 +40,9 @@ public class WxVtwoActivityOrderServiceImpl extends ServiceImpl<WxVtwoActivityOr | |||||
| @Autowired | @Autowired | ||||
| private WxVtwoActivityOrderMapper wxVtwoActivityOrderMapper; | private WxVtwoActivityOrderMapper wxVtwoActivityOrderMapper; | ||||
| @Autowired | |||||
| private WxVtwoActivityGrantOrderMapper wxVtwoActivityGrantOrderMapper; | |||||
| @Autowired | @Autowired | ||||
| private WxVtwoActivitySpecialTopicService wxVtwoActivitySpecialTopicService; | private WxVtwoActivitySpecialTopicService wxVtwoActivitySpecialTopicService; | ||||
| @@ -66,6 +71,15 @@ public class WxVtwoActivityOrderServiceImpl extends ServiceImpl<WxVtwoActivityOr | |||||
| return recordPage; | return recordPage; | ||||
| } | } | ||||
| @Override | |||||
| public List<WxVtwoActivityOrder> findList(WxVtwoActivityOrder record, Long activityId) { | |||||
| handlerQuery(record); | |||||
| List<WxVtwoActivityOrder> recordList = wxVtwoActivityOrderMapper.findList(record); | |||||
| handlerList(record,recordList); | |||||
| handlerOrderStatus(activityId,recordList); | |||||
| return recordList; | |||||
| } | |||||
| private void handlerQuery(WxVtwoActivityOrder record) { | private void handlerQuery(WxVtwoActivityOrder record) { | ||||
| //商户处理 | //商户处理 | ||||
| if (StringUtils.isNotBlank(record.getMerchantName())) { | if (StringUtils.isNotBlank(record.getMerchantName())) { | ||||
| @@ -81,8 +95,7 @@ public class WxVtwoActivityOrderServiceImpl extends ServiceImpl<WxVtwoActivityOr | |||||
| } | } | ||||
| } | } | ||||
| @Override | |||||
| public void handlerList(TenantEntity tenantEntity, List<WxVtwoActivityOrder> recordList) { | |||||
| private void handlerList(TenantEntity tenantEntity, List<WxVtwoActivityOrder> recordList) { | |||||
| if (recordList == null || recordList.size() <= 0) { | if (recordList == null || recordList.size() <= 0) { | ||||
| return; | return; | ||||
| } | } | ||||
| @@ -120,6 +133,26 @@ public class WxVtwoActivityOrderServiceImpl extends ServiceImpl<WxVtwoActivityOr | |||||
| } | } | ||||
| } | } | ||||
| private void handlerOrderStatus(Long activityId, List<WxVtwoActivityOrder> recordList){ | |||||
| if(activityId == null){ | |||||
| return; | |||||
| } | |||||
| if (recordList == null || recordList.size() <= 0) { | |||||
| return; | |||||
| } | |||||
| for (WxVtwoActivityOrder record : recordList) { | |||||
| WxVtwoActivityGrantOrder grantOrder = new WxVtwoActivityGrantOrder(); | |||||
| grantOrder.updateTenantInfo(record); | |||||
| grantOrder.setActivityId(activityId); | |||||
| grantOrder.setOrderId(record.getId()); | |||||
| grantOrder.setStatus(EnumVtwoActivityGrantStatus.VALID.getCode()); | |||||
| Integer orderGrantCount = wxVtwoActivityGrantOrderMapper.selectCount(new QueryWrapper<>(grantOrder)); | |||||
| if(orderGrantCount > 0){ | |||||
| record.setAuditStatus(EnumOfflineActivityRecordStatus.IS_GRANT.getCode()); | |||||
| } | |||||
| } | |||||
| } | |||||
| @Override | @Override | ||||
| public boolean saveOrUpdate(WxVtwoActivityOrder activityOrder) { | public boolean saveOrUpdate(WxVtwoActivityOrder activityOrder) { | ||||
| if(activityOrder.getMerchantId() != null){ | if(activityOrder.getMerchantId() != null){ | ||||
| @@ -160,24 +193,29 @@ public class WxVtwoActivityOrderServiceImpl extends ServiceImpl<WxVtwoActivityOr | |||||
| } | } | ||||
| @Override | @Override | ||||
| public Map<String, Integer> getStatistics(WxVtwoActivityOrder record) { | |||||
| public Map<String, Object> getStatistics(WxVtwoActivityOrder record) { | |||||
| List<WxVtwoActivityOrderStatistics> auditStatusStatistics = wxVtwoActivityOrderMapper.auditStatusStatistics(record); | List<WxVtwoActivityOrderStatistics> auditStatusStatistics = wxVtwoActivityOrderMapper.auditStatusStatistics(record); | ||||
| Map<String, Integer> result = new HashMap<>(); | |||||
| Map<String, Object> result = new HashMap<>(); | |||||
| Integer audting = 0, audi_success = 0, audt_fail = 0, invalid = 0; | Integer audting = 0, audi_success = 0, audt_fail = 0, invalid = 0; | ||||
| BigDecimal sum_success = BigDecimal.ZERO, sum_fail = BigDecimal.ZERO; | |||||
| for(WxVtwoActivityOrderStatistics statistics : auditStatusStatistics){ | for(WxVtwoActivityOrderStatistics statistics : auditStatusStatistics){ | ||||
| if(EnumOfflineActivityRecordStatus.AUDTING.getCode().equals(statistics.getAuditStatus())){ | if(EnumOfflineActivityRecordStatus.AUDTING.getCode().equals(statistics.getAuditStatus())){ | ||||
| audting = statistics.getCount(); | audting = statistics.getCount(); | ||||
| } else if (EnumOfflineActivityRecordStatus.AUDI_SUCCESS.getCode().equals(statistics.getAuditStatus())) { | } else if (EnumOfflineActivityRecordStatus.AUDI_SUCCESS.getCode().equals(statistics.getAuditStatus())) { | ||||
| audi_success = statistics.getCount(); | audi_success = statistics.getCount(); | ||||
| sum_success = statistics.getSumMoney(); | |||||
| } else if (EnumOfflineActivityRecordStatus.AUDT_FAIL.getCode().equals(statistics.getAuditStatus())) { | } else if (EnumOfflineActivityRecordStatus.AUDT_FAIL.getCode().equals(statistics.getAuditStatus())) { | ||||
| audt_fail = statistics.getCount(); | audt_fail = statistics.getCount(); | ||||
| sum_fail = statistics.getSumMoney(); | |||||
| } else if (EnumOfflineActivityRecordStatus.INVALID.getCode().equals(statistics.getAuditStatus())) { | } else if (EnumOfflineActivityRecordStatus.INVALID.getCode().equals(statistics.getAuditStatus())) { | ||||
| invalid = statistics.getCount(); | invalid = statistics.getCount(); | ||||
| } | } | ||||
| } | } | ||||
| result.put("audting",audting); | result.put("audting",audting); | ||||
| result.put("audi_success",audi_success); | result.put("audi_success",audi_success); | ||||
| result.put("sum_success",sum_success); | |||||
| result.put("audt_fail",audt_fail); | result.put("audt_fail",audt_fail); | ||||
| result.put("sum_fail",sum_fail); | |||||
| result.put("invalid",invalid); | result.put("invalid",invalid); | ||||
| result.put("sum_count",audting+audi_success+audt_fail+invalid); | result.put("sum_count",audting+audi_success+audt_fail+invalid); | ||||
| return result; | return result; | ||||
| @@ -317,10 +355,8 @@ public class WxVtwoActivityOrderServiceImpl extends ServiceImpl<WxVtwoActivityOr | |||||
| } | } | ||||
| @Override | @Override | ||||
| public void exportData(HttpServletRequest request, HttpServletResponse response, WxVtwoActivityOrder record) { | |||||
| handlerQuery(record); | |||||
| List<WxVtwoActivityOrder> list = wxVtwoActivityOrderMapper.findList(record); | |||||
| handlerList(record,list); | |||||
| public void exportData(HttpServletRequest request, HttpServletResponse response, WxVtwoActivityOrder record, Long activityId) { | |||||
| List<WxVtwoActivityOrder> list = this.findList(record, activityId); | |||||
| excelService.exportExcel(list, null, "活动订单列表", WxOfflineActivityRecord.class, "活动订单列表.xlsx", response, false); | excelService.exportExcel(list, null, "活动订单列表", WxOfflineActivityRecord.class, "活动订单列表.xlsx", response, false); | ||||
| } | } | ||||
| @@ -332,6 +368,12 @@ public class WxVtwoActivityOrderServiceImpl extends ServiceImpl<WxVtwoActivityOr | |||||
| return wxVtwoActivityOrderMapper.getCount(record); | return wxVtwoActivityOrderMapper.getCount(record); | ||||
| } | } | ||||
| @Override | |||||
| public WxVtwoActivityOrder getlimitOne(WxVtwoActivityOrder activityOrder) { | |||||
| activityOrder.setSortColumns(BaseEntity.SortField.CreateDate_DESC); | |||||
| return wxVtwoActivityOrderMapper.selectLimitOne(activityOrder); | |||||
| } | |||||
| } | } | ||||
| @@ -10,6 +10,7 @@ import com.iformall.domain.vo.WxVtwoActivityOrderStatistics; | |||||
| import com.iformall.domain.vo.WxVtwoActivityRuleDetail; | import com.iformall.domain.vo.WxVtwoActivityRuleDetail; | ||||
| import com.iformall.enums.*; | import com.iformall.enums.*; | ||||
| import com.iformall.mapper.*; | import com.iformall.mapper.*; | ||||
| import com.iformall.service.ExcelService; | |||||
| import com.iformall.service.WxVtwoActivityAwardService; | import com.iformall.service.WxVtwoActivityAwardService; | ||||
| import com.iformall.service.WxVtwoActivityMerchantService; | import com.iformall.service.WxVtwoActivityMerchantService; | ||||
| import com.iformall.service.WxVtwoAmountGiftActivityService; | import com.iformall.service.WxVtwoAmountGiftActivityService; | ||||
| @@ -54,6 +55,9 @@ public class WxVtwoAmountGiftActivityServiceImpl extends ServiceImpl<WxVtwoAmoun | |||||
| @Autowired | @Autowired | ||||
| private WxVtwoActivityMerchantService wxVtwoActivityMerchantService; | private WxVtwoActivityMerchantService wxVtwoActivityMerchantService; | ||||
| @Autowired | |||||
| private ExcelService excelService; | |||||
| @Override | @Override | ||||
| public PageInfo<WxVtwoAmountGiftActivity> listAsPage(WxVtwoAmountGiftActivity amountGiftActivity, Integer pageNum, Integer pageSize) { | public PageInfo<WxVtwoAmountGiftActivity> listAsPage(WxVtwoAmountGiftActivity amountGiftActivity, Integer pageNum, Integer pageSize) { | ||||
| handlerQuery(amountGiftActivity); | handlerQuery(amountGiftActivity); | ||||
| @@ -213,6 +217,10 @@ public class WxVtwoAmountGiftActivityServiceImpl extends ServiceImpl<WxVtwoAmoun | |||||
| return amountGiftActivity; | return amountGiftActivity; | ||||
| } | } | ||||
| @Override | |||||
| public WxVtwoAmountGiftActivity getById(Long id, String tenantId) { | |||||
| return wxVtwoAmountGiftActivityMapper.selectById(id, tenantId); | |||||
| } | |||||
| } | } | ||||
| @@ -11,10 +11,7 @@ import com.iformall.domain.vo.WxVtwoActivityRuleDetail; | |||||
| import com.iformall.domain.vo.WxVtwoActivityTaxDeductionRule; | import com.iformall.domain.vo.WxVtwoActivityTaxDeductionRule; | ||||
| import com.iformall.enums.*; | import com.iformall.enums.*; | ||||
| import com.iformall.mapper.*; | import com.iformall.mapper.*; | ||||
| import com.iformall.service.WxVtwoActivityAwardService; | |||||
| import com.iformall.service.WxVtwoActivityMerchantService; | |||||
| import com.iformall.service.WxVtwoCashBackActivityService; | |||||
| import com.iformall.service.WxVtwoCashBackAwardService; | |||||
| import com.iformall.service.*; | |||||
| import org.apache.commons.lang3.StringUtils; | import org.apache.commons.lang3.StringUtils; | ||||
| import org.springframework.beans.factory.annotation.Autowired; | import org.springframework.beans.factory.annotation.Autowired; | ||||
| import org.springframework.stereotype.Service; | import org.springframework.stereotype.Service; | ||||
| @@ -58,6 +55,9 @@ public class WxVtwoCashBackActivityServiceImpl extends ServiceImpl<WxVtwoCashBac | |||||
| @Autowired | @Autowired | ||||
| private WxVtwoActivityMerchantService wxVtwoActivityMerchantService; | private WxVtwoActivityMerchantService wxVtwoActivityMerchantService; | ||||
| @Autowired | |||||
| private ExcelService excelService; | |||||
| @Override | @Override | ||||
| public PageInfo<WxVtwoCashBackActivity> listAsPage(WxVtwoCashBackActivity cashBackActivity, Integer pageNum, Integer pageSize) { | public PageInfo<WxVtwoCashBackActivity> listAsPage(WxVtwoCashBackActivity cashBackActivity, Integer pageNum, Integer pageSize) { | ||||
| handlerQuery(cashBackActivity); | handlerQuery(cashBackActivity); | ||||
| @@ -216,6 +216,10 @@ public class WxVtwoCashBackActivityServiceImpl extends ServiceImpl<WxVtwoCashBac | |||||
| return cashBackActivity; | return cashBackActivity; | ||||
| } | } | ||||
| @Override | |||||
| public WxVtwoCashBackActivity getById(Long id, String tenantId) { | |||||
| return wxVtwoCashBackActivityMapper.selectById(id, tenantId); | |||||
| } | |||||
| } | } | ||||
| @@ -9,20 +9,22 @@ import com.github.pagehelper.PageHelper; | |||||
| import com.github.pagehelper.PageInfo; | import com.github.pagehelper.PageInfo; | ||||
| import com.iformall.common.IdWorker; | import com.iformall.common.IdWorker; | ||||
| import com.iformall.domain.po.*; | import com.iformall.domain.po.*; | ||||
| import com.iformall.domain.po.base.BaseEntity; | |||||
| import com.iformall.domain.vo.OfflineActivityRecordStatistics; | import com.iformall.domain.vo.OfflineActivityRecordStatistics; | ||||
| import com.iformall.domain.vo.WxVtwoActivityOrderStatistics; | import com.iformall.domain.vo.WxVtwoActivityOrderStatistics; | ||||
| import com.iformall.domain.vo.WxVtwoActivityRule; | import com.iformall.domain.vo.WxVtwoActivityRule; | ||||
| import com.iformall.domain.vo.WxVtwoActivityRuleDetail; | import com.iformall.domain.vo.WxVtwoActivityRuleDetail; | ||||
| import com.iformall.enums.*; | import com.iformall.enums.*; | ||||
| import com.iformall.mapper.*; | import com.iformall.mapper.*; | ||||
| import com.iformall.service.WxVtwoActivityAwardService; | |||||
| import com.iformall.service.WxVtwoActivityMerchantService; | |||||
| import com.iformall.service.WxVtwoPrizeDrawActivityService; | |||||
| import com.iformall.service.*; | |||||
| import org.apache.commons.lang3.StringUtils; | import org.apache.commons.lang3.StringUtils; | ||||
| import org.springframework.beans.factory.annotation.Autowired; | import org.springframework.beans.factory.annotation.Autowired; | ||||
| import org.springframework.stereotype.Service; | import org.springframework.stereotype.Service; | ||||
| import org.springframework.transaction.annotation.Transactional; | import org.springframework.transaction.annotation.Transactional; | ||||
| import javax.servlet.http.HttpServletRequest; | |||||
| import javax.servlet.http.HttpServletResponse; | |||||
| import java.util.Collections; | |||||
| import java.util.Date; | import java.util.Date; | ||||
| import java.util.List; | import java.util.List; | ||||
| @@ -59,6 +61,8 @@ public class WxVtwoPrizeDrawActivityServiceImpl extends ServiceImpl<WxVtwoPrizeD | |||||
| @Autowired | @Autowired | ||||
| private WxVtwoActivityMerchantService wxVtwoActivityMerchantService; | private WxVtwoActivityMerchantService wxVtwoActivityMerchantService; | ||||
| @Autowired | |||||
| private ExcelService excelService; | |||||
| @Override | @Override | ||||
| public PageInfo<WxVtwoPrizeDrawActivity> listAsPage(WxVtwoPrizeDrawActivity prizeDrawActivity, Integer pageNum, Integer pageSize) { | public PageInfo<WxVtwoPrizeDrawActivity> listAsPage(WxVtwoPrizeDrawActivity prizeDrawActivity, Integer pageNum, Integer pageSize) { | ||||
| @@ -218,6 +222,12 @@ public class WxVtwoPrizeDrawActivityServiceImpl extends ServiceImpl<WxVtwoPrizeD | |||||
| } | } | ||||
| return prizeDrawActivity; | return prizeDrawActivity; | ||||
| } | } | ||||
| @Override | |||||
| public WxVtwoPrizeDrawActivity getById(Long id, String tenantId) { | |||||
| return wxVtwoPrizeDrawActivityMapper.selectById(id, tenantId); | |||||
| } | |||||
| } | } | ||||
| @@ -9,6 +9,7 @@ | |||||
| <result property="tenantId" column="tenant_id" jdbcType="VARCHAR"/> | <result property="tenantId" column="tenant_id" jdbcType="VARCHAR"/> | ||||
| <result property="parentTenantId" column="parent_tenant_id" jdbcType="VARCHAR"/> | <result property="parentTenantId" column="parent_tenant_id" jdbcType="VARCHAR"/> | ||||
| <result property="grantId" column="grant_id" jdbcType="BIGINT"/> | <result property="grantId" column="grant_id" jdbcType="BIGINT"/> | ||||
| <result property="activityId" column="activity_id" jdbcType="BIGINT"/> | |||||
| <result property="orderId" column="order_id" jdbcType="BIGINT"/> | <result property="orderId" column="order_id" jdbcType="BIGINT"/> | ||||
| <result property="isAmount" column="is_amount" jdbcType="SMALLINT"/> | <result property="isAmount" column="is_amount" jdbcType="SMALLINT"/> | ||||
| <result property="status" column="status" jdbcType="SMALLINT"/> | <result property="status" column="status" jdbcType="SMALLINT"/> | ||||
| @@ -16,8 +17,8 @@ | |||||
| <sql id="allColumns"> | <sql id="allColumns"> | ||||
| id,tenant_id,parent_tenant_id, | id,tenant_id,parent_tenant_id, | ||||
| grant_id,order_id,is_amount, | |||||
| status | |||||
| grant_id,activity_id,order_id, | |||||
| is_amount, status | |||||
| </sql> | </sql> | ||||
| <sql id="dynamicWhereConditions"> | <sql id="dynamicWhereConditions"> | ||||
| @@ -34,6 +35,9 @@ | |||||
| <if test=" null != grantId "> | <if test=" null != grantId "> | ||||
| and `grant_id` = #{grantId} | and `grant_id` = #{grantId} | ||||
| </if> | </if> | ||||
| <if test=" null != activityId "> | |||||
| and `activity_id` = #{activityId} | |||||
| </if> | |||||
| <if test=" null != orderId "> | <if test=" null != orderId "> | ||||
| and `order_id` = #{orderId} | and `order_id` = #{orderId} | ||||
| </if> | </if> | ||||
| @@ -56,7 +56,7 @@ | |||||
| </select> | </select> | ||||
| <insert id="insertList" parameterType="java.util.List"> | <insert id="insertList" parameterType="java.util.List"> | ||||
| insert into wx_vtwo_activity_award | |||||
| insert into wx_vtwo_special_topic_activity | |||||
| (id, | (id, | ||||
| special_topic_id,activity_id,activity_type, | special_topic_id,activity_id,activity_type, | ||||
| activity_name,activity_create_date,activity_start_time, | activity_name,activity_create_date,activity_start_time, | ||||
| @@ -73,7 +73,7 @@ | |||||
| </insert> | </insert> | ||||
| <update id="updateByActivity" parameterType="com.iformall.domain.po.WxVtwoSpecialTopicActivity"> | <update id="updateByActivity" parameterType="com.iformall.domain.po.WxVtwoSpecialTopicActivity"> | ||||
| update wx_vtwo_activity_award | |||||
| update wx_vtwo_special_topic_activity | |||||
| set | set | ||||
| <if test=" null != activityName and '' != activityName"> | <if test=" null != activityName and '' != activityName"> | ||||
| `activity_name` = #{activityName}, | `activity_name` = #{activityName}, | ||||