调度员还书同步修改

src/main/java/com/ssj/weixin/library/controller/BookManagerController.java

@@ -1259,46 +1259,29 @@ public class BookManagerController extends BaseController {
     public String disbackBook(Model model, String id) {
         //调度员可以还所有馆的书籍
         String userId = UserUtil.getUserId(request);
-        Map<String, Object> bookInfo = bookService.searchBookInfo(id);
         String diode = tokenManager.getString("dispatcher2018");
         if (diode.contains(userId)) { //如果是调度员，微信扫码进入还书页面
-            List<Map<String, Object>> bookList = new ArrayList<>();
-            String vipId = "";
-            String borrowUserId = "";
-            if (bookInfo.get("user_id") == null || "".equals(bookInfo.get("user_id").toString())) { //此书没人借
+            BookDetail detail = detailService.getById(id);
+            //此书没人借
+            if (Objects.isNull(detail.getVipId())) {
                 //返回某个提示页面或者查看书籍详情
                 model.addAttribute("msgType", "图书馆管理员您好！此书暂无人借阅，无需归还");
                 return "/weixin/library/bangding_infor";
-            } else {
-
-                if (bookInfo.get("vip_id") == null) {
-                    borrowUserId = bookInfo.get("user_id").toString();
-                } else {
-                    vipId = bookInfo.get("vip_id").toString();
-                    borrowUserId = bookInfo.get("user_id").toString();
-                }
-            }
-            User user = userService.getById(borrowUserId);
-            LibReadVip vip = vipService.getById(vipId);
-            String bookTags = "";
-            List<String> list = new ArrayList<String>();
-            if (bookInfo.get("tag_name") != null) {
-                bookTags = bookInfo.get("tag_name").toString();
-                String[] bookTagArr = bookTags.split(",");
-                list = Arrays.asList(bookTagArr);
             }
-            bookInfo.put("tags", list);
-            bookList.add(bookInfo);
-            if (vip == null) {
-                model.addAttribute("vipId", "");
-                model.addAttribute("name", user.getName());
-            } else {
-                model.addAttribute("vipId", vip.getId());
-                model.addAttribute("name", vip.getChildName());
+            TbLibBookInfo bookInfo = binfoService.getById(detail.getInfoId());
+            if (bookInfo == null) {
+                model.addAttribute("msgType", "您好！此书不存在！");
+                return "/weixin/library/bangding_infor";
             }
-            model.addAttribute("bookList", bookList);
-            model.addAttribute("bookTotal", bookList.size());
-            model.addAttribute("vip", vip == null ? user : vip);
+            LibReadVip vip = vipService.getById(detail.getVipId());
+            OrderDetails details = orderDetailsService.findbyBookDetailId(id);
+            model.addAttribute("vipId", vip.getId());
+            model.addAttribute("name", vip.getChildName());
+            model.addAttribute("bookList", bookInfo);
+            model.addAttribute("bookDetailId", id);
+            model.addAttribute("detailId", details.getId());
+            model.addAttribute("bookTotal", 1);
+            model.addAttribute("vip", vip);
             return "weixin/library/backcart";
         } else {
             model.addAttribute("msgType", "暂无权限处理！");