opt;

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/candy/CandyCouponAdminController.java

@@ -8,11 +8,14 @@ import com.liquidnet.client.admin.common.core.domain.AjaxResult;
 import com.liquidnet.client.admin.common.core.page.TableDataInfo;
 import com.liquidnet.client.admin.zhengzai.candy.service.ICandyCouponAdminService;
 import com.liquidnet.client.admin.zhengzai.candy.service.ICandyCouponRuleAdminService;
+import com.liquidnet.service.candy.dto.admin.CandyCouponFilterDto;
 import com.liquidnet.service.candy.dto.admin.CandyCouponListParam;
 import com.liquidnet.service.candy.dto.admin.CandyCouponTemplateDto;
 import com.liquidnet.service.candy.entity.CandyCoupon;
 import com.liquidnet.service.candy.entity.CandyCouponRule;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -22,7 +25,11 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
 @Api(tags = "我的券包")
 @Controller
@@ -35,10 +42,17 @@ public class CandyCouponAdminController extends BaseController {
     ICandyCouponRuleAdminService candyCouponRuleAdminService;
 
     @ApiOperation(value = "券列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(type = "form", required = false, dataType = "Integer", name = "busiType", value = "业务类别[0-全场｜1-演出｜2-商品｜3-优先购]"),
+            @ApiImplicitParam(type = "form", required = false, dataType = "Integer", name = "couType", value = "券类型[1-代金券｜2-满减券｜3-兑换券｜4-折扣券|101-优先券]"),
+            @ApiImplicitParam(type = "form", required = false, dataType = "String", name = "bindType", value = "领取方式[0-用户输入兑换｜1-发放至用户｜2-积分兑换｜3-发放需领取｜4-会员专属],多种方式则以,分隔入参"),
+            @ApiImplicitParam(type = "form", required = false, dataType = "String", name = "keyword", value = "搜索关键字"),
+    })
     @PostMapping("list")
     @ResponseBody
     public TableDataInfo list(CandyCouponListParam listParam) {
         LambdaQueryWrapper<CandyCoupon> queryWrapper = Wrappers.lambdaQuery(CandyCoupon.class);
+        queryWrapper.eq(CandyCoupon::getState, 1);
         queryWrapper.select(CandyCoupon::getCouponId, CandyCoupon::getTitle);
         queryWrapper.orderByDesc(CandyCoupon::getCreatedAt);
 
@@ -52,13 +66,26 @@ public class CandyCouponAdminController extends BaseController {
             if (null != listParam.getCouType()) {
                 queryWrapper.eq(CandyCoupon::getCouType, listParam.getCouType());
             }
-            if (null != listParam.getBindType()) {
-                queryWrapper.eq(CandyCoupon::getBindType, listParam.getBindType());
+//            if (null != listParam.getBindType()) {
+//                queryWrapper.eq(CandyCoupon::getBindType, listParam.getBindType());
+//            }
+            if (null != listParam.getBindType() && Pattern.matches("^[\\d,]*$", listParam.getBindType())) {
+                String[] bindTypeArr = listParam.getBindType().split(",");
+                if (bindTypeArr.length > 0) {
+                    queryWrapper.in(CandyCoupon::getBindType, Arrays.stream(bindTypeArr).toArray());
+                }
             }
         }
 
         startPage();
-        return getDataTable(candyCouponAdminService.list(queryWrapper));
+        List<CandyCoupon> list = candyCouponAdminService.list(queryWrapper);
+        TableDataInfo dataTable = getDataTable(list);
+        List<CandyCouponFilterDto> dtoList = new ArrayList<>();
+        list.forEach(r -> {
+            dtoList.add(CandyCouponFilterDto.getNew().copy(r));
+        });
+        dataTable.setRows(dtoList);
+        return dataTable;
     }
 
     @ApiOperation(value = "券详情")

liquidnet-bus-do/liquidnet-service-candy-do/src/main/java/com/liquidnet/service/candy/dto/admin/CandyCouponFilterDto.java

+package com.liquidnet.service.candy.dto.admin;
+
+import com.liquidnet.service.candy.entity.CandyCoupon;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class CandyCouponFilterDto implements Serializable, Cloneable {
+    private static final long serialVersionUID = -3287018184399499549L;
+    private String couponId;
+    private String title;
+
+    private static final CandyCouponFilterDto obj = new CandyCouponFilterDto();
+
+    public static CandyCouponFilterDto getNew() {
+        try {
+            return (CandyCouponFilterDto) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new CandyCouponFilterDto();
+        }
+    }
+
+    public CandyCouponFilterDto copy(CandyCoupon source) {
+        if (null == source) return this;
+        this.setCouponId(source.getCouponId());
+        this.setTitle(source.getTitle());
+        return this;
+    }
+}

liquidnet-bus-do/liquidnet-service-candy-do/src/main/java/com/liquidnet/service/candy/dto/admin/CandyCouponListParam.java

@@ -11,8 +11,11 @@ public class CandyCouponListParam {
     private String keyword;
     /**
      * 领取方式[0-用户输入兑换｜1-发放至用户｜2-积分兑换｜3-发放需领取｜4-会员专属]
+     * <p>
+     * 多种方式则以,分隔入参
+     * </p>
      */
-    private Integer bindType;
+    private String bindType;
     /**
      * 业务类别[0-全场｜1-演出｜2-商品｜3-优先购]
      */
@@ -34,11 +37,11 @@ public class CandyCouponListParam {
         this.keyword = keyword;
     }
 
-    public Integer getBindType() {
+    public String getBindType() {
         return bindType;
     }
 
-    public void setBindType(Integer bindType) {
+    public void setBindType(String bindType) {
         this.bindType = bindType;
     }