格式调整

src/main/java/com/caimei/modules/user/web/newUser/SpController.java

@@ -106,42 +106,30 @@ public class SpController extends BaseController {
     @RequestMapping(value = "saveReview")
     public Map<String, Object> saveReview(String reviewStatus, Integer clubChangeSpRecordID, Integer newSpID) {
         OperationalLogs sysLog = new OperationalLogs();
-
         Map<String, Object> map = Maps.newLinkedHashMap();
         try {
             Date currentTime = new Date();
             SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HHmmss");
             String dateString = formatter.format(currentTime);
-
             ClubChangeSp clubChangeSp = new ClubChangeSp();
             //审核通过
             if (StringUtils.equals("pass", reviewStatus)) {
                 ClubChangeSp cssp = clubChangeSpReviewService.getClubChangeSpById(clubChangeSpRecordID);
                 if (null != cssp) {
                     String ClubsNames = sysLogService.ClubsName(clubChangeSpRecordID);
-                    System.out.println("操作员" + ClubsNames);
-
-                    Integer oldserviceProviderId=cssp.getOldSpID();
-                    Integer clubId=cssp.getClubID();
-                    Integer oldSpID=cssp.getOldSpID();
-                    Integer newspId=cssp.getNewSpID();
-                    List<Integer> oldname= newCmClubService.ClubsIds(cssp);
-                    for(Integer i : oldname){
-                    System.out.println("旧协销>>>>>>"+oldname+oldname.contains(null));
-                    if(i==null){
-                        System.out.println("旧协销id添加成功");
-                        newCmClubService.oldname(oldserviceProviderId,clubId,oldSpID,newspId);
-                     }else {
-                        newCmClubService.oldnames(clubId,oldSpID,newspId);
-                        newCmClubService.updateServiceProvider(clubId,oldSpID,newspId);
-                    }
+                    Integer oldserviceProviderId = cssp.getOldSpID();
+                    Integer clubId = cssp.getClubID();
+                    Integer oldSpID = cssp.getOldSpID();
+                    Integer newspId = cssp.getNewSpID();
+                    List<Integer> oldname = newCmClubService.ClubsIds(cssp);
+                    for (Integer i : oldname) {
+                        if (i == null) {
+                            newCmClubService.oldname(oldserviceProviderId, clubId, oldSpID, newspId);
+                        } else {
+                            newCmClubService.oldnames(clubId, oldSpID, newspId);
+                            newCmClubService.updateServiceProvider(clubId, oldSpID, newspId);
+                        }
                     }
-                    System.out.println("旧ID>>>>>>>>" + cssp.getOldSpID());
-                    System.out.println("ID>>>>>>>>" + cssp.getNewSpID());
-                    System.out.println("ID>>>>>>>>" + cssp.getClubID());
-
-
-
                     // 查询serviceprovider协销表
                     List<ServiceProviderModel> serviceprovider = serviceProviderDao.getServiceproviderById(cssp.getNewSpID());
                     // 查询cm_bind表
@@ -150,7 +138,6 @@ public class SpController extends BaseController {
                         Integer userID = serviceProvider.getUserID();
                         System.out.println("ID>>>>>>>>" + userID);
                         List<CmBind> bind = cmBindService.findCmbindByUserId(userID);
-
                         //fixme gclub -- club 更换协销
                         CmClub club = cmClubService.get(cssp.getClubID().toString());
                         club.setDefaultServiceProviderUpdTime(dateString);//协销修改时间
@@ -162,7 +149,6 @@ public class SpController extends BaseController {
                             club.setFlag(cmBind.getBindID() + ",");
                             club.setInviterBindID(cmBind.getBindID());
                         }
-
                         club.setInviterName(serviceProvider.getName());
                         cmClubService.save(club);
                         // 更新通过状态
@@ -173,31 +159,26 @@ public class SpController extends BaseController {
                         map.put("success", true);
                         map.put("msg", "操作成功");
                         String ClubsName = sysLogService.ClubsName(clubChangeSpRecordID);
-//                        Integer clubId=newCmClubService.ClubsIds(ClubsNames);
                         String jgName = sysLogService.JgName(clubChangeSpRecordID);
                         String linkMans = sysLogService.ClubName(clubChangeSpRecordID);
                         sysLog.setOperationtime(new Date());
-                       if(ClubsNames==null){
-                           sysLog.setActioncontent("采美默认协销经理(官方账号)" + "更换为" + ClubsName);
-                       }else {
-                           sysLog.setActioncontent(ClubsNames + "更换为" + ClubsName);
-                       }
+                        if (ClubsNames == null) {
+                            sysLog.setActioncontent("采美默认协销经理(官方账号)" + "更换为" + ClubsName);
+                        } else {
+                            sysLog.setActioncontent(ClubsNames + "更换为" + ClubsName);
+                        }
                         sysLog.setOperationtype("更换协销");
                         sysLog.setContact(linkMans);
                         sysLog.setInstitutionName(jgName);
                         SystemAuthorizingRealm.Principal principal = UserUtils.getPrincipal();
-                        System.out.println("操作员" + ClubsName);
-//                        System.out.println("ID>>>>>>>>" +clubId);
-                        System.out.println("ID>>>>>>>>" + clubChangeSpRecordID);
                         String username = principal.getName();
                         sysLog.setOperator(username);
                         //调用service保存SysLog实体类到数据库
                         if (!"".equals(sysLog.getActioncontent())) {
                             if (sysLog.getInstitutionName() != null && sysLog.getContact() != null) {
-                                int i = sysLogService.insert(sysLog);
+                                sysLogService.insert(sysLog);
                             }
                         }
-
                     } else {
                         map.put("success", false);
                         map.put("msg", "操作失败");
@@ -215,7 +196,6 @@ public class SpController extends BaseController {
                 clubChangeSp.setCheckStatus("-1");//审核未通过
                 clubChangeSp.setClubChangeSpRecordID(clubChangeSpRecordID);
                 clubChangeSpReviewService.updateCheckStatusById(clubChangeSp);
-                String clubID = sysLogService.ClubsName(clubChangeSpRecordID);
                 String jgName = sysLogService.JgName(clubChangeSpRecordID);
                 String linkMans = sysLogService.ClubName(clubChangeSpRecordID);
                 sysLog.setOperationtime(new Date());
@@ -226,13 +206,12 @@ public class SpController extends BaseController {
                 sysLog.setContact(linkMans);
                 sysLog.setInstitutionName(jgName);
                 SystemAuthorizingRealm.Principal principal = UserUtils.getPrincipal();
-                System.out.println("操作员" + principal.getName());
                 String username = principal.getName();
                 sysLog.setOperator(username);
                 //调用service保存SysLog实体类到数据库
                 if (!"".equals(sysLog.getActioncontent())) {
                     if (sysLog.getInstitutionName() != null && sysLog.getContact() != null) {
-                        int i = sysLogService.insert(sysLog);
+                        sysLogService.insert(sysLog);
                     }
                 }
                 map.put("success", true);
@@ -494,9 +473,9 @@ public class SpController extends BaseController {
     @RequestMapping(value = "leader")
     public String leader(NewCmSp newCmSp, Model model, RedirectAttributes redirectAttributes) {
         newCmSp.setTeams(cmSpService.findTeam());
-        NewCmSp manager=cmSpService.findSpManagerInfo();
+        NewCmSp manager = cmSpService.findSpManagerInfo();
         model.addAttribute("newCmSp", newCmSp);
-        model.addAttribute("manager",manager);
+        model.addAttribute("manager", manager);
         return "modules/userNew/cmSpTeamList";
     }