Commit 1fa4cce0 by 刘继明

Merge branch 'feature/jimmy/20240711-三方券支付方式拆分' into qa

parents bb39806e 07e9dfd6
...@@ -100,7 +100,7 @@ public class ThirdCouponOrderHandle { ...@@ -100,7 +100,7 @@ public class ThirdCouponOrderHandle {
// 判断是否使用了三方券支付 // 判断是否使用了三方券支付
if (CollectionUtils.isNotEmpty(orderPayItemCreateReqList)) { if (CollectionUtils.isNotEmpty(orderPayItemCreateReqList)) {
return orderPayItemCreateReqList.stream().anyMatch(o -> o.getPayChannelType().toString().equals(CashTypeEnum.THIRD_COUPON.getCode())); return orderPayItemCreateReqList.stream().anyMatch(o -> CashTypeEnum.isThirdCoupon(o.getPayChannelType().toString()));
} }
return false; return false;
......
...@@ -7,6 +7,9 @@ public enum CashTypeEnum { ...@@ -7,6 +7,9 @@ public enum CashTypeEnum {
SQB("51", "收钱吧"), SQB("51", "收钱吧"),
CASH("52", "现金"), CASH("52", "现金"),
THIRD_COUPON("53", "三方券支付"), THIRD_COUPON("53", "三方券支付"),
MEITUAN_COUPON("54", "美团团购券支付"),
TIKTOK_COUPON("55", "抖音团购券支付"),
; ;
...@@ -45,4 +48,11 @@ public enum CashTypeEnum { ...@@ -45,4 +48,11 @@ public enum CashTypeEnum {
public void setCode(String code) { public void setCode(String code) {
this.code = code; this.code = code;
} }
public static boolean isThirdCoupon(String payType) {
return THIRD_COUPON.getCode().equals(payType) ||
MEITUAN_COUPON.getCode().equals(payType) ||
TIKTOK_COUPON.getCode().equals(payType);
}
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment