Skip to content

GitLab

Q
qk_backend
Commit 7356469d authored by shiyu's avatar shiyu
Browse files
Options

寄售中不能修改

parent 22f6b0ae
Hide whitespace changes
Inline Side-by-side
Showing with 322 additions and 309 deletions
ch-admin-api/src/main/java/com/wwdz/ch/admin/Application.java
View file @ 7356469d
package com.wwdz.ch.admin; package com.wwdz.ch.admin;
import org.apache.dubbo.config.spring.context.annotation.EnableDubbo;
import org.mybatis.spring.annotation.MapperScan; import org.mybatis.spring.annotation.MapperScan;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
...@@ -17,6 +18,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement; ...@@ -17,6 +18,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
@MapperScan({ "com.wwdz.ch.db.mapper", "com.wwdz.ch.db.mapper.ex" }) @MapperScan({ "com.wwdz.ch.db.mapper", "com.wwdz.ch.db.mapper.ex" })
@EnableTransactionManagement @EnableTransactionManagement
@EnableScheduling @EnableScheduling
@EnableDubbo(scanBasePackages = {"com.wwdz.ch.admin"})
public class Application { public class Application {
public static void main(String[] args) { public static void main(String[] args) {
......
ch-admin-api/src/main/java/com/wwdz/ch/admin/impl/AdminUserServiceImpl.java
View file @ 7356469d
package com.wwdz.ch.admin.impl; package com.wwdz.ch.admin.impl;
import com.alibaba.dubbo.config.annotation.Reference;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.wwdz.ch.admin.controller.AdminUserController; import com.wwdz.ch.admin.controller.AdminUserController;
import com.wwdz.ch.admin.service.AdminUserService; import com.wwdz.ch.admin.service.AdminUserService;
import com.wwdz.ch.core.util.ConvertUtil;
import com.wwdz.ch.db.dao.dts.DtsUserDao; import com.wwdz.ch.db.dao.dts.DtsUserDao;
import com.wwdz.ch.db.domain.User; import com.wwdz.ch.db.domain.User;
import com.wwdz.ch.db.dto.request.UserSearchRequestDto; import com.wwdz.ch.db.dto.request.UserSearchRequestDto;
import com.wwdz.mall.common.vo.response.CloudServerResponse;
import com.wwdz.user.api.service.user.UserReadService;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import java.util.HashMap; import java.util.*;
import java.util.List;
import java.util.Map;
@Service @Service
public class AdminUserServiceImpl implements AdminUserService { public class AdminUserServiceImpl implements AdminUserService {
...@@ -23,8 +26,12 @@ public class AdminUserServiceImpl implements AdminUserService { ...@@ -23,8 +26,12 @@ public class AdminUserServiceImpl implements AdminUserService {
@Autowired @Autowired
private DtsUserDao dtsUserDao; private DtsUserDao dtsUserDao;
@Reference
UserReadService userReadService;
@Override @Override
public Object findList(String username, String mobile, Integer page, Integer size, String sort, String order) { public Object findList(String username, String mobile, Integer page, Integer size, String sort, String order) {
List<User> userList = dtsUserDao.querySelective(username, mobile, page, size, sort, order); List<User> userList = dtsUserDao.querySelective(username, mobile, page, size, sort, order);
long total = PageInfo.of(userList).getTotal(); long total = PageInfo.of(userList).getTotal();
Map<String, Object> data = new HashMap<>(); Map<String, Object> data = new HashMap<>();
...@@ -35,7 +42,13 @@ public class AdminUserServiceImpl implements AdminUserService { ...@@ -35,7 +42,13 @@ public class AdminUserServiceImpl implements AdminUserService {
@Override @Override
public List<User> findList(UserSearchRequestDto dto) { public List<User> findList(UserSearchRequestDto dto) {
return dtsUserDao.querySelective(dto.getNickname(), null, 1, 1000, "update_time", "desc"); CloudServerResponse<List<com.wwdz.user.api.model.user.User>> cloudServerResponse = userReadService.getUsersByUnick(dto.getNickname());
if (cloudServerResponse.getCode() != 1001) {
return new ArrayList<>();
}
List<com.wwdz.user.api.model.user.User> wUserList = cloudServerResponse.getResult();
List<User> userList = ConvertUtil.convertUserList(wUserList);
return userList;
} }
} }
ch-admin-api/src/main/java/com/wwdz/ch/admin/impl/ConsignSaleServiceImpl.java
View file @ 7356469d
...@@ -54,7 +54,7 @@ public class ConsignSaleServiceImpl implements ConsignSaleService { ...@@ -54,7 +54,7 @@ public class ConsignSaleServiceImpl implements ConsignSaleService {
@Override @Override
public Result findList(ConsignSaleRequestDto dto) { public Result findList(ConsignSaleRequestDto dto) {
try { try {
List<ConsignSale> list = consignSaleDao.find(dto); List<ConsignSale> list = consignSaleDao.findByPage(dto);
PageInfo<ConsignSale> pageInfo = new PageInfo<>(list); PageInfo<ConsignSale> pageInfo = new PageInfo<>(list);
if (CollectionUtils.isEmpty(list)) { if (CollectionUtils.isEmpty(list)) {
return Result.success(); return Result.success();
......
ch-core/pom.xml
View file @ 7356469d
...@@ -145,17 +145,7 @@ ...@@ -145,17 +145,7 @@
</dependency> </dependency>
<dependency>
<groupId>com.alibaba.boot</groupId>
<artifactId>dubbo-spring-boot-starter</artifactId>
<version>0.2.0</version>
<exclusions>
<exclusion>
<artifactId>pagehelper</artifactId>
<groupId>com.github.pagehelper</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency> <dependency>
<groupId>jakarta.json</groupId> <groupId>jakarta.json</groupId>
...@@ -201,45 +191,16 @@ ...@@ -201,45 +191,16 @@
</dependency> </dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo</artifactId>
<version>2.7.6.1.0-ext</version>
</dependency>
<dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-recipes</artifactId>
<version>2.13.0</version>
</dependency>
<!-- <dependency> <!-- <dependency>
<groupId>org.apache.dubbo</groupId> <groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-wwdz</artifactId> <artifactId>dubbo-wwdz</artifactId>
<version>2.7.6.1.0-ext</version> <version>2.7.6.1.0-ext</version>
</dependency>--> </dependency>-->
<dependency>
<groupId>com.wwdz.user</groupId>
<artifactId>user-api</artifactId>
<version>${user-api.version}</version>
<exclusions>
<exclusion>
<artifactId>sentinel-core-ext</artifactId>
<groupId>com.alibaba.csp</groupId>
</exclusion>
<exclusion>
<artifactId>sentinel-core</artifactId>
<groupId>com.alibaba.csp</groupId>
</exclusion>
<exclusion>
<artifactId>apollo-client</artifactId>
<groupId>com.ctrip.framework.apollo</groupId>
</exclusion>
<exclusion>
<artifactId>arch-config</artifactId>
<groupId>com.wwdz.arch</groupId>
</exclusion>
</exclusions>
</dependency>
<!-- <dependency> <!-- <dependency>
<groupId>com.wwdz.mall</groupId> <groupId>com.wwdz.mall</groupId>
...@@ -257,29 +218,7 @@ ...@@ -257,29 +218,7 @@
</exclusions> </exclusions>
</dependency>--> </dependency>-->
<dependency>
<groupId>com.wwdz.user</groupId>
<artifactId>user-api</artifactId>
<version>${user-api.version}</version>
<exclusions>
<exclusion>
<artifactId>sentinel-core-ext</artifactId>
<groupId>com.alibaba.csp</groupId>
</exclusion>
<exclusion>
<artifactId>sentinel-core</artifactId>
<groupId>com.alibaba.csp</groupId>
</exclusion>
<exclusion>
<artifactId>apollo-client</artifactId>
<groupId>com.ctrip.framework.apollo</groupId>
</exclusion>
<exclusion>
<artifactId>arch-config</artifactId>
<groupId>com.wwdz.arch</groupId>
</exclusion>
</exclusions>
</dependency>
<!-- <dependency> <!-- <dependency>
<groupId>com.wwdz.arch</groupId> <groupId>com.wwdz.arch</groupId>
......
ch-core/src/main/java/com/wwdz/ch/core/type/UserTypeEnum.java
View file @ 7356469d
...@@ -19,7 +19,7 @@ public enum UserTypeEnum { ...@@ -19,7 +19,7 @@ public enum UserTypeEnum {
this.desc = desc; this.desc = desc;
} }
public static UserTypeEnum getInstance(Byte level2) { public static UserTypeEnum getInstance(Integer level2) {
if (level2 != null) { if (level2 != null) {
for (UserTypeEnum tmp : UserTypeEnum.values()) { for (UserTypeEnum tmp : UserTypeEnum.values()) {
if (tmp.level.intValue() == level2.intValue()) { if (tmp.level.intValue() == level2.intValue()) {
......
ch-core/src/main/java/com/wwdz/ch/core/util/CacheUtil.java
View file @ 7356469d
...@@ -132,17 +132,27 @@ public class CacheUtil { ...@@ -132,17 +132,27 @@ public class CacheUtil {
* @return * @return
*/ */
public String getAppletUserList(long key) { public String getAppletUserList(long key) {
/* User user = dtsUserDao.findById(key);
return user.getNickname();*/
List<User> userList = dtsUserDao.findAll(); List<User> userList = dtsUserDao.findAll();
Map<Long, String> map = userList.stream().collect(Collectors.toMap(User::getId, User::getNickname, (k1, k2) -> k2)); Map<Long, String> map = userList.stream().collect(Collectors.toMap(User::getId, User::getNickname, (k1, k2) -> k2));
return map.get(key); return map.get(key);
} }
/* public String getAppletUserList(long key) {
List<User> userList = dtsUserDao.findAll();
Map<Long, String> map = userList.stream().collect(Collectors.toMap(User::getId, User::getNickname, (k1, k2) -> k2));
return map.get(key);
}*/
/** /**
* 查询小程序会员 * 查询小程序会员
* @return * @return
*/ */
public User getAppletUsers(long key) { public User getAppletUsers(long key) {
/* User user = dtsUserDao.findById(key);
return user;*/
List<User> userList = dtsUserDao.findAll(); List<User> userList = dtsUserDao.findAll();
Map<Long, User> map = userList.stream().collect(Collectors.toMap(User::getId, Function.identity(), (k1, k2) -> k2)); Map<Long, User> map = userList.stream().collect(Collectors.toMap(User::getId, Function.identity(), (k1, k2) -> k2));
return map.get(key); return map.get(key);
......
ch-core/src/main/java/com/wwdz/ch/core/util/ConvertUtil.java 0 → 100644
View file @ 7356469d
package com.wwdz.ch.core.util;
import com.wwdz.ch.db.domain.User;
import org.springframework.util.ObjectUtils;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
public class ConvertUtil {
public static User convertUser(com.wwdz.user.api.model.user.User wuser){
User user = new User();
user.setId(wuser.getUserId());
user.setUsername(wuser.getUname());
user.setPassword(wuser.getPassword());
user.setGender(wuser.getGender());
if (!ObjectUtils.isEmpty(wuser.getBirthday())) {
user.setBirthday(new Date(wuser.getBirthday() * 1000L));
}
user.setUserLevel(wuser.getLevel());
if (!ObjectUtils.isEmpty(wuser.getBirthday())) {
user.setLastLoginTime(new Date(wuser.getLastLoginTime() * 1000L));
}
user.setNickname(wuser.getUnick());
user.setMobile(wuser.getPhone());
user.setAvatar("https://cdn.wanwudezhi.com" + wuser.getAvatar());
user.setWeixinOpenid(wuser.getOpenId());
user.setWeixinUnionid(wuser.getUnionId());
user.setStatus(wuser.getStatus());
user.setDeleted(wuser.getIsDeleted() == 1 ? true : false);
return user;
}
public static List<User> convertUserList(List<com.wwdz.user.api.model.user.User> wusers){
List<User> userList = new ArrayList<>();
wusers.forEach(wuser ->{
User user = convertUser(wuser);
userList.add(user);
});
return userList;
}
}
ch-dao/pom.xml
View file @ 7356469d
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
<artifactId>ch-dao</artifactId> <artifactId>ch-dao</artifactId>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<user-api.version>1.9.33</user-api.version>
</properties> </properties>
<dependencies> <dependencies>
...@@ -183,6 +184,54 @@ ...@@ -183,6 +184,54 @@
<artifactId>junit</artifactId> <artifactId>junit</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>com.alibaba.boot</groupId>
<artifactId>dubbo-spring-boot-starter</artifactId>
<version>0.2.0</version>
<exclusions>
<exclusion>
<artifactId>pagehelper</artifactId>
<groupId>com.github.pagehelper</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.wwdz.user</groupId>
<artifactId>user-api</artifactId>
<version>${user-api.version}</version>
<exclusions>
<exclusion>
<artifactId>sentinel-core-ext</artifactId>
<groupId>com.alibaba.csp</groupId>
</exclusion>
<exclusion>
<artifactId>sentinel-core</artifactId>
<groupId>com.alibaba.csp</groupId>
</exclusion>
<exclusion>
<artifactId>apollo-client</artifactId>
<groupId>com.ctrip.framework.apollo</groupId>
</exclusion>
<exclusion>
<artifactId>arch-config</artifactId>
<groupId>com.wwdz.arch</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo</artifactId>
<version>2.7.6.1.0-ext</version>
</dependency>
<dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-recipes</artifactId>
<version>2.13.0</version>
</dependency>
</dependencies> </dependencies>
......
ch-dao/src/main/java/com/wwdz/ch/db/dao/ConsignSaleDao.java
View file @ 7356469d
...@@ -27,11 +27,17 @@ public interface ConsignSaleDao { ...@@ -27,11 +27,17 @@ public interface ConsignSaleDao {
ConsignSale findById(String saleId); ConsignSale findById(String saleId);
/**
* 根据商品id查询寄售单
* @param itemId
* @return
*/
List<ConsignSale> findByItemId(long itemId);
/** /**
* *
* @param dto * @param dto
* @return * @return
*/ */
List<ConsignSale> find(ConsignSaleRequestDto dto); List<ConsignSale> findByPage(ConsignSaleRequestDto dto);
} }
ch-dao/src/main/java/com/wwdz/ch/db/domain/User.java
View file @ 7356469d
...@@ -4,9 +4,12 @@ import java.io.Serializable; ...@@ -4,9 +4,12 @@ import java.io.Serializable;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Date; import java.util.Date;
import java.util.List;
import com.xxdxxs.entity.Entity; import com.xxdxxs.entity.Entity;
import lombok.Data; import lombok.Data;
import org.springframework.util.ObjectUtils;
import org.springframework.util.StringUtils;
/** /**
* @author shiyu * @author shiyu
...@@ -47,7 +50,7 @@ public class User implements Entity { ...@@ -47,7 +50,7 @@ public class User implements Entity {
/** /**
* 性别：0 未知， 1男， 1 女 * 性别：0 未知， 1男， 1 女
*/ */
private Byte gender; private Integer gender;
/** /**
* 生日 * 生日
...@@ -67,7 +70,7 @@ public class User implements Entity { ...@@ -67,7 +70,7 @@ public class User implements Entity {
/** /**
* 用户层级 0 普通用户，1 VIP用户，2 区域代理用户 * 用户层级 0 普通用户，1 VIP用户，2 区域代理用户
*/ */
private Byte userLevel; private Integer userLevel;
/** /**
* 用户昵称或网络名称 * 用户昵称或网络名称
...@@ -117,7 +120,7 @@ public class User implements Entity { ...@@ -117,7 +120,7 @@ public class User implements Entity {
/** /**
* 0 可用, 1 禁用, 2 注销 * 0 可用, 1 禁用, 2 注销
*/ */
private Byte status; private Integer status;
/** /**
* 创建时间 * 创建时间
...@@ -143,6 +146,78 @@ public class User implements Entity { ...@@ -143,6 +146,78 @@ public class User implements Entity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
public static User of(com.wwdz.user.api.model.user.User wuser) {
return convertUser(wuser);
}
public static List<User> ofList(List<com.wwdz.user.api.model.user.User> wusers) {
return convertUserList(wusers);
}
public static User convertUser(com.wwdz.user.api.model.user.User wuser){
User user = new User();
user.setId(wuser.getUserId());
user.setUsername(wuser.getUname());
user.setPassword(wuser.getPassword());
user.setGender(wuser.getGender());
if (!ObjectUtils.isEmpty(wuser.getBirthday())) {
user.setBirthday(new Date(wuser.getBirthday() * 1000L));
}
user.setUserLevel(wuser.getLevel());
if (!ObjectUtils.isEmpty(wuser.getLastLoginTime())) {
user.setLastLoginTime(new Date(wuser.getLastLoginTime() * 1000L));
}
user.setNickname(wuser.getUnick());
user.setMobile(wuser.getPhone());
user.setAvatar("https://cdn.wanwudezhi.com" + wuser.getAvatar());
user.setWeixinOpenid(wuser.getOpenId());
user.setWeixinUnionid(wuser.getUnionId());
user.setStatus(wuser.getStatus());
user.setDeleted(wuser.getIsDeleted() == 1 ? true : false);
return user;
}
public static List<User> convertUserList(List<com.wwdz.user.api.model.user.User> wusers){
List<User> userList = new ArrayList<>();
wusers.forEach(wuser ->{
User user = convertUser(wuser);
userList.add(user);
});
return userList;
}
public static com.wwdz.user.api.model.user.User convertToWWDZUser(User user){
com.wwdz.user.api.model.user.User wuser = new com.wwdz.user.api.model.user.User();
wuser.setUserId(user.getId());
wuser.setUname(user.getUsername());
wuser.setPassword(user.getPassword());
wuser.setGender(user.getGender());
if (!ObjectUtils.isEmpty(user.getBirthday())) {
wuser.setBirthday((int) (user.getBirthday().getTime() / 1000));
}
wuser.setLevel(user.getUserLevel());
if (!ObjectUtils.isEmpty(user.getLastLoginTime())) {
wuser.setLastLoginTime((int)(user.getLastLoginTime().getTime() / 1000));
}
wuser.setPhone(user.getMobile());
if (StringUtils.hasLength(user.getAvatar()) && user.getAvatar().contains("https://cdn.wanwudezhi.com")) {
wuser.setAvatar(user.getAvatar().replace("https://cdn.wanwudezhi.com", ""));
}
wuser.setUnick(user.getNickname());
wuser.setOpenId(user.getWeixinOpenid());
wuser.setUnionId(user.getWeixinUnionid());
wuser.setIsDeleted(0);
return wuser;
}
@Override @Override
public String toString() { public String toString() {
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
......
ch-dao/src/main/java/com/wwdz/ch/db/impl/ConsignSaleDaoImpl.java
View file @ 7356469d
...@@ -42,9 +42,18 @@ public class ConsignSaleDaoImpl implements ConsignSaleDao { ...@@ -42,9 +42,18 @@ public class ConsignSaleDaoImpl implements ConsignSaleDao {
return consignSaleMapper.selectOneByExample(example); return consignSaleMapper.selectOneByExample(example);
} }
@Override
public List<ConsignSale> findByItemId(long itemId) {
ConsignSaleExample example = new ConsignSaleExample();
ConsignSaleExample.Criteria criteria = example.createCriteria();
criteria.andItemIdEqualTo(itemId);
return consignSaleMapper.selectByExample(example);
}
@Override @Override
public List<ConsignSale> find(ConsignSaleRequestDto dto) { public List<ConsignSale> findByPage(ConsignSaleRequestDto dto) {
ConsignSaleExample example = new ConsignSaleExample(); ConsignSaleExample example = new ConsignSaleExample();
ConsignSaleExample.Criteria criteria = example.createCriteria(); ConsignSaleExample.Criteria criteria = example.createCriteria();
JdbcHelper.ifPresent(dto.getSaleId(), criteria::andSaleIdEqualTo); JdbcHelper.ifPresent(dto.getSaleId(), criteria::andSaleIdEqualTo);
......
ch-dao/src/main/java/com/wwdz/ch/db/impl/dts/DtsUserDaoImpl.java
View file @ 7356469d
package com.wwdz.ch.db.impl.dts; package com.wwdz.ch.db.impl.dts;
import com.alibaba.dubbo.config.annotation.Reference;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.wwdz.ch.db.bean.DayStatis; import com.wwdz.ch.db.bean.DayStatis;
import com.wwdz.ch.db.dao.dts.DtsUserDao; import com.wwdz.ch.db.dao.dts.DtsUserDao;
import com.wwdz.ch.db.domain.User; import com.wwdz.ch.db.domain.User;
import com.wwdz.ch.db.domain.UserExample; import com.wwdz.ch.db.domain.UserExample;
import com.wwdz.ch.db.domain.UserVo; import com.wwdz.ch.db.domain.UserVo;
import com.wwdz.ch.db.dto.request.UserSearchRequestDto;
import com.wwdz.ch.db.mapper.UserAccountObsoleteMapper; import com.wwdz.ch.db.mapper.UserAccountObsoleteMapper;
import com.wwdz.ch.db.mapper.UserMapper; import com.wwdz.ch.db.mapper.UserMapper;
import com.wwdz.ch.db.mapper.ex.StatMapper; import com.wwdz.ch.db.mapper.ex.StatMapper;
import com.xxdxxs.db.component.JdbcHelper; import com.wwdz.mall.common.vo.response.CloudServerResponse;
import com.wwdz.user.api.service.user.UserReadService;
import com.wwdz.user.api.service.user.UserWriteService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
...@@ -30,43 +33,60 @@ public class DtsUserDaoImpl implements DtsUserDao { ...@@ -30,43 +33,60 @@ public class DtsUserDaoImpl implements DtsUserDao {
@Resource @Resource
private StatMapper statMapper; private StatMapper statMapper;
@Reference
UserReadService userReadService;
@Reference
UserWriteService userWriteService;
@Override @Override
public User findById(Long userId) { public User findById(Long userId) {
return userMapper.selectByPrimaryKey(userId); CloudServerResponse<com.wwdz.user.api.model.user.User> cloudServerResponse = userReadService.getUserIsNotDelete(userId);
if (cloudServerResponse.getCode() != 1001) {
return new User();
}
com.wwdz.user.api.model.user.User wUser = cloudServerResponse.getResult();
return User.of(wUser);
} }
@Override @Override
public UserVo findUserVoById(Long userId) { public UserVo findUserVoById(Long userId) {
User user = findById(userId); CloudServerResponse<com.wwdz.user.api.model.user.User> cloudServerResponse = userReadService.getUserIsNotDelete(userId);
if (cloudServerResponse.getCode() != 1001) {
return new UserVo();
}
com.wwdz.user.api.model.user.User wUser = cloudServerResponse.getResult();
UserVo userVo = new UserVo(); UserVo userVo = new UserVo();
userVo.setNickname(user.getNickname()); userVo.setNickname(wUser.getUnick());
userVo.setAvatar(user.getAvatar()); userVo.setAvatar(wUser.getAvatar());
return userVo; return userVo;
} }
@Override @Override
public User queryByOid(String openId) { public User queryByOid(String openId) {
UserExample example = new UserExample(); CloudServerResponse<com.wwdz.user.api.model.user.User> cloudServerResponse = userReadService.getUserByOpenIdOrUnionId(null, openId);
example.or().andWeixinOpenidEqualTo(openId).andDeletedEqualTo(false); if (cloudServerResponse.getCode() != 1001) {
return userMapper.selectOneByExample(example); return new User();
}
com.wwdz.user.api.model.user.User wUser = cloudServerResponse.getResult();
return User.of(wUser);
} }
@Override @Override
public void add(User user) { public void add(User user) {
user.setAddTime(new Date()); userWriteService.add(User.convertToWWDZUser(user));
user.setUpdateTime(new Date());
userMapper.insertSelective(user);
} }
@Override @Override
public int updateById(User user) { public int updateById(User user) {
user.setUpdateTime(new Date()); CloudServerResponse<Integer> cloudServerResponse = userWriteService.updateByUserId(User.convertToWWDZUser(user));
return userMapper.updateByPrimaryKeySelective(user); return cloudServerResponse.getResult();
} }
@Override @Override
public List<User> querySelective(String username, String mobile, Integer page, Integer size, String sort, public List<User> querySelective(String username, String mobile, Integer page, Integer size, String sort,
String order) { String order) {
UserExample example = new UserExample(); UserExample example = new UserExample();
UserExample.Criteria criteria = example.createCriteria(); UserExample.Criteria criteria = example.createCriteria();
...@@ -96,30 +116,55 @@ public class DtsUserDaoImpl implements DtsUserDao { ...@@ -96,30 +116,55 @@ public class DtsUserDaoImpl implements DtsUserDao {
@Override @Override
public List<User> queryByUsername(String username) { public List<User> queryByUsername(String username) {
List<User> userList = new ArrayList<>();
CloudServerResponse<com.wwdz.user.api.model.user.User> cloudServerResponse = userReadService.getUserByName(username);
com.wwdz.user.api.model.user.User wUser = cloudServerResponse.getResult();
if (ObjectUtils.isEmpty(cloudServerResponse.getResult())) {
return userList;
}
userList.add(User.of(wUser));
return userList;
/*
UserExample example = new UserExample(); UserExample example = new UserExample();
example.or().andUsernameEqualTo(username).andDeletedEqualTo(false); example.or().andUsernameEqualTo(username).andDeletedEqualTo(false);
return userMapper.selectByExample(example); return userMapper.selectByExample(example);*/
} }
@Override @Override
public boolean checkByUsername(String username) { public boolean checkByUsername(String username) {
UserExample example = new UserExample(); CloudServerResponse<com.wwdz.user.api.model.user.User> cloudServerResponse = userReadService.getUserByName(username);
if (ObjectUtils.isEmpty(cloudServerResponse.getResult())) {
return false;
}
return true;
/*UserExample example = new UserExample();
example.or().andUsernameEqualTo(username).andDeletedEqualTo(false); example.or().andUsernameEqualTo(username).andDeletedEqualTo(false);
return userMapper.countByExample(example) != 0; return userMapper.countByExample(example) != 0;*/
} }
@Override @Override
public List<User> queryByMobile(String mobile) { public List<User> queryByMobile(String mobile) {
UserExample example = new UserExample(); List<User> userList = new ArrayList<>();
example.or().andMobileEqualTo(mobile).andDeletedEqualTo(false); CloudServerResponse<com.wwdz.user.api.model.user.User> cloudServerResponse = userReadService.getByPhone(mobile);
return userMapper.selectByExample(example); if (cloudServerResponse.getCode() != 1001) {
return userList;
}
com.wwdz.user.api.model.user.User wUser = cloudServerResponse.getResult();
userList.add(User.of(wUser));
return userList;
} }
@Override @Override
public List<User> queryByOpenid(String openid) { public List<User> queryByOpenid(String openid) {
UserExample example = new UserExample(); List<User> userList = new ArrayList<>();
example.or().andWeixinOpenidEqualTo(openid).andDeletedEqualTo(false); CloudServerResponse<com.wwdz.user.api.model.user.User> cloudServerResponse = userReadService.getUserByOpenIdOrUnionId(null, openid);
return userMapper.selectByExample(example); if (cloudServerResponse.getCode() != 1001) {
return userList;
}
com.wwdz.user.api.model.user.User wUser = cloudServerResponse.getResult();
userList.add(User.of(wUser));
return userList;
} }
@Override @Override
......
ch-wx-api/src/main/java/com/wwdz/ch/wx/dao/UserInfo.java
View file @ 7356469d
package com.wwdz.ch.wx.dao; package com.wwdz.ch.wx.dao;
import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
/** /**
...@@ -8,6 +10,7 @@ import java.io.Serializable; ...@@ -8,6 +10,7 @@ import java.io.Serializable;
* @author CHENBO * @author CHENBO
* @since 1.0.0 * @since 1.0.0
*/ */
@Data
public class UserInfo implements Serializable { public class UserInfo implements Serializable {
private static final long serialVersionUID = -5813029516433359765L; private static final long serialVersionUID = -5813029516433359765L;
...@@ -19,12 +22,12 @@ public class UserInfo implements Serializable { ...@@ -19,12 +22,12 @@ public class UserInfo implements Serializable {
private String province; private String province;
private String city; private String city;
private String language; private String language;
private Byte gender; private Integer gender;
private String phone; private String phone;
private Byte userLevel;// 用户层级 0 普通用户，1 VIP用户，2 区域代理用户 private Integer userLevel;// 用户层级 0 普通用户，1 VIP用户，2 区域代理用户
private String userLevelDesc;// 代理用户描述 private String userLevelDesc;// 代理用户描述
private Byte status;//状态 private Integer status;//状态
private String registerDate;//注册日期 private String registerDate;//注册日期
// 微信号 // 微信号
private String wechatId; private String wechatId;
...@@ -40,204 +43,6 @@ public class UserInfo implements Serializable { ...@@ -40,204 +43,6 @@ public class UserInfo implements Serializable {
private String profile; private String profile;
private String background; private String background;
public String getCountry() {
return country;
}
public void setCountry(String country) {
this.country = country;
}
public String getProvince() {
return province;
}
public void setProvince(String province) {
this.province = province;
}
public String getCity() {
return city;
}
public void setCity(String city) {
this.city = city;
}
public String getLanguage() {
return language;
}
public void setLanguage(String language) {
this.language = language;
}
public Byte getGender() {
return gender;
}
public void setGender(Byte gender) {
this.gender = gender;
}
public String getNickName() {
return nickName;
}
public void setNickName(String nickName) {
this.nickName = nickName;
}
public String getAvatarUrl() {
return avatarUrl;
}
public void setAvatarUrl(String avatarUrl) {
this.avatarUrl = avatarUrl;
}
public Long getUserId() {
return userId;
}
public void setUserId(Long userId) {
this.userId = userId;
}
public String getPhone() {
return phone;
}
public void setPhone(String phone) {
this.phone = phone;
}
public String getWechatId() {
return wechatId;
}
public void setWechatId(String wechatId) {
this.wechatId = phone;
}
public Byte getUserLevel() {
return userLevel;
}
public void setUserLevel(Byte userLevel) {
this.userLevel = userLevel;
}
public String getUserLevelDesc() {
return userLevelDesc;
}
public void setUserLevelDesc(String userLevelDesc) {
this.userLevelDesc = userLevelDesc;
}
public String getRegisterDate() {
return registerDate;
}
public void setRegisterDate(String registerDate) {
this.registerDate = registerDate;
}
public Byte getStatus() {
return status;
}
public void setStatus(Byte status) {
this.status = status;
}
public String getFollowersNumber() {
return followersNumber;
}
public void setFollowersNumber(String followersNumber) {
this.followersNumber = followersNumber;
}
public String getCollectionsViewsNumber() {
return collectionsViewsNumber;
}
public void setCollectionsViewsNumber(String collectionsViewsNumber) {
this.collectionsViewsNumber = collectionsViewsNumber;
}
public String getFansNumber() {
return fansNumber;
}
public void setFansNumber(String fansNumber) {
this.fansNumber = fansNumber;
}
public long getCollectionsNumber() {
return collectionsNumber;
}
public void setCollectionsNumber(long collectionsNumber) {
this.collectionsNumber = collectionsNumber;
}
public long getViewsNumber() {
return viewsNumber;
}
public void setViewsNumber(long viewsNumber) {
this.viewsNumber = viewsNumber;
}
public long getAllNumber() {
return allNumber;
}
public void setAllNumber(long allNumber) {
this.allNumber = allNumber;
}
public long getPrivacyNumber() {
return privacyNumber;
}
public void setPrivacyNumber(long privacyNumber) {
this.privacyNumber = privacyNumber;
}
public Boolean getIsFollowed() {
return isFollowed;
}
public void setIsFollowed(Boolean isFollowed) {
this.isFollowed = isFollowed;
}
public Integer getFollowedId() {
return followedId;
}
public void setFollowedId(Integer followedId) {
this.followedId = followedId;
}
public String getProfile() {
return profile;
}
public void setProfile(String profile) {
this.profile = profile;
}
public String getBackground() {
return background;
}
public void setBackground(String background) {
this.background = background;
}
} }
ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/ConsignSaleServiceImpl.java
View file @ 7356469d
...@@ -14,7 +14,6 @@ import com.wwdz.ch.db.dao.ItemDao; ...@@ -14,7 +14,6 @@ import com.wwdz.ch.db.dao.ItemDao;
import com.wwdz.ch.db.domain.ConsignSale; import com.wwdz.ch.db.domain.ConsignSale;
import com.wwdz.ch.db.domain.ConsignSaleRecord; import com.wwdz.ch.db.domain.ConsignSaleRecord;
import com.wwdz.ch.db.domain.Item; import com.wwdz.ch.db.domain.Item;
import com.wwdz.ch.db.domain.UserItemsRelation;
import com.wwdz.ch.db.dto.request.CoinRequestDto; import com.wwdz.ch.db.dto.request.CoinRequestDto;
import com.wwdz.ch.db.dto.request.ConsignSaleRequestDto; import com.wwdz.ch.db.dto.request.ConsignSaleRequestDto;
import com.wwdz.ch.wx.service.ConsignSaleService; import com.wwdz.ch.wx.service.ConsignSaleService;
...@@ -121,7 +120,7 @@ public class ConsignSaleServiceImpl implements ConsignSaleService { ...@@ -121,7 +120,7 @@ public class ConsignSaleServiceImpl implements ConsignSaleService {
dto.setSaleId(dto.getSearchParam()); dto.setSaleId(dto.getSearchParam());
} }
} }
List<ConsignSale> list = consignSaleDao.find(dto); List<ConsignSale> list = consignSaleDao.findByPage(dto);
PageInfo<ConsignSale> pageInfo = new PageInfo<>(list); PageInfo<ConsignSale> pageInfo = new PageInfo<>(list);
if (CollectionUtils.isEmpty(list)) { if (CollectionUtils.isEmpty(list)) {
return Result.success(); return Result.success();
......
ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/ItemServiceImpl.java
View file @ 7356469d
...@@ -14,6 +14,7 @@ import com.wwdz.ch.db.bean.ItemOfEs; ...@@ -14,6 +14,7 @@ import com.wwdz.ch.db.bean.ItemOfEs;
import com.wwdz.ch.db.dao.*; import com.wwdz.ch.db.dao.*;
import com.wwdz.ch.db.domain.*; import com.wwdz.ch.db.domain.*;
import com.wwdz.ch.db.dto.request.CoinRequestDto; import com.wwdz.ch.db.dto.request.CoinRequestDto;
import com.wwdz.ch.db.dto.request.ConsignSaleRequestDto;
import com.wwdz.ch.db.dto.request.EsSearchRequestDto; import com.wwdz.ch.db.dto.request.EsSearchRequestDto;
import com.wwdz.ch.db.dto.request.FollowFansRecordRequestDto; import com.wwdz.ch.db.dto.request.FollowFansRecordRequestDto;
import com.wwdz.ch.db.es.ItemEsDao; import com.wwdz.ch.db.es.ItemEsDao;
...@@ -57,6 +58,7 @@ import java.io.ByteArrayInputStream; ...@@ -57,6 +58,7 @@ import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.lang.System;
import java.net.URL; import java.net.URL;
import java.text.MessageFormat; import java.text.MessageFormat;
import java.time.LocalDateTime; import java.time.LocalDateTime;
...@@ -139,6 +141,9 @@ public class ItemServiceImpl implements ItemService { ...@@ -139,6 +141,9 @@ public class ItemServiceImpl implements ItemService {
@Autowired @Autowired
WxAppletApi wxAppletApi; WxAppletApi wxAppletApi;
@Autowired
ConsignSaleDao consignSaleDao;
@Override @Override
public Result nameList(ItemRequestDto dto) { public Result nameList(ItemRequestDto dto) {
try { try {
...@@ -939,6 +944,7 @@ public class ItemServiceImpl implements ItemService { ...@@ -939,6 +944,7 @@ public class ItemServiceImpl implements ItemService {
} }
} }
@Override @Override
public Result update(ItemRequestDto dto) { public Result update(ItemRequestDto dto) {
try { try {
...@@ -946,6 +952,11 @@ public class ItemServiceImpl implements ItemService { ...@@ -946,6 +952,11 @@ public class ItemServiceImpl implements ItemService {
if (Objects.isNull(item)) { if (Objects.isNull(item)) {
return Result.failed("数据异常，该藏品不存在"); return Result.failed("数据异常，该藏品不存在");
} }
List<ConsignSale> consignSales = consignSaleDao.findByItemId(dto.getItemId());
long count = consignSales.stream().filter(consignSale -> consignSale.getCustomState().intValue() == ConsignSaleEnum.SaleForUserStateEnum.CONSIGN_SALEING.getCode()).count();
if (count > 0) {
return Result.failed("该藏品正在寄售中，不能编辑");
}
item.setName(dto.getName()); item.setName(dto.getName());
item.setCid(Objects.isNull(dto.getCid()) ? 0 : dto.getCid()); item.setCid(Objects.isNull(dto.getCid()) ? 0 : dto.getCid());
......
ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/UserServiceImpl.java
View file @ 7356469d
...@@ -546,9 +546,9 @@ public class UserServiceImpl implements UserService { ...@@ -546,9 +546,9 @@ public class UserServiceImpl implements UserService {
break; break;
} }
} }
user.setGender((byte) 0); user.setGender(0);
user.setUserLevel((byte) 0); user.setUserLevel(0);
user.setStatus((byte) 0); user.setStatus(0);
user.setDeleted(false); user.setDeleted(false);
user.setAddTime(now); user.setAddTime(now);
user.setUpdateTime(now); user.setUpdateTime(now);
......
pom.xml
View file @ 7356469d
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
<spring-boot-starter-web.version>2.0.4.RELEASE</spring-boot-starter-web.version> <spring-boot-starter-web.version>2.0.4.RELEASE</spring-boot-starter-web.version>
<spring-boot-starter-sercurity.version>2.0.4.RELEASE</spring-boot-starter-sercurity.version> <spring-boot-starter-sercurity.version>2.0.4.RELEASE</spring-boot-starter-sercurity.version>
<mapstruct.version>1.4.2.Final</mapstruct.version> <mapstruct.version>1.4.2.Final</mapstruct.version>
<user-api.version>1.9.33</user-api.version>
</properties> </properties>
...@@ -148,6 +148,7 @@ ...@@ -148,6 +148,7 @@
</dependency> </dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>
<dependencies> <dependencies>
...@@ -169,6 +170,10 @@ ...@@ -169,6 +170,10 @@
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
</dependencies> </dependencies>
<profiles> <profiles>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment