|
@@ -59,7 +59,7 @@ public class ClientRoomInfoService {
|
|
|
private final FeeTypeRepo feeTypeRepo;
|
|
private final FeeTypeRepo feeTypeRepo;
|
|
|
private final UserMoneyRecordRepo userMoneyRecordRepo;
|
|
private final UserMoneyRecordRepo userMoneyRecordRepo;
|
|
|
private final MemberRepo memberRepo;
|
|
private final MemberRepo memberRepo;
|
|
|
- private final AlipayClient alipayClient;
|
|
|
|
|
|
|
+// private final AlipayClient alipayClient;
|
|
|
|
|
|
|
|
public ClientRoomInfoService(UserRepo userRepo, CheckinInfoRepo checkinInfoRepo, WxPayService wxPayService,
|
|
public ClientRoomInfoService(UserRepo userRepo, CheckinInfoRepo checkinInfoRepo, WxPayService wxPayService,
|
|
|
WxMpService wxMpService, Environment environment, PersonalFeeRepo personalFeeRepo,
|
|
WxMpService wxMpService, Environment environment, PersonalFeeRepo personalFeeRepo,
|
|
@@ -75,7 +75,7 @@ public class ClientRoomInfoService {
|
|
|
this.feeTypeRepo = feeTypeRepo;
|
|
this.feeTypeRepo = feeTypeRepo;
|
|
|
this.userMoneyRecordRepo = userMoneyRecordRepo;
|
|
this.userMoneyRecordRepo = userMoneyRecordRepo;
|
|
|
this.memberRepo = memberRepo;
|
|
this.memberRepo = memberRepo;
|
|
|
- this.alipayClient = alipayClient;
|
|
|
|
|
|
|
+// this.alipayClient = alipayClient;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
public ClientRoomInfoDTO getClientRoomInfoDTO(Long userId) {
|
|
public ClientRoomInfoDTO getClientRoomInfoDTO(Long userId) {
|
|
@@ -173,34 +173,34 @@ public class ClientRoomInfoService {
|
|
|
.add(Constants.ATTACH_AMOUNT, checkinInfo.getDepositAmount())
|
|
.add(Constants.ATTACH_AMOUNT, checkinInfo.getDepositAmount())
|
|
|
.build());
|
|
.build());
|
|
|
return wxPayService.createOrder(request);
|
|
return wxPayService.createOrder(request);
|
|
|
- case ALIPAY:
|
|
|
|
|
- AlipayTradeAppPayRequest alipayRequest = new AlipayTradeAppPayRequest();
|
|
|
|
|
- AlipayTradeAppPayModel model = new AlipayTradeAppPayModel();
|
|
|
|
|
- model.setOutTradeNo(UUID.randomUUID().toString());
|
|
|
|
|
- model.setSubject(body);
|
|
|
|
|
- model.setTotalAmount(checkinInfo.getDepositAmount().toString());
|
|
|
|
|
- model.setDisablePayChannels("pcredit,creditCard");
|
|
|
|
|
- model.setProductCode("QUICK_MSECURITY_PAY");
|
|
|
|
|
- model.setBody(new JsonUtils.Builder()
|
|
|
|
|
- .add(Constants.ATTACH_TYPE, "deposit")
|
|
|
|
|
- .add(Constants.ATTACH_CHECKIN_ID, checkinInfoId)
|
|
|
|
|
- .add(Constants.ATTACH_USER_ID, userId)
|
|
|
|
|
- .add(Constants.ATTACH_AMOUNT, checkinInfo.getDepositAmount())
|
|
|
|
|
- .build());
|
|
|
|
|
- if (Arrays.stream(environment.getActiveProfiles()).noneMatch(s -> s.equals("prod"))) {
|
|
|
|
|
- // 测试环境设为1分
|
|
|
|
|
|
|
+// case ALIPAY:
|
|
|
|
|
+// AlipayTradeAppPayRequest alipayRequest = new AlipayTradeAppPayRequest();
|
|
|
|
|
+// AlipayTradeAppPayModel model = new AlipayTradeAppPayModel();
|
|
|
|
|
+// model.setOutTradeNo(UUID.randomUUID().toString());
|
|
|
|
|
+// model.setSubject(body);
|
|
|
|
|
+// model.setTotalAmount(checkinInfo.getDepositAmount().toString());
|
|
|
|
|
+// model.setDisablePayChannels("pcredit,creditCard");
|
|
|
|
|
+// model.setProductCode("QUICK_MSECURITY_PAY");
|
|
|
|
|
+// model.setBody(new JsonUtils.Builder()
|
|
|
|
|
+// .add(Constants.ATTACH_TYPE, "deposit")
|
|
|
|
|
+// .add(Constants.ATTACH_CHECKIN_ID, checkinInfoId)
|
|
|
|
|
+// .add(Constants.ATTACH_USER_ID, userId)
|
|
|
|
|
+// .add(Constants.ATTACH_AMOUNT, checkinInfo.getDepositAmount())
|
|
|
|
|
+// .build());
|
|
|
|
|
+// if (Arrays.stream(environment.getActiveProfiles()).noneMatch(s -> s.equals("prod"))) {
|
|
|
|
|
+// // 测试环境设为1分
|
|
|
// model.setTotalAmount("0.01");
|
|
// model.setTotalAmount("0.01");
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
- alipayRequest.setNotifyUrl(aliNotifyUrl);
|
|
|
|
|
- alipayRequest.setBizModel(model);
|
|
|
|
|
-
|
|
|
|
|
- AlipayTradeAppPayResponse response = alipayClient.sdkExecute(alipayRequest);
|
|
|
|
|
- if (response.isSuccess()) {
|
|
|
|
|
- return response.getBody();
|
|
|
|
|
- } else {
|
|
|
|
|
- throw new BusinessException("支付宝下单失败");
|
|
|
|
|
- }
|
|
|
|
|
|
|
+// }
|
|
|
|
|
+//
|
|
|
|
|
+// alipayRequest.setNotifyUrl(aliNotifyUrl);
|
|
|
|
|
+// alipayRequest.setBizModel(model);
|
|
|
|
|
+//
|
|
|
|
|
+// AlipayTradeAppPayResponse response = alipayClient.sdkExecute(alipayRequest);
|
|
|
|
|
+// if (response.isSuccess()) {
|
|
|
|
|
+// return response.getBody();
|
|
|
|
|
+// } else {
|
|
|
|
|
+// throw new BusinessException("支付宝下单失败");
|
|
|
|
|
+// }
|
|
|
default:
|
|
default:
|
|
|
throw new BusinessException("不支持此支付方式");
|
|
throw new BusinessException("不支持此支付方式");
|
|
|
}
|
|
}
|
|
@@ -269,36 +269,36 @@ public class ClientRoomInfoService {
|
|
|
// request.setTotalFee(1);
|
|
// request.setTotalFee(1);
|
|
|
}
|
|
}
|
|
|
return wxPayService.createOrder(request);
|
|
return wxPayService.createOrder(request);
|
|
|
- case ALIPAY:
|
|
|
|
|
- AlipayTradeAppPayRequest alipayRequest = new AlipayTradeAppPayRequest();
|
|
|
|
|
- AlipayTradeAppPayModel model = new AlipayTradeAppPayModel();
|
|
|
|
|
- model.setOutTradeNo(UUID.randomUUID().toString());
|
|
|
|
|
- model.setSubject(body);
|
|
|
|
|
- model.setTotalAmount(amount.toString());
|
|
|
|
|
- model.setDisablePayChannels("pcredit,creditCard");
|
|
|
|
|
- model.setProductCode("QUICK_MSECURITY_PAY");
|
|
|
|
|
- model.setBody(new JsonUtils.Builder()
|
|
|
|
|
- .add(Constants.ATTACH_TYPE, "recharge")
|
|
|
|
|
- .add(Constants.ATTACH_RECHARGE_TYPE, type.name())
|
|
|
|
|
- .add(Constants.ATTACH_CHECKIN_ID, checkinInfo.getId())
|
|
|
|
|
- .add(Constants.ATTACH_USER_ID, userId)
|
|
|
|
|
- .add(Constants.ATTACH_AMOUNT, amount)
|
|
|
|
|
- .add(Constants.ATTACH_REMARK, "")
|
|
|
|
|
- .build());
|
|
|
|
|
- if (Arrays.stream(environment.getActiveProfiles()).noneMatch(s -> s.equals("prod"))) {
|
|
|
|
|
- // 测试环境设为1分
|
|
|
|
|
-// model.setTotalAmount("0.01");
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
- alipayRequest.setNotifyUrl(aliNotifyUrl);
|
|
|
|
|
- alipayRequest.setBizModel(model);
|
|
|
|
|
-
|
|
|
|
|
- AlipayTradeAppPayResponse response = alipayClient.sdkExecute(alipayRequest);
|
|
|
|
|
- if (response.isSuccess()) {
|
|
|
|
|
- return response.getBody();
|
|
|
|
|
- } else {
|
|
|
|
|
- throw new BusinessException("支付宝下单失败");
|
|
|
|
|
- }
|
|
|
|
|
|
|
+// case ALIPAY:
|
|
|
|
|
+// AlipayTradeAppPayRequest alipayRequest = new AlipayTradeAppPayRequest();
|
|
|
|
|
+// AlipayTradeAppPayModel model = new AlipayTradeAppPayModel();
|
|
|
|
|
+// model.setOutTradeNo(UUID.randomUUID().toString());
|
|
|
|
|
+// model.setSubject(body);
|
|
|
|
|
+// model.setTotalAmount(amount.toString());
|
|
|
|
|
+// model.setDisablePayChannels("pcredit,creditCard");
|
|
|
|
|
+// model.setProductCode("QUICK_MSECURITY_PAY");
|
|
|
|
|
+// model.setBody(new JsonUtils.Builder()
|
|
|
|
|
+// .add(Constants.ATTACH_TYPE, "recharge")
|
|
|
|
|
+// .add(Constants.ATTACH_RECHARGE_TYPE, type.name())
|
|
|
|
|
+// .add(Constants.ATTACH_CHECKIN_ID, checkinInfo.getId())
|
|
|
|
|
+// .add(Constants.ATTACH_USER_ID, userId)
|
|
|
|
|
+// .add(Constants.ATTACH_AMOUNT, amount)
|
|
|
|
|
+// .add(Constants.ATTACH_REMARK, "")
|
|
|
|
|
+// .build());
|
|
|
|
|
+// if (Arrays.stream(environment.getActiveProfiles()).noneMatch(s -> s.equals("prod"))) {
|
|
|
|
|
+// // 测试环境设为1分
|
|
|
|
|
+//// model.setTotalAmount("0.01");
|
|
|
|
|
+// }
|
|
|
|
|
+//
|
|
|
|
|
+// alipayRequest.setNotifyUrl(aliNotifyUrl);
|
|
|
|
|
+// alipayRequest.setBizModel(model);
|
|
|
|
|
+//
|
|
|
|
|
+// AlipayTradeAppPayResponse response = alipayClient.sdkExecute(alipayRequest);
|
|
|
|
|
+// if (response.isSuccess()) {
|
|
|
|
|
+// return response.getBody();
|
|
|
|
|
+// } else {
|
|
|
|
|
+// throw new BusinessException("支付宝下单失败");
|
|
|
|
|
+// }
|
|
|
default:
|
|
default:
|
|
|
throw new BusinessException("不支持此支付方式");
|
|
throw new BusinessException("不支持此支付方式");
|
|
|
}
|
|
}
|