售后信息加上付款类型

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

@@ -14,6 +14,7 @@ public class PostageInfo implements Serializable{
     private Integer postageAmount;//邮费金额
     private String postageAlipay;//支付宝账户
     private String postageAlipayName;//支付宝姓名
+    private Integer postageAlipayType;//转账类型  1：用户付款  2：客户付款  3：公司付款
     private String postageDesc;//备注
     private Date postageCreateTime;//创建时间
     private Date postageUpdateTime;//修改时间
@@ -89,4 +90,12 @@ public class PostageInfo implements Serializable{
     public void setPostageUpdateTime(Date postageUpdateTime) {
         this.postageUpdateTime = postageUpdateTime;
     }
+
+    public Integer getPostageAlipayType() {
+        return postageAlipayType;
+    }
+
+    public void setPostageAlipayType(Integer postageAlipayType) {
+        this.postageAlipayType = postageAlipayType;
+    }
 }

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

@@ -1288,6 +1288,7 @@ LEFT JOIN tb_rst_cm_sendback_info csi ON csi.relation_id = cr.relation_id
       postage_amount,
       postage_alipay,
       postage_alipay_name,
+      postage_alipay_type,
       postage_desc,
       postage_create_time
     )
@@ -1297,6 +1298,7 @@ LEFT JOIN tb_rst_cm_sendback_info csi ON csi.relation_id = cr.relation_id
       #{postageAmount},
       #{postageAlipay},
       #{postageAlipayName},
+      #{postageAlipayType},
       #{postageDesc},
       NOW()
       )
@@ -1316,6 +1318,9 @@ LEFT JOIN tb_rst_cm_sendback_info csi ON csi.relation_id = cr.relation_id
       <if test="postageAlipayName != null and postageAlipayName != ''">
         postage_alipay_name = #{postageAlipayName},
       </if>
+      <if test="postageAlipayType != null">
+          postage_alipay_type = #{postageAlipayType},
+      </if>
       <if test="postageDesc != null and postageDesc != ''">
         postage_desc = #{postageDesc}
       </if>

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

@@ -372,6 +372,7 @@
                         <th>邮费金额</th>
                         <th>支付宝姓名</th>
                         <th>支付宝账号</th>
+                        <th>付款类型</th>
                         <th>状态</th>
                         <th>备注</th>
                         <th>操作</th>
@@ -385,6 +386,11 @@
                             <td>${(postageInfo.postageAmount)!''}</td>
                             <td>${(postageInfo.postageAlipayName)!''}</td>
                             <td>${(postageInfo.postageAlipay)!''}</td>
+                            <td>
+                                <#if postageInfo.postageAlipayType == 1>用户付款</#if>
+                                <#if postageInfo.postageAlipayType == 2>客户付款</#if>
+                                <#if postageInfo.postageAlipayType == 3>公司付款</#if>
+                            </td>
                             <#if postageInfo.postageStatus??>
                                 <#if postageInfo.postageStatus == 0><td>未申请</td></#if>
                                 <#if postageInfo.postageStatus == 1><td>未申请</td></#if>
@@ -453,6 +459,20 @@
                 </div>
                 <div class="row cl">
                     <div class="formControls col-2 col-sm-2 text-r">
+                        <strong>付款类型</strong>
+                    </div>
+                    <div class="formControls col-5 col-sm-5">
+                        <span class="select-box" >
+                            <select name="postageAlipayType" id="postageAlipayType" class="select">
+                                <option value="1">用户付款</option>
+                                <option value="2">客户付款</option>
+                                <option value="3">公司付款</option>
+                            </select>
+                        </span>
+                    </div>
+                </div>
+                <div class="row cl">
+                    <div class="formControls col-2 col-sm-2 text-r">
                         <strong>备注信息</strong>
                     </div>
                     <div class="formControls col-5 col-sm-5">
@@ -517,6 +537,20 @@
                 </div>
                 <div class="row cl">
                     <div class="formControls col-2 col-sm-2 text-r">
+                        <strong>付款类型</strong>
+                    </div>
+                    <div class="formControls col-5 col-sm-5">
+                        <span class="select-box" >
+                            <select name="postageAlipayTypes" id="postageAlipayTypes" class="select">
+                                <option value="1">用户付款</option>
+                                <option value="2">客户付款</option>
+                                <option value="3">公司付款</option>
+                            </select>
+                        </span>
+                    </div>
+                </div>
+                <div class="row cl">
+                    <div class="formControls col-2 col-sm-2 text-r">
                         <strong>备注信息</strong>
                     </div>
                     <div class="formControls col-5 col-sm-5">
@@ -1591,6 +1625,7 @@
         var postageAlipayName = $("#postageAlipayName").val();
         var postageAlipay = $("#postageAlipay").val();
         var postageDesc = $("#postageDesc").val();
+        var postageAlipayType = $("#postageAlipayType").val();
         if(postageStatus == null || postageStatus == ""){
             layer.msg("请选择邮费状态!",{icon: 5,time:1000});
             return;
@@ -1619,6 +1654,7 @@
                        "postageAmount" : postageAmount,
                        "postageAlipayName" : postageAlipayName,
                        "postageAlipay" : postageAlipay,
+                       "postageAlipayType" : postageAlipayType,
                        "postageDesc" : postageDesc},
                 url: "${path}/admin/customer/add_PostageInfo",
                 async: false,
@@ -1639,10 +1675,20 @@
                         if(postageInfo.postageStatus == 4){
                             postageStatuss = "未知";
                         }
+                        //付款类型  1：用户付款  2：客户付款  3：公司付款
+                        var postageAlipayType = ''
+                        if(postageInfo.postageAlipayType == 1){
+                            postageAlipayType = '用户付款';
+                        }else if(postageInfo.postageAlipayType == 2){
+                            postageAlipayType = '客户付款';
+                        }else if(postageInfo.postageAlipayType == 3){
+                            postageAlipayType = '公司付款';
+                        }
                         $("#trbodyId").append('<tr id="deleteId'+postageInfo.postageId+'"><td>'+postageInfo.postageId+'</td>' +
                                 '<td>'+(postageInfo.postageAmount)/100+'</td>' +
                                 '<td>'+postageInfo.postageAlipayName+'</td>' +
                                 '<td>'+postageInfo.postageAlipay+'</td>' +
+                                '<td>'+postageAlipayType+'</td>' +
                                 '<td>'+postageStatuss+'</td>' +
                                 '<td>'+postageInfo.postageDesc+'</td>' +
                                 '<td><a onclick="deletePostage('+postageInfo.postageId+');">删除</a>&nbsp&nbsp<a onclick="getPostage('+postageInfo.postageId+');">修改</a></td></tr>');
@@ -1699,6 +1745,7 @@
                     $("#postageAmounts").val(postageInfo.postageAmount/100);
                     $("#postageAlipays").val(postageInfo.postageAlipay);
                     $("#postageAlipayNames").val(postageInfo.postageAlipayName);
+                    $("#postageAlipayTypes").val(postageInfo.postageAlipayTypes);
                     $("#postageDescs").val(postageInfo.postageDesc);
 
                 } else {
@@ -1719,6 +1766,7 @@
         var postageAmount = $("#postageAmounts").val()*100;
         var postageAlipayName = $("#postageAlipayNames").val();
         var postageAlipay = $("#postageAlipays").val();
+        var postageAlipayTypes = $("#postageAlipayTypes").val();
         var postageDesc = $("#postageDescs").val();
         if(postageStatus == null || postageStatus == ""){
             layer.msg("请选择邮费状态!",{icon: 5,time:1000});
@@ -1749,6 +1797,7 @@
                 "postageAmount" : postageAmount,
                 "postageAlipayName" : postageAlipayName,
                 "postageAlipay" : postageAlipay,
+                "postageAlipayType" : postageAlipayTypes,
                 "postageDesc" : postageDesc},
             url: "${path}/admin/customer/update_PostageInfo",
             async: false,