From 1ac3f12b4b07c81385d84c72e959272e3a22acd1 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Tue, 4 Jul 2023 14:16:50 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E5=B9=B3=E5=8F=B0=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E4=BA=BA=E5=91=98=E8=BF=94=E5=9B=9E=E7=99=BD=E5=90=8D=E5=8D=95?= =?UTF-8?q?=E6=94=AF=E4=BB=98=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jsowell/api/uniapp/MemberController.java | 17 ++--------------- .../java/com/jsowell/service/OrderService.java | 15 +++++++-------- 2 files changed, 9 insertions(+), 23 deletions(-) diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/MemberController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/MemberController.java index 07806b34f..16dd9fe98 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/MemberController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/MemberController.java @@ -13,26 +13,14 @@ import com.jsowell.common.response.RestApiResponse; import com.jsowell.common.util.SMSUtil; import com.jsowell.common.util.StringUtils; import com.jsowell.pile.domain.MemberPlateNumberRelation; -import com.jsowell.pile.dto.BindingCarNoDTO; -import com.jsowell.pile.dto.BindingCardDTO; -import com.jsowell.pile.dto.InvoiceTitleDTO; -import com.jsowell.pile.dto.MemberRegisterAndLoginDTO; -import com.jsowell.pile.dto.MemberRegisterDTO; -import com.jsowell.pile.dto.UniAppQueryMemberBalanceDTO; -import com.jsowell.pile.dto.WechatLoginDTO; -import com.jsowell.pile.dto.WeixinPayDTO; +import com.jsowell.pile.dto.*; import com.jsowell.pile.service.IMemberBasicInfoService; import com.jsowell.pile.service.IMemberPlateNumberRelationService; -import com.jsowell.pile.vo.MemberPlateNumberVO; import com.jsowell.pile.vo.uniapp.InvoiceTitleVO; import com.jsowell.pile.vo.uniapp.MemberVO; import com.jsowell.service.MemberService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import java.util.List; @@ -146,7 +134,6 @@ public class MemberController extends BaseController { /** * 查询用户账户信息 - * * http://localhost:8080/uniapp/member/getMemberInfo * @return 用户账户信息 */ 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 e7e4ac899..78ca39fe8 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java @@ -42,10 +42,8 @@ import com.jsowell.pile.vo.base.OrderPeriodAmountVO; import com.jsowell.pile.vo.base.PileInfoVO; import com.jsowell.pile.vo.base.StationInfoVO; import com.jsowell.pile.vo.uniapp.*; -import com.jsowell.pile.vo.web.BillingTemplateVO; -import com.jsowell.pile.vo.web.OrderDetailInfoVO; -import com.jsowell.pile.vo.web.PileStationVO; -import com.jsowell.pile.vo.web.UpdateMemberBalanceDTO; +import com.jsowell.pile.vo.uniapp.InvoiceRecordVO; +import com.jsowell.pile.vo.web.*; import com.jsowell.wxpay.dto.WeChatRefundDTO; import com.jsowell.wxpay.response.WechatPayNotifyParameter; import org.apache.commons.collections4.CollectionUtils; @@ -1129,10 +1127,11 @@ public class OrderService { List result = Lists.newArrayList(); // 查询会员在站点是否是白名单用户 PileStationWhitelist whitelist = pileStationWhitelistService.queryWhitelistByMemberId(dto.getStationId(), dto.getMemberId()); - boolean flag = false; - if (whitelist != null) { - flag = true; - } + + // 查询是否为平台测试员 + PlatformTesterVO platformTesterVO = memberBasicInfoService.selectPlatformTesterStatus(dto.getMemberId()); + + boolean flag = whitelist != null || StringUtils.equals(platformTesterVO.getStatus(), Constants.ONE); if (flag) { result.add(