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

# Conflicts:
#	watero-rst-interface/src/main/java/com/iamberry/rst/faces/cm/ComplaintSmallClassInfoService.java
#	watero-rst-interface/src/main/java/com/iamberry/rst/faces/cm/ComplaintTypeInfoService.java
#	watero-rst-service/src/main/java/com/iamberry/rst/service/cm/ComplaintSmallClassInfoServiceImpl.java
#	watero-rst-service/src/main/java/com/iamberry/rst/service/cm/ComplaintTypeInfoServiceImpl.java

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/SalesOrder.java

@@ -1,7 +1,9 @@
 package com.iamberry.rst.core.cm;
 
 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 客诉订单实体类
@@ -40,6 +42,8 @@ public class SalesOrder implements Serializable {
     private Integer salesCompanyId;         //销售公司id
     private Integer salesType;              //订单类型
 
+    private List<SalesOrderItem> salesOrderItemList = new ArrayList<SalesOrderItem>();
+
     public Integer getSalesId() {
         return salesId;
     }
@@ -271,4 +275,12 @@ public class SalesOrder implements Serializable {
     public void setSalesType(Integer salesType) {
         this.salesType = salesType;
     }
+
+    public List<SalesOrderItem> getSalesOrderItemList() {
+        return salesOrderItemList;
+    }
+
+    public void setSalesOrderItemList(List<SalesOrderItem> salesOrderItemList) {
+        this.salesOrderItemList = salesOrderItemList;
+    }
 }

watero-rst-interface/src/main/java/com/iamberry/rst/faces/cm/SalesOrderService.java

@@ -1,6 +1,7 @@
 package com.iamberry.rst.faces.cm;
 
 import com.iamberry.rst.core.cm.SalesOrder;
+import com.iamberry.rst.core.cm.SalesOrderItem;
 
 import java.util.List;
 
@@ -43,4 +44,12 @@ public interface SalesOrderService {
      * @return
      */
     List<SalesOrder> listSalesOrder (SalesOrder salesOrder);
+
+    /**
+     * 获取订单项集合
+     * @param salesOrderItem
+     * @return
+     */
+    List<SalesOrderItem> listSalesOrderItem(SalesOrderItem salesOrderItem);
+
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/SalesOrderServiceImpl.java

@@ -1,6 +1,7 @@
 package com.iamberry.rst.service.cm;
 
 import com.iamberry.rst.core.cm.SalesOrder;
+import com.iamberry.rst.core.cm.SalesOrderItem;
 import com.iamberry.rst.faces.cm.SalesOrderService;
 import com.iamberry.rst.service.cm.mapper.SalesOrderMapper;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -41,4 +42,9 @@ public class SalesOrderServiceImpl implements SalesOrderService {
     public List<SalesOrder> listSalesOrder(SalesOrder salesOrder) {
         return salesOrderMapper.listSalesOrder(salesOrder);
     }
+
+    @Override
+    public List<SalesOrderItem> listSalesOrderItem(SalesOrderItem salesOrderItem) {
+        return salesOrderMapper.listSalesOrderItem(salesOrderItem);
+    }
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/mapper/SalesOrderMapper.java

@@ -1,6 +1,7 @@
 package com.iamberry.rst.service.cm.mapper;
 
 import com.iamberry.rst.core.cm.SalesOrder;
+import com.iamberry.rst.core.cm.SalesOrderItem;
 
 import java.util.List;
 
@@ -40,4 +41,11 @@ public interface SalesOrderMapper {
      * @return
      */
     List<SalesOrder> listSalesOrder (SalesOrder salesOrder);
+
+    /**
+     * 获取订单项集合
+     * @param salesOrderItem
+     * @return
+     */
+    List<SalesOrderItem> listSalesOrderItem(SalesOrderItem salesOrderItem);
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/mapper/salesOrderMapper.xml

@@ -79,6 +79,13 @@
     </where>
   </select>
 
+  <!-- 订单项集合 -->
+  <select id="listSalesOrderItem" resultType="SalesOrder" parameterType="SalesOrder" >
+    select
+    <include refid="salesOrderInfo" />
+    from tb_rst_sales_order_info
+  </select>
+
   <!-- 添加订单信息 -->
   <insert id="addSalesOrder" parameterType="SalesOrder" keyProperty="salesId" useGeneratedKeys="true" >
     insert into tb_rst_sales_order_info (sales_id, sales_orderId, sales_openId, 
@@ -103,13 +110,6 @@
       #{salesCompanyId,jdbcType=INTEGER}, #{salesType,jdbcType=INTEGER})
   </insert>
 
-  <!--<insert id="addOrderItemList" parameterType="ArrayList">
-    INSERT INTO tb_rst_sales_order_item
-      (
-
-      )
-  </insert>-->
-
   <!-- 批量添加订单信息 -->
   <insert id="addSalesOrderList" parameterType="ArrayList" >
     insert into tb_rst_sales_order_info (

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

@@ -126,7 +126,11 @@ public class AdminCustomerController {
     public ResponseJson listOrder(HttpServletRequest request,SalesOrder salesOrder) {
         List<SalesOrder> salesOrderList = salesOrderService.listSalesOrder(salesOrder);
 
-
+        for(SalesOrder order : salesOrderList){
+            SalesOrderItem salesOrderItem = new SalesOrderItem();
+            List<SalesOrderItem> salesOrderItemList = salesOrderService.listSalesOrderItem(salesOrderItem);
+            order.setSalesOrderItemList(salesOrderItemList);
+        }
 
         if (salesOrderList == null || salesOrderList.size() < 1) {
             return new ResponseJson(500, "查询失败", 500);