update 站点白名单

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<PayModeVO> list = orderService.getPayMode(dto);
 			response = new RestApiResponse<>(ImmutableMap.of("list", list));
 		} catch (BusinessException e) {

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<PayModeVO> getPayMode(GetPayModeDTO dto) {
 		List<PayModeVO> result = Lists.newArrayList();
 		// 查询会员在站点是否是白名单用户
-		boolean flag = false;
+		PileStationWhitelist whitelist = pileStationWhitelistService.queryWhitelistByMemberId(dto.getStationId(), dto.getMemberId());
+		boolean flag = whitelist != null;
 		if (flag) {
 			result.add(
 					PayModeVO.builder()

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);
 }

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);
 }

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);
+	}
 }

jsowell-pile/src/main/resources/mapper/pile/PileStationWhitelistMapper.xml

@@ -91,4 +91,13 @@
             #{id}
         </foreach>
     </delete>
+
+    <select id="queryWhitelistByMemberId" resultMap="PileStationWhitelistResult">
+        select
+            <include refid="Base_Column_List"/>
+        from pile_station_whitelist
+        where del_flag = '0'
+        and member_id = #{memberId,jdbcType=VARCHAR}
+        and station_id = #{stationId,jdbcType=VARCHAR}
+    </select>
 </mapper>