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

@@ -280,4 +280,6 @@ public interface OrderService {
     List<SalesOrder> getFromRstSalesOrderInfo(String orderDealCode);
 
     List<SalesOrder> querySalesOrderItemListBySalesId(int salesId);
+
+    public void updateSalesOrderPostType(SalesOrder salesOrders, String postType);
 }

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

@@ -160,7 +160,10 @@ public class OrderServiceImpl implements OrderService{
     public List<SalesOrder> querySalesOrderItemListBySalesId(int salesId){
         return orderMapper.querySalesOrderItemListBySalesId(salesId);
     }
-
+    public void updateSalesOrderPostType(SalesOrder salesOrders, String postType){
+        salesOrders.setSalesPostFirm(postType);
+        orderMapper.updateSalesOrderPostType(salesOrders);
+    }
     @Override
     public OrderSource getSource(Integer sourceId) {
         return orderMapper.getSource(sourceId);

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

@@ -260,4 +260,6 @@ public interface OrderMapper {
     List<SalesOrder> getFromRstSalesOrderInfo(String orderDealCode);
 
     List<SalesOrder> querySalesOrderItemListBySalesId(int salesId);
+
+    void updateSalesOrderPostType(SalesOrder salesOrders);
 }

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

@@ -810,5 +810,13 @@
         WHERE
         a.sales_main_order_id = #{salesId}
     </select>
-
+    <!--updateSalesOrderPostType-->
+    <update id="updateSalesOrderPostType" parameterType="SalesOrder">
+        UPDATE
+        tb_rst_sales_order_info
+        SET
+        sales_post_firm = #{salesPostFirm}
+        WHERE
+        sales_deal_code = #{salesDealCode}
+    </update>
 </mapper>

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

@@ -1118,6 +1118,7 @@ public class AdminOrderController {
         }
         StringBuffer sb = new StringBuffer();
          for(SalesOrder salesOrders: mapsalesOrderList.values()){
+                orderService.updateSalesOrderPostType(salesOrders,postType);
                 bl = salesOrderService.addRstOrderAndIteminfo(salesOrders);
                 logger.info("EFAST升级合并订单项调用boolean值+："+bl);
                /* return new ResponseJson(200, "SUCCESS", 200)