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

Dev

See merge request quanshu/mp-server!881

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 (StringUtils.isNotBlank(queryParam.getPayType())) {
+			if (PayTypeEnum.ALIPAY.getValue().equals(queryParam.getPayType())) {
+				// 1是支付宝,10支付宝直连
+				queryWrapper.in("t1.pay_type",PayTypeEnum.ALIPAY.getValue(),"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) {
@@ -307,6 +319,17 @@ public class UserDeliverOrderMgrController extends BaseApiController {
 		queryWrapper.le(null != queryParam && null != queryParam.getEndTime(), "t1.created_time", queryParam.getEndTime());
 		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 (StringUtils.isNotBlank(queryParam.getPayType())) {
+			if (PayTypeEnum.ALIPAY.getValue().equals(queryParam.getPayType())) {
+				// 1是支付宝,10支付宝直连
+				queryWrapper.in("t1.pay_type",PayTypeEnum.ALIPAY.getValue(),"10");
+			} else if (PayTypeEnum.WXPAY.getValue().equals(queryParam.getPayType())) {
+				// 2是微信
+				queryWrapper.eq("t1.pay_type", PayTypeEnum.WXPAY.getValue());
+			}
+		}
+
 		queryWrapper.orderByDesc("t1.order_id");
 		int totalSize = userDeliverOrderService.selectUserDeliverOrderCount(queryWrapper);
 		if (totalSize == 0) {
@@ -377,7 +400,13 @@ public class UserDeliverOrderMgrController extends BaseApiController {
 							deliverOrderExcel.setTel(deliverOrder.getTel());
 							deliverOrderExcel.setDeliveryFlowId(userDeliverOrderItem.getDeliveryFlowId());
 							deliverOrderExcel.setCompanyName(userDeliverOrderItem.getCompanyName());
-
+							if (StringUtils.isNotBlank(deliverOrder.getPayType())) {
+								if (PayTypeEnum.WXPAY.getValue().equals(deliverOrder.getPayType())) {
+									deliverOrderExcel.setPayType(PayTypeEnum.WXPAY.getDesc());
+								}else if (PayTypeEnum.ALIPAY.getValue().equals(deliverOrder.getPayType()) || "10".equals(deliverOrder.getPayType())){
+									deliverOrderExcel.setPayType(PayTypeEnum.ALIPAY.getDesc());
+								}
+							}
 
 							int cost = 0;
 							Integer skuCost = userDeliverOrderItem.getSkuCost();

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 (StringUtils.isNotBlank(userTicketOrderQueryParam.getPayType())) {
+            if (PayTypeEnum.ALIPAY.getValue().equals(userTicketOrderQueryParam.getPayType())) {
+                // 1是支付宝,10支付宝直连
+                userTicketOrderLambdaQueryWrapper.in(UserTicketOrder::getPayType,PayTypeEnum.ALIPAY.getValue(),"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)) {
@@ -185,6 +196,16 @@ public class UserTicketOrderMgrController extends BaseApiController {
             }
         }
 
+        if (StringUtils.isNotBlank(userTicketOrderQueryParam.getPayType())) {
+            if (PayTypeEnum.ALIPAY.getValue().equals(userTicketOrderQueryParam.getPayType())) {
+                // 1是支付宝,10支付宝直连
+                userTicketOrderLambdaQueryWrapper.in(UserTicketOrder::getPayType,PayTypeEnum.ALIPAY.getValue(),"10");
+            } else if (PayTypeEnum.WXPAY.getValue().equals(userTicketOrderQueryParam.getPayType())) {
+                // 2是微信
+                userTicketOrderLambdaQueryWrapper.eq(UserTicketOrder::getPayType, PayTypeEnum.WXPAY.getValue());
+            }
+        }
+
         userTicketOrderLambdaQueryWrapper.orderByDesc(UserTicketOrder::getCreatedTime);
 
         int totalSize = userTicketOrderService.count(userTicketOrderLambdaQueryWrapper);
@@ -238,6 +259,15 @@ public class UserTicketOrderMgrController extends BaseApiController {
             if (Objects.nonNull(userTicketOrderListVO.getBoxType())){
                 userTicketOrderExcel.setBoxType(userTicketOrderListVO.getBoxType().getDesc());
             }
+
+            if (StringUtils.isNotBlank(userTicketOrderListVO.getPayType())) {
+                if (PayTypeEnum.WXPAY.getValue().equals(userTicketOrderListVO.getPayType())) {
+                    userTicketOrderExcel.setPayType(PayTypeEnum.WXPAY.getDesc());
+                }else if (PayTypeEnum.ALIPAY.getValue().equals(userTicketOrderListVO.getPayType()) || "10".equals(userTicketOrderListVO.getPayType())){
+                    userTicketOrderExcel.setPayType(PayTypeEnum.ALIPAY.getDesc());
+                }
+            }
+
             return userTicketOrderExcel;
         }).collect(Collectors.toList());
 

mp-common/src/main/java/com/qs/mp/common/enums/PayTypeEnum.java

@@ -7,23 +7,27 @@ import com.baomidou.mybatisplus.annotation.IEnum;
  * 前端选择的支付类型
  *
  */
-public enum PayTypeEnum implements IEnum<Integer> {
+public enum PayTypeEnum implements IEnum<String> {
 
-  ALIPAY(1, "支付宝"),
-  WXPAY(2, "微信支付"),
-  ACCTPAY(3,"余额支付");
+  ALIPAY("1", "支付宝"),
+  WXPAY("2", "微信"),
+  ACCTPAY("3","余额支付");
 
 
-  private final int value;
+  private final String value;
   private final String desc;
 
-  PayTypeEnum(final int value, final String desc) {
+  PayTypeEnum(final String value, final String desc) {
     this.value = value;
     this.desc = desc;
   }
 
   @Override
-  public Integer getValue() {
+  public String getValue() {
     return value;
   }
+
+  public String getDesc() {
+    return desc;
+  }
 }

mp-service/src/main/java/com/qs/mp/admin/domain/excel/UserTicketOrderExcel.java

@@ -47,6 +47,9 @@ public class UserTicketOrderExcel {
     @Excel(name = "实付金额")
     private BigDecimal payAmt;
 
+    @Excel(name = "付款方式")
+    private String payType;
+
     @Excel(name = "用户昵称")
     private String nickName;
 

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 String 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 String payType;
 }

mp-service/src/main/java/com/qs/mp/user/domain/excel/DeliverOrderExcel.java

@@ -67,6 +67,9 @@ public class DeliverOrderExcel {
     @Excel(name = "订单类型")
     private String resource;
 
+    @Excel(name = "付款方式")
+    private String payType;
+
     /**
      * 收货人
      */