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

# Conflicts:
#	watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/order_list.ftl

watero-rst-interface/src/main/java/com/iamberry/rst/faces/order/OrderService.java

@@ -1,5 +1,7 @@
 package com.iamberry.rst.faces.order;
 
+import com.iamberry.rst.core.cm.SalesOrder;
+import com.iamberry.rst.core.cm.SalesOrderItem;
 import com.iamberry.rst.core.order.*;
 import com.iamberry.rst.core.page.PageRequest;
 import com.iamberry.rst.core.page.PagedResult;
@@ -274,4 +276,8 @@ public interface OrderService {
     Order getOrderByTelName(Order order);
 
     EfastOrder getFromRstEfastOrderInfo(String orderDealCode);
+
+    List<SalesOrder> getFromRstSalesOrderInfo(String orderDealCode);
+
+    List<SalesOrder> querySalesOrderItemListBySalesId(int salesId);
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/order/OrderServiceImpl.java

@@ -2,6 +2,8 @@ package com.iamberry.rst.service.order;
 
 import com.github.pagehelper.PageHelper;
 import com.iamberry.cache.LocalCache;
+import com.iamberry.rst.core.cm.SalesOrder;
+import com.iamberry.rst.core.cm.SalesOrderItem;
 import com.iamberry.rst.core.order.*;
 import com.iamberry.rst.core.page.PageRequest;
 import com.iamberry.rst.core.page.PagedResult;
@@ -150,6 +152,16 @@ public class OrderServiceImpl implements OrderService{
     }
 
     @Override
+    public List<SalesOrder> getFromRstSalesOrderInfo(String orderDealCode){
+        return orderMapper.getFromRstSalesOrderInfo(orderDealCode);
+    }
+
+    @Override
+    public List<SalesOrder> querySalesOrderItemListBySalesId(int salesId){
+        return orderMapper.querySalesOrderItemListBySalesId(salesId);
+    }
+
+    @Override
     public OrderSource getSource(Integer sourceId) {
         return orderMapper.getSource(sourceId);
     }

watero-rst-service/src/main/java/com/iamberry/rst/service/order/mapper/OrderMapper.java

@@ -1,5 +1,7 @@
 package com.iamberry.rst.service.order.mapper;
 
+import com.iamberry.rst.core.cm.SalesOrder;
+import com.iamberry.rst.core.cm.SalesOrderItem;
 import com.iamberry.rst.core.order.*;
 import org.apache.ibatis.annotations.Param;
 
@@ -254,4 +256,8 @@ public interface OrderMapper {
      * @return
      */
     EfastOrder getFromRstEfastOrderInfo(String orderDealCode);
+
+    List<SalesOrder> getFromRstSalesOrderInfo(String orderDealCode);
+
+    List<SalesOrder> querySalesOrderItemListBySalesId(int salesId);
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/order/mapper/orderMapper.xml

@@ -771,4 +771,44 @@
         WHERE
         a.sales_deal_code = #{orderDealCode}
     </select>
+    <!-- getFromRstSalesOrderInfo new 2018-6-12 -->
+    <resultMap type="com.iamberry.rst.core.cm.SalesOrder" id="salesOrderResult">
+        <id property="salesId" column="sales_id"/>
+        <result property="salesAddressName" column="sales_address_name" />
+        <result property="salesAddressTel" column="sales_address_tel" />
+        <result property="salesAddressInfo" column="sales_address_info" />
+        <result property="salesPostFirm" column="sales_post_firm" />
+        <result property="salesPostNum" column="sales_post_num" />
+        <result property="itemProductName" column="item_product_name" />
+        <result property="itemNum" column="item_num" />
+        <result property="salesDealCode" column="sales_deal_code" />
+    </resultMap>
+    <select id="getFromRstSalesOrderInfo" parameterType="java.lang.String" resultMap="salesOrderResult">
+        SELECT
+        a.sales_id,a.sales_address_name,a.sales_address_tel,a.sales_address_info,a.sales_post_firm,a.sales_post_num,
+        b.item_product_name,b.item_num,a.sales_deal_code
+        FROM
+        tb_rst_sales_order_info a
+        LEFT JOIN
+        tb_rst_sales_order_item b
+        ON
+        a.sales_id = b.item_order_id
+        WHERE
+        a.sales_deal_code = #{orderDealCode}
+    </select>
+    <!--querySalesOrderItemListBySalesId 查询订单项-->
+    <select id="querySalesOrderItemListBySalesId" parameterType="java.lang.Integer" resultMap="salesOrderResult">
+        SELECT
+        a.sales_id,a.sales_address_name,a.sales_address_tel,a.sales_address_info,a.sales_post_firm,a.sales_post_num,
+        b.item_product_name,b.item_num,a.sales_deal_code
+        FROM
+        tb_rst_sales_order_info a
+        LEFT JOIN
+        tb_rst_sales_order_item b
+        ON
+        a.sales_id = b.item_order_id
+        WHERE
+        a.sales_main_order_id = #{salesId}
+    </select>
+
 </mapper>

watero-rst-web/src/main/java/com/iamberry/rst/controllers/order/AdminOrderController.java

@@ -617,6 +617,7 @@ public class AdminOrderController {
         BufferedReader reader=null;
         String temp=null;
         List<EfastOrder> efastOrderList = new ArrayList<EfastOrder>();
+        List<SalesOrder> temporarySalesOrderList = new ArrayList<SalesOrder>();
         int line=1;
         try{
             reader=new BufferedReader(new FileReader(file));
@@ -642,11 +643,43 @@ public class AdminOrderController {
                 }
             }
         }
+        Map<String,SalesOrder> mapsalesOrderList = new HashMap<>();
         for (int i=0;i<efastOrderList.size();i++){
             //EfastOrder efastOrder = efastOrderService.getFromEfastOrderInfo(efastOrderList.get(i).getOrderDealCode());
             //orderService
-            EfastOrder efastOrder = orderService.getFromRstEfastOrderInfo(efastOrderList.get(i).getOrderDealCode());
-            if(efastOrder != null){
+            //EfastOrder efastOrder = orderService.getFromRstEfastOrderInfo(efastOrderList.get(i).getOrderDealCode());
+            List<SalesOrder> salesOrderList = orderService.getFromRstSalesOrderInfo(efastOrderList.get(i).getOrderDealCode());
+            /*if(salesOrderList != null && salesOrderList.size() > 0){
+                for (SalesOrder salesOrder: salesOrderList) {
+                    int salesId = salesOrder.getSalesId();
+                    salesOrderItemList = orderService.querySalesOrderItemListBySalesId(salesId);
+                    if(salesOrderItemList != null && salesOrderItemList.size() >0){
+                        for (SalesOrderItem salesOrderItem: salesOrderItemList) {
+                            int saId = salesOrderItem.getItemOrderId();
+                        }
+                    }
+                }
+            }*/
+            //List<SalesOrder> temporarySalesOrderList = new ArrayList<SalesOrder>();
+            if(salesOrderList != null && salesOrderList.size() > 0) {
+                for (SalesOrder salesOrder : salesOrderList) {
+                    int salesId = salesOrder.getSalesId();
+                    List<SalesOrder> salesMainOrderList = orderService.querySalesOrderItemListBySalesId(salesId);
+                    if(salesMainOrderList != null && salesMainOrderList.size() > 0){
+                        for(SalesOrder salesMainOrder:salesMainOrderList){
+                            temporarySalesOrderList.add(salesMainOrder);
+                        }
+                    }
+                }
+            }
+            if(temporarySalesOrderList != null && temporarySalesOrderList.size() >0){
+                if(salesOrderList != null && salesOrderList.size() > 0) {
+                    for (SalesOrder salesOrder : salesOrderList) {
+                        temporarySalesOrderList.add(salesOrder);
+                    }
+                }
+            }
+            /*if(efastOrder != null){
                 efastOrderList.get(i).setOrderAddressName(efastOrder.getOrderAddressName());
                 efastOrderList.get(i).setOrderAddressTel(efastOrder.getOrderAddressTel());
                 efastOrderList.get(i).setOrderAddress(efastOrder.getOrderAddress());
@@ -654,7 +687,7 @@ public class AdminOrderController {
                 efastOrderList.get(i).setOrderPostNum(efastOrder.getOrderPostNum());
                 efastOrderList.get(i).setOrderProductName(efastOrder.getOrderProductName());
                 efastOrderList.get(i).setOrderNum(efastOrder.getOrderNum());
-            }
+            }*/
         }
 
         // 准备model
@@ -675,19 +708,31 @@ public class AdminOrderController {
         model.put("titles", titles);
         PtsBatch ptsBatch = new PtsBatch();
         List<List<Object>> countexts = new ArrayList<List<Object>>();
-        for (EfastOrder efastOrder : efastOrderList) {
-            List<Object> row = new ArrayList<Object>();
-            row.add(efastOrder.getPlatformOrderId() == null ? null:efastOrder.getPlatformOrderId());
-            row.add(efastOrder.getOrderDealCode() == null ? null:efastOrder.getOrderDealCode());
-            row.add(efastOrder.getOrderAddressName() == null ? null:efastOrder.getOrderAddressName());
-            row.add(efastOrder.getOrderAddressTel() == null ? null:efastOrder.getOrderAddressTel());
-            row.add(efastOrder.getOrderAddress() == null ? null:efastOrder.getOrderAddress());
-            String frim = replace(efastOrder.getOrderPostFirm());
-            row.add(frim);
-            row.add(efastOrder.getOrderPostNum() == null ? null:efastOrder.getOrderPostNum());
-            row.add(efastOrder.getOrderProductName() == null ? null:efastOrder.getOrderProductName());
-            row.add(efastOrder.getOrderNum() == null ? null:efastOrder.getOrderNum());
-            countexts.add(row);
+        if(temporarySalesOrderList != null && temporarySalesOrderList.size() >0){
+            for (SalesOrder salesOrder : temporarySalesOrderList) {
+                List<Object> row = new ArrayList<Object>();
+                /*row.add(efastOrder.getPlatformOrderId() == null ? null:efastOrder.getPlatformOrderId());
+                row.add(efastOrder.getOrderDealCode() == null ? null:efastOrder.getOrderDealCode());
+                row.add(efastOrder.getOrderAddressName() == null ? null:efastOrder.getOrderAddressName());
+                row.add(efastOrder.getOrderAddressTel() == null ? null:efastOrder.getOrderAddressTel());
+                row.add(efastOrder.getOrderAddress() == null ? null:efastOrder.getOrderAddress());
+                String frim = replace(efastOrder.getOrderPostFirm());
+                row.add(frim);
+                row.add(efastOrder.getOrderPostNum() == null ? null:efastOrder.getOrderPostNum());
+                row.add(efastOrder.getOrderProductName() == null ? null:efastOrder.getOrderProductName());
+                row.add(efastOrder.getOrderNum() == null ? null:efastOrder.getOrderNum());*/
+                row.add(salesOrder.getSalesOrderId() == null ? null:salesOrder.getSalesOrderId());
+                row.add(salesOrder.getSalesDealCode() == null ? null:salesOrder.getSalesDealCode());
+                row.add(salesOrder.getSalesAddressName() == null ? null:salesOrder.getSalesAddressName());
+                row.add(salesOrder.getSalesAddressTel() == null ? null:salesOrder.getSalesAddressTel());
+                row.add(salesOrder.getSalesAddressInfo() == null ? null:salesOrder.getSalesAddressInfo());
+                String frim = replace(salesOrder.getSalesPostFirm());
+                row.add(frim);
+                row.add(salesOrder.getSalesPostNum() == null ? null:salesOrder.getSalesPostNum());
+                row.add(salesOrder.getItemProductName() == null ? null:salesOrder.getItemProductName());
+                row.add(salesOrder.getItemNum() == null ? null:salesOrder.getItemNum());
+                countexts.add(row);
+            }
         }
         model.put("varList", countexts);
         ObjectExcelView erv = new ObjectExcelView();
@@ -1072,7 +1117,7 @@ public class AdminOrderController {
                 mapsalesOrderList.put(orderId, salesOrder);
             }
         }
-
+        StringBuffer sb = new StringBuffer();
          for(SalesOrder salesOrders: mapsalesOrderList.values()){
                 bl = salesOrderService.addRstOrderAndIteminfo(salesOrders);
                 logger.info("EFAST升级合并订单项调用boolean值+："+bl);
@@ -1081,23 +1126,25 @@ public class AdminOrderController {
                         .addResponseKeyValue("order_list", salesOrderList);*/
                if(bl == false){
                    newFaultNum ++;
+               }else{
+                   sb.append(salesOrders.getSalesDealCode()+"\r\n");
                }
          }
         /*if(!bl){
             return ResponseJson.SUCCESS;
         }*/
         //Efast升级 2018-6-8
-        StringBuffer sb = new StringBuffer();
-        if(mapsalesOrderList != null && mapsalesOrderList.size() > 0){
-            /*for (int i = 0; i < mapsalesOrderList.size(); i++) {
+        //StringBuffer sb = new StringBuffer();
+        /*if(mapsalesOrderList != null && mapsalesOrderList.size() > 0){
+            *//*for (int i = 0; i < mapsalesOrderList.size(); i++) {
                 //Efast升级只取交易号 2018-6-8
                 //sb.append(orderEfasts.get(i).getPlatformOrderId().trim() + "@");
                 //sb.append(orderEfasts.get(i).getOrderId() + "\r\n");
-            }*/
+            }*//*
             for(String key: mapsalesOrderList.keySet()){
                 sb.append(key + "\r\n");
             }
-        }
+        }*/
         SimpleDateFormat formatter = new SimpleDateFormat("yyyyMMdd");
         String dateString = formatter.format(new Date());
         String webPath = request.getSession().getServletContext().getRealPath("/");