+我的券后台功能;

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/candy/CandyMgtCouponController.java → liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/candy/CandyMgtCoupon2AdminController.java

@@ -33,26 +33,26 @@ import java.time.format.DateTimeFormatter;
 import java.util.List;
 
 @Api(tags = "券发放管理")
-@Slf4j
 @Controller
-@RequestMapping("candy/coupon/mgt")
-public class CandyMgtCouponController extends BaseController {
+@RequestMapping("candy/coupon2/mgt")
+public class CandyMgtCoupon2AdminController extends BaseController {
     private final String prefix = "zhengzai/candy/coupon/mgt";
     @Autowired
     private ICandyMgtCouponAdminService candyMgtCouponAdminService;
     @Autowired
     private ICandyCouponAdminService candyCouponAdminService;
 
-    @RequiresPermissions("candy:coupon:mgt:view")
+    @RequiresPermissions("candy:coupon2:mgt:view")
     @GetMapping()
-    public String coupon(@RequestParam Integer couType) {
-        return prefix + "/coupon" + couType;
+    public String coupon() {
+        return prefix + "/coupon2";
     }
 
-    @RequiresPermissions("candy:coupon:mgt:list")
+    @RequiresPermissions("candy:coupon2:mgt:list")
     @PostMapping("list")
     @ResponseBody
     public TableDataInfo list(CandyMgtCouponListParam listParam) {
+        listParam.setCouType(2);
         startPage();
         List<CandyMgtCouponInfoDto> list = candyMgtCouponAdminService.listForMgtCouponInfoDto(listParam);
         return getDataTable(list);
@@ -60,11 +60,11 @@ public class CandyMgtCouponController extends BaseController {
 
     @GetMapping("add")
     public String add() {
-        return prefix + "/add";
+        return prefix + "/add2";
     }
 
     @ApiOperation(value = "新建券")
-    @RequiresPermissions("candy:coupon:mgt:add")
+    @RequiresPermissions("candy:coupon2:mgt:add")
     @Log(title = "券发放管理", businessType = BusinessType.INSERT)
     @PostMapping("add")
     @ResponseBody
@@ -93,7 +93,7 @@ public class CandyMgtCouponController extends BaseController {
                 discount = buildParam.getDiscount();
                 break;
             default:
-                log.warn("Invalid operation[buildParam.couType={}]", couType);
+                logger.warn("Invalid operation[buildParam.couType={}]", couType);
                 return this.error(AjaxResult.Type.WARN, "券类型无效");
         }
         effectAt = eventAt.with(LocalTime.MIN);
@@ -154,7 +154,7 @@ public class CandyMgtCouponController extends BaseController {
         return prefix + "/code";
     }
 
-    @RequiresPermissions("candy:coupon:mgt:code:list")
+    @RequiresPermissions("candy:coupon2:mgt:code:list")
     @PostMapping("codeList")
     @ResponseBody
     public TableDataInfo codeList(CandyMgtCouponListParam listParam) {