支付宝支付

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

@@ -167,6 +167,8 @@ public class PayController extends BaseController {
 		RestApiResponse<?> response;
 		try {
 			dto.setMemberId(getMemberIdByAuthorization(request));
+			// 设置请求来源
+			dto.setRequestSource(UserAgentUtils.determineRequestSource(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

@@ -26,6 +26,8 @@ import com.jsowell.common.enums.DelFlagEnum;
 import com.jsowell.common.enums.InvoiceRecordEnum;
 import com.jsowell.common.enums.MemberWalletEnum;
 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.OccupyOrderStatusEnum;
 import com.jsowell.common.enums.ykc.*;
@@ -789,6 +791,7 @@ public class OrderService {
      * @param dto
      */
     public List<PayModeVO> getPayMode(GetPayModeDTO dto) {
+        log.info("当前登录会员 获取支付方式, param:{}, 请求来源:{}", JSON.toJSONString(dto), dto.getRequestSource());
         List<PayModeVO> result = Lists.newArrayList();
         // 查询会员在站点是否是白名单用户
         PileStationWhitelist whitelist = pileStationWhitelistService.queryWhitelistByMemberId(dto.getStationId(), dto.getMemberId());
@@ -810,12 +813,23 @@ public class OrderService {
             );
         } else {
             // 微信支付
+            if (StringUtils.equals(dto.getRequestSource(), AdapayPayChannelEnum.WX_LITE.getValue())) {
                 result.add(
                         PayModeVO.builder()
                                 .payModeCode(OrderPayModeEnum.PAYMENT_OF_WECHATPAY.getValue())
                                 .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-希晓
                 // 余额支付

jsowell-pile/src/main/java/com/jsowell/pile/dto/GetPayModeDTO.java

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