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

# Conflicts:
#	watero-rst-core/src/main/java/com.iamberry.rst.core/cm/CustomerInfo.java

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

@@ -53,6 +53,8 @@ public class CustomerInfo  implements Serializable {
     private Date customerUpdateTime;
     //  问题标题
     private String customerQuestionTitle;
+    //  客诉备注
+    private String customerDesc;
 
     /*客诉信息本身延伸字段*/
     //区域,用于修改客诉处理区域选择逻辑
@@ -624,6 +626,15 @@ public class CustomerInfo  implements Serializable {
         this.backLogisticsCompany = backLogisticsCompany;
     }
 
+    public String getCustomerDesc() {
+        return customerDesc;
+    }
+
+    public void setCustomerDesc(String customerDesc) {
+        this.customerDesc = customerDesc;
+    }
+
+
     public String getIsNeedSelectOrder() {
         return isNeedSelectOrder;
     }

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

@@ -20,6 +20,7 @@
     <result column="customer_area" property="customerArea" jdbcType="VARCHAR" />
     <result column="customer_create_time" property="customerCreateTime" jdbcType="TIMESTAMP" />
     <result column="customer_update_time" property="customerUpdateTime" jdbcType="TIMESTAMP" />
+    <result column="customer_desc" property="customerDesc" jdbcType="VARCHAR" />
   </resultMap>
   <sql id="Base_Column_List" >
     customer_id, admin_id, question_id, company_id, store_id, customer_source_type, customer_source, 
@@ -49,7 +50,8 @@
       t.customer_area,
       t.customer_create_time,
       t.customer_update_time,
-      t.customer_question_title
+      t.customer_question_title,
+      t.customer_desc
     from tb_rst_customer_info t
     where t.customer_id = #{customerId,jdbcType=INTEGER}
   </select>
@@ -82,6 +84,7 @@
       c.customer_is_solve,
       c.customer_is_visit,
       c.customer_create_time,
+      c.customer_desc,
       v.visit_status,
       v.visit_complete_date,
       v.visit_name,
@@ -234,6 +237,7 @@
     <result column="customer_is_solve" property="customerIsSolve"/>
     <result column="customer_is_visit" property="customerIsVisit"/>
     <result column="customer_create_time" property="customerCreateTime"/>
+    <result column="customer_desc" property="customerDesc"/>
     <result column="visit_status" property="visitStatus"/>
     <result column="visit_complete_date" property="visitCompleteDate"/>
     <result column="visit_name" property="visitName"/>
@@ -262,13 +266,13 @@
       company_id, store_id, customer_source_type, 
       customer_source, customer_counsel_type, customer_name, 
       customer_tel,customer_wechat_name, customer_is_solve, customer_is_visit,
-      customer_in_TDS, customer_out_TDS, customer_area, type_id
+      customer_in_TDS, customer_out_TDS, customer_area, type_id, customer_desc
       )
     values (#{customerId,jdbcType=INTEGER}, #{adminId,jdbcType=INTEGER}, #{questionId,jdbcType=INTEGER}, 
       #{companyId,jdbcType=INTEGER}, #{storeId,jdbcType=INTEGER}, #{customerSourceType,jdbcType=TINYINT}, 
       #{customerSource,jdbcType=VARCHAR}, #{customerCounselType,jdbcType=BIT}, #{customerName,jdbcType=VARCHAR}, 
       #{customerTel,jdbcType=VARCHAR},#{customerWechatName,jdbcType=VARCHAR}, #{customerIsSolve,jdbcType=TINYINT}, #{customerIsVisit,jdbcType=VARCHAR},
-      #{customerInTDS,jdbcType=INTEGER}, #{customerOutTDS,jdbcType=INTEGER}, #{customerArea,jdbcType=VARCHAR},#{typeId}
+      #{customerInTDS,jdbcType=INTEGER}, #{customerOutTDS,jdbcType=INTEGER}, #{customerArea,jdbcType=VARCHAR},#{typeId},#{customerDesc}
       )
   </insert>
 
@@ -330,6 +334,9 @@
       <if test="typeId != null" >
         type_id = #{typeId}
       </if>
+      <if test="customerDesc != null" >
+        customer_desc = #{customerDesc}
+      </if>
     </set>
     where customer_id = #{customerId}
   </update>

watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/add_customer.ftl

@@ -288,16 +288,6 @@
                     </div>
                 </div>
             </div>
-             <div class="row cl">
-              <#--客服备注-->
-                 <label class="form-label col-1 col-sm-1">备注：</label>
-                    <div class="formControls col-5 col-sm-5">
-                    <script id="" type="text/plain" style="width:983px;height:250px;"></script>
-                    </script>
-                    <input type="hidden" id="describeHandleDesc" name="describeHandleDesc">
-                            </div>
-                            </div>
-
             <div class="row cl">
                 <label class="form-label col-1 col-sm-1"></label>
                 <div class="formControls col-10 col-sm-10">
@@ -451,7 +441,12 @@
                     </script>-->
                 </div>
             </div>
-
+             <div class="row cl" id="customerDescDiv">
+                 <label class="form-label col-1 col-sm-1">备注：</label>
+                 <div class="col-2 col-sm-2 col-offset-3">
+                      <textarea type="text" placeholder="" id="customerDesc" name="customerDesc" style="width: 540px;height: 100px;margin-left: -279px;"></textarea>
+                 </div>
+             </div>
             <div class="row cl" id="sendAddressByPhone" style="display: none;">
                 <label class="form-label col-1 col-sm-1"></label>
                 <div class="formControls col-2 col-sm-2">

watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/update_customer.ftl

@@ -535,6 +535,12 @@
                     </script>-->
                 </div>
             </div>
+            <div class="row cl" id="customerDescDiv">
+                <label class="form-label col-1 col-sm-1">备注：</label>
+                <div class="col-2 col-sm-2 col-offset-3">
+                    <textarea type="text" placeholder="" id="customerDesc" name="customerDesc" style="width: 540px;height: 100px;margin-left: -279px;">${customerInfo.customerDesc}</textarea>
+                </div>
+            </div>
             <div class="row cl" id="sendAddressByPhone" style="display: none;">
                 <label class="form-label col-1 col-sm-1"></label>
                 <div class="formControls col-2 col-sm-2">