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

# Conflicts:
#	watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/add_order.ftl

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

@@ -48,6 +48,7 @@ public class CustomerStatisticalInfo implements Serializable {
     private Integer relationId;//处理主键
     private String procMethodName;//处理详细方式
     private String postageString;//邮费信息
+    private String typeName;//产品类型名称
 
     //售后签收产品表
     private List<SignclosedProductInfo> signclosedProductInfos = new ArrayList<SignclosedProductInfo>();
@@ -315,4 +316,12 @@ public class CustomerStatisticalInfo implements Serializable {
     public void setSignclosedProductInfos(List<SignclosedProductInfo> signclosedProductInfos) {
         this.signclosedProductInfos = signclosedProductInfos;
     }
+
+    public String getTypeName() {
+        return typeName;
+    }
+
+    public void setTypeName(String typeName) {
+        this.typeName = typeName;
+    }
 }

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

@@ -38,6 +38,7 @@ public class SalesOrderItem implements Serializable {
     private String salesOrderId;            //订单号
     private String salesDealCode;   //交易号
     private Integer itemReturnNum;   //退货数量
+    private String typeName;   //产品类型名称
 
     public Integer getItemIsSource() {
         return itemIsSource;
@@ -230,4 +231,12 @@ public class SalesOrderItem implements Serializable {
     public void setItemCostTotal(Integer itemCostTotal) {
         this.itemCostTotal = itemCostTotal;
     }
+
+    public String getTypeName() {
+        return typeName;
+    }
+
+    public void setTypeName(String typeName) {
+        this.typeName = typeName;
+    }
 }

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

@@ -496,12 +496,14 @@
             pc.color_is_weight,
             pc.color_is_machine,
             item_return_num,
-            oi.sales_orderId
+            oi.sales_orderId,
+            pt.type_name
         FROM
             tb_rst_sales_order_item
       LEFT JOIN tb_rst_product_info pi ON tb_rst_sales_order_item.item_product_id = pi.product_id
       LEFT JOIN tb_rst_product_color pc ON tb_rst_sales_order_item.item_color_id = pc.color_id
       LEFT JOIN tb_rst_sales_order_info oi ON tb_rst_sales_order_item.item_order_id = oi.sales_id
+      LEFT JOIN tb_rst_product_type pt ON pt.type_id = tb_rst_sales_order_item.item_product_type
       <where>
           <if test="itemOrderId !=null and itemOrderId !=''">
               AND item_order_id = #{itemOrderId}

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

@@ -1826,7 +1826,7 @@ public class AdminCustomerController {
             String[] cells = {
                     "日期", "姓名", "联系电话", "类别", "来源入口",
                     "问题类别", "小类名称", "客诉问题", "处理过程", "购买日期",
-                    "处理方式","处理结果", "销售公司", "销售渠道", "产品型号", "产品颜色",
+                    "处理方式","处理结果", "销售公司", "销售渠道", "产品型号", "产品颜色","产品类型",
                     "产品数量", "寄回快递", "寄回单号", "签收日期",
                     "状态", "寄出快递", "寄出快递", "开箱损", "二次客诉", "跟进客服", "工厂报价", "客户报价", "邮费信息"
             };
@@ -1865,6 +1865,9 @@ public class AdminCustomerController {
                                         customers.setItemProductName(salesOrderItem.getItemProductName());
                                         customers.setItemProductColor(salesOrderItem.getItemProductColor());
                                         customers.setItemNum(String.valueOf(salesOrderItem.getItemNum()));
+                                        if(salesOrderItem.getTypeName() != null || !salesOrderItem.getTypeName().equals("")){
+                                            customers.setTypeName(String.valueOf(salesOrderItem.getTypeName()));
+                                        }
                                         customers.setRelationFactoryCosts(customerInfo.getRelationFactoryCosts());
                                         customers.setRelationCustomerCosts(customerInfo.getRelationCustomerCosts());
                                         customers.setSignclosedProductInfos(common.getSignclosedProductInfos());
@@ -2021,27 +2024,28 @@ public class AdminCustomerController {
             row.createCell(14).setCellValue(sb.toString());
 
             row.createCell(15).setCellValue(customerStatisticalInfo.getItemProductColor() == null ? null : customerStatisticalInfo.getItemProductColor());
-            row.createCell(16).setCellValue(customerStatisticalInfo.getItemNum() == null ? null : customerStatisticalInfo.getItemNum());
-            row.createCell(17).setCellValue(backLogisticsCompany);
-            row.createCell(18).setCellValue(customerStatisticalInfo.getRelationBackLogisticsNo() == null ? null : customerStatisticalInfo.getRelationBackLogisticsNo());
-            row.createCell(19).setCellValue(customerStatisticalInfo.getRelationBackReceiptDate() == null ? null : customerStatisticalInfo.getRelationBackReceiptDate());
-            row.createCell(20).setCellValue(backStatus);
-            row.createCell(21).setCellValue(sendLogisticsCompany);
-            row.createCell(22).setCellValue(customerStatisticalInfo.getRelationSendLogisticsNo() == null ? null : customerStatisticalInfo.getRelationSendLogisticsNo());
-            row.createCell(23).setCellValue(customerStatisticalInfo.getCustomerOutDamaged() == null ? null : customerStatisticalInfo.getCustomerOutDamaged());
-            row.createCell(24).setCellValue(customerStatisticalInfo.getCustomerSecondaryCustomer() == null ? null : customerStatisticalInfo.getCustomerSecondaryCustomer());
-            row.createCell(25).setCellValue(customerStatisticalInfo.getAdminName() == null ? null : customerStatisticalInfo.getAdminName());
+            row.createCell(16).setCellValue(customerStatisticalInfo.getTypeName() == null ? null : customerStatisticalInfo.getTypeName());
+            row.createCell(17).setCellValue(customerStatisticalInfo.getItemNum() == null ? null : customerStatisticalInfo.getItemNum());
+            row.createCell(18).setCellValue(backLogisticsCompany);
+            row.createCell(19).setCellValue(customerStatisticalInfo.getRelationBackLogisticsNo() == null ? null : customerStatisticalInfo.getRelationBackLogisticsNo());
+            row.createCell(20).setCellValue(customerStatisticalInfo.getRelationBackReceiptDate() == null ? null : customerStatisticalInfo.getRelationBackReceiptDate());
+            row.createCell(21).setCellValue(backStatus);
+            row.createCell(22).setCellValue(sendLogisticsCompany);
+            row.createCell(23).setCellValue(customerStatisticalInfo.getRelationSendLogisticsNo() == null ? null : customerStatisticalInfo.getRelationSendLogisticsNo());
+            row.createCell(24).setCellValue(customerStatisticalInfo.getCustomerOutDamaged() == null ? null : customerStatisticalInfo.getCustomerOutDamaged());
+            row.createCell(25).setCellValue(customerStatisticalInfo.getCustomerSecondaryCustomer() == null ? null : customerStatisticalInfo.getCustomerSecondaryCustomer());
+            row.createCell(26).setCellValue(customerStatisticalInfo.getAdminName() == null ? null : customerStatisticalInfo.getAdminName());
             if(customerStatisticalInfo.getRelationFactoryCosts() == null){
-                row.createCell(25).setCellValue("");
+                row.createCell(27).setCellValue("");
             }else{
-                row.createCell(25).setCellValue(customerStatisticalInfo.getRelationFactoryCosts());
+                row.createCell(27).setCellValue(customerStatisticalInfo.getRelationFactoryCosts());
             }
             if(customerStatisticalInfo.getRelationCustomerCosts() == null){
-                row.createCell(26).setCellValue("");
+                row.createCell(28).setCellValue("");
             }else{
-                row.createCell(26).setCellValue(customerStatisticalInfo.getRelationCustomerCosts());
+                row.createCell(28).setCellValue(customerStatisticalInfo.getRelationCustomerCosts());
             }
-            row.createCell(27).setCellValue(customerStatisticalInfo.getPostageString());
+            row.createCell(29).setCellValue(customerStatisticalInfo.getPostageString());
 
         }
         //下载导出订单Excel