Merge remote-tracking branch 'remotes/origin/developer' into developerB

src/main/java/com/caimei/modules/newhome/service/CmInstrumentMaintenanceService.java

@@ -92,8 +92,8 @@ public class CmInstrumentMaintenanceService extends CrudService<CmInstrumentMain
     @Transactional(readOnly = false)
     public void update(CmInstrumentMaintenance cmInstrumentMaintenance) {
         CmInstrumentMaintenance dbbean = super.get(cmInstrumentMaintenance.getId());
-        String wwwServer = Global.getConfig("caimei.crm.server");
-        String msgLink = wwwServer + "maintain/page/$.shtml";
+        String wwwServer = Global.getConfig("wwwServer");
+        String msgLink = wwwServer + "supplier/repair/detail.html?code=$";
         //用户分享链接
         CmInstrumentMaintenanceLinks link = cmInstrumentMaintenanceLinksDao.getShareLinkCode(cmInstrumentMaintenance.getId(), "1");
         String customerLink = "";
@@ -115,11 +115,11 @@ public class CmInstrumentMaintenanceService extends CrudService<CmInstrumentMain
                     repairerLink.setLinkCode(UUID.randomUUID().toString().replaceAll("-", ""));
                     cmInstrumentMaintenanceLinksDao.insert(repairerLink);
                     //发送对接成功短信
-                    String msgCustomer = "【采美365网】" + cmInstrumentMaintenance.getUserContact() +
+                    String msgCustomer = cmInstrumentMaintenance.getUserContact() +
                             "，您的维修申请已对接到维修服务商" + cmInstrumentMaintenance.getMaintainerName() +
                             "，点击" + msgLink.replace("$", customerLink) +"，查看维修商详情，请注意保存此短信，方便后续服务评价，采美客服0755-22907771";
 
-                    String msgRepairer = "【采美365网】" + cmInstrumentMaintenance.getMaintainerName() +
+                    String msgRepairer = cmInstrumentMaintenance.getMaintainerName() +
                             "，已为您对接到维修用户" + cmInstrumentMaintenance.getUserContact() +
                             "，联系电话" + cmInstrumentMaintenance.getUserMobile() + "，点击"+ msgLink.replace("$", repairerLink.getLinkCode()) +"，查看维修详情，请注意保存此短信，方便后续查看进展，采美客服0755-22907771";
 
@@ -128,7 +128,7 @@ public class CmInstrumentMaintenanceService extends CrudService<CmInstrumentMain
                     cmInstrumentMaintenance.setStatus("2");
                     cmInstrumentMaintenance.setDockingDate(new Date());
                 } else if (isFirstConfirm && cmInstrumentMaintenance.getMaintainerMobile() == null) { //只是核实了信息 没有填写供应商信息
-                    String msgCustomer = "【采美365网】" + cmInstrumentMaintenance.getUserContact() +
+                    String msgCustomer = cmInstrumentMaintenance.getUserContact() +
                             "，您的维修申请已确认，我们将在1-2个工作日为您安排维修服务，点击" + msgLink.replace("$", customerLink) + "，查看后续维修进展，采美客服0755-22907771"; //发送核实短信
 
                     SMSUtils.sendSms(cmInstrumentMaintenance.getUserMobile().toString(), msgCustomer);
@@ -139,11 +139,11 @@ public class CmInstrumentMaintenanceService extends CrudService<CmInstrumentMain
                     repairerLink.setCmInstrumentMaintenanceId(Long.valueOf(cmInstrumentMaintenance.getId()));
                     repairerLink.setLinkCode(UUID.randomUUID().toString().replaceAll("-", ""));
                     cmInstrumentMaintenanceLinksDao.insert(repairerLink);
-                    String msgCustomer = "【采美365网】" + cmInstrumentMaintenance.getUserContact() +
+                    String msgCustomer = cmInstrumentMaintenance.getUserContact() +
                             "，您的维修申请已对接到维修服务商" + cmInstrumentMaintenance.getMaintainerName() +
                             "，点击" + msgLink.replace("$", customerLink) + "，查看维修商详情，请注意保存此短信，方便后续服务评价，采美客服0755-22907771";
 
-                    String msgRepairer = "【采美365网】" + cmInstrumentMaintenance.getMaintainerName() +
+                    String msgRepairer = cmInstrumentMaintenance.getMaintainerName() +
                             "，已为您对接到维修用户" + cmInstrumentMaintenance.getUserContact() +
                             "，联系电话" + cmInstrumentMaintenance.getUserMobile() +
                             "，点击" + msgLink.replace("$", repairerLink.getLinkCode()) +"，查看维修详情，请注意保存此短信，方便后续查看进展，采美客服0755-22907771";
@@ -158,14 +158,16 @@ public class CmInstrumentMaintenanceService extends CrudService<CmInstrumentMain
             if (!dbbean.getMaintainerName().trim().equals(cmInstrumentMaintenance.getMaintainerName().trim())
                     || !dbbean.getMaintainerMobile().toString().trim().equals(cmInstrumentMaintenance.getMaintainerMobile().toString().trim())
                     || !dbbean.getMaintainerAddress().trim().equals(cmInstrumentMaintenance.getMaintainerAddress())) {
-                String msgCustomer = "【采美365网】" + cmInstrumentMaintenance.getUserContact() +
+                String msgCustomer = cmInstrumentMaintenance.getUserContact() +
                         "，您的维修申请已对接到维修服务商" + cmInstrumentMaintenance.getMaintainerName() +
                         "，点击" + msgLink.replace("$", customerLink) +"，查看维修商详情，请注意保存此短信，方便后续服务评价，采美客服0755-22907771";
 
                 CmInstrumentMaintenanceLinks l = cmInstrumentMaintenanceLinksDao.getShareLinkCode(cmInstrumentMaintenance.getId(), "3");
                 String str = "";
-                if (l != null) str = l.getLinkCode();
-                String msgRepairer = "【采美365网】" + cmInstrumentMaintenance.getMaintainerName() +
+                if (l != null) {
+                    str = l.getLinkCode();
+                }
+                String msgRepairer = cmInstrumentMaintenance.getMaintainerName() +
                         "，已为您对接到维修用户" + cmInstrumentMaintenance.getUserContact() +
                         "，联系电话" + cmInstrumentMaintenance.getUserMobile() +
                         "，点击" + msgLink.replace("$", str) +"，查看维修详情，请注意保存此短信，方便后续查看进展，采美客服0755-22907771";

src/main/java/com/caimei/modules/newhome/web/CmInstrumentMaintenanceController.java

@@ -71,16 +71,20 @@ public class CmInstrumentMaintenanceController extends BaseController {
             cmInstrumentMaintenance.setEndTime(cmInstrumentMaintenance.getEndTime() + " 23:59:59");
         }
         Page<CmInstrumentMaintenance> page = cmInstrumentMaintenanceService.findPage(new Page<>(request, response), cmInstrumentMaintenance);
+        String wwwServer = Global.getConfig("wwwServer");
         for (CmInstrumentMaintenance bean : page.getList()) {
             String type = "";
-            if ("1".equals(bean.getStatus()) && "1".equals(bean.getAuthenticity()))
+            if ("1".equals(bean.getStatus()) && "1".equals(bean.getAuthenticity())) {
                 type = "2";
-            if ("2".equals(bean.getStatus()) || "3".equals(bean.getStatus()))
+            }
+            if ("2".equals(bean.getStatus()) || "3".equals(bean.getStatus())) {
                 type = "3";
+            }
             if (StringUtils.isNoneBlank(type)) {
                 CmInstrumentMaintenanceLinks l = cmInstrumentMaintenanceLinksService.findWithType(bean.getId(), type);
-                if (l != null)
-                    bean.setLink(Global.getConfig("caimei.crm.server") + "maintain/page/" + l.getLinkCode() +".shtml");
+                if (l != null){
+                    bean.setLink(wwwServer + "supplier/repair/detail.html?code=" + l.getLinkCode());
+                }
             }
         }
         model.addAttribute("page", page);
@@ -115,8 +119,8 @@ public class CmInstrumentMaintenanceController extends BaseController {
             b = cmInstrumentMaintenanceLinksService.findWithType(cmInstrumentMaintenance.getId(), "3");
         }
         if (b != null && StringUtils.isNoneEmpty(b.getLinkCode())) {
-            String wwwServer = Global.getConfig("caimei.crm.server");
-            String link = wwwServer + "maintain/page/" + b.getLinkCode() +".shtml";
+            String wwwServer = Global.getConfig("wwwServer");
+            String link = wwwServer + "supplier/repair/detail.html?code=" + b.getLinkCode();
             model.addAttribute("link", link);
         }
         model.addAttribute("cmInstrumentMaintenance", cmInstrumentMaintenance);

src/main/java/com/caimei/modules/opensearch/CoreServiceUitls.java

@@ -53,7 +53,7 @@ public class CoreServiceUitls {
         // 打印参数
         logger.info("更新索引uri：" + uri);
         // 发起Post请求
-        MultiValueMap<String, Integer> paramMap = new LinkedMultiValueMap<>();
+        MultiValueMap<String, String> paramMap = new LinkedMultiValueMap<>();
         String result = restTemplate.postForObject(uri, paramMap, String.class);
         logger.info("更新索引result：" + result);
     }

src/main/java/com/caimei/modules/sys/utils/SMSUtils.java

@@ -1,21 +1,42 @@
 package com.caimei.modules.sys.utils;
 
-import com.ruanwei.interfacej.SmsClientSend;
+import com.alibaba.fastjson.JSONObject;
+import com.thinkgem.jeesite.common.config.Global;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
+import org.springframework.web.client.RestTemplate;
 
 public class SMSUtils {
-	private static String url = "http://47.96.109.82:9999/sms.aspx";
-	private static String userid = "321";
-	private static String account = "0755cmxx";
-	private static String password = "CaimeiSMS999";
+//	private static String url = "http://47.96.109.82:9999/sms.aspx";
+//	private static String userid = "321";
+//	private static String account = "0755cmxx";
+//	private static String password = "CaimeiSMS999";
 	
 	public static boolean sendSms(String mobile, String content){
-		String res = SmsClientSend.sendSms(url, userid, account, password, mobile, content);
-		return res.indexOf("Success") != -1;
-//		System.out.println("手机号："+mobile +" -  内容："+content);
-//		return true;
+
+//		String res = SmsClientSend.sendSms(url, userid, account, password, mobile, content);
+//		return res.indexOf("Success") != -1;
+
+		// 获取core服务器地址
+		String coreServer = Global.getConfig("caimei.core");
+		RestTemplate restTemplate = new RestTemplate();
+		String uri = coreServer + "/tools/sms/send";
+		// 发起Post请求
+		MultiValueMap<String, String> paramMap = new LinkedMultiValueMap<>();
+		paramMap.add("mobile", mobile);
+		paramMap.add("content", content);
+		String result = restTemplate.postForObject(uri, paramMap, String.class);
+		System.out.println(result);
+		JSONObject json = (JSONObject) JSONObject.parse(result);
+		if (null != json && json.getInteger("code") == 0) {
+			return true;
+		} else {
+			return false;
+		}
 	}
-	
+
 	public static void main(String[] args) {
-		System.out.println(sendSms("13631650502", "您登录亲朋棋牌的手机短 信验证码是：7895，祝您游戏愉快！请确认账号是由本人操作"));
+		//System.out.println(sendSms("13631650502", "您登录亲朋棋牌的手机短 信验证码是：7895，祝您游戏愉快！请确认账号是由本人操作"));
+		// System.out.println(sendSms("15814011616", "您短信验证码是：7895"));
 	}
 }

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/java/com/caimei/modules/weisha/service/CmOrganizeBuyerService.java

@@ -72,7 +72,7 @@ public class CmOrganizeBuyerService extends CrudService<CmOrganizeBuyerDao, CmOr
             //发送短信
             String mobile = cmOrganizeBuyer.getMobile();
             if (StringUtils.isNotEmpty(mobile)) {
-                SMSUtils.sendSms(mobile, "您的邀请码为：" + flag + "，在微信搜索“维沙采购商城”小程序，使用邀请码进行登录后，即可开始采购");
+                SMSUtils.sendSms(mobile, "您的邀请码为：" + flag + "，在微信搜索“维沙采购商城”小程序，使用邀请码进行登录后，即可开始采购。");
             }
         }
         cmOrganizeBuyer.setUpdateTime(date);
@@ -117,7 +117,7 @@ public class CmOrganizeBuyerService extends CrudService<CmOrganizeBuyerDao, CmOr
             //发送短信
             String mobile = cmOrganizeBuyer.getMobile();
             if (StringUtils.isNotEmpty(mobile)) {
-                SMSUtils.sendSms(mobile, "您的邀请码为：" + flag + "，在微信搜索“维沙采购商城”小程序，使用邀请码进行登录后，即可开始采购");
+                SMSUtils.sendSms(mobile, "您的邀请码为：" + flag + "，在微信搜索“维沙采购商城”小程序，使用邀请码进行登录后，即可开始采购。");
             }
             cmOrganizeBuyer.setUpdateTime(date);
             organizeBuyerDao.update(cmOrganizeBuyer);

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) {