魏熙美 6 years ago
parent
commit
29faa61444

+ 6
- 2
CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/AliPayController.java View File

14
 import io.swagger.annotations.ApiImplicitParam;
14
 import io.swagger.annotations.ApiImplicitParam;
15
 import io.swagger.annotations.ApiImplicitParams;
15
 import io.swagger.annotations.ApiImplicitParams;
16
 import io.swagger.annotations.ApiOperation;
16
 import io.swagger.annotations.ApiOperation;
17
+import lombok.extern.slf4j.Slf4j;
17
 import org.slf4j.Logger;
18
 import org.slf4j.Logger;
18
 import org.slf4j.LoggerFactory;
19
 import org.slf4j.LoggerFactory;
19
 import org.springframework.beans.factory.annotation.Autowired;
20
 import org.springframework.beans.factory.annotation.Autowired;
40
 @RefreshScope
41
 @RefreshScope
41
 @RequestMapping("/")
42
 @RequestMapping("/")
42
 @Api(value = "支付宝支付 API", description = "支付宝支付 API")
43
 @Api(value = "支付宝支付 API", description = "支付宝支付 API")
44
+@Slf4j
43
 public class AliPayController {
45
 public class AliPayController {
44
 	
46
 	
45
 	private Logger log = LoggerFactory.getLogger(AliPayController.class);
47
 	private Logger log = LoggerFactory.getLogger(AliPayController.class);
56
 	@ApiOperation(value = "统一下单", notes = "统一下单")
58
 	@ApiOperation(value = "统一下单", notes = "统一下单")
57
 	@ApiImplicitParams({
59
 	@ApiImplicitParams({
58
 			@ApiImplicitParam(paramType = "path", dataType = "String", name = "outTradeNo", value = "订单号"),
60
 			@ApiImplicitParam(paramType = "path", dataType = "String", name = "outTradeNo", value = "订单号"),
59
-			@ApiImplicitParam(paramType = "form", dataType = "String", name = "type", value = "订单类型:type: 类型(car 车缴费, bill 物业缴费)"),
61
+			@ApiImplicitParam(paramType = "query", dataType = "String", name = "type", value = "订单类型:type: 类型(car 车缴费, bill 物业缴费)"),
60
 			@ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token") })
62
 			@ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token") })
61
 	@RequestMapping(value = "/aliPayOrder/{outTradeNo}",method = RequestMethod.GET)
63
 	@RequestMapping(value = "/aliPayOrder/{outTradeNo}",method = RequestMethod.GET)
62
 	public ResponseBean wxUnifiedOrder(@PathVariable("outTradeNo") String outTradeNo, @RequestParam("type") String type, HttpSession session){
64
 	public ResponseBean wxUnifiedOrder(@PathVariable("outTradeNo") String outTradeNo, @RequestParam("type") String type, HttpSession session){
77
 	@ApiOperation(value = "支付宝手机订单支付完成后回调 物业缴费", notes = "支付宝手机订单支付完成后回调")
79
 	@ApiOperation(value = "支付宝手机订单支付完成后回调 物业缴费", notes = "支付宝手机订单支付完成后回调")
78
 	@RequestMapping(value = "/aliPayBillNotify",method = RequestMethod.POST)
80
 	@RequestMapping(value = "/aliPayBillNotify",method = RequestMethod.POST)
79
 	public void aliPayBillNotify(HttpServletRequest request, HttpServletResponse response){
81
 	public void aliPayBillNotify(HttpServletRequest request, HttpServletResponse response){
82
+		log.info("支付宝手机订单支付完成后回调 物业缴费");
80
 		wxNotify(request, Constant.PAY_TYPE_BILL);
83
 		wxNotify(request, Constant.PAY_TYPE_BILL);
81
 	}
84
 	}
82
 
85
 
83
 	@ApiOperation(value = "支付宝手机订单支付完成后回调 车缴费", notes = "支付宝手机订单支付完成后回调 车缴费")
86
 	@ApiOperation(value = "支付宝手机订单支付完成后回调 车缴费", notes = "支付宝手机订单支付完成后回调 车缴费")
84
 	@RequestMapping(value = "/aliPayCarNotify",method = RequestMethod.POST)
87
 	@RequestMapping(value = "/aliPayCarNotify",method = RequestMethod.POST)
85
 	public void aliPayCarNotify(HttpServletRequest request, HttpServletResponse response){
88
 	public void aliPayCarNotify(HttpServletRequest request, HttpServletResponse response){
89
+		log.info("支付宝手机订单支付完成后回调 车缴费");
86
 		wxNotify(request, Constant.PAY_TYPE_CAR);
90
 		wxNotify(request, Constant.PAY_TYPE_CAR);
87
 	}
91
 	}
88
 
92
 
92
 	 * @param type
96
 	 * @param type
93
 	 */
97
 	 */
94
 	private void wxNotify(HttpServletRequest request, String type) {
98
 	private void wxNotify(HttpServletRequest request, String type) {
95
-		System.out.println("alipay result  start =======");
99
+		log.info("支付宝 alipay result  start =======");
96
 		Map<String,String> params = new HashMap<String,String>();
100
 		Map<String,String> params = new HashMap<String,String>();
97
 		Map requestParams = request.getParameterMap();
101
 		Map requestParams = request.getParameterMap();
98
 		for (Iterator iter = requestParams.keySet().iterator(); iter.hasNext();) {
102
 		for (Iterator iter = requestParams.keySet().iterator(); iter.hasNext();) {

+ 1
- 1
CODE/smart-community/app-api/src/main/java/com/community/huiju/service/AliPayServiceI.java View File

6
 
6
 
7
 public interface AliPayServiceI {
7
 public interface AliPayServiceI {
8
 	/**
8
 	/**
9
-	 * 微信支付统一下单
9
+	 * 支付宝支付统一下单
10
 	 * @return
10
 	 * @return
11
 	 * @param outTradeNo
11
 	 * @param outTradeNo
12
 	 * @param type  类型(car 车缴费, bill 物业缴费)
12
 	 * @param type  类型(car 车缴费, bill 物业缴费)