From 9e0bd7c9e49ac8b657b63fa752dd484a9ed448f8 Mon Sep 17 00:00:00 2001 From: winter Date: Sun, 31 Dec 2023 23:01:33 +0800 Subject: [PATCH] fix --- .../market/WxOrderGroupController.java | 70 ------------------- .../iformall/service/WxOrderGroupService.java | 42 ----------- 2 files changed, 112 deletions(-) delete mode 100644 yqzjAdmin/src/main/java/com/iformall/controller/market/WxOrderGroupController.java delete mode 100644 yqzjService/src/main/java/com/iformall/service/WxOrderGroupService.java diff --git a/yqzjAdmin/src/main/java/com/iformall/controller/market/WxOrderGroupController.java b/yqzjAdmin/src/main/java/com/iformall/controller/market/WxOrderGroupController.java deleted file mode 100644 index eed435a..0000000 --- a/yqzjAdmin/src/main/java/com/iformall/controller/market/WxOrderGroupController.java +++ /dev/null @@ -1,70 +0,0 @@ -package com.iformall.controller.market; - -import com.github.pagehelper.PageInfo; -import com.iformall.annotation.SystemControllerLog; -import com.iformall.annotation.TenantIgnore; -import com.iformall.common.ResultData; -import com.iformall.controller.base.BaseController; -import com.iformall.domain.po.base.TenantEntity; -import com.iformall.domain.vo.WxOrderGroupMarketing; -import com.iformall.service.WxMallService; -import com.iformall.service.WxOrderGroupService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.util.List; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -@RestController -@RequestMapping("/orderGroup") -@Api(description = "拼团相关接口") -public class WxOrderGroupController extends BaseController { - private final Logger logger = LoggerFactory.getLogger(this.getClass()); - - @Autowired - WxOrderGroupService wxOrderGroupService; - @Autowired - WxMallService wxMallService; - - @TenantIgnore - @ApiOperation(value = "拼团营销分析") - @GetMapping("queryOrderGroupMarketingList") - @ApiImplicitParams({ - @ApiImplicitParam(name = "couponId", value = "couponId", dataType = "String", paramType = "query"), - @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), - @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true), - }) - @SystemControllerLog(description = "订单管理-拼团营销分析") - public ResultData queryOrderGroupMarketingList(@ModelAttribute WxOrderGroupMarketing wxOrderGroupMarketing, Integer pageNum, Integer pageSize) { - TenantEntity tenantEntity = getTenantInfo(); - List tenantEntitys = wxMallService.getTenantEntitys(tenantEntity); - wxOrderGroupMarketing.updateTenantInfo(tenantEntity); - final PageInfo page = wxOrderGroupService.queryOrderGroupMarketingList(wxOrderGroupMarketing,tenantEntitys, pageNum, pageSize); - return new ResultData(page); - } - - @ApiOperation(value = "拼团营销数据导出") - @GetMapping("exportOrderGroupMarketingList") - @ApiImplicitParams({ - @ApiImplicitParam(name = "couponId", value = "couponId", dataType = "String", paramType = "query") - }) - @SystemControllerLog(description = "营销统计-拼团营销数据导出") - public void exportOrderGroupMarketingList(@ModelAttribute WxOrderGroupMarketing wxOrderGroupMarketing, HttpServletRequest request, HttpServletResponse response) { - TenantEntity tenantEntity = getTenantInfo(); - List tenantEntitys = wxMallService.getTenantEntitys(tenantEntity); - wxOrderGroupMarketing.updateTenantInfo(tenantEntity); - wxOrderGroupService.exportOrderGroupMarketingList(wxOrderGroupMarketing,tenantEntitys, request, response); - } - -} diff --git a/yqzjService/src/main/java/com/iformall/service/WxOrderGroupService.java b/yqzjService/src/main/java/com/iformall/service/WxOrderGroupService.java deleted file mode 100644 index 835d1b4..0000000 --- a/yqzjService/src/main/java/com/iformall/service/WxOrderGroupService.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.iformall.service; - -import com.github.pagehelper.PageInfo; -import com.iformall.common.ResultData; -import com.iformall.domain.po.WxCoupon; -import com.iformall.domain.po.WxOrder; -import com.iformall.domain.po.WxOrderGroup; -import com.iformall.domain.po.base.TenantEntity; -import com.iformall.domain.vo.WxOrderGroupMarketing; - -import java.util.List; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -/** - * @author gongbiao - */ -public interface WxOrderGroupService { - - void createOrderGroup(WxOrder order, WxCoupon wxCoupon,boolean isScheduleTask); - - ResultData queryRemainOne(WxOrderGroup wxOrderGroup, Long userId); - - PageInfo> queryOrderGroup(WxOrder wxOrder, Integer pageNum, Integer pageSize); - - ResultData toOrderGroup(WxOrderGroup wxOrderGroup); - - ResultData queryOrderGroupStatus(WxOrderGroup wxOrderGroup); - - ResultData queryAttendStatus(WxOrderGroup wxOrderGroup); - - void updateGroupStatus(WxOrderGroup wxOrderGroup); - - List findList(WxOrderGroup group); - - PageInfo queryOrderGroupMarketingList(WxOrderGroupMarketing marketing, List tenantEntitys, Integer pageNum, Integer pageSize); - - void exportOrderGroupMarketingList(WxOrderGroupMarketing marketing, List tenantEntitys, HttpServletRequest request, HttpServletResponse response); - -}