供应商审核

src/main/java/com/caimei/modules/user/web/NewCmShopController.java

@@ -115,20 +115,26 @@ public class NewCmShopController extends BaseController {
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
             String format = sdf.format(date);
             String manufacturerStatus = "";
+            String smsMessage = "";
+            CmUser companyUser = cmUserService.get(userId + "");
+            String mobile = companyUser.getBindMobile();
             if (StringUtils.equals("1", auditStatus)) {
                 manufacturerStatus = "90";
+                smsMessage = "恭喜您成功通过资料审核，您可以使用账号" + mobile + "在采美登录您的企业账号，开始愉快的采购之旅。";
             }
             if (StringUtils.equals("2", auditStatus)) {
                 manufacturerStatus = "92";
+                smsMessage = "很遗憾，您的资料信息有误，未通过审核，请登录采美修改资料信息。";
             }
             // 更新用户信息
-            newCmShopService.updateUserAudit(auditStatus, auditNote, format, manufacturerStatus, userId, "1");//通过
-            newCmShopService.updateUserAudit(auditStatus, auditNote, format, manufacturerStatus, userId, null);//未通过
-
+            newCmShopService.updateUserAudit(auditStatus, auditNote, format, manufacturerStatus, userId, "1");
             // 更新供应商信息
             newCmShopService.updateShopAudit(auditStatus, auditNote, format, manufacturerStatus, shopId);
             map.put("success", true);
             map.put("msg", "审核成功");
+            if (StringUtils.isNotEmpty(mobile)) {
+                SMSUtils.sendSms(mobile, smsMessage);
+            }
         } catch (Exception e) {
             e.printStackTrace();
             logger.error(e.getMessage());
@@ -179,97 +185,97 @@ public class NewCmShopController extends BaseController {
         return "modules/userNew/cmShopOperation";
     }
 
-    /**
-     * 供应商审核
-     *
-     * @param auditStatus
-     * @param auditNote
-     * @param id
-     * @param request
-     * @param response
-     * @return
-     */
-    @RequiresPermissions("user:newCmShop:edit")
-    @ResponseBody
-    @RequestMapping(value = "auditShop")
-    public Map<String, Object> auditShop(String auditStatus, String auditNote, String id, HttpServletRequest request, HttpServletResponse response) {
-        Map<String, Object> map = Maps.newLinkedHashMap();
-        Integer status;
-        String smsMessage = "";
-        String currTime = DateUtils.getDateTime();
-        Integer userPermission;
-        try {
-            NewCmShop newCmShop = newCmShopService.get(id);
-            Integer companyUserID = newCmShop.getUserID();
-            CmUser companyUser = cmUserService.get(companyUserID + "");
-            //供应商审核 --
-            // 1、直接注册成为企业供应商
-            // 2、个人用户升级成为企业供应商
-            //获取企业供应商下级用户
-            List<CmUser> cmUsers = cmUserService.findByCompanyUserID(companyUserID);
-            status = newCmShop.getStatus();//当前供应商的状态
-            // 发送系统消息给对应的userID用户
-            String title = "供应商资格认证审核结果";
-            String messageContent = "";
-            /**审核处理*/
-            //审核通过
-            if (StringUtils.equals("1", auditStatus)) {
-                auditStatus = "1";
-                userPermission = 3;
-                companyUser.setUserPermission(userPermission);
-                if (ShopStatus.WAIT_CHECK_DATA.getCode() == status || ShopStatus.CHECK_DATA_FAIL.getCode() == status) {
-                    //客服审核  生成交易信息,用于财务交易管理审核
-                    status = ShopStatus.WAIT_CASH_DEPOSIT.getCode();//待缴纳保证金
-                } else {
-                    //财务审核 审核通过即可上线
-                    status = ShopStatus.ONLINE.getCode();//已上线
-                    messageContent = "恭喜您，" + title + "【已通过】，恭喜您成功加入采美，祝您开店愉快，生意兴隆！";
-                    smsMessage = "恭喜您成功通过资料审核，您可以使用账号" + companyUser.getEmail() + "在采美登录您的企业账号，开始愉快的采购之旅。";
-                }
-            } else {
-                //审核未通过
-                userPermission = 1;
-                companyUser.setUserPermission(0);
-                status = 92;
-                auditStatus = "2";
-                messageContent = title + "【未通过】，原因：" + auditNote;
-                smsMessage = "很遗憾，您的资料信息有误，未通过审核，请登录采美修改资料信息。";
-            }
-            //供应商表修改
-            newCmShop.setStatus(status);
-            newCmShop.setAuditTime(currTime);
-            newCmShop.setAuditNote(auditNote);
-            //企业用户表修改
-            companyUser.setValidFlag(AppKeys.FLAG_YES);//正常
-            companyUser.setManufacturerStatus(status + "");
-            companyUser.setAuditStatus(auditStatus);//同步到用户表的审核信息中
-            companyUser.setAuditNote(auditNote);
-            companyUser.setAuditTime(currTime);
-            newCmShopService.update(newCmShop);
-            cmUserService.update(companyUser);
-
-            //直接注册成为企业供应商 或 升级成为供应商
-            if (CollectionUtils.isNotEmpty(cmUsers)) {
-                //个人用户升级成为企业供应商
-                cmUserService.updateEmployeeStatus(userPermission, null, status + "", null, companyUserID);
-            }
-
-            /**发送采美消息*/
-            sendMessage("1", companyUser.getUserID(), title, messageContent);
-            /**发送短信*/
-            String mobile = companyUser.getBindMobile();
-            if (StringUtils.isNotEmpty(mobile)) {
-                SMSUtils.sendSms(mobile, smsMessage);
-            }
-            map.put("success", true);
-            map.put("msg", "操作成功");
-        } catch (Exception e) {
-            logger.debug(e.toString(), e);
-            map.put("success", false);
-            map.put("msg", "操作失败");
-        }
-        return map;
-    }
+//    /**
+//     * 供应商审核
+//     *
+//     * @param auditStatus
+//     * @param auditNote
+//     * @param id
+//     * @param request
+//     * @param response
+//     * @return
+//     */
+//    @RequiresPermissions("user:newCmShop:edit")
+//    @ResponseBody
+//    @RequestMapping(value = "auditShop")
+//    public Map<String, Object> auditShop(String auditStatus, String auditNote, String id, HttpServletRequest request, HttpServletResponse response) {
+//        Map<String, Object> map = Maps.newLinkedHashMap();
+//        Integer status;
+//        String smsMessage = "";
+//        String currTime = DateUtils.getDateTime();
+//        Integer userPermission;
+//        try {
+//            NewCmShop newCmShop = newCmShopService.get(id);
+//            Integer companyUserID = newCmShop.getUserID();
+//            CmUser companyUser = cmUserService.get(companyUserID + "");
+//            //供应商审核 --
+//            // 1、直接注册成为企业供应商
+//            // 2、个人用户升级成为企业供应商
+//            //获取企业供应商下级用户
+//            List<CmUser> cmUsers = cmUserService.findByCompanyUserID(companyUserID);
+//            status = newCmShop.getStatus();//当前供应商的状态
+//            // 发送系统消息给对应的userID用户
+//            String title = "供应商资格认证审核结果";
+//            String messageContent = "";
+//            /**审核处理*/
+//            //审核通过
+//            if (StringUtils.equals("1", auditStatus)) {
+//                auditStatus = "1";
+//                userPermission = 3;
+//                companyUser.setUserPermission(userPermission);
+//                if (ShopStatus.WAIT_CHECK_DATA.getCode() == status || ShopStatus.CHECK_DATA_FAIL.getCode() == status) {
+//                    //客服审核  生成交易信息,用于财务交易管理审核
+//                    status = ShopStatus.WAIT_CASH_DEPOSIT.getCode();//待缴纳保证金
+//                } else {
+//                    //财务审核 审核通过即可上线
+//                    status = ShopStatus.ONLINE.getCode();//已上线
+//                    messageContent = "恭喜您，" + title + "【已通过】，恭喜您成功加入采美，祝您开店愉快，生意兴隆！";
+//                    smsMessage = "恭喜您成功通过资料审核，您可以使用账号" + companyUser.getEmail() + "在采美登录您的企业账号，开始愉快的采购之旅。";
+//                }
+//            } else {
+//                //审核未通过
+//                userPermission = 1;
+//                companyUser.setUserPermission(0);
+//                status = 92;
+//                auditStatus = "2";
+//                messageContent = title + "【未通过】，原因：" + auditNote;
+//                smsMessage = "很遗憾，您的资料信息有误，未通过审核，请登录采美修改资料信息。";
+//            }
+//            //供应商表修改
+//            newCmShop.setStatus(status);
+//            newCmShop.setAuditTime(currTime);
+//            newCmShop.setAuditNote(auditNote);
+//            //企业用户表修改
+//            companyUser.setValidFlag(AppKeys.FLAG_YES);//正常
+//            companyUser.setManufacturerStatus(status + "");
+//            companyUser.setAuditStatus(auditStatus);//同步到用户表的审核信息中
+//            companyUser.setAuditNote(auditNote);
+//            companyUser.setAuditTime(currTime);
+//            newCmShopService.update(newCmShop);
+//            cmUserService.update(companyUser);
+//
+//            //直接注册成为企业供应商 或 升级成为供应商
+//            if (CollectionUtils.isNotEmpty(cmUsers)) {
+//                //个人用户升级成为企业供应商
+//                cmUserService.updateEmployeeStatus(userPermission, null, status + "", null, companyUserID);
+//            }
+//
+//            /**发送采美消息*/
+//            sendMessage("1", companyUser.getUserID(), title, messageContent);
+//            /**发送短信*/
+//            String mobile = companyUser.getBindMobile();
+//            if (StringUtils.isNotEmpty(mobile)) {
+//                SMSUtils.sendSms(mobile, smsMessage);
+//            }
+//            map.put("success", true);
+//            map.put("msg", "操作成功");
+//        } catch (Exception e) {
+//            logger.debug(e.toString(), e);
+//            map.put("success", false);
+//            map.put("msg", "操作失败");
+//        }
+//        return map;
+//    }
 
     /**
      * 修改密码

src/main/webapp/WEB-INF/views/modules/user/newCmShopList.jsp

@@ -665,43 +665,6 @@
             }
         })
     });
-    /**
-     *    审核供应商
-     */
-    function audit(id) {
-        var html = "<div style='padding:20px;'><font color='red'>*</font>审核：" +
-            "<select name='auditStatus' id='auditStatus'  rows='1' cols='8'>" +
-            "<option value='1'>通过</option>" +
-            "<option value='2'>不通过</option><select/>" +
-            "</br>" +
-            "<font color='red'>*</font>审核批注：" +
-            "<textarea name='auditNote' id='auditNote' rows='3' cols='8'/></div>";
-        var submit = function (v, h, f) {
-            if (f.auditStatus == '') {
-                $.jBox.tip("请选择状态", 'error', {focusId: "auditStatus"});
-                return false;
-            } else if (f.auditNote == '') {
-                $.jBox.tip("请输入内容", 'error', {focusId: "auditNote"});
-                return false;
-            } else if (f.auditNote.length > 100) {
-                $.jBox.tip("内容过长", 'error', {focusId: "auditNote"});
-                return false;
-            }
-            $.post("${ctx}/user/newCmShop/auditShop", {
-                'auditStatus': f.auditStatus,
-                'id': id,
-                'auditNote': f.auditNote
-            }, function (data) {
-                if (true == data.success) {
-                    $.jBox.tip(data.msg, 'info');
-                    $("#searchForm").submit();
-                } else {
-                    $.jBox.tip(data.msg, 'error');
-                }
-            }, "JSON");//这里返回的类型有：json,html,xml,text
-        };
-        $.jBox(html, {title: "确定执行该操作吗？", submit: submit});
-    }
 
     // 修改密码
     function updatePwd(id) {