From 7ae72733e84694ceaefadd1fbea886dec24e586d Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Fri, 21 Apr 2023 09:35:42 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E7=AB=99=E7=82=B9=E7=99=BD=E5=90=8D?= =?UTF-8?q?=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/jsowell/api/uniapp/PayController.java | 2 +- .../src/main/java/com/jsowell/service/OrderService.java | 8 +++++++- .../jsowell/pile/mapper/PileStationWhitelistMapper.java | 3 +++ .../pile/service/IPileStationWhitelistService.java | 2 ++ .../service/impl/PileStationWhitelistServiceImpl.java | 5 +++++ .../resources/mapper/pile/PileStationWhitelistMapper.xml | 9 +++++++++ 6 files changed, 27 insertions(+), 2 deletions(-) diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PayController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PayController.java index 0b2a5023f..962e33ea6 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PayController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PayController.java @@ -142,7 +142,7 @@ public class PayController extends BaseController { public RestApiResponse getPayMode(HttpServletRequest request, @RequestBody GetPayModeDTO dto) { RestApiResponse response; try { - // dto.setMemberId(getMemberIdByAuthorization(request)); + dto.setMemberId(getMemberIdByAuthorization(request)); List list = orderService.getPayMode(dto); response = new RestApiResponse<>(ImmutableMap.of("list", list)); } catch (BusinessException e) { 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 ecbf48b8a..09c1203bb 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java @@ -34,6 +34,7 @@ import com.jsowell.pile.domain.OrderBasicInfo; import com.jsowell.pile.domain.OrderDetail; import com.jsowell.pile.domain.OrderInvoiceRecord; import com.jsowell.pile.domain.OrderPayRecord; +import com.jsowell.pile.domain.PileStationWhitelist; import com.jsowell.pile.domain.WxpayCallbackRecord; import com.jsowell.pile.dto.ApplyOrderInvoiceDTO; import com.jsowell.pile.dto.BasicPileDTO; @@ -57,6 +58,7 @@ import com.jsowell.pile.service.IOrderInvoiceRecordService; import com.jsowell.pile.service.IOrderPayRecordService; import com.jsowell.pile.service.IPileBillingTemplateService; import com.jsowell.pile.service.IPileStationInfoService; +import com.jsowell.pile.service.IPileStationWhitelistService; import com.jsowell.pile.service.WechatPayService; import com.jsowell.pile.service.WxpayCallbackRecordService; import com.jsowell.pile.transaction.dto.OrderTransactionDTO; @@ -140,6 +142,9 @@ public class OrderService { @Autowired private IOrderInvoiceRecordService orderInvoiceRecordService; + @Autowired + private IPileStationWhitelistService pileStationWhitelistService; + @Autowired private RedisCache redisCache; @@ -976,7 +981,8 @@ public class OrderService { public List getPayMode(GetPayModeDTO dto) { List result = Lists.newArrayList(); // 查询会员在站点是否是白名单用户 - boolean flag = false; + PileStationWhitelist whitelist = pileStationWhitelistService.queryWhitelistByMemberId(dto.getStationId(), dto.getMemberId()); + boolean flag = whitelist != null; if (flag) { result.add( PayModeVO.builder() diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileStationWhitelistMapper.java b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileStationWhitelistMapper.java index 72dad76fc..071bf3627 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileStationWhitelistMapper.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileStationWhitelistMapper.java @@ -1,6 +1,7 @@ package com.jsowell.pile.mapper; import com.jsowell.pile.domain.PileStationWhitelist; +import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; import java.util.List; @@ -60,4 +61,6 @@ public interface PileStationWhitelistMapper { * @return 结果 */ public int deletePileStationWhitelistByIds(Long[] ids); + + PileStationWhitelist queryWhitelistByMemberId(@Param("stationId") String stationId, @Param("memberId") String memberId); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/IPileStationWhitelistService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/IPileStationWhitelistService.java index e3f635d25..6d2469e87 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/IPileStationWhitelistService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/IPileStationWhitelistService.java @@ -58,4 +58,6 @@ public interface IPileStationWhitelistService { * @return 结果 */ public int deletePileStationWhitelistById(Long id); + + PileStationWhitelist queryWhitelistByMemberId(String stationId, String memberId); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationWhitelistServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationWhitelistServiceImpl.java index 2c89d9c00..37d1c7580 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationWhitelistServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationWhitelistServiceImpl.java @@ -101,4 +101,9 @@ public class PileStationWhitelistServiceImpl implements IPileStationWhitelistSer public int deletePileStationWhitelistById(Long id) { return pileStationWhitelistMapper.deletePileStationWhitelistById(id); } + + @Override + public PileStationWhitelist queryWhitelistByMemberId(String stationId, String memberId) { + return pileStationWhitelistMapper.queryWhitelistByMemberId(stationId, memberId); + } } diff --git a/jsowell-pile/src/main/resources/mapper/pile/PileStationWhitelistMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/PileStationWhitelistMapper.xml index 8d9fb6ebb..6ce1738e3 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/PileStationWhitelistMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/PileStationWhitelistMapper.xml @@ -91,4 +91,13 @@ #{id} + + \ No newline at end of file