盲票和提货订单列表筛选增加支付类型

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

@@ -15,10 +15,12 @@ import com.qs.mp.common.enums.BusinessType;
 import com.qs.mp.common.enums.DeliverOrderStatusEnum;
 import com.qs.mp.common.enums.DeliverTypeEnum;
 import com.qs.mp.common.enums.ErrorCodeEnum;
+import com.qs.mp.common.enums.PayTypeEnum;
 import com.qs.mp.common.jsms.JSMSUtils;
 import com.qs.mp.common.utils.DateUtils;
 import com.qs.mp.user.domain.UserDeliverOrder;
 import com.qs.mp.user.domain.UserDeliverOrderItem;
+import com.qs.mp.user.domain.UserTicketOrder;
 import com.qs.mp.user.domain.excel.DeliverOrderExcel;
 import com.qs.mp.user.domain.vo.OrderDeliverItemVO;
 import com.qs.mp.user.domain.vo.UserDeliverOrderItemVO;
@@ -107,6 +109,16 @@ public class UserDeliverOrderMgrController extends BaseApiController {
 		queryWrapper.eq(null != queryParam && null != queryParam.getSupplierId(), "t3.supplier_id", queryParam.getSupplierId());
 		queryWrapper.like(null != queryParam && StringUtils.isNotBlank(queryParam.getNickName()), "t2.nick_name", queryParam.getNickName());
 		queryWrapper.like(null != queryParam && StringUtils.isNotBlank(queryParam.getTitle()), "t3.title", queryParam.getTitle());
+
+		if (queryParam.getPayType() != null) {
+			if (PayTypeEnum.ALIPAY.getValue().equals(queryParam.getPayType())) {
+				// 1是支付宝,10支付宝直连
+				queryWrapper.in("t1.pay_type","1","10");
+			} else if (PayTypeEnum.WXPAY.getValue().equals(queryParam.getPayType())) {
+				// 2是微信
+				queryWrapper.eq("t1.pay_type", PayTypeEnum.WXPAY.getValue());
+			}
+		}
 		queryWrapper.orderByDesc("t1.order_id");
 		List<UserDeliverOrderVO> userDeliverOrderVOList = userDeliverOrderService.selectUserDeliverOrderVoList(queryWrapper);
 		for (UserDeliverOrderVO userDeliverOrderVO : userDeliverOrderVOList) {

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

@@ -16,6 +16,7 @@ import com.qs.mp.common.core.domain.AjaxResult;
 import com.qs.mp.common.core.page.TableDataInfo;
 import com.qs.mp.common.enums.BusinessType;
 import com.qs.mp.common.enums.PayOrderStatusEnum;
+import com.qs.mp.common.enums.PayTypeEnum;
 import com.qs.mp.common.enums.TicketPrizeTypeEnum;
 import com.qs.mp.common.enums.UserTicketOrderStatusEnum;
 import com.qs.mp.common.utils.DateUtils;
@@ -100,6 +101,16 @@ public class UserTicketOrderMgrController extends BaseApiController {
             }
         }
 
+        if (userTicketOrderQueryParam.getPayType() != null) {
+            if (PayTypeEnum.ALIPAY.getValue().equals(userTicketOrderQueryParam.getPayType())) {
+                // 1是支付宝,10支付宝直连
+                userTicketOrderLambdaQueryWrapper.in(UserTicketOrder::getPayType,"1","10");
+            } else if (PayTypeEnum.WXPAY.getValue().equals(userTicketOrderQueryParam.getPayType())) {
+                // 2是微信
+                userTicketOrderLambdaQueryWrapper.eq(UserTicketOrder::getPayType, PayTypeEnum.WXPAY.getValue());
+            }
+        }
+
         if (Objects.nonNull(userTicketOrderQueryParam.getBoxType())) {
             List<TicketBox> ticketBoxList = ticketBoxService.list(new LambdaQueryWrapper<TicketBox>().eq(TicketBox::getType, userTicketOrderQueryParam.getBoxType()));
             if (CollectionUtils.isNotEmpty(ticketBoxList)) {

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

@@ -50,4 +50,7 @@ public class UserDeliverOrderQueryParam {
 	@ApiModelProperty("订单来源:1提货订单,2现金购买")
 	private DeliverOrderResourceEnum resource;
 
+	@ApiModelProperty("支付类型1支付宝,2微信")
+	private Integer payType;
+
 }

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

@@ -41,4 +41,7 @@ public class UserTicketOrderQueryParam {
 
     @ApiModelProperty("结束时间")
     private Date endTime;
+
+    @ApiModelProperty("支付类型1支付宝,2微信")
+    private Integer payType;
 }