Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

watero-rst-web/src/main/java/com/iamberry/rst/controllers/cm/AdminCustomerController.java

@@ -31,7 +31,7 @@ import java.util.*;
  * Created by wxm
  */
 @Controller
-@RequestMapping("/customer")
+@RequestMapping("/admin/customer")
 public class AdminCustomerController {
 
     @Autowired
@@ -69,23 +69,6 @@ public class AdminCustomerController {
 
     private Object lock = new Object();
 
-    @RequestMapping("/test_efast")
-    public void testEfast() throws Exception{
-        EfastOrder efastOrder = new EfastOrder();
-        efastOrder.setOrderDealCode("060619392147176-1");
-        efastOrder.setOrderId("706060002366");
-        efastOrder.setOrderPostFirm("yto");
-        efastOrder.setOrderPostNum("sss");
-        List<EfastOrderItem> itemList = new ArrayList<EfastOrderItem>();
-        EfastOrderItem item = new EfastOrderItem();
-        item.setItemNum(1);
-        item.setItemDiscount(1599);
-        item.setItemColorBar("6970465730023");
-        itemList.add(item);
-        efastOrder.setItemList(itemList);
-        efastOrderService.returnOrderFormEfast(efastOrder);
-    }
-
 
     /**
      * 获取客诉列表