liujie
2 天以前 dec64d47a9a3a3cc133afdf5141744d90fcb49b4
Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai into 2.0

# Conflicts:
# cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TVipDetailController.java
2个文件已修改
20 ■■■■ 已修改文件
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TVipDetailController.java 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-management/src/main/webapp/static/modular/system/vipPayment/vipPayment.js 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TVipDetailController.java
@@ -51,6 +51,12 @@
    @Autowired
    private VipPaymentClient vipPaymentClient;
    @Autowired
    private IUserService userService;
    @Autowired
    private IRoleService roleService;
    @Autowired
    private ITSiteService siteService;
    @Autowired
    private TOperatorService operatorService;
    private String PREFIX = "/system/vipPayment/";
@@ -273,9 +279,16 @@
    @RequestMapping(value = "/refund")
    @ResponseBody
    public Object list(@RequestBody VipRefundDto vipRefundDto) {
        Integer objectId = UserExt.getUser().getObjectId();
        User user = userService.getById(UserExt.getUser().getId());
        String roleid = user.getRoleid();
        Role role = roleService.getById(roleid);
        if (!role.getName().contains("财务")){
            return ResultUtil.error("权限不足");
        }
        String code =vipPaymentClient.refund(vipRefundDto);
        if (code!=null&& code.equals("200")){
            return ResultUtil.success();
            return ResultUtil.success("操作成功");
        }else{
            return ResultUtil.error("退费失败");
        }
cloud-server-management/src/main/webapp/static/modular/system/vipPayment/vipPayment.js
@@ -131,9 +131,8 @@
                        window.location.reload();
                        layer.closeAll();
                    },
                    error: function(xhr, status, error) {
                        var errorMessage = xhr.responseText ? xhr.responseText : "退费失败!";
                        Feng.error("退费失败!");
                    error: function(response) {
                        Feng.error("退费失败!原因:"+response.msg);
                    }
                });
            }