Merge branch 'dev' into 'mp-server-test'

Dev

See merge request quanshu/mp-server!771

mp-admin/src/main/java/com/qs/mp/web/controller/api/admin/CouponMgrController.java

@@ -39,10 +39,7 @@ import io.swagger.annotations.ApiResponses;
 import ma.glasnost.orika.MapperFacade;
 
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collector;
 import java.util.stream.Collectors;
 
@@ -176,6 +173,17 @@ public class CouponMgrController extends BaseApiController {
 		return AjaxResult.success(couponVO);
 	}
 
+
+	public static void main(String[] args) {
+		String boxIds = "964952657896800257,979749771218649117,986362095543124033,986361444503257092,984109134842560513";
+		String[] boxIdArray = boxIds.split(",");
+		for (int i = 0; i < boxIdArray.length; i++) {
+			String boxId = boxIdArray[i];
+			System.out.println("boxId = " + boxId);
+		}
+
+	}
+
 	/**
 	 * 新增优惠券信息
 	 * @param
@@ -264,6 +272,7 @@ public class CouponMgrController extends BaseApiController {
 	        	CouponTicket couponTicket = new CouponTicket();
 	        	couponTicket.setBoxId(boxId);
 	        	couponTicket.setCouponId(coupon.getCouponId());
+				ticketList.add(couponTicket);
 	        }
 		}
 		try {

mp-admin/src/main/java/com/qs/mp/web/controller/api/admin/TicketBoxMgrController.java

@@ -107,12 +107,16 @@ public class TicketBoxMgrController extends BaseApiController {
 	@ApiResponses(
 			@ApiResponse(code = 200, message = "查询成功", response = TicketBox.class)
 	)
-	public TableDataInfo list(@RequestBody TicketBox ticketBox) {
+	public TableDataInfo list(@RequestBody TicketBoxQueryParam ticketBoxQueryParam) {
 		startPage();
 		QueryWrapper<TicketBox> queryWrapper = new QueryWrapper<TicketBox>();
-		queryWrapper.like(null != ticketBox && StringUtils.isNotBlank(ticketBox.getTitle()), "title", ticketBox.getTitle());
-		queryWrapper.eq(null != ticketBox && null != ticketBox.getType(), "type", ticketBox.getType());
-		queryWrapper.eq(null != ticketBox && null != ticketBox.getStatus(), "status", ticketBox.getStatus());
+		queryWrapper.like(null != ticketBoxQueryParam && StringUtils.isNotBlank(ticketBoxQueryParam.getTitle()), "title", ticketBoxQueryParam.getTitle());
+		queryWrapper.eq(null != ticketBoxQueryParam && null != ticketBoxQueryParam.getType(), "type", ticketBoxQueryParam.getType());
+		queryWrapper.eq(null != ticketBoxQueryParam && null != ticketBoxQueryParam.getStatus(), "status", ticketBoxQueryParam.getStatus());
+		// 排除指定票组
+		if (CollectionUtils.isNotEmpty(ticketBoxQueryParam.getExcludeBoxIds())) {
+			queryWrapper.notIn("boxId", ticketBoxQueryParam.getExcludeBoxIds());
+		}
 		queryWrapper.orderByAsc("FIELD(`status`, 'wait', 'doing', 'done', 'on', 'off')").orderByDesc("box_id");
 		List<TicketBox> list = ticketBoxService.list(queryWrapper);
 		return getDataTable(list);

mp-service/src/main/java/com/qs/mp/admin/domain/param/TicketBoxQueryParam.java

@@ -0,0 +1,37 @@
+package com.qs.mp.admin.domain.param;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.alibaba.fastjson.serializer.SerializerFeature;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.qs.mp.common.enums.TicketBoxStatusEnum;
+import com.qs.mp.common.enums.TicketTypeEnum;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author Cup
+ * @date 2022/6/27
+ */
+@ApiModel("盲票组查询入参类")
+@Data
+public class TicketBoxQueryParam {
+
+    @ApiModelProperty("盲票组标题")
+    private String title;
+
+    @ApiModelProperty("盲票形式（线上或线下）")
+    @JSONField(serialzeFeatures = SerializerFeature.WriteEnumUsingToString)
+    private TicketTypeEnum type;
+
+    @ApiModelProperty("状态,上架/下架")
+    @JSONField(serialzeFeatures = SerializerFeature.WriteEnumUsingToString)
+    private TicketBoxStatusEnum status;
+
+    @ApiModelProperty("排除的盲票组id列表")
+    private List<String> excludeBoxIds;
+
+
+}