Commit a0aa09bf authored by renjie's avatar renjie

支付宝接口

parent 0bf171ca
package com.edgec.browserbackend.account.controller; package com.edgec.browserbackend.account.controller;
import com.edgec.browserbackend.account.domain.*; import com.edgec.browserbackend.account.domain.*;
import com.edgec.browserbackend.account.dto.AlipayReturnDto;
import com.edgec.browserbackend.account.dto.MobileDto; import com.edgec.browserbackend.account.dto.MobileDto;
import com.edgec.browserbackend.account.dto.ResultDto; import com.edgec.browserbackend.account.dto.ResultDto;
import com.edgec.browserbackend.account.dto.BillQueryCriteriaDto; import com.edgec.browserbackend.account.dto.BillQueryCriteriaDto;
...@@ -280,10 +279,10 @@ public class AccountController { ...@@ -280,10 +279,10 @@ public class AccountController {
public void alipayPutOrder(HttpServletRequest request, HttpServletResponse response, @PathVariable int amount) throws Exception { public void alipayPutOrder(HttpServletRequest request, HttpServletResponse response, @PathVariable int amount) throws Exception {
String by = request.getParameter("by"); String by = request.getParameter("by");
AlipayReturnDto dto= paymentService.alipayPutPayOrder(request.getUserPrincipal().getName(), amount, by); String form = paymentService.alipayPutPayOrder(request.getUserPrincipal().getName(), amount, by);
response.setContentType("text/html;charset=utf-8"); response.setContentType("text/html;charset=utf-8");
response.getWriter().println(dto.getForm()); response.getWriter().println(form);
response.getWriter().println(dto.getTradeNo());
} }
@RequestMapping(path = "/0xh5wxpayputorder/{amount}", method = RequestMethod.GET) @RequestMapping(path = "/0xh5wxpayputorder/{amount}", method = RequestMethod.GET)
......
package com.edgec.browserbackend.account.dto;
/**
* @Desc
* @Author jason
* @CreateTime 2020/3/13 6:58 下午
**/
public class AlipayReturnDto {
private String tradeNo;
private String form;
public String getTradeNo() {
return tradeNo;
}
public void setTradeNo(String tradeNo) {
this.tradeNo = tradeNo;
}
public String getForm() {
return form;
}
public void setForm(String form) {
this.form = form;
}
@Override
public String toString() {
return "{tradeNo='" + tradeNo + '\'' +
", form='" + form + '\'' +
'}';
}
}
...@@ -3,13 +3,12 @@ package com.edgec.browserbackend.account.service; ...@@ -3,13 +3,12 @@ package com.edgec.browserbackend.account.service;
import com.edgec.browserbackend.account.domain.UserBalance; import com.edgec.browserbackend.account.domain.UserBalance;
import com.edgec.browserbackend.account.domain.UserPaymentDto; import com.edgec.browserbackend.account.domain.UserPaymentDto;
import com.edgec.browserbackend.account.dto.AlipayReturnDto;
public interface PaymentService { public interface PaymentService {
UserPaymentDto wxPutPayOrder(String username, int amount); UserPaymentDto wxPutPayOrder(String username, int amount);
AlipayReturnDto alipayPutPayOrder(String username, int amount, String by); String alipayPutPayOrder(String username, int amount, String by);
String wechatPayCallback(String tradno); String wechatPayCallback(String tradno);
......
...@@ -7,7 +7,6 @@ import com.alipay.api.request.AlipayTradePagePayRequest; ...@@ -7,7 +7,6 @@ import com.alipay.api.request.AlipayTradePagePayRequest;
import com.alipay.api.request.AlipayTradeQueryRequest; import com.alipay.api.request.AlipayTradeQueryRequest;
import com.alipay.api.response.AlipayTradePagePayResponse; import com.alipay.api.response.AlipayTradePagePayResponse;
import com.alipay.api.response.AlipayTradeQueryResponse; import com.alipay.api.response.AlipayTradeQueryResponse;
import com.edgec.browserbackend.account.dto.AlipayReturnDto;
import com.edgec.browserbackend.account.exception.AccountErrorCode; import com.edgec.browserbackend.account.exception.AccountErrorCode;
import com.edgec.browserbackend.account.repository.UserBalanceRepository; import com.edgec.browserbackend.account.repository.UserBalanceRepository;
import com.edgec.browserbackend.account.repository.UserPaymentRepository; import com.edgec.browserbackend.account.repository.UserPaymentRepository;
...@@ -17,7 +16,6 @@ import com.edgec.browserbackend.account.service.PaymentService; ...@@ -17,7 +16,6 @@ import com.edgec.browserbackend.account.service.PaymentService;
import com.edgec.browserbackend.account.controller.AccountController; import com.edgec.browserbackend.account.controller.AccountController;
import com.edgec.browserbackend.account.domain.*; import com.edgec.browserbackend.account.domain.*;
import com.edgec.browserbackend.account.service.SmsUtils; import com.edgec.browserbackend.account.service.SmsUtils;
import com.edgec.browserbackend.account.service.UserPrePaidBillingService;
import com.edgec.browserbackend.alipay.AlipayConfig; import com.edgec.browserbackend.alipay.AlipayConfig;
import com.edgec.browserbackend.alipay.CloudamAlipayConfig; import com.edgec.browserbackend.alipay.CloudamAlipayConfig;
import com.edgec.browserbackend.alipay.VpsAlipayConfig; import com.edgec.browserbackend.alipay.VpsAlipayConfig;
...@@ -26,7 +24,6 @@ import com.edgec.browserbackend.wxpay.*; ...@@ -26,7 +24,6 @@ import com.edgec.browserbackend.wxpay.*;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.time.Instant; import java.time.Instant;
...@@ -290,7 +287,7 @@ public class PaymentServiceImpl implements PaymentService { ...@@ -290,7 +287,7 @@ public class PaymentServiceImpl implements PaymentService {
} }
@Override @Override
public AlipayReturnDto alipayPutPayOrder(String username, int amount, String by) { public String alipayPutPayOrder(String username, int amount, String by) {
Account byName = accountService.findByName(username); Account byName = accountService.findByName(username);
if (byName == null) if (byName == null)
...@@ -333,10 +330,8 @@ public class PaymentServiceImpl implements PaymentService { ...@@ -333,10 +330,8 @@ public class PaymentServiceImpl implements PaymentService {
internalOrder.setTransId(response.getTradeNo()); internalOrder.setTransId(response.getTradeNo());
userPaymentRepository.save(internalOrder); userPaymentRepository.save(internalOrder);
AlipayReturnDto alipayReturnDto = new AlipayReturnDto(); String form = response.getBody();
alipayReturnDto.setForm(response.getBody()); return form;
alipayReturnDto.setTradeNo(response.getTradeNo());
return alipayReturnDto;
} catch (Exception e) { } catch (Exception e) {
log.error("Alypay payment order generation fails", e); log.error("Alypay payment order generation fails", e);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment