修改客诉信息增加收费信息

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

@@ -1331,10 +1331,10 @@ LEFT JOIN tb_rst_cm_sendback_info csi ON csi.relation_id = cr.relation_id
   <select id="getInformationInfo" parameterType="Integer" resultType="InformationInfo">
     select * from tb_rst_fee_information_info where fee_id = #{feeId};
   </select>
-  <select id="ListInformationInfo" parameterType="Integer" resultType="InformationInfo">
+  <select id="listInformationInfo" parameterType="Integer" resultType="InformationInfo">
     select * from tb_rst_fee_information_info where relation_id = #{relationId};
   </select>
-  <insert id="addInformationInfo" parameterType="InformationInfo">
+  <insert id="addInformationInfo" parameterType="InformationInfo" keyProperty="feeId" useGeneratedKeys="true">
     insert into tb_rst_fee_information_info
     (
       relation_id,

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

@@ -1217,10 +1217,12 @@ public class AdminCustomerController {
         List<LogisticsInfo>logisticsInfoList =  logisticsInfoService.getLogisticsInfoList(new LogisticsInfo());
         List<PostageInfo> listPostageInfo = customerService.listPostageInfo(cmRelation.getRelationId());
         List<SendbackInfo> listSendbackInfo = customerService.listSendbackInfo(cmRelation.getRelationId());
+        List<InformationInfo> listInformationInfo = customerService.listInformationInfo(cmRelation.getRelationId());
         //查询寄回产品
         ClosedProdcue record = new ClosedProdcue();
         record.setRelationId(cmRelation.getRelationId());
         List <ClosedProdcue> listClosedProdcue = customerService.listclosedProdcue(record);
+        mv.addObject("listInformationInfo",listInformationInfo);
         mv.addObject("listClosedProdcue",listClosedProdcue);
         mv.addObject("listSendbackInfo",listSendbackInfo);
         mv.addObject("logisticsInfoList",logisticsInfoList);
@@ -2226,5 +2228,92 @@ public class AdminCustomerController {
            String msg = customerService.synchronizeSendbackInfo();
         return new ResponseJson(200, msg, 200);
     }
+
+    /**
+     * 添加收费
+     * @param request
+     * @param informationInfo
+     * @return
+     */
+    @ResponseBody
+    @RequestMapping("/add_informationInfo")
+    public ResponseJson addInformationInfo(HttpServletRequest request,InformationInfo informationInfo){
+        ResponseJson rj = new ResponseJson(200, "添加成功", 200);
+        if(informationInfo == null){
+            return new ResponseJson(500, "添加失败，请检查参数!", 500);
+        }
+        /*signTime*/
+        Integer msg = customerService.addInformationInfo(informationInfo);
+        if(msg < 1){
+            return new ResponseJson(500, "添加失败", 500);
+        }
+        InformationInfo info = customerService.getInformationInfo(informationInfo.getFeeId());
+        rj.addResponseKeyValue("informationInfo",info);
+        return rj;
+    }
+
+    /**
+     * 修改收费
+     * @param request
+     * @param informationInfo
+     * @return
+     */
+    @ResponseBody
+    @RequestMapping("/update_informationInfo")
+    public ResponseJson updateInformationInfo(HttpServletRequest request,InformationInfo informationInfo){
+        ResponseJson rj = new ResponseJson(200, "修改成功", 200);
+        if(informationInfo == null){
+            return new ResponseJson(500, "修改失败，请检查参数!", 500);
+        }
+        /*signTime*/
+        Integer msg = customerService.updateInformationInfo(informationInfo);
+        if(msg < 1){
+            return new ResponseJson(500, "修改失败", 500);
+        }
+        InformationInfo info = customerService.getInformationInfo(informationInfo.getFeeId());
+        rj.addResponseKeyValue("informationInfo",info);
+        return rj;
+    }
+
+    /**
+     * 删除单个收费信息
+     * @param request
+     * @param feeId
+     * @return
+     */
+    @ResponseBody
+    @RequestMapping("/delete_informationInfo")
+    public ResponseJson deleteInformationInfo(HttpServletRequest request,Integer feeId){
+        ResponseJson rj = new ResponseJson(200, "删除成功", 200);
+        if(feeId == null){
+            return new ResponseJson(500, "删除失败，请检查参数!", 500);
+        }
+        Integer msg = customerService.delInformationInfo(feeId);
+        if(msg < 1){
+            return new ResponseJson(500, "删除失败", 500);
+        }
+        return rj;
+    }
+
+    /**
+     * 查询单个收费信息
+     * @param request
+     * @param feeId
+     * @return
+     */
+    @ResponseBody
+    @RequestMapping("/get_informationInfo")
+    public ResponseJson getInformationInfo(HttpServletRequest request,Integer feeId){
+        ResponseJson rj = new ResponseJson(200, "查询成功", 200);
+        if(feeId == null){
+            return new ResponseJson(500, "查询成功，请检查参数!", 500);
+        }
+        InformationInfo informationInfo = customerService.getInformationInfo(feeId);
+        if(informationInfo == null){
+            return new ResponseJson(500, "查询成功", 500);
+        }
+        rj.addResponseKeyValue("informationInfo",informationInfo);
+        return rj;
+    }
 }
 

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

@@ -50,7 +50,9 @@
 <#if procMethod.procMethodIsSend == 1>
             <span>寄送信息</span>
 </#if>
+
 <#if procMethod.procMethodIsBack == 1>
+            <span>收费信息</span>
             <span>工厂检查信息</span>
             <span>工厂返修进度</span>
 </#if>
@@ -627,6 +629,228 @@
                     </div>
                 </div>
             </div>
+        <div <#if procMethod.procMethodIsBack == 1>class="tabCon"</#if>
+                <div class="row cl" id="informationInformation">
+                    <div class="formControls col-2 col-sm-2 text-r">
+                        <strong>收费信息</strong>
+                    </div>
+                    <div class="formControls col-10 col-sm-10">
+                        <table class="table table-border table-bg table-bordered" >
+                            <thead>
+                            <tr>
+                                <th>id</th>
+                                <th>收费金额</th>
+                                <th>收费原由</th>
+                                <th>支付渠道</th>
+                                <th>支付账号</th>
+                                <th>状态</th>
+                                <th>备注</th>
+                                <th>操作</th>
+                            </tr>
+                            </thead>
+                            <tbody id="trbodyInformationInfoId">
+                            <#if listInformationInfo?? &&  (listInformationInfo?size > 0) >
+                                <#list listInformationInfo as informationInfo>
+                                <tr id="deleteInfoId${(informationInfo.feeId)!''}">
+                                    <td>${(informationInfo.feeId)!''}</td>
+                                    <td>
+                                        <#if informationInfo.feeCharges??>
+                                            ${(informationInfo.feeCharges)/100}
+                                        </#if>
+                                    </td>
+                                <td>
+                                    <#if informationInfo.feePayChannel??>
+                                        <#if informationInfo.feeOriginally == 1>以旧换新</#if>
+                                        <#if informationInfo.feeOriginally == 2>机器维修</#if>
+                                        <#if informationInfo.feeOriginally == 3>机器运费</#if>
+                                    </#if>
+                                </td>
+                                <td>
+                                    <#if informationInfo.feePayChannel??>
+                                        <#if informationInfo.feePayChannel == 1>微信</#if>
+                                        <#if informationInfo.feePayChannel == 2>支付宝</#if>
+                                        <#if informationInfo.feePayChannel == 3>银行卡</#if>
+                                    </#if>
+                                    </td>
+                                    <td>${informationInfo.feePayAccount!''}</td>
+                                <td>
+                                    <#if informationInfo.feeStatus??>
+                                        <#if informationInfo.feeStatus == 1>代付款</#if>
+                                        <#if informationInfo.feeStatus == 2>已收款</#if>
+                                    </#if>
+                                </td>
+                                    <td>${informationInfo.feeDesc!''}</td>
+                                    <td><a onclick="deleteInformationInfo(${(informationInfo.feeId)!});">删除</a>&nbsp;&nbsp;<a onclick="getInformationInfo(${(informationInfo.feeId)!});">修改</a></td>
+                                </tr>
+                                </#list>
+                            <#else>
+                            <tr id="colspanInformationId"><td colspan="8" class="td-manage text-c" >暂时没有收费信息，请添加！</td></tr>
+                            </#if>
+                            </tbody>
+                        </table>
+                        <button type="button" class="btn btn-primary" style="background: #32a3d8;color: #fff;" id="" name="" onclick="showInformationInfoDiv();">录入收费信息</button>
+                    </div>
+                </div>
+                <div class="row cl" id="addInformationInfoId" style="display: none;">
+                    <div class="formControls col-2 col-sm-2 text-r">
+                        <strong></strong>
+                    </div>
+                    <div class="formControls col-10 col-sm-10">
+                        <div >
+                            <div class="row cl">
+                                <div class="formControls col-2 col-sm-2 text-r">
+                                    <strong>状态</strong>
+                                </div>
+                                <div class="formControls col-10 col-sm-10">
+                                    <div class="radio-box">
+                                        <input type="radio" id="tel-333" name="feeStatus" checked value="1">
+                                        <label for="tel-333">待付款</label>
+                                    </div>
+                                    <div class="radio-box">
+                                        <input type="radio" id="tel-334" name="feeStatus" value="2">
+                                        <label for="tel-334">已付款</label>
+                                    </div>
+                                </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">
+                                    <input type="text" class="input-text" placeholder="收费金额" id="feeCharges" name="feeCharges">
+                                </div>
+                                <div class="formControls col-5 col-sm-5">
+                                    <div style="width: 100%;display: inline-block;margin-right: 10px;">
+                                        <span class="select-box">
+                                                <select name="feeOriginally" id="feeOriginally" class="select">
+                                                    <option value="1">以旧换新</option>
+                                                    <option value="2">机器维修</option>
+                                                    <option value="3">机器运费</option>
+                                                </select>
+                                        </span>
+                                    </div>
+                                </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">
+                                    <div style="width: 100%;display: inline-block;margin-right: 10px;">
+                                        <span class="select-box">
+                                                <select name="feePayChannel" id="feePayChannel" class="select">
+                                                    <option value="1">支付宝</option>
+                                                    <option value="2">微信</option>
+                                                    <option value="3">银行卡</option>
+                                                </select>
+                                        </span>
+                                    </div>
+                                </div>
+                                <div class="formControls col-5 col-sm-5">
+                                    <input type="text" class="input-text" placeholder="填写支付账号" id="feePayAccount" name="feePayAccount">
+                                </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">
+                                    <textarea type="text" placeholder="" id="feeDesc" name="feeDesc" style="width: 100%;height: 80px;"></textarea>
+                                </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">
+                                    <button type="button" class="btn btn-primary" style="background: #32a3d8;color: #fff;" id="" name="" onclick="addInformationInfo()">确定录入收费信息</button>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="row cl" id="updateInformationInfoId" style="display: none;">
+                    <div class="formControls col-2 col-sm-2 text-r">
+                        <strong></strong>
+                    </div>
+                    <div class="formControls col-10 col-sm-10">
+                        <div >
+                            <div class="row cl">
+                                <div class="formControls col-2 col-sm-2 text-r">
+                                    <strong>状态</strong>
+                                </div>
+                                <div class="formControls col-10 col-sm-10">
+                                    <div class="radio-box">
+                                        <input type="radio" id="tel-333s" name="feeStatuss" checked value="1">
+                                        <label for="tel-333s">待付款</label>
+                                    </div>
+                                    <div class="radio-box">
+                                        <input type="radio" id="tel-334s" name="feeStatuss" value="2">
+                                        <label for="tel-334s">已付款</label>
+                                    </div>
+                                </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">
+                                    <input type="text" class="input-text" placeholder="收费金额" id="feeChargess" name="feeChargess">
+                                </div>
+                                <div class="formControls col-5 col-sm-5">
+                                    <div style="width: 100%;display: inline-block;margin-right: 10px;">
+                                        <span class="select-box">
+                                                <select name="feeOriginallys" id="feeOriginallys" class="select">
+                                                    <option value="1">以旧换新</option>
+                                                    <option value="2">机器维修</option>
+                                                    <option value="3">机器运费</option>
+                                                </select>
+                                        </span>
+                                    </div>
+                                </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">
+                                    <div style="width: 100%;display: inline-block;margin-right: 10px;">
+                                        <span class="select-box">
+                                                <select name="feePayChannels" id="feePayChannels" class="select">
+                                                    <option value="1">支付宝</option>
+                                                    <option value="2">微信</option>
+                                                    <option value="3">银行卡</option>
+                                                </select>
+                                        </span>
+                                    </div>
+                                </div>
+                                <div class="formControls col-5 col-sm-5">
+                                    <input type="text" class="input-text" placeholder="填写支付账号" id="feePayAccounts" name="feePayAccounts">
+                                </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">
+                                    <textarea type="text" placeholder="" id="feeDescs" name="feeDescs" style="width: 100%;height: 80px;"></textarea>
+                                </div>
+                            </div>
+                            <div class="row cl">
+                                <div class="formControls col-2 col-sm-2 text-r">
+                                    <strong></strong>
+                                </div>
+                                <input type="hidden" value="" id="feeIds">
+                                <div class="formControls col-5 col-sm-5">
+                                    <button type="button" class="btn btn-primary" style="background: #32a3d8;color: #fff;" id="" name="" onclick="updateInformationInfo()">确定修改收费信息</button>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
 <#if procMethod.procMethodIsBack == 1>
         <div class="tabCon">
             <div class="row cl" style="margin-left: -70px;">
@@ -701,6 +925,10 @@
             $("#postageInformation").show();
         }
     }
+    function showInformationInfoDiv(){
+        $("#updateInformationInfoId").hide();
+        $("#addInformationInfoId").show();
+    }
 
     /*查询寄回信息*/
     function getSendbackInfo(sendbackId) {
@@ -1215,6 +1443,229 @@
         })
     }
 
+
+    /*添加收费信息*/
+    function addInformationInfo() {
+        var informationInfo;
+        var relationId = $("#relationId").val();
+        var feeStatus = parseInt($("input[name='feeStatus']:checked").val());
+        var feeOriginally = $("#feeOriginally").val();
+        var feePayChannel = $("#feePayChannel").val();
+        var feeCharges = $("#feeCharges").val()*100;
+        var feePayAccount = $("#feePayAccount").val();
+        var feeDesc = $("#feeDesc").val();
+        if(feeStatus == null || feeStatus == ""){
+            layer.msg("请选择状态!",{icon: 5,time:1000});
+            return;
+        }
+        if (!money.test(feeCharges)) {
+            layer.msg("邮费格式不正确，请重新输入!",{icon: 5,time:1000});
+            return;
+        }
+        if(feePayAccount == null || feePayAccount == ""){
+            layer.msg("请输入支付账号!",{icon: 5,time:1000});
+            return;
+        }
+        $.ajax({
+            cache: true,
+            type: "POST",
+            data: {"relationId" : relationId,
+                "feeStatus" : feeStatus,
+                "feeOriginally" : feeOriginally,
+                "feePayChannel" : feePayChannel,
+                "feeCharges" : feeCharges,
+                "feePayAccount" : feePayAccount,
+                "feeDesc" : feeDesc},
+            url: "${path}/admin/customer/add_informationInfo",
+            async: false,
+            success: function(data){
+                if (data.returnCode == 200) {
+                    $("#colspanInformationId").remove();
+                    informationInfo = data.returnMsg.informationInfo;
+                    var feeStatus;
+                    if(informationInfo.feeStatus == 1){
+                        feeStatus = "待付款";
+                    }
+                    if(informationInfo.feeStatus == 2){
+                        feeStatus = "已付款";
+                    }
+                    var feeOriginally;
+                    if(informationInfo.feeOriginally == 1){
+                        feeOriginally = "以旧换新";
+                    }
+                    if(informationInfo.feeOriginally == 2){
+                        feeOriginally = "机器维修";
+                    }
+                    if(informationInfo.feeOriginally == 3){
+                        feeOriginally = "机器运费";
+                    }
+                    var feePayChannel;
+                    if(informationInfo.feePayChannel == 1){
+                        feePayChannel = "支付宝";
+                    }
+                    if(informationInfo.feePayChannel == 2){
+                        feePayChannel = "微信";
+                    }
+                    if(informationInfo.feePayChannel == 3){
+                        feePayChannel = "银行卡";
+                    }
+                    $("#trbodyInformationInfoId").append('<tr id="deleteInfoId'+informationInfo.feeId+'"><td>'+informationInfo.feeId+'</td>' +
+                            '<td>'+(informationInfo.feeCharges)/100+'</td>' +
+                            '<td>'+feeOriginally+'</td>' +
+                            '<td>'+feePayChannel+'</td>' +
+                            '<td>'+informationInfo.feePayAccount+'</td>' +
+                            '<td>'+feeStatus+'</td>' +
+                            '<td>'+informationInfo.feeDesc+'</td>' +
+                            '<td><a onclick="deleteInformationInfo('+informationInfo.feeId+');">删除</a>&nbsp&nbsp<a onclick="getInformationInfo('+informationInfo.feeId+');">修改</a></td></tr>');
+                    layer.msg("添加成功!",{icon: 1,time:1000});
+                } else {
+                    layer.msg("添加失败!",{icon: 5,time:1000});
+                }
+            },
+            error: function(XmlHttpRequest, textStatus, errorThrown){
+                window.parent.admin_result("添加失败!",5);
+            }
+        })
+    }
+
+    /*查询邮费信息*/
+    function getInformationInfo(feeId) {
+        var informationInfo;
+        $.ajax({
+            cache: true,
+            type: "POST",
+            data: {"feeId" : feeId},
+            url: "${path}/admin/customer/get_informationInfo",
+            async: false,
+            success: function(data){
+                if (data.returnCode == 200) {
+                    $("#addInformationInfoId").hide();
+                    $("#updateInformationInfoId").show();
+                    informationInfo = data.returnMsg.informationInfo;
+                    $("#feeDescs").val("");
+                    $("#feeIds").val(informationInfo.feeId);
+                    $("input[type=radio][name=feeStatuss][value='"+informationInfo.feeStatus+"']").prop("checked",true);
+                    $("#feeChargess").val(informationInfo.feeCharges/100);
+                    $("#feeOriginallys").val(informationInfo.feeOriginally);
+                    $("#feePayChannels").val(informationInfo.feePayChannel);
+                    $("#feePayAccounts").val(informationInfo.feePayAccount);
+                    $("#feeDescs").val(informationInfo.feeDesc);
+
+                } else {
+                    layer.msg("修改失败!",{icon: 5,time:1000});
+                }
+            },
+            error: function(XmlHttpRequest, textStatus, errorThrown){
+                window.parent.admin_result("修改失败!",5);
+            }
+        })
+    }
+
+    /*修改收费信息*/
+    function updateInformationInfo() {
+        var informationInfo;
+        var feeId = $("#feeIds").val();
+        var feeStatus = parseInt($("input[name='feeStatuss']:checked").val());
+        var feeOriginally = $("#feeOriginallys").val();
+        var feePayChannel = $("#feePayChannels").val();
+        var feeCharges = $("#feeChargess").val()*100;
+        var feePayAccount = $("#feePayAccounts").val();
+        var feeDesc = $("#feeDescs").val();
+        if (!money.test(feeCharges)) {
+            layer.msg("邮费格式不正确，请重新输入!",{icon: 5,time:1000});
+            return;
+        }
+        if(feePayAccount == null || feePayAccount == ""){
+            layer.msg("请输入支付账号!",{icon: 5,time:1000});
+            return;
+        }
+        $.ajax({
+            cache: true,
+            type: "POST",
+            data: {"feeId" : feeId,
+                "feeStatus" : feeStatus,
+                "feeOriginally" : feeOriginally,
+                "feePayChannel" : feePayChannel,
+                "feeCharges" : feeCharges,
+                "feePayAccount" : feePayAccount,
+                "feeDesc" : feeDesc},
+            url: "${path}/admin/customer/update_informationInfo",
+            async: false,
+            success: function(data){
+                if (data.returnCode == 200) {
+                    $("#colspanInformationId").remove();
+                    informationInfo = data.returnMsg.informationInfo;
+                    var feeStatus;
+                    if(informationInfo.feeStatus == 1){
+                        feeStatus = "待付款";
+                    }
+                    if(informationInfo.feeStatus == 2){
+                        feeStatus = "已付款";
+                    }
+                    var feeOriginally;
+                    if(informationInfo.feeOriginally == 1){
+                        feeOriginally = "以旧换新";
+                    }
+                    if(informationInfo.feeOriginally == 2){
+                        feeOriginally = "机器维修";
+                    }
+                    if(informationInfo.feeOriginally == 3){
+                        feeOriginally = "机器运费";
+                    }
+                    var feePayChannel;
+                    if(informationInfo.feePayChannel == 1){
+                        feePayChannel = "支付宝";
+                    }
+                    if(informationInfo.feePayChannel == 2){
+                        feePayChannel = "微信";
+                    }
+                    if(informationInfo.feePayChannel == 3){
+                        feePayChannel = "银行卡";
+                    }
+                    $("#deleteInfoId"+feeId).html("");
+                    $("#deleteInfoId"+feeId).append('<td>'+informationInfo.feeId+'</td>' +
+                            '<td>'+(informationInfo.feeCharges)/100+'</td>' +
+                            '<td>'+feeOriginally+'</td>' +
+                            '<td>'+feePayChannel+'</td>' +
+                            '<td>'+informationInfo.feePayAccount+'</td>' +
+                            '<td>'+feeStatus+'</td>' +
+                            '<td>'+informationInfo.feeDesc+'</td>' +
+                            '<td><a onclick="deleteInformationInfo('+informationInfo.feeId+');">删除</a>&nbsp&nbsp<a onclick="getInformationInfo('+informationInfo.feeId+');">修改</a></td>');
+                    layer.msg("添加成功!",{icon: 1,time:1000});
+                } else {
+                    layer.msg("添加失败!",{icon: 5,time:1000});
+                }
+            },
+            error: function(XmlHttpRequest, textStatus, errorThrown){
+                window.parent.admin_result("添加失败!",5);
+            }
+        })
+    }
+
+    /*删除收费信息*/
+    function deleteInformationInfo(feeId) {
+        $.ajax({
+            cache: true,
+            type: "POST",
+            data: {"feeId" : feeId},
+            url: "${path}/admin/customer/delete_informationInfo",
+            async: false,
+            success: function(data){
+                if (data.returnCode == 200) {
+                    $("#deleteInfoId"+feeId).remove();
+                    layer.msg("删除成功!",{icon: 1,time:1000});
+                } else {
+                    layer.msg("删除失败!",{icon: 5,time:1000});
+                }
+            },
+            error: function(XmlHttpRequest, textStatus, errorThrown){
+                window.parent.admin_result("修改失败!",5);
+            }
+        })
+    }
+
+
+
     $(function(){
 
         get_cmRelation_info();