From 435ff1cbd16412a8344339266530507b67e8fa27 Mon Sep 17 00:00:00 2001 From: Lemon Date: Sat, 23 Sep 2023 11:49:15 +0800 Subject: [PATCH] =?UTF-8?q?update=20=20=E5=B8=8C=E6=99=93=E5=B0=8F?= =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E6=81=A2=E5=A4=8D=E4=BD=99=E9=A2=9D=E6=94=AF?= =?UTF-8?q?=E4=BB=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jsowell/service/OrderService.java | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java index eef46aaba..289b64b72 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java @@ -687,6 +687,9 @@ public class OrderService { // 查询是否为平台测试员 PlatformTesterVO platformTesterVO = memberBasicInfoService.selectPlatformTesterStatus(dto.getMemberId()); + // 根据memberId查询该用户是否是希晓的会员 + MemberBasicInfo memberBasicInfo = memberBasicInfoService.selectInfoByMemberId(dto.getMemberId()); + boolean flag = whitelist != null || StringUtils.equals(platformTesterVO.getStatus(), Constants.ONE); if (flag) { @@ -704,13 +707,16 @@ public class OrderService { .payModeName(OrderPayModeEnum.PAYMENT_OF_WECHATPAY.getLabel()) .build() ); - // 余额支付 - // result.add( - // PayModeVO.builder() - // .payModeCode(OrderPayModeEnum.PAYMENT_OF_BALANCE.getValue()) - // .payModeName(OrderPayModeEnum.PAYMENT_OF_BALANCE.getLabel()) - // .build() - // ); + // 如果是希晓的会员，将余额支付添加进去 + if (StringUtils.equals(String.valueOf(memberBasicInfo.getMerchantId()), "35")) { // 35-希晓 + // 余额支付 + result.add( + PayModeVO.builder() + .payModeCode(OrderPayModeEnum.PAYMENT_OF_BALANCE.getValue()) + .payModeName(OrderPayModeEnum.PAYMENT_OF_BALANCE.getLabel()) + .build() + ); + } } return result; }