Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/uas/platform/b2c/prod/store/api/OrderController.java

@@ -1,6 +1,5 @@
 package com.uas.platform.b2c.prod.store.api;
 
-import com.uas.platform.b2c.trade.order.model.Order;
 import com.uas.platform.b2c.trade.order.service.OrderService;
 import com.uas.platform.b2c.trade.order.service.PurchaseService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -49,15 +48,15 @@ public class OrderController {
 		return map;
 	}
 
-	/**
-	 * 修正原先历史状态记录中没有时间数据的问题。
-	 * @return
-	 */
-	@RequestMapping(value = "/completeTime/test", method = RequestMethod.GET)
-	public ModelMap insertCompleteTimeToOrderAndPurchase() {
-		List<Order> orders = orderService.insertCompleteTimeToOrderAndPurchase();
-		ModelMap map = new ModelMap();
-		map.put("order", orders);
-		return map;
-	}
+//	/**
+//	 * 修正原先历史状态记录中没有时间数据的问题。
+//	 * @return
+//	 */
+//	@RequestMapping(value = "/completeTime/test", method = RequestMethod.GET)
+//	public ModelMap insertCompleteTimeToOrderAndPurchase() {
+//		List<Order> orders = orderService.insertCompleteTimeToOrderAndPurchase();
+//		ModelMap map = new ModelMap();
+//		map.put("order", orders);
+//		return map;
+//	}
 }

src/test/java/com/uas/platform/b2c/javase/collection/ListTest.java

@@ -0,0 +1,38 @@
+package com.uas.platform.b2c.javase.collection;
+
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ListTest {
+
+    @Test
+    public void testSimpleListEquals() {
+        List<String> list1 = new ArrayList<String>();
+        List<String> list2 = new ArrayList<String>();
+        list1.add("a");
+        list1.add("b");
+        list2.add("a");
+        list2.add("b");
+        // true
+        System.out.println(list1.equals(list2));
+    }
+
+    @Test
+    public void testSimpleListEquals2() {
+        List<String> list1 = new ArrayList<String>();
+        List<String> list2 = new ArrayList<String>();
+        list1.add("a");
+        list1.add("b");
+        list2.add("a");
+        list2.add("c");
+        // false
+        /**
+         * rayList 会重写equals 方法，会先判断个数是否一样，
+         * 然后会将相同位置上的每一个元素拿出来equals，如果都是true，那么就是true
+         */
+        System.out.println(list1.equals(list2));
+    }
+
+}