提交

CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/WxPayController.java

@@ -47,16 +47,19 @@ public class WxPayController {
 	@ApiOperation(value = "统一下单", notes = "统一下单")
 	@ApiImplicitParams({
 			@ApiImplicitParam(paramType = "path", dataType = "Integer", name = "outTradeNo", value = "订单号"),
+			@ApiImplicitParam(paramType = "query", dataType = "String", name = "type", value = "订单类型： bill 表示订单，car 车缴费"),
 			@ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
 	})
 	@RequestMapping(value = "/wxUnifiedOrder/{outTradeNo}",method = RequestMethod.GET)
-	public ResponseBean wxUnifiedOrder(@PathVariable("outTradeNo") String outTradeNo, HttpSession session){
+	public ResponseBean wxUnifiedOrder(@PathVariable("outTradeNo") String outTradeNo,
+									   @RequestParam("type") String type,
+									   HttpSession session){
 		ResponseBean responseBean = new ResponseBean();
 		UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
 		
 		Map<String, String> resp = Maps.newHashMap();
 		try {
-			resp = wxPayService.wxUnifiedOrder(outTradeNo,userElement);
+			resp = wxPayService.wxUnifiedOrder(outTradeNo, type,userElement);
 		} catch (Exception e) {
 			e.printStackTrace();
 			responseBean.addError(e.getMessage());