bugfix2

src/main/java/com/caimei365/user/model/dto/ShopUpdateDto.java

@@ -40,7 +40,7 @@ public class ShopUpdateDto implements Serializable {
      * 邮箱
      */
     @ApiModelProperty("邮箱")
-    private String email;
+    private String contractEmail;
     /**
      * 固定电话
      */

src/main/java/com/caimei365/user/service/impl/ShopServiceImpl.java

@@ -147,8 +147,8 @@ public class ShopServiceImpl implements ShopService {
         if (null == shopUpdateDto.getShopId()) {
             return ResponseJson.error("参数异常：供应商Id不能为空！");
         }
-        if (StringUtils.isNotBlank(shopUpdateDto.getEmail())) {
-            Integer userIdByEmail = baseMapper.getUserIdByEmail(shopUpdateDto.getEmail());
+        if (StringUtils.isNotBlank(shopUpdateDto.getContractEmail())) {
+            Integer userIdByEmail = baseMapper.getUserIdByEmail(shopUpdateDto.getContractEmail());
             if (null != userIdByEmail && !userIdByEmail.equals(shopUpdateDto.getUserId())) {
                 return ResponseJson.error("该邮箱已被使用");
             }
@@ -160,7 +160,7 @@ public class ShopServiceImpl implements ShopService {
         user.setUserId(shopUpdateDto.getUserId());
         user.setName(shopUpdateDto.getName());
         user.setUserName(shopUpdateDto.getShortName());
-        user.setEmail(shopUpdateDto.getEmail());
+        user.setEmail(shopUpdateDto.getContractEmail());
         // 更新供应商用户信息
         shopMapper.updateShopUserByUpdateInfo(user);
         // 更新供应商信息

src/main/resources/mapper/ShopMapper.xml

@@ -20,8 +20,8 @@
             <if test="shortName != null and shortName != ''">
                 sname = #{shortName},
             </if>
-            <if test="email != null and email != ''">
-                contractEmail1 = #{email},
+            <if test="contractEmail != null and contractEmail != ''">
+                contractEmail1 = #{contractEmail},
             </if>
             <if test="contractPhone != null and contractPhone != ''">
                 contractPhone = #{contractPhone},