bug fix

pom.xml

@@ -142,9 +142,9 @@
 			</properties>
 		</profile>
 		<profile>
-			<id>test</id>
+			<id>green</id>
 			<properties>
-				<profiles.active>test</profiles.active>
+				<profiles.active>green</profiles.active>
 			</properties>
 		</profile>
 		<profile>
@@ -154,39 +154,9 @@
 			</properties>
 		</profile>
 		<profile>
-			<id>xs</id>
+			<id>blue</id>
 			<properties>
-				<profiles.active>xs</profiles.active>
-			</properties>
-		</profile>
-		<profile>
-			<id>rc</id>
-			<properties>
-				<profiles.active>rc</profiles.active>
-			</properties>
-		</profile>
-		<profile>
-			<id>nj</id>
-			<properties>
-				<profiles.active>nj</profiles.active>
-			</properties>
-		</profile>
-		<profile>
-			<id>hj</id>
-			<properties>
-				<profiles.active>hj</profiles.active>
-			</properties>
-		</profile>
-		<profile>
-			<id>gzysd</id>
-			<properties>
-				<profiles.active>gzysd</profiles.active>
-			</properties>
-		</profile>
-		<profile>
-			<id>jj</id>
-			<properties>
-				<profiles.active>jj</profiles.active>
+				<profiles.active>blue</profiles.active>
 			</properties>
 		</profile>
 	</profiles>

src/main/java/com/huiju/estateagents/center/sysUser/controller/SysUserController.java

@@ -196,8 +196,8 @@ public class SysUserController extends BaseController {
 
         //验证用户名密码是否正确
         TaChannelProxy taChannelProxy = iTaChannelProxyService.getOne(taChannelProxyQueryWrapper);
-        String defaultPsw = MD5Utils.md5("abc@123");
-        if (taChannelProxy == null || !defaultPsw.equals(params.getString("password"))) {
+        String defaultPsw = MD5Utils.md5(params.getString("password"));
+        if (taChannelProxy == null || !defaultPsw.equals(taChannelProxy.getPassword())) {
             return ResponseBean.error("用户名或密码错误", ResponseBean.ERROR_ILLEGAL_PARAMS);
         }
 
@@ -222,42 +222,31 @@ public class SysUserController extends BaseController {
     }
 
     @PostMapping("/center/changePassword")
-    public ResponseBean changePassword(@RequestBody String paramStr) {
-        JSONObject params = JSONObject.parseObject(paramStr);
-        if (params == null) {
-            return ResponseBean.error("非法参数", ResponseBean.ERROR_MISSING_PARAMS);
-        }
-        String loginPassword = params.get("loginPassword").toString();
-        String newPassword = params.get("newPassword").toString();
-        String confirmPassword = params.get("confirmPassword").toString();
+    public ResponseBean changePassword(@RequestParam String originalPassword,
+                                       @RequestParam String newPassword,HttpServletRequest request) {
 
-        //校验密码
-        QueryWrapper<TaUser> taUserQueryWrapper = new QueryWrapper<>();
-        taUserQueryWrapper.eq("user_id", params.get("userId"));
-        TaUser taUser = iTaUserService.getOne(taUserQueryWrapper);
+        if (org.apache.commons.lang3.StringUtils.isBlank(newPassword) || newPassword.length() < 6) {
+            return ResponseBean.error("新密不能小于6位", ResponseBean.ERROR_UNAVAILABLE);
+        }
 
-        if (!taUser.getLoginPassword().equals(MD5Utils.md5(MD5Utils.md5(loginPassword)))){
-            return ResponseBean.error("旧密码错误，请重新输入", ResponseBean.ERROR_UNAVAILABLE);
-        };
+        Integer channelId = getChannelId(request);
 
-        if (StringUtils.isEmpty(newPassword) || StringUtils.isEmpty(confirmPassword)){
-            return ResponseBean.error("请输入新密码", ResponseBean.ERROR_UNAVAILABLE);
+        // 校验当前旧密码是否正确
+        String password = MD5Utils.md5(MD5Utils.md5(originalPassword));
+        TaChannelProxy taChannelProxy = iTaChannelProxyService.getById(channelId);
+        if (!password.equals(taChannelProxy.getPassword())){
+            return ResponseBean.error("旧密码错误,请重新输入", ResponseBean.ERROR_UNAVAILABLE);
         }
 
-        if (!newPassword.equals(confirmPassword)){
-            return ResponseBean.error("两次密码不一致，请确认重新输入", ResponseBean.ERROR_UNAVAILABLE);
+        try {
+            iTaChannelProxyService.resetPassword(channelId, newPassword);
+            return ResponseBean.success("操作成功！");
+        } catch (Exception e) {
+            e.printStackTrace();
+            return ResponseBean.error(e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
         }
-
-        //重置密码
-        QueryWrapper<TaUser> updateWrapper = new QueryWrapper<>();
-        TaUser user = new TaUser();
-        user.setLoginPassword(MD5Utils.md5(MD5Utils.md5(newPassword)));
-        updateWrapper.eq("user_id", params.get("userId"));
-        iTaUserService.update(user, updateWrapper);
-
-        return ResponseBean.success("设置成功");
     }
-    
+
     @PostMapping("/center/signout")
     public ResponseBean signout(HttpServletRequest request) {
         String token = JWTUtils.getToken(request);

src/main/java/com/huiju/estateagents/center/taUser/service/impl/TaUserServiceImpl.java

@@ -93,6 +93,9 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 	@Autowired
 	private ISysOrgParamsService iSysOrgParamsService;
 
+	@Autowired
+	private TaChannelAppRelationMapper taChannelAppRelationMapper;
+
 	@Override
 	public IPage<Map<String,Object>> getPageList(IPage pg, Integer channelId) {
 		List<Map<String,Object>> taUserList = taUserMapper.getPageList(pg, channelId);
@@ -146,6 +149,13 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 			throw new Exception("生成用户公司信息失败");
 		}
 
+		//维护渠道和小程序关系
+		TaChannelAppRelation taChannelAppRelation = new TaChannelAppRelation();
+		taChannelAppRelation.setChannelId(channelId);
+		taChannelAppRelation.setOrgId(taOrg.getOrgId());
+		taChannelAppRelation.setCreateTime(LocalDateTime.now());
+		taChannelAppRelationMapper.insert(taChannelAppRelation);
+
 		// 维护当前城市所在城市
 		addAndupdate(taUser.getSelectCityTree(),false,taOrg.getOrgId());
 
@@ -352,7 +362,7 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 			taUser.setLoginName(taUser.getPhone());
 		}
 		
-		List<TaUser> taUserList = taUserMapper.getUserList(taUser.getPhone(),taUser.getLoginName(),taUser.getOrgId());
+		List<TaUser> taUserList = taUserMapper.getUserList(taUser.getPhone(),taUser.getLoginName(),null);
 		if (null != taUserList && taUserList.size() > 0) {
 			throw new Exception("电话号码或登录名重复");
 		}

src/main/java/com/huiju/estateagents/channel/sysChannel/controller/SysUserChannelController.java

@@ -179,7 +179,7 @@ public class SysUserChannelController extends BaseController {
                 responseBean.addError("手机号已存在");
                 return responseBean;
             }
-
+            taChannelProxy.setPassword(MD5Utils.md5(MD5Utils.md5("abc@123")));
             taChannelProxy.setStatus(1);
             taChannelProxy.setCreateTime(LocalDateTime.now());
             iTaChannelProxyService.save(taChannelProxy);

src/main/java/com/huiju/estateagents/channel/sysChannel/entity/TaChannelProxy.java

@@ -1,6 +1,8 @@
 package com.huiju.estateagents.channel.sysChannel.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -11,6 +13,7 @@ import java.time.LocalDateTime;
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
 public class TaChannelProxy {
+    @TableId(value = "channel_id", type = IdType.AUTO)
     private Integer channelId;
 
     private String channelProxyName;
@@ -23,6 +26,8 @@ public class TaChannelProxy {
 
     private String userName;
 
+    private String password;
+
     private LocalDateTime expireDate;
 
     private Integer status;

src/main/java/com/huiju/estateagents/channel/sysChannel/service/ITaChannelProxyService.java

@@ -7,4 +7,6 @@ import com.huiju.estateagents.channel.sysChannel.entity.TaChannelProxy;
 
 public interface ITaChannelProxyService extends IService<TaChannelProxy> {
     IPage<TaChannelProxy> getChannelList(IPage page);
+
+    void resetPassword(Integer id, String newPass) throws Exception;
 }

src/main/java/com/huiju/estateagents/channel/sysChannel/service/impl/TaChannelProxyServiceImpl.java

@@ -4,9 +4,11 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.channel.sysChannel.entity.TaChannelProxy;
 import com.huiju.estateagents.channel.sysChannel.mapper.TaChannelProxyMapper;
 import com.huiju.estateagents.channel.sysChannel.service.ITaChannelProxyService;
+import com.huiju.estateagents.common.MD5Utils;
 import com.huiju.estateagents.entity.TaChannelAppRelation;
 import com.huiju.estateagents.mapper.TaChannelAppRelationMapper;
 import org.apache.commons.collections.CollectionUtils;
@@ -35,4 +37,21 @@ public class TaChannelProxyServiceImpl extends ServiceImpl<TaChannelProxyMapper,
         }
         return taChannelProxyIPage;
     }
+
+    @Override
+    public void resetPassword(Integer id, String newPass) throws Exception {
+        TaChannelProxy taChannelProxy = this.getById(id);
+        if (null == taChannelProxy) {
+            throw new Exception("未找到有效的渠道信息");
+        }
+
+        String encryptPass = MD5Utils.md5(MD5Utils.md5(newPass));
+        TaChannelProxy proxy = new TaChannelProxy();
+        proxy.setPassword(encryptPass);
+        proxy.setChannelId(id);
+
+        if (!this.updateById(proxy)) {
+            throw new Exception("重置渠道密码失败");
+        }
+    }
 }

src/main/java/com/huiju/estateagents/entity/TdBizEvent.java

@@ -55,6 +55,10 @@ public class TdBizEvent implements Serializable {
      */
     private LocalDateTime createDate;
 
+    /**
+     * 分数
+     */
+    private Integer points;
     /**
      * 意向值
      */

src/main/java/com/huiju/estateagents/service/impl/TaBuildingIntentionServiceImpl.java

@@ -79,7 +79,7 @@ public class TaBuildingIntentionServiceImpl extends ServiceImpl<TaBuildingIntent
             taBuildingIntention.setEventId(e.getEventId());
             taBuildingIntention.setEventCode(e.getEventCode());
             taBuildingIntention.setEventName(e.getEventName());
-            taBuildingIntention.setIntention(1);
+            taBuildingIntention.setIntention(e.getPoints());
             taBuildingIntention.setCreateDate(LocalDateTime.now());
             taBuildingIntention.setBuildingId(buildingId);
             taBuildingIntention.setStatus(1);

src/main/java/com/huiju/estateagents/service/impl/TaMiniappServiceImpl.java

@@ -72,14 +72,6 @@ public class TaMiniappServiceImpl extends ServiceImpl<TaMiniappMapper, TaMiniapp
             throw new Exception("当前系统仅供维护"+ taChannelProxy.getAppMaxNum() +"个小程序，需要维护更多项目，请联系相关管理人员");
         }
 
-        //维护渠道和小程序关系
-        TaChannelAppRelation taChannelAppRelation = new TaChannelAppRelation();
-        taChannelAppRelation.setChannelId(channelId);
-        taChannelAppRelation.setOrgId(taMiniapp.getOrgId());
-        taChannelAppRelation.setCreateTime(LocalDateTime.now());
-        taChannelAppRelationMapper.insert(taChannelAppRelation);
-
-
         TaMiniapp orign = this.getById(taMiniapp.getMiniappId());
         if (null != orign) {
             if (!this.updateById(taMiniapp)) {

src/main/resources/mapper/TaUserMapper.xml

@@ -27,7 +27,7 @@
             ta_user t
             LEFT JOIN ta_org o ON t.org_id = o.org_id
             LEFT JOIN ta_miniapp m ON o.org_id = m.org_id
-            left join ta_channel_app_relation n on m.org_id = n.org_id
+            left join ta_channel_app_relation n on o.org_id = n.org_id
             left join ta_channel_proxy z on z.channel_id = n.channel_id
         WHERE
             t.is_admin =1
@@ -53,8 +53,10 @@
     FROM
         ta_user
     WHERE
-          org_id = #{orgId}
-        and (phone = #{phone}
+    <if test="orgId != null and orgId != ''">
+        org_id = #{orgId} and
+    </if>
+         (phone = #{phone}
         OR login_Name = #{loginName})
     </select>
     <select id="seleUserList" resultType="com.huiju.estateagents.center.taUser.entity.TaUser">