Browse Source

门店绑定二维码

zhangkaikai 1 year ago
parent
commit
3d8d274c24

+ 0 - 22
mp-admin/src/main/java/com/qs/mp/web/controller/api/channel/ChannelController.java

@@ -4,10 +4,7 @@ import com.alibaba.druid.sql.visitor.functions.If;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.qs.mp.admin.domain.TicketBox;
-import com.qs.mp.admin.domain.param.TicketBoxQueryParam;
 import com.qs.mp.admin.domain.vo.TicketCntVO;
 import com.qs.mp.admin.domain.vo.TicketCntVO;
-import com.qs.mp.admin.service.ITicketBoxService;
 import com.qs.mp.admin.service.ITicketService;
 import com.qs.mp.admin.service.ITicketService;
 import com.qs.mp.channel.domain.Channel;
 import com.qs.mp.channel.domain.Channel;
 import com.qs.mp.channel.domain.ChannelCommission;
 import com.qs.mp.channel.domain.ChannelCommission;
@@ -102,8 +99,6 @@ public class ChannelController extends BaseApiController {
     @Autowired
     @Autowired
     private IUserAddrService userAddrService;
     private IUserAddrService userAddrService;
 
 
-    @Autowired
-    private ITicketBoxService ticketBoxService;
 
 
 
 
     @PostMapping("/saleSite/info/{channelId}")
     @PostMapping("/saleSite/info/{channelId}")
@@ -788,21 +783,4 @@ public class ChannelController extends BaseApiController {
         return AjaxResult.success(map);
         return AjaxResult.success(map);
     }
     }
 
 
-    @PostMapping("/list/underChannel")
-    @PreAuthorize("@ss.hasPermi('business:ticket:list')")
-    @ApiOperation("查询门店下盲票组列表")
-    @ApiResponses(
-            @ApiResponse(code = 200, message = "查询成功", response = TicketBox.class)
-    )
-    public TableDataInfo listUnderChannel(@RequestBody TicketBoxQueryParam ticketBoxQueryParam) {
-        startPage();
-        QueryWrapper<TicketBox> ticketBoxQueryWrapper = new QueryWrapper<>();
-        ticketBoxQueryWrapper.eq("t1.status", TicketBoxStatusEnum.PUT_ON)
-                .eq("t1.sale_channel_type", TicketBoxSaleChannelTypeEnum.SHOP.getValue())
-                .eq("t2.channel_id", ticketBoxQueryParam.getChannelId());
-
-        List<TicketBox> ticketBoxList = ticketBoxService.listBySaleChannel(ticketBoxQueryWrapper);
-        return getDataTable(ticketBoxList);
-    }
-
 }
 }

+ 19 - 0
mp-admin/src/main/java/com/qs/mp/web/controller/api/user/UserTicketController.java

@@ -11,6 +11,7 @@ import com.qs.mp.admin.domain.*;
 import com.qs.mp.admin.domain.dto.TicketDrawNumDTO;
 import com.qs.mp.admin.domain.dto.TicketDrawNumDTO;
 import com.qs.mp.admin.domain.param.TicketBoxGoodsQueryParam;
 import com.qs.mp.admin.domain.param.TicketBoxGoodsQueryParam;
 import com.qs.mp.admin.domain.param.TicketBoxParam;
 import com.qs.mp.admin.domain.param.TicketBoxParam;
+import com.qs.mp.admin.domain.param.TicketBoxQueryParam;
 import com.qs.mp.admin.domain.param.TicketParam;
 import com.qs.mp.admin.domain.param.TicketParam;
 import com.qs.mp.admin.domain.vo.*;
 import com.qs.mp.admin.domain.vo.*;
 import com.qs.mp.admin.service.*;
 import com.qs.mp.admin.service.*;
@@ -51,6 +52,7 @@ import io.swagger.annotations.ApiResponses;
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;
 import ma.glasnost.orika.MapperFacade;
 import ma.glasnost.orika.MapperFacade;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 
 
@@ -374,6 +376,23 @@ public class UserTicketController extends BaseApiController {
     }
     }
 
 
 
 
+    @PostMapping("/ticket/list/underChannel")
+    @ApiOperation("查询门店下盲票组列表")
+    @ApiResponses(
+            @ApiResponse(code = 200, message = "查询成功", response = TicketBox.class)
+    )
+    public TableDataInfo listUnderChannel(@RequestBody TicketBoxQueryParam ticketBoxQueryParam) {
+        startPage();
+        QueryWrapper<TicketBox> ticketBoxQueryWrapper = new QueryWrapper<>();
+        ticketBoxQueryWrapper.eq("t1.status", TicketBoxStatusEnum.PUT_ON)
+                .eq("t1.sale_channel_type", TicketBoxSaleChannelTypeEnum.SHOP.getValue())
+                .eq("t2.channel_id", ticketBoxQueryParam.getChannelId());
+
+        List<TicketBox> ticketBoxList = ticketBoxService.listBySaleChannel(ticketBoxQueryWrapper);
+        return getDataTable(ticketBoxList);
+    }
+
+
     @PostMapping("/ticket/prize/list/{boxId}")
     @PostMapping("/ticket/prize/list/{boxId}")
     @ApiOperation("查询盲票下奖品列表")
     @ApiOperation("查询盲票下奖品列表")
     public TableDataInfo listPrize(@PathVariable("boxId") String boxId) {
     public TableDataInfo listPrize(@PathVariable("boxId") String boxId) {