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

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

@@ -63,8 +63,10 @@ public class Renewed  implements Serializable {
     private String renewedDesc;
      //状态    1：使用中  2：停用中 
     private Integer renewedState;
-     //转账账户 
+     //转账账户 (支付宝账户)
     private String renewedAlipay;
+    //转账账户 (账户姓名)
+    private String renewedAlipayName;
      //是否已转账邮费  0:不需要 1:已转  2:待转 
     private Integer renewedIsTransfer;
      //创建时间 
@@ -481,4 +483,12 @@ public class Renewed  implements Serializable {
     public void setSalesDealCode(String salesDealCode) {
         this.salesDealCode = salesDealCode;
     }
+
+    public String getRenewedAlipayName() {
+        return renewedAlipayName;
+    }
+
+    public void setRenewedAlipayName(String renewedAlipayName) {
+        this.renewedAlipayName = renewedAlipayName;
+    }
 }

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

@@ -63,8 +63,10 @@ public class Repair implements Serializable {
     private String repairDesc;
     //  状态    1：使用中  2：停用中 
     private Integer repairState;
-    //  转账账户 
+    //  转账账户
     private String repairAlipay;
+    //  转账账户 姓名
+    private String repairAlipayName;
     //  是否已转账邮费  0:不需要 1:已转  2:待转 
     private Integer repairIsTransfer;
     //  创建时间 
@@ -481,4 +483,12 @@ public class Repair implements Serializable {
     public void setSalesDealCode(String salesDealCode) {
         this.salesDealCode = salesDealCode;
     }
+
+    public String getRepairAlipayName() {
+        return repairAlipayName;
+    }
+
+    public void setRepairAlipayName(String repairAlipayName) {
+        this.repairAlipayName = repairAlipayName;
+    }
 }

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

@@ -71,7 +71,8 @@
       renewed_alipay,
       renewed_is_transfer,
       renewed_create_time,
-      renewed_update_time
+      renewed_update_time,
+      renewed_alipay_name
     from
       tb_rst_renewed
     <where>
@@ -297,6 +298,9 @@
       <if test="renewedUpdateTime != null" >
         renewed_update_time = #{renewedUpdateTime},
       </if>
+      <if test="renewedAlipayName != null" >
+        renewed_alipay_name = #{renewedAlipayName},
+      </if>
     </set>
     where renewed_id = #{renewedId}
   </update>

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

@@ -97,7 +97,8 @@
       repair_alipay,
       repair_is_transfer,
       repair_create_time,
-      repair_update_time
+      repair_update_time,
+      repair_alipay_name
     from
       tb_rst_repair
     <where>
@@ -287,6 +288,9 @@
       <if test="repairUpdateTime != null" >
         repair_update_time = #{repairUpdateTime},
       </if>
+      <if test="repairAlipayName != null" >
+        repair_alipay_name = #{repairAlipayName},
+      </if>
     </set>
     where repair_id = #{repairId}
   </update>

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

@@ -158,6 +158,7 @@
                 <div class="formControls col-2 col-sm-2 text-r">
                     <input style="width: 150px;margin-right: 10px;" type="text" class="input-text" value="" placeholder="寄回邮费" id="renewedBackPostage" name="renewedBackPostage" seleType="postage">
                     <input style="width: 150px;margin-top: 20px;" type="text" class="input-text" value="" placeholder="用户支付宝账户" id="renewedAlipay" name="renewedAlipay" seleType="postage">
+                    <input style="width: 150px;margin-top: 20px;" type="text" class="input-text" value="" placeholder="用户支付宝姓名" id="renewedAlipayName" name="renewedAlipayName" seleType="postage">
                 </div>
             </div>
 
@@ -642,6 +643,7 @@
                     $('#renewedBackLogisticsNo').val(renewed.renewedBackLogisticsNo);
                     $('#renewedBackPostage').val(renewed.renewedBackPostage/100);
                     $('#renewedAlipay').val(renewed.renewedAlipay);
+                    $('#renewedAlipayName').val(renewed.renewedAlipayName);
                     $('input[name="renewedIsTransfer"]').each(function(){
                         if (this.value == renewed.renewedIsTransfer) {
                             $(this).iCheck('check');
@@ -833,6 +835,7 @@
             var renewedIsTransfer = $('input[name="renewedIsTransfer"]:checked').val();
             var renewedBackPostage = $('#renewedBackPostage').val().trim();//寄回邮费
             var renewedAlipay = $('#renewedAlipay').val().trim();//支付宝账户
+            var renewedAlipayName = $('#renewedAlipayName').val().trim();//支付宝账户姓名
 
             if(renewedIsTransfer == 1){
                 if (!money.test(renewedBackPostage)) {
@@ -845,6 +848,11 @@
                     renewed_flag = false;
                     return renewed_flag;
                 }
+                if (renewedAlipayName == null || renewedAlipayName == '') {
+                    layer.msg("支付宝姓名不能为空，请重新输入!",{icon: 5,time:1000});
+                    renewed_flag = false;
+                    return renewed_flag;
+                }
             }
         }else if(type == 3){
             var renewedSendStatus = $('input[name="renewedSendStatus"]:checked').val();//寄回状态

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

@@ -158,6 +158,7 @@
                     <div class="formControls col-2 col-sm-2 text-r">
                         <input style="width: 150px;margin-right: 10px;" type="text" class="input-text" value="" placeholder="寄回邮费" id="repairBackPostage" name="repairBackPostage" seleType="postage">
                         <input style="width: 150px;margin-top: 20px;" type="text" class="input-text" value="" placeholder="用户支付宝账户" id="repairAlipay" name="repairAlipay" seleType="postage">
+                        <input style="width: 150px;margin-top: 20px;" type="text" class="input-text" value="" placeholder="用户支付宝姓名" id="repairAlipayName" name="repairAlipayName" seleType="postage">
                     </div>
                 </div>
 
@@ -642,6 +643,7 @@
                     $('#repairBackLogisticsNo').val(repair.repairBackLogisticsNo);
                     $('#repairBackPostage').val(repair.repairBackPostage/100);
                     $('#repairAlipay').val(repair.repairAlipay);
+                    $('#repairAlipayName').val(repair.repairAlipayName);
                     $('input[name="repairIsTransfer"]').each(function(){
                         if (this.value == repair.repairIsTransfer) {
                             $(this).iCheck('check');
@@ -833,6 +835,7 @@
             var repairIsTransfer = $('input[name="repairIsTransfer"]:checked').val();
             var repairBackPostage = $('#repairBackPostage').val().trim();//寄回邮费
             var repairAlipay = $('#repairAlipay').val().trim();//支付宝账户
+            var repairAlipayName = $('#repairAlipayName').val().trim();//支付宝账户
 
             if(repairIsTransfer == 1){
                 if (!money.test(repairBackPostage)) {
@@ -845,6 +848,11 @@
                     repair_flag = false;
                     return repair_flag;
                 }
+                if (repairAlipayName == null || repairAlipayName == '') {
+                    layer.msg("支付宝姓名不能为空!",{icon: 5,time:1000});
+                    repair_flag = false;
+                    return repair_flag;
+                }
             }
         }else if(type == 3){
             var repairSendStatus = $('input[name="repairSendStatus"]:checked').val();//寄回状态