Authored by sailing-PC\sailing

Merge branch 'master' into dev

@@ -35,7 +35,7 @@ public class BuyerOrderController { @@ -35,7 +35,7 @@ public class BuyerOrderController {
35 * 5:交易成功 35 * 5:交易成功
36 * 7:交易失败 36 * 7:交易失败
37 */ 37 */
38 - @RequestMapping(params = "method=app.buyer.list") 38 + @RequestMapping(params = "method=ufo.order.list")
39 @ResponseBody 39 @ResponseBody
40 public ApiResponse getOrderList(@RequestParam("type") int type, 40 public ApiResponse getOrderList(@RequestParam("type") int type,
41 @RequestParam("uid") int uid, 41 @RequestParam("uid") int uid,
@@ -79,7 +79,7 @@ public class BuyerOrderController { @@ -79,7 +79,7 @@ public class BuyerOrderController {
79 * @param uid 79 * @param uid
80 * @return 80 * @return
81 */ 81 */
82 - @RequestMapping(params = "method=app.buyer.detail") 82 + @RequestMapping(params = "method=ufo.order.detail")
83 @ResponseBody 83 @ResponseBody
84 public ApiResponse getOrderDetail(@RequestParam("orderCode") long orderCode, 84 public ApiResponse getOrderDetail(@RequestParam("orderCode") long orderCode,
85 @RequestParam("uid") int uid, 85 @RequestParam("uid") int uid,
@@ -100,7 +100,7 @@ public class BuyerOrderController { @@ -100,7 +100,7 @@ public class BuyerOrderController {
100 * 取消订单 100 * 取消订单
101 */ 101 */
102 102
103 - @RequestMapping(params = "method=app.buyer.cancel") 103 + @RequestMapping(params = "method=ufo.buyer.cancel")
104 @ResponseBody 104 @ResponseBody
105 public ApiResponse cancel(@RequestParam("orderCode") long orderCode, 105 public ApiResponse cancel(@RequestParam("orderCode") long orderCode,
106 @RequestParam("uid") int uid) { 106 @RequestParam("uid") int uid) {
@@ -120,7 +120,7 @@ public class BuyerOrderController { @@ -120,7 +120,7 @@ public class BuyerOrderController {
120 * @param uid 120 * @param uid
121 * @return 121 * @return
122 */ 122 */
123 - @RequestMapping(params = "method=app.buyer.confirm") 123 + @RequestMapping(params = "method=ufo.buyer.confirm")
124 @ResponseBody 124 @ResponseBody
125 public ApiResponse confirm(@RequestParam("orderCode") long orderCode, 125 public ApiResponse confirm(@RequestParam("orderCode") long orderCode,
126 @RequestParam("uid") int uid) { 126 @RequestParam("uid") int uid) {