wangqifan před 4 roky
rodič
revize
83200a88a2

+ 31 - 39
src/main/java/com/izouma/zhumj/service/UserMoneyWithdrawApplyService.java

@@ -1,14 +1,6 @@
 package com.izouma.zhumj.service;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.serializer.SerializerFeature;
-import com.alipay.api.AlipayApiException;
-import com.alipay.api.AlipayClient;
-import com.alipay.api.domain.AlipayFundTransPayModel;
-import com.alipay.api.domain.AlipayFundTransUniTransferModel;
-import com.alipay.api.domain.Participant;
-import com.alipay.api.request.AlipayFundTransUniTransferRequest;
-import com.alipay.api.response.AlipayFundTransUniTransferResponse;
+
 import com.github.binarywang.wxpay.bean.entpay.EntPayRequest;
 import com.github.binarywang.wxpay.bean.entpay.EntPayResult;
 import com.github.binarywang.wxpay.exception.WxPayException;
@@ -43,7 +35,7 @@ public class UserMoneyWithdrawApplyService {
     private WxPayService               wxPayService;
     private CheckinInfoRepo            checkinInfoRepo;
     private MemberRepo                 memberRepo;
-    private AlipayClient               alipayClient;
+//    private AlipayClient               alipayClient;
 
     public UserMoneyWithdrawApply apply(Long userId, WithdrawMethod method, String account, String name) {
         User user = userRepo.findById(userId).orElseThrow(new BusinessException("用户不存在"));
@@ -129,35 +121,35 @@ public class UserMoneyWithdrawApplyService {
                     throw new BusinessException(e.getMessage());
                 }
                 break;
-            case ALIPAY:
-                AlipayFundTransUniTransferRequest request = new AlipayFundTransUniTransferRequest();
-                AlipayFundTransUniTransferModel model = new AlipayFundTransUniTransferModel();
-                model.setOutBizNo(apply.getTradeNo());
-                model.setTransAmount(apply.getAmount().toString());
-                model.setProductCode("TRANS_ACCOUNT_NO_PWD");
-                model.setBizScene("DIRECT_TRANSFER");
-                Participant participant = new Participant();
-                participant.setIdentity(apply.getAccount());
-                participant.setIdentityType("ALIPAY_LOGON_ID");
-                participant.setName(apply.getName());
-                model.setPayeeInfo(participant);
-                request.setBizModel(model);
-
-                AlipayFundTransUniTransferResponse response = null;
-                try {
-                    response = alipayClient.certificateExecute(request);
-                    log.info("支付宝转账返回 \n{}", JSON.parseObject(response.getBody())
-                            .toString(SerializerFeature.PrettyFormat));
-                    if (!(response.isSuccess() && "10000".equals(response.getCode()))) {
-                        throw new BusinessException(String
-                                .format("%s %s %s %s", response.getCode(), response.getMsg(),
-                                        response.getSubCode(), response.getSubMsg()));
-                    }
-                } catch (AlipayApiException e) {
-                    log.error("余额提现失败", e);
-                    throw new BusinessException(e.getMessage());
-                }
-                break;
+//            case ALIPAY:
+//                AlipayFundTransUniTransferRequest request = new AlipayFundTransUniTransferRequest();
+//                AlipayFundTransUniTransferModel model = new AlipayFundTransUniTransferModel();
+//                model.setOutBizNo(apply.getTradeNo());
+//                model.setTransAmount(apply.getAmount().toString());
+//                model.setProductCode("TRANS_ACCOUNT_NO_PWD");
+//                model.setBizScene("DIRECT_TRANSFER");
+//                Participant participant = new Participant();
+//                participant.setIdentity(apply.getAccount());
+//                participant.setIdentityType("ALIPAY_LOGON_ID");
+//                participant.setName(apply.getName());
+//                model.setPayeeInfo(participant);
+//                request.setBizModel(model);
+//
+//                AlipayFundTransUniTransferResponse response = null;
+//                try {
+//                    response = alipayClient.certificateExecute(request);
+//                    log.info("支付宝转账返回 \n{}", JSON.parseObject(response.getBody())
+//                            .toString(SerializerFeature.PrettyFormat));
+//                    if (!(response.isSuccess() && "10000".equals(response.getCode()))) {
+//                        throw new BusinessException(String
+//                                .format("%s %s %s %s", response.getCode(), response.getMsg(),
+//                                        response.getSubCode(), response.getSubMsg()));
+//                    }
+//                } catch (AlipayApiException e) {
+//                    log.error("余额提现失败", e);
+//                    throw new BusinessException(e.getMessage());
+//                }
+//                break;
             default:
                 throw new BusinessException("不支持此提现方式");
         }

+ 1 - 2
src/main/java/com/izouma/zhumj/service/client/ClientRoomInfoService.java

@@ -3,7 +3,6 @@ package com.izouma.zhumj.service.client;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.alipay.api.AlipayApiException;
-import com.alipay.api.AlipayClient;
 import com.alipay.api.domain.AlipayTradeAppPayModel;
 import com.alipay.api.request.AlipayTradeAppPayRequest;
 import com.alipay.api.request.AlipayTradeWapPayRequest;
@@ -65,7 +64,7 @@ public class ClientRoomInfoService {
                                  WxMpService wxMpService, Environment environment, PersonalFeeRepo personalFeeRepo,
                                  PersonalFeeTypeRepo personalFeeTypeRepo, ContractRepo contractRepo,
                                  RoomFeeRepo roomFeeRepo, FeeTypeRepo feeTypeRepo, UserMoneyRecordRepo userMoneyRecordRepo,
-                                 MemberRepo memberRepo, AlipayClient alipayClient) {
+                                 MemberRepo memberRepo) {
         this.userRepo = userRepo;
         this.checkinInfoRepo = checkinInfoRepo;
         this.wxPayService = wxPayService;

+ 29 - 36
src/main/java/com/izouma/zhumj/service/client/DepositRefundApplyService.java

@@ -1,12 +1,5 @@
 package com.izouma.zhumj.service.client;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.serializer.SerializerFeature;
-import com.alipay.api.AlipayApiException;
-import com.alipay.api.AlipayClient;
-import com.alipay.api.domain.AlipayTradeRefundModel;
-import com.alipay.api.request.AlipayTradeRefundRequest;
-import com.alipay.api.response.AlipayTradeRefundResponse;
 import com.github.binarywang.wxpay.bean.entpay.EntPayBankRequest;
 import com.github.binarywang.wxpay.bean.entpay.EntPayRequest;
 import com.github.binarywang.wxpay.bean.entpay.EntPayResult;
@@ -63,8 +56,8 @@ public class DepositRefundApplyService {
     private UserRepo               userRepo;
     @Autowired
     private MemberRepo             memberRepo;
-    @Autowired
-    private AlipayClient           alipayClient;
+//    @Autowired
+//    private AlipayClient           alipayClient;
 
     public Page<DepositRefundApply> getDepositRefundApply(Long storeId, String search, DepositRefundStatus status, DepositRefundType depositRefundType, Pageable pageable) {
         return depositRefundApplyRepo
@@ -253,33 +246,33 @@ public class DepositRefundApplyService {
                 }
                 depositRecordRepo.save(apply.getCheckinInfo().getDepositRecord());
                 return;
-            case ALIPAY:
-                AlipayTradeRefundRequest request = new AlipayTradeRefundRequest();
-                AlipayTradeRefundModel model = new AlipayTradeRefundModel();
-                model.setTradeNo(checkinInfo.getDepositRecord().getTransactionId());
-                model.setRefundAmount(apply.getAmount().toString());
-                request.setBizModel(model);
-                AlipayTradeRefundResponse response = null;
-                try {
-                    response = alipayClient.execute(request);
-                    log.info("支付宝退款返回 \n{}", JSON.parseObject(response.getBody())
-                            .toString(SerializerFeature.PrettyFormat));
-                    if (response.isSuccess() && "10000".equals(response.getCode())) {
-                        apply.setStatus(DepositRefundStatus.SUCCESS);
-                        apply.setRefundTime(LocalDateTime.now());
-                        depositRefundApplyRepo.save(apply);
-                        checkinInfo.setDepositStatus(DepositStatus.REFUNDED);
-                    } else {
-                        throw new BusinessException(String
-                                .format("%s %s %s %s", response.getCode(), response.getMsg(),
-                                        response.getSubCode(), response.getSubMsg()));
-                    }
-                } catch (AlipayApiException e) {
-                    e.printStackTrace();
-                    log.error("支付宝退款失败", e);
-                    throw new BusinessException(e.getMessage());
-                }
-                break;
+//            case ALIPAY:
+//                AlipayTradeRefundRequest request = new AlipayTradeRefundRequest();
+//                AlipayTradeRefundModel model = new AlipayTradeRefundModel();
+//                model.setTradeNo(checkinInfo.getDepositRecord().getTransactionId());
+//                model.setRefundAmount(apply.getAmount().toString());
+//                request.setBizModel(model);
+//                AlipayTradeRefundResponse response = null;
+//                try {
+//                    response = alipayClient.execute(request);
+//                    log.info("支付宝退款返回 \n{}", JSON.parseObject(response.getBody())
+//                            .toString(SerializerFeature.PrettyFormat));
+//                    if (response.isSuccess() && "10000".equals(response.getCode())) {
+//                        apply.setStatus(DepositRefundStatus.SUCCESS);
+//                        apply.setRefundTime(LocalDateTime.now());
+//                        depositRefundApplyRepo.save(apply);
+//                        checkinInfo.setDepositStatus(DepositStatus.REFUNDED);
+//                    } else {
+//                        throw new BusinessException(String
+//                                .format("%s %s %s %s", response.getCode(), response.getMsg(),
+//                                        response.getSubCode(), response.getSubMsg()));
+//                    }
+//                } catch (AlipayApiException e) {
+//                    e.printStackTrace();
+//                    log.error("支付宝退款失败", e);
+//                    throw new BusinessException(e.getMessage());
+//                }
+//                break;
         }
     }