增加维修费用字段

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

@@ -71,6 +71,8 @@ public class Repair implements Serializable {
     //20180327 当前邮费默认为  0 不需要
     //是否已转账邮费  0:不需要 10:需要转账
     private Integer repairIsTransfer;
+    //维修费用
+    private Integer repairCosts;
     //  创建时间 
     private Date repairCreateTime;
     //  修改时间 ,
@@ -504,4 +506,12 @@ public class Repair implements Serializable {
     public void setRepairBackReceiptDate(Date repairBackReceiptDate) {
         this.repairBackReceiptDate = repairBackReceiptDate;
     }
+
+    public Integer getRepairCosts() {
+        return repairCosts;
+    }
+
+    public void setRepairCosts(Integer repairCosts) {
+        this.repairCosts = repairCosts;
+    }
 }

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

@@ -101,7 +101,8 @@
       repair_create_time,
       repair_update_time,
       repair_alipay_name,
-      repair_back_receipt_date
+      repair_back_receipt_date,
+      repair_costs
     from
       tb_rst_repair
     <where>
@@ -148,6 +149,7 @@
     <result column="repair_create_time" property="repairCreateTime"/>
     <result column="repair_update_time" property="repairUpdateTime"/>
     <result column="repair_back_receipt_date" property="repairBackReceiptDate"/>
+    <result column="repair_costs" property="repairCosts"/>
     <collection property="complaintDetectList" column="customer_id" ofType="ComplaintDetectInfo" select="listComplaintDetect"/>
   </resultMap>
 
@@ -299,6 +301,9 @@
       <if test="repairBackReceiptDate != null" >
         repair_back_receipt_date = #{repairBackReceiptDate},
       </if>
+      <if test="repairCosts != null" >
+        repair_costs = #{repairCosts}
+      </if>
     </set>
     where repair_id = #{repairId}
   </update>

watero-rst-web/src/main/java/com/iamberry/rst/utils/ExcelUtil.java

@@ -406,22 +406,22 @@ public class ExcelUtil {
         Iterator<Cell> cells = row.cellIterator();
         while (cells.hasNext()) {
             Cell cell = cells.next();
-            if (name.equals(cell.getStringCellValue().trim())) {
+            if (name.trim().equals(cell.getStringCellValue().trim())) {
                 // 匹配姓名列
                 nameColumnIndex = cell.getColumnIndex();
-            } else if (platformOrder.equals(cell.getStringCellValue().trim())) {
+            } else if (platformOrder.trim().equals(cell.getStringCellValue().trim())) {
                 // 匹配订单编号
                 platformOrderColumnIndex = cell.getColumnIndex();
-            } else if (tel.equals(cell.getStringCellValue().trim())) {
+            } else if (tel.trim().equals(cell.getStringCellValue().trim())) {
                 // 匹配电话
                 telColumnIndex = cell.getColumnIndex();
             } else if (productName.trim().equals(cell.getStringCellValue().trim())) {
                 // 匹配产品列
                 productColumnIndex = cell.getColumnIndex();
-            } else if (num.equals(cell.getStringCellValue().trim())) {
+            } else if (num.trim().equals(cell.getStringCellValue().trim())) {
                 // 匹配购买数量
                 numColumnIndex = cell.getColumnIndex();
-            }  else if (remark.equals(cell.getStringCellValue().trim())) {
+            }  else if (remark.trim().equals(cell.getStringCellValue().trim())) {
                 // 匹配备注
                 remarkColumnIndex = cell.getColumnIndex();
             } else {

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

@@ -138,6 +138,14 @@
                         <input type="text" placeholder="请选择仓库签收时间" id="repairBackReceiptDate"  name="repairBackReceiptDate" datatype="*" class="input-text Wdate" onclick="WdatePicker({skin:'whyGreen',maxDate:'%y-%M-%d'})"  readonly="readonly" seleType="send">
                     </div>
                 </div>
+                <div class="row cl" style="position: relative;/*display: none;*/">
+                    <div class="formControls col-2 col-sm-2 text-r">
+                        <strong>维修费用</strong>
+                    </div>
+                    <div class="formControls col-4 col-sm-4">
+                        <input type="text" id="repairCosts" placeholder="维修费用" name="repairCosts" datatype="*" class="input-text"  seleType="send">
+                    </div>
+                </div>
                 <div class="row cl">
                     <div class="formControls col-2 col-sm-2">
                     </div>
@@ -696,6 +704,9 @@
                     $('#repairSendAddress').val(repair.repairSendAddress);
                     $('#repairSendLogisticsNo').val(repair.repairSendLogisticsNo);
                     $('#repairDesc').val(repair.repairDesc);
+                    if(repair.repairCosts != null){
+                        $('#repairCosts').val(repair.repairCosts/100);
+                    }
                     $('#repairBackReceiptDate').val(formatDate(repair.repairBackReceiptDate));
 
                     var detect_table = $('#detect_table');
@@ -779,6 +790,9 @@
         //寄回邮费
         var repairBackPostage = $("#repairBackPostage").val();
         $("#repairBackPostage").val(parseInt(repairBackPostage*100));
+        //维修费用
+        var repairCosts = $("#repairCosts").val();
+        $("#repairCosts").val(parseInt(repairCosts*100));
         var obj = null;
         if(type == 1){
             obj = getseleType("send");
@@ -820,6 +834,7 @@
         var repairBackLogisticsCompany = $("#repairBackLogisticsCompany option:selected").val();//寄回物流公司
         var repairBackName = $('#repairBackName').val();//寄件人姓名
         var repairBackTel = $('#repairBackTel').val();//寄件人电话
+        var repairCosts = $('#repairCosts').val();//寄件人电话
         if(type == 1){
             if (repairBackStatus == 1) {
 //            if (repairBackLogisticsNo != null && repairBackLogisticsNo != '') {
@@ -868,6 +883,11 @@
                     repair_flag = false;
                     return repair_flag;
                 }
+                if (!money.test(repairCosts)) {
+                    layer.msg("维修费用格式不正确，请重新输入!",{icon: 5,time:1000});
+                    repair_flag = false;
+                    return repair_flag;
+                }
             }
             if (repairBackStatus == 3) {
                 var repairBackReceiptDate = $('#repairBackReceiptDate').val();//仓库签收时间