liujie
2025-11-26 dada99b9dcfa83f5e178c75d039beea3e98c2125
Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/JiaYiXing2025
3个文件已修改
18 ■■■■■ 已修改文件
ManagementJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TPubWithdrawalController.java 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TPubWithdrawal.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementJYXTravel/guns-admin/src/main/webapp/static/modular/system/tPubWithdrawal/tPubWithdrawal.js 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TPubWithdrawalController.java
@@ -187,7 +187,12 @@
                            if (!result.get("resp_code").equals("00000000")) {
                                return new ErrorTip(500, "操作失败,异常原因:"+result.get("resp_desc"));
                            }
                            if (result.get("resp_code").equals("00000000") && "S".equals(result.get("trans_stat"))) {
                                tPubWithdrawal.setState(2);
                            }
                            if (result.get("resp_code").equals("00000000") && "P".equals(result.get("trans_stat"))) {
                                tPubWithdrawal.setState(4);
                            }
                            String hfSeqId = (String) result.get("hf_seq_id");
                            tPubWithdrawal.setReqSeqId(reqSeqId);
                            tPubWithdrawal.setHfSeqId(hfSeqId);
@@ -240,7 +245,12 @@
                        if (!result.get("resp_code").equals("00000000")) {
                            return new ErrorTip(500, "操作失败,异常原因:"+result.get("resp_desc"));
                        }
                        if (result.get("resp_code").equals("00000000") && "S".equals(result.get("trans_stat"))) {
                            tPubWithdrawal.setState(2);
                        }
                        if (result.get("resp_code").equals("00000000") && "P".equals(result.get("trans_stat"))) {
                            tPubWithdrawal.setState(4);
                        }
                        String hfSeqId = (String) result.get("hf_seq_id");
                        tPubWithdrawal.setReqSeqId(reqSeqId);
                        tPubWithdrawal.setHfSeqId(hfSeqId);
ManagementJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TPubWithdrawal.java
@@ -44,7 +44,7 @@
     */
    private BigDecimal money;
    /**
     * 状态(1=待处理,2=成功,3=失败)
     * 状态(1=待处理,2=成功,3=失败,4=处理中)
     */
    private Integer state;
    /**
ManagementJYXTravel/guns-admin/src/main/webapp/static/modular/system/tPubWithdrawal/tPubWithdrawal.js
@@ -127,6 +127,8 @@
                        btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="已同意" onfocus="TUser.tooltip()">已同意</p>']
                    }else if (row.state == 3){
                        btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="已拒绝" onfocus="TUser.tooltip()">已拒绝</p>']
                    }else if (row.state == 4){
                        btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="处理中" onfocus="TUser.tooltip()">处理中</p>']
                    }
                }
                return btn;