|
|
@@ -111,17 +111,12 @@ public class AlipayController {
|
|
|
//商户ID
|
|
|
String seller_id = new String(request.getParameter("seller_id").getBytes("ISO-8859-1"),"UTF-8");
|
|
|
|
|
|
- System.out.println(tradeStatus);
|
|
|
- System.out.println(out_trade_no);
|
|
|
- System.out.println(trade_no);
|
|
|
- System.out.println(total_amount);
|
|
|
- System.out.println(seller_id);
|
|
|
Order order=orderService.retrieveOrder(Integer.parseInt(out_trade_no));
|
|
|
if (order==null)
|
|
|
return "failed";
|
|
|
|
|
|
if (order.getPrice() == Double.parseDouble(total_amount)&& alipayProperties.getSellerId().equals(seller_id)) {
|
|
|
- tradeService.createTrade(Integer.parseInt(out_trade_no), Integer.parseInt(trade_no));
|
|
|
+ tradeService.createTrade(Integer.parseInt(out_trade_no), trade_no);
|
|
|
}
|
|
|
|
|
|
if (tradeStatus.equals("TRADE_SUCCESS")||tradeStatus.equals("TRADE_FINISHED") ){
|