修改重名方法

suishenbang-wxportal/suishenbang-wxportal-common/src/main/java/com/dgtly/wxportal/mapper/WxMagnetMapper.java

@@ -58,7 +58,7 @@ public interface WxMagnetMapper
      * @param magnetName 磁贴名称
      * @return 结果
      */
-    WxMagnet checkMagnetNameUnique(@Param("magnetName") String magnetName);
+    WxMagnet checkMagnetNameUnique(@Param("magnetName") String magnetName,@Param("userType") String userType);
 
     /**
      * 新增保存磁贴信息

suishenbang-wxportal/suishenbang-wxportal-common/src/main/java/com/dgtly/wxportal/service/impl/WxMagnetServiceImpl.java

@@ -111,7 +111,7 @@ public class WxMagnetServiceImpl implements IWxMagnetService
     @Override
     public String checkMagnetNameUnique(WxMagnet wxMagnet) {
         Long magnetId = StringUtils.isNull(wxMagnet.getMagnetId()) ? -1L : wxMagnet.getMagnetId();
-        WxMagnet info = wxMagnetMapper.checkMagnetNameUnique(wxMagnet.getMagnetName());
+        WxMagnet info = wxMagnetMapper.checkMagnetNameUnique(wxMagnet.getMagnetName(),wxMagnet.getUserType());
         if (StringUtils.isNotNull(info) && info.getMagnetId().longValue() != magnetId.longValue())
         {
             return UserConstants.MENU_NAME_NOT_UNIQUE;

suishenbang-wxportal/suishenbang-wxportal-common/src/main/resources/mapper/wxportal/WxMagnetMapper.xml

@@ -74,7 +74,7 @@
 
     <select id="checkMagnetNameUnique"  resultMap="WxMagnetResult">
         <include refid="selectMagnetVo"/>
-        where magnet_name=#{magnetName}
+        where magnet_name=#{magnetName} and user_type=#{userType}
     </select>
 
     <insert id="insertMagnet" parameterType="com.dgtly.wxportal.domain.WxMagnet">

suishenbang-wxportal/suishenbang-wxportal-manager/src/main/java/com/dgtly/wxportal/controller/WxMagnetController.java

@@ -106,19 +106,6 @@ public class WxMagnetController extends BaseController
     @ResponseBody
     public AjaxResult addSave(@Validated WxMagnet wxMagnet)
     {
-        String newMagnetName = wxMagnet.getMagnetName();
-        String newOrderNum = "";
-        if ("0".equals(wxMagnet.getUserType())){
-            newMagnetName = newMagnetName + "(立邦员工)";
-        }else if ("1".equals(wxMagnet.getUserType())){
-            newMagnetName = newMagnetName + "(经销商)";
-        }else if ("2".equals(wxMagnet.getUserType())){
-            newMagnetName = newMagnetName + "(服务商)";
-        }else if ("3".equals(wxMagnet.getUserType())){
-            newMagnetName = newMagnetName + "(金牌店)";
-        }
-        wxMagnet.setMagnetName(newMagnetName);
-        wxMagnet.setOrderNum(newOrderNum);
         if (UserConstants.MENU_NAME_NOT_UNIQUE.equals(wxMagnetService.checkMagnetNameUnique(wxMagnet)))
         {
             return error("新增磁贴'" + wxMagnet.getMagnetName() + "'失败，磁贴名称已存在");
@@ -147,20 +134,6 @@ public class WxMagnetController extends BaseController
     @ResponseBody
     public AjaxResult editSave(@Validated WxMagnet wxMagnet)
     {
-        String newMagnetName = wxMagnet.getMagnetName();
-        String newOrderNum = "";
-        // 根据用户类型设置磁铁名称和订单号前缀
-        if ("0".equals(wxMagnet.getUserType())){
-            newMagnetName = newMagnetName + "(立邦员工)";
-        }else if ("1".equals(wxMagnet.getUserType())){
-            newMagnetName = newMagnetName + "(经销商)";
-        }else if ("2".equals(wxMagnet.getUserType())){
-            newMagnetName = newMagnetName + "(服务商)";
-        }else if ("3".equals(wxMagnet.getUserType())){
-            newMagnetName = newMagnetName + "(金牌店)";
-        }
-        wxMagnet.setMagnetName(newMagnetName);
-        wxMagnet.setOrderNum(newOrderNum);
         if (UserConstants.MENU_NAME_NOT_UNIQUE.equals(wxMagnetService.checkMagnetNameUnique(wxMagnet)))
         {
             return error("修改磁贴'" + wxMagnet.getMagnetName() + "'失败，磁贴名称已存在");