Authored by sailing-PC\sailing

Merge branch 'master' into dev

... ... @@ -35,7 +35,7 @@ public class BuyerOrderController {
* 5:交易成功
* 7:交易失败
*/
@RequestMapping(params = "method=app.buyer.list")
@RequestMapping(params = "method=ufo.order.list")
@ResponseBody
public ApiResponse getOrderList(@RequestParam("type") int type,
@RequestParam("uid") int uid,
... ... @@ -79,7 +79,7 @@ public class BuyerOrderController {
* @param uid
* @return
*/
@RequestMapping(params = "method=app.buyer.detail")
@RequestMapping(params = "method=ufo.order.detail")
@ResponseBody
public ApiResponse getOrderDetail(@RequestParam("orderCode") long orderCode,
@RequestParam("uid") int uid,
... ... @@ -100,7 +100,7 @@ public class BuyerOrderController {
* 取消订单
*/
@RequestMapping(params = "method=app.buyer.cancel")
@RequestMapping(params = "method=ufo.buyer.cancel")
@ResponseBody
public ApiResponse cancel(@RequestParam("orderCode") long orderCode,
@RequestParam("uid") int uid) {
... ... @@ -120,7 +120,7 @@ public class BuyerOrderController {
* @param uid
* @return
*/
@RequestMapping(params = "method=app.buyer.confirm")
@RequestMapping(params = "method=ufo.buyer.confirm")
@ResponseBody
public ApiResponse confirm(@RequestParam("orderCode") long orderCode,
@RequestParam("uid") int uid) {
... ...