meiya-admin/src/main/java/com/sinata/modular/member/controller/MemUserSalesController.java
@@ -237,20 +237,13 @@ // 用户等级 Integer userMemberGradeId = map.get("member_grade_id") == null ? null : (Integer) map.get("member_grade_id"); // 查询上级城市合伙人、市场总监信息 MemUser[] parentV4V5User = memUserRelationService.getParentV4V5ByRelationPath( v4UserList, v5UserList, MemUser[] parentV4V5User = memUserRelationService.getParentV4V5ByRelationPath2( map.get("relation_path") == null ? null : map.get("relation_path").toString(), userMemberGradeId ); if (parentV4V5User[0] != null) { if (parentV4V5User[0] != null) { map.put("v4ShowId", parentV4V5User[0].getShowId()); map.put("v4Team", parentV4V5User[0].getRealName()); } else if (parentV4V5User[1] != null) { map.put("v4ShowId", parentV4V5User[1].getShowId()); map.put("v4Team", parentV4V5User[1].getRealName()); map.put("v5ShowId", parentV4V5User[1].getShowId()); map.put("v5Team", parentV4V5User[1].getRealName()); } if (parentV4V5User[1] != null) { map.put("v5ShowId", parentV4V5User[1].getShowId()); meiya-admin/src/main/java/com/sinata/modular/member/service/IMemUserRelationService.java
@@ -53,5 +53,5 @@ List<Map<String, Object>> wrapperUserRelation(List<Map<String, Object>> list, String userKey); MemUser[] getParentV4V5ByRelationPath(List<MemUser> v4UserList, List<MemUser> v5UserList, String relationPath, Integer memberGradeId); MemUser[] getParentV4V5ByRelationPath2(String relationPath, Integer memberGradeId); } meiya-admin/src/main/java/com/sinata/modular/member/service/impl/MemUserRelationServiceImpl.java
@@ -147,5 +147,42 @@ } return array; } @Override public MemUser[] getParentV4V5ByRelationPath2(String relationPath, Integer memberGradeId) { MemUser[] array = new MemUser[]{null, null}; if (relationPath != null) { String[] pathArray = relationPath.split("/"); String parentId = pathArray[pathArray.length - 2]; MemUser parentUser = memUserService.selectById(parentId); findParents(parentUser, pathArray, array); } return array; } private void findParents(MemUser user, String[] pathArray, MemUser[] array) { if (user != null) { Integer memberGradeId = user.getMemberGradeId(); if (memberGradeId == EnumMemberGrade.G_3.index) { String grandParentId = pathArray[pathArray.length - 3]; MemUser grandParent = memUserService.selectById(grandParentId); if (grandParent != null && grandParent.getMemberGradeId() == EnumMemberGrade.G_4.index) { array[0] = grandParent; String greatGrandParentId = pathArray[pathArray.length - 3]; MemUser greatGrandParent = memUserService.selectById(greatGrandParentId); if (greatGrandParent != null && greatGrandParent.getMemberGradeId() == EnumMemberGrade.G_5.index) { array[1] = greatGrandParent; } } } else if (memberGradeId == EnumMemberGrade.G_4.index) { array[0] = user; String parentId = pathArray[pathArray.length - 3]; MemUser parent = memUserService.selectById(parentId); if (parent != null && parent.getMemberGradeId() == EnumMemberGrade.G_5.index) { array[1] = parent; } } else if (memberGradeId == EnumMemberGrade.G_5.index) { array[0] = user; array[1] = user; } } } } meiya-rest/src/main/java/com/sinata/rest/modular/mall/service/impl/MallOrderServiceImpl.java
@@ -182,6 +182,10 @@ order.setIdCard(body.getIdCard()); order.setNumber(body.getNumber()); order.setState(EnumMallOrderState.WAIT_PAY.index); if (Objects.isNull(order.getCityCode())) { AreaCity city = areaCityMapper.getCityByMerchantId(body.getMerchantId()); Optional.ofNullable(city).ifPresent(c ->order.setCityCode(c.getCityCode())); } // 生成订单编号 String generateOrderNo = dailyIncrementIdGenerator.generateId(); order.setOrderNo(generateOrderNo); meiya-rest/src/main/java/com/sinata/rest/modular/member/controller/UserController.java
@@ -369,7 +369,9 @@ vo.setIdCard(user.getIdCard()); vo.setImAccount(user.getImAccount()); vo.setImPassword(user.getImPassword()); if (user.getIsLeaveOffice() != -1 && user.getAuditState() != 2) { vo.setModifyUserInfo(false); } return vo; }
@@ -106,4 +106,6 @@ @ApiModelProperty(value = "审核状态，0待，1通过，2拒绝") private Integer auditState; @ApiModelProperty(value = "是否可以修改个人资料") private Boolean modifyUserInfo = Boolean.TRUE; } meiya-rest/src/main/java/com/sinata/rest/modular/system/dao/AreaCityMapper.java
@@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.sinata.rest.modular.system.model.AreaCity; import org.apache.ibatis.annotations.Param; /** * <p> @@ -14,4 +15,5 @@ */ public interface AreaCityMapper extends BaseMapper<AreaCity> { AreaCity getCityByMerchantId(@Param("merchantId") Integer merchantId); } meiya-rest/src/main/java/com/sinata/rest/modular/system/dao/mapping/AreaCityMapper.xml
@@ -3,5 +3,14 @@ <mapper namespace="com.sinata.rest.modular.system.dao.AreaCityMapper"> <select id="getCityByMerchantId" resultType="com.sinata.rest.modular.system.model.AreaCity"> SELECT sac.* FROM mem_merchant mm LEFT JOIN sys_area_city sac ON sac.id = mm.city_id <where> mm.id = #{merchantId} </where> </select> </mapper>
