autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-07-03 13:38:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

支付宝支付

Browse Source
This commit is contained in:
Guoqs
2024-06-17 11:23:14 +08:00
parent fa2eae3aa2
commit 6daf71d813
3 changed files with 25 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jsowell-admin/src/main/java/com/jsowell/api/uniapp/PayController.java
View File

@@ -167,6 +167,8 @@ public class PayController extends BaseController {
RestApiResponse<?> response; RestApiResponse<?> response;
try { try {
dto.setMemberId(getMemberIdByAuthorization(request)); dto.setMemberId(getMemberIdByAuthorization(request));
// 设置请求来源
dto.setRequestSource(UserAgentUtils.determineRequestSource(request));
List<PayModeVO> list = orderService.getPayMode(dto); List<PayModeVO> list = orderService.getPayMode(dto);
response = new RestApiResponse<>(ImmutableMap.of("list", list)); response = new RestApiResponse<>(ImmutableMap.of("list", list));
} catch (BusinessException e) { } catch (BusinessException e) {

26
jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
View File

@@ -26,6 +26,8 @@ import com.jsowell.common.enums.DelFlagEnum;
import com.jsowell.common.enums.InvoiceRecordEnum; import com.jsowell.common.enums.InvoiceRecordEnum;
import com.jsowell.common.enums.MemberWalletEnum; import com.jsowell.common.enums.MemberWalletEnum;
import com.jsowell.common.enums.adapay.AdapayEventEnum; import com.jsowell.common.enums.adapay.AdapayEventEnum;
import com.jsowell.common.enums.adapay.AdapayPayChannelEnum;
import com.jsowell.common.enums.lianlian.PayChannelEnum;
import com.jsowell.common.enums.uniapp.OccupyOrderPayStatusEnum; import com.jsowell.common.enums.uniapp.OccupyOrderPayStatusEnum;
import com.jsowell.common.enums.uniapp.OccupyOrderStatusEnum; import com.jsowell.common.enums.uniapp.OccupyOrderStatusEnum;
import com.jsowell.common.enums.ykc.*; import com.jsowell.common.enums.ykc.*;
@@ -789,6 +791,7 @@ public class OrderService {
* @param dto * @param dto
*/ */
public List<PayModeVO> getPayMode(GetPayModeDTO dto) { public List<PayModeVO> getPayMode(GetPayModeDTO dto) {
log.info("当前登录会员 获取支付方式, param:{}, 请求来源:{}", JSON.toJSONString(dto), dto.getRequestSource());
List<PayModeVO> result = Lists.newArrayList(); List<PayModeVO> result = Lists.newArrayList();
// 查询会员在站点是否是白名单用户 // 查询会员在站点是否是白名单用户
PileStationWhitelist whitelist = pileStationWhitelistService.queryWhitelistByMemberId(dto.getStationId(), dto.getMemberId()); PileStationWhitelist whitelist = pileStationWhitelistService.queryWhitelistByMemberId(dto.getStationId(), dto.getMemberId());
@@ -810,12 +813,23 @@ public class OrderService {
); );
} else { } else {
// 微信支付 // 微信支付
result.add( if (StringUtils.equals(dto.getRequestSource(), AdapayPayChannelEnum.WX_LITE.getValue())) {
PayModeVO.builder() result.add(
.payModeCode(OrderPayModeEnum.PAYMENT_OF_WECHATPAY.getValue()) PayModeVO.builder()
.payModeName(OrderPayModeEnum.PAYMENT_OF_WECHATPAY.getLabel()) .payModeCode(OrderPayModeEnum.PAYMENT_OF_WECHATPAY.getValue())
.build() .payModeName(OrderPayModeEnum.PAYMENT_OF_WECHATPAY.getLabel())
); .build()
);
}
// 支付宝支付
if (StringUtils.equals(dto.getRequestSource(), AdapayPayChannelEnum.ALIPAY_LITE.getValue())) {
result.add(
PayModeVO.builder()
.payModeCode(OrderPayModeEnum.PAYMENT_OF_ALIPAY.getValue())
.payModeName(OrderPayModeEnum.PAYMENT_OF_ALIPAY.getLabel())
.build()
);
}
// 如果是希晓的会员，将余额支付添加进去 // 如果是希晓的会员，将余额支付添加进去
if (MerchantUtils.isXiXiaoMerchant(String.valueOf(memberBasicInfo.getMerchantId()))) { // 35-希晓 if (MerchantUtils.isXiXiaoMerchant(String.valueOf(memberBasicInfo.getMerchantId()))) { // 35-希晓
// 余额支付 // 余额支付

5
jsowell-pile/src/main/java/com/jsowell/pile/dto/GetPayModeDTO.java
View File

@@ -4,12 +4,13 @@ import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder;
@Data @Data
@AllArgsConstructor @AllArgsConstructor
@NoArgsConstructor @NoArgsConstructor
@Builder @SuperBuilder
public class GetPayModeDTO { public class GetPayModeDTO extends BaseDTO{
private String memberToken; private String memberToken;
private String memberId; private String memberId;