杨杰 6 anos atrás
pai
commit
2c892ce544

+ 2 - 2
src/main/java/com/llisoft/service/pay/controller/AliPayController.java

@@ -33,7 +33,7 @@ public class AliPayController {
 	
 	@ApiOperation(value="同步回调")
 	@GetMapping("/return")
-	public String retur(HttpServletRequest request) {
+	public String retur(HttpServletRequest request) throws Exception {
 		Map<String, String> resultMap = this.getParamMap(request);
 		logger.info("收到支付宝同步回调: {}", resultMap);
 		try {
@@ -50,7 +50,7 @@ public class AliPayController {
 	
 	@ApiOperation(value="异步通知")
 	@PostMapping(value="/notify")
-	public @ResponseBody String notify(HttpServletRequest request) {
+	public @ResponseBody String notify(HttpServletRequest request) throws Exception {
 		Map<String, String> resultMap = this.getParamMap(request);
 		logger.info("收到支付宝异步通知: {}", resultMap);
 		try {

+ 3 - 4
src/main/java/com/llisoft/service/pay/controller/OrderController.java

@@ -10,7 +10,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.llisoft.common.exception.MtaException;
 import com.llisoft.common.util.JsonUtil;
 import com.llisoft.common.vo.ResponseVo;
 import com.llisoft.service.pay.service.OrderService;
@@ -37,21 +36,21 @@ public class OrderController{
 	
 	@ApiOperation(value="订单添加")
 	@PostMapping("/add")
-	public ResponseVo<OrderAddResponseVo> add(@Valid @RequestBody OrderAddRequestVo vo) throws MtaException{
+	public ResponseVo<OrderAddResponseVo> add(@Valid @RequestBody OrderAddRequestVo vo) throws Exception{
 		logger.info("收到订单添加请求: {}", JsonUtil.toJson(vo));
 		return ResponseVo.success(orderService.add(vo.getAppKey(), vo.getMoney(), vo.getTitle()));
 	}
 	
 	@ApiOperation(value="订单支付")
 	@PostMapping("/pay")
-	public ResponseVo<OrderPayResponseVo> pay(@Valid @RequestBody OrderPayRequestVo vo) throws MtaException{
+	public ResponseVo<OrderPayResponseVo> pay(@Valid @RequestBody OrderPayRequestVo vo) throws Exception{
 		logger.info("收到订单支付请求: {}", JsonUtil.toJson(vo));
 		return ResponseVo.success(orderService.pay(vo.getOrderNum(), vo.getPayType(), vo.isMobile()));
 	}
 	
 	@ApiOperation(value="订单详情")
 	@PostMapping("/info")
-	public ResponseVo<OrderInfoResponseVo> get(@Valid @RequestBody OrderInfoRequestVo vo) throws MtaException{
+	public ResponseVo<OrderInfoResponseVo> get(@Valid @RequestBody OrderInfoRequestVo vo) throws Exception{
 		logger.info("收到订单详情请求: {}", JsonUtil.toJson(vo));
 		return ResponseVo.success(orderService.info(vo.getOrderNum()));
 	}

+ 4 - 5
src/main/java/com/llisoft/service/pay/service/AliPayService.java

@@ -22,7 +22,6 @@ import com.alipay.api.internal.util.AlipaySignature;
 import com.alipay.api.request.AlipayTradePagePayRequest;
 import com.alipay.api.request.AlipayTradeQueryRequest;
 import com.alipay.api.request.AlipayTradeWapPayRequest;
-import com.llisoft.common.exception.MtaException;
 import com.llisoft.common.util.JsonUtil;
 import com.llisoft.common.util.MoneyUtil;
 
@@ -154,9 +153,9 @@ public class AliPayService {
 	 * 处理异步通知
 	 * @param map
 	 * @return
-	 * @throws MtaException 
+	 * @throws Exception 
 	 */
-	public boolean doNotify(Map<String, String> map) throws MtaException {
+	public boolean doNotify(Map<String, String> map) throws Exception {
 		// 验证签名
 		if(!this.checkSign(map)) {
 			logger.error("支付宝异步通知: 签名验证失败: {}", map);
@@ -177,10 +176,10 @@ public class AliPayService {
 
 	/**
 	 * 处理同步回调
-	 * @throws MtaException 
+	 * @throws Exception 
 	 */
 	@SuppressWarnings("unchecked")
-	public boolean doReturn(Map<String, String> map) throws MtaException {
+	public boolean doReturn(Map<String, String> map) throws Exception {
 		// 验证签名
 		if(!this.checkSign(map)) {
 			logger.error("支付宝同步回调: 签名验证失败: {}", map);

+ 2 - 2
src/main/java/com/llisoft/service/pay/service/OrderService.java

@@ -139,9 +139,9 @@ public class OrderService {
 	 * 完成
 	 * @param orderNum
 	 * @return
-	 * @throws MtaException 
+	 * @throws Exception 
 	 */
-	public boolean finish(int orderId) throws MtaException{
+	public boolean finish(int orderId) throws Exception{
 		Order order = this.get(orderId);
 		if (Objects.isNull(order)) {
 			throw new MtaException("订单不存在: " + orderId);

+ 2 - 2
src/main/java/com/llisoft/service/pay/service/PayService.java

@@ -108,10 +108,10 @@ public class PayService {
 	 * @param money 实际支付金额(分)
 	 * @param flag 支付成功标记(1异步通知/2同步通知/3主动查询/4对账)
 	 * @return
-	 * @throws MtaException 
+	 * @throws Exception 
 	 */
 	@Transactional
-	public boolean finish(String payNum, String tradeNum, int money, byte flag) throws MtaException{
+	public boolean finish(String payNum, String tradeNum, int money, byte flag) throws Exception{
 		Item item = this.get(payNum);
 		Order order = orderService.get(item.getOrderId());
 		if (order.getOrderMoney() != money) { // 核对金额