diff --git a/hiver-core/pom.xml b/hiver-core/pom.xml
index d7e7fdb6..9bea1c3b 100644
--- a/hiver-core/pom.xml
+++ b/hiver-core/pom.xml
@@ -170,5 +170,11 @@
pinyin4j
2.5.0
+
+ com.github.binarywang
+ weixin-java-mp
+ 4.6.0
+ compile
+
\ No newline at end of file
diff --git a/hiver-core/src/main/java/cc/hiver/core/dao/UserDao.java b/hiver-core/src/main/java/cc/hiver/core/dao/UserDao.java
index 45f833bb..3914bca6 100644
--- a/hiver-core/src/main/java/cc/hiver/core/dao/UserDao.java
+++ b/hiver-core/src/main/java/cc/hiver/core/dao/UserDao.java
@@ -85,7 +85,20 @@ public interface UserDao extends HiverBaseDao
{
@Query("select u from User u where u.email = ?1 and u.type like %?2% ")
User findByEmailAndType(String email,String type);
- @Query(value = "select s.type,t.id,t.create_by,t.create_time,t.del_flag,t.update_by,t.update_time,t.address,t.avatar,t.description,t.email,t.mobile,t.nickname,t.password,t.sex,t.status,t.username,t.department_id,t.street,t.pass_strength,t.department_title,t.birth,t.invite_code,t.client_id from t_shop_user s left join t_user t on s.user_id = t.id where s.shop_id = ?",nativeQuery = true)
+ @Query(value = "select s.type,t.id,t.create_by,t.create_time,t.del_flag,t.update_by,t.update_time,t.address,t.avatar,t.description,t.email,t.mobile,t.nickname,t.password,t.sex,t.status,t.username,t.department_id,t.street,t.pass_strength,t.department_title,t.birth,t.invite_code,t.client_id,t.mini_program_openid,t.unionid,t.official_account_openid,t.wechat_name from t_shop_user s left join t_user t on s.user_id = t.id where s.shop_id = ?",nativeQuery = true)
List findByShopId( String shopId);
+ @Query("select u from User u where u.unionid = ?1 ")
+ User findByUnionid(String unionid);
+
+ @Query("select u from User u where u.miniProgramOpenid = ?1 ")
+ User findByMiniProgramOpenid(String miniProgramOpenid);
+
+ @Modifying
+ @Query("update User u set u.mobile='' where u.mobile=?1")
+ void setUserPhoneToNull(String userPhone);
+
+ @Modifying
+ @Query("update User u set u.mobile=?1 where u.id=?2")
+ void updateUserPhoneById(String userPhone, String userId);
}
diff --git a/hiver-core/src/main/java/cc/hiver/core/entity/User.java b/hiver-core/src/main/java/cc/hiver/core/entity/User.java
index cf45a31c..9bc7b817 100644
--- a/hiver-core/src/main/java/cc/hiver/core/entity/User.java
+++ b/hiver-core/src/main/java/cc/hiver/core/entity/User.java
@@ -20,7 +20,6 @@ import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
-import javax.validation.constraints.NotNull;
import javax.validation.constraints.Pattern;
import javax.validation.constraints.Size;
import java.util.Date;
@@ -122,4 +121,17 @@ public class User extends HiverBaseEntity {
@Transient
@ApiModelProperty(value = "是否有维护成本权限 1:是；0否")
private Integer shopAdminCost;
+
+
+ @ApiModelProperty(value = "小程序id")
+ private String miniProgramOpenid;
+
+ @ApiModelProperty(value = "微信平台统一id")
+ private String unionid;
+
+ @ApiModelProperty(value = "公众号id")
+ private String officialAccountOpenid;
+
+ @ApiModelProperty(value = "微信昵称")
+ private String wechatName;
}
diff --git a/hiver-core/src/main/java/cc/hiver/core/service/UserService.java b/hiver-core/src/main/java/cc/hiver/core/service/UserService.java
index ba6fc22b..5130b68e 100644
--- a/hiver-core/src/main/java/cc/hiver/core/service/UserService.java
+++ b/hiver-core/src/main/java/cc/hiver/core/service/UserService.java
@@ -3,11 +3,11 @@ package cc.hiver.core.service;
import cc.hiver.core.base.HiverBaseService;
import cc.hiver.core.common.vo.SearchVo;
import cc.hiver.core.entity.User;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage;
+import me.chanjar.weixin.mp.bean.result.WxMpUser;
import org.springframework.cache.annotation.CacheConfig;
-import org.springframework.cache.annotation.Cacheable;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
-import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
import java.util.List;
@@ -43,6 +43,15 @@ public interface UserService extends HiverBaseService {
*/
User findByEmail(String email);
+ /**
+ * 获取用户角色权限
+ * @author 王富康
+ * @date 2024/12/3
+ * @param user
+ * @return User
+ */
+ User userToDTO(User user);
+
/**
* 多条件分页获取用户
*
@@ -107,4 +116,26 @@ public interface UserService extends HiverBaseService {
User findByUserNameAndType(String userName,String type);
User findByMobileAndType(String mobile,String type);
List findByShopId(String shopId);
+
+ /**
+ * 公众号关注
+ * @author 王富康
+ * @date 2024/12/29
+ */
+ void subscribeWxServer(WxMpUser user);
+
+ /**
+ * 取消公众号关注
+ * @author 王富康
+ * @date 2024/12/29
+ */
+ void unSubscribeWxServer(WxMpXmlMessage wxMessage);
+
+ User findByUnionid(String unionid);
+
+ User findByMiniProgramOpenid(String miniProgramOpenid);
+
+ void setUserPhoneToNull(String userPhone);
+
+ void updateUserPhoneById(String userPhone, String userId);
}
diff --git a/hiver-core/src/main/java/cc/hiver/core/serviceimpl/UserServiceImpl.java b/hiver-core/src/main/java/cc/hiver/core/serviceimpl/UserServiceImpl.java
index 7e224c08..c9342859 100644
--- a/hiver-core/src/main/java/cc/hiver/core/serviceimpl/UserServiceImpl.java
+++ b/hiver-core/src/main/java/cc/hiver/core/serviceimpl/UserServiceImpl.java
@@ -1,7 +1,10 @@
package cc.hiver.core.serviceimpl;
import cc.hiver.core.common.constant.CommonConstant;
+import cc.hiver.core.common.constant.UserConstant;
+import cc.hiver.core.common.utils.PageUtil;
import cc.hiver.core.common.utils.SecurityUtil;
+import cc.hiver.core.common.vo.PageVo;
import cc.hiver.core.common.vo.SearchVo;
import cc.hiver.core.dao.UserDao;
import cc.hiver.core.dao.mapper.PermissionMapper;
@@ -9,12 +12,17 @@ import cc.hiver.core.dao.mapper.UserRoleMapper;
import cc.hiver.core.entity.Permission;
import cc.hiver.core.entity.Role;
import cc.hiver.core.entity.User;
+import cc.hiver.core.entity.UserRole;
+import cc.hiver.core.service.RoleService;
+import cc.hiver.core.service.UserRoleService;
import cc.hiver.core.service.UserService;
import cc.hiver.core.vo.PermissionDTO;
import cc.hiver.core.vo.RoleDTO;
import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.CharSequenceUtil;
import lombok.extern.slf4j.Slf4j;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage;
+import me.chanjar.weixin.mp.bean.result.WxMpUser;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
@@ -24,9 +32,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.persistence.criteria.*;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -50,6 +56,12 @@ public class UserServiceImpl implements UserService {
@Autowired
private SecurityUtil securityUtil;
+ @Autowired
+ private UserRoleService userRoleService;
+
+ @Autowired
+ private RoleService roleService;
+
@Override
public UserDao getRepository() {
return userDao;
@@ -57,35 +69,36 @@ public class UserServiceImpl implements UserService {
@Override
public User findByUsername(String username) {
- User user = userDao.findByUsername(username);
+ final User user = userDao.findByUsername(username);
return userToDTO(user);
}
@Override
public User findByMobile(String mobile) {
- User user = userDao.findByMobile(mobile);
+ final User user = userDao.findByMobile(mobile);
return userToDTO(user);
}
@Override
public User findByEmail(String email) {
- User user = userDao.findByEmail(email);
+ final User user = userDao.findByEmail(email);
return userToDTO(user);
}
+ @Override
public User userToDTO(User user) {
if (user == null) {
return null;
}
// 关联角色
- List roleList = userRoleMapper.findByUserId(user.getId());
- List roleDTOList = roleList.stream().map(e -> {
+ final List roleList = userRoleMapper.findByUserId(user.getId());
+ final List roleDTOList = roleList.stream().map(e -> {
return new RoleDTO().setId(e.getId()).setName(e.getName());
}).collect(Collectors.toList());
user.setRoles(roleDTOList);
// 关联权限菜单
- List permissionList = permissionMapper.findByUserId(user.getId());
- List permissionDTOList = permissionList.stream()
+ final List permissionList = permissionMapper.findByUserId(user.getId());
+ final List permissionDTOList = permissionList.stream()
.filter(e -> CommonConstant.PERMISSION_OPERATION.equals(e.getType()))
.map(e -> {
return new PermissionDTO().setTitle(e.getTitle()).setPath(e.getPath());
@@ -100,43 +113,43 @@ public class UserServiceImpl implements UserService {
@Nullable
@Override
public Predicate toPredicate(Root root, CriteriaQuery cq, CriteriaBuilder cb) {
- Path idField = root.get("id");
- Path usernameField = root.get("username");
- Path nicknameField = root.get("nickname");
- Path mobileField = root.get("mobile");
- Path emailField = root.get("email");
- Path departmentIdField = root.get("departmentId");
- Path sexField = root.get("sex");
- Path statusField = root.get("status");
- Path createTimeField = root.get("createTime");
-
- List list = new ArrayList<>();
-
- if (StrUtil.isNotBlank(user.getId())) {
+ final Path idField = root.get("id");
+ final Path usernameField = root.get("username");
+ final Path nicknameField = root.get("nickname");
+ final Path mobileField = root.get("mobile");
+ final Path emailField = root.get("email");
+ final Path departmentIdField = root.get("departmentId");
+ final Path sexField = root.get("sex");
+ final Path statusField = root.get("status");
+ final Path createTimeField = root.get("createTime");
+
+ final List list = new ArrayList<>();
+
+ if (CharSequenceUtil.isNotBlank(user.getId())) {
list.add(cb.equal(idField, user.getId()));
}
// 模糊搜素
- if (StrUtil.isNotBlank(user.getUsername())) {
+ if (CharSequenceUtil.isNotBlank(user.getUsername())) {
list.add(cb.like(usernameField, '%' + user.getUsername() + '%'));
}
- if (StrUtil.isNotBlank(user.getNickname())) {
+ if (CharSequenceUtil.isNotBlank(user.getNickname())) {
list.add(cb.like(nicknameField, '%' + user.getNickname() + '%'));
}
- if (StrUtil.isNotBlank(user.getMobile())) {
+ if (CharSequenceUtil.isNotBlank(user.getMobile())) {
list.add(cb.like(mobileField, '%' + user.getMobile() + '%'));
}
- if (StrUtil.isNotBlank(user.getEmail())) {
+ if (CharSequenceUtil.isNotBlank(user.getEmail())) {
list.add(cb.like(emailField, '%' + user.getEmail() + '%'));
}
// 部门
- if (StrUtil.isNotBlank(user.getDepartmentId())) {
+ if (CharSequenceUtil.isNotBlank(user.getDepartmentId())) {
list.add(cb.equal(departmentIdField, user.getDepartmentId()));
}
// 性别
- if (StrUtil.isNotBlank(user.getSex())) {
+ if (CharSequenceUtil.isNotBlank(user.getSex())) {
list.add(cb.equal(sexField, user.getSex()));
}
// 状态
@@ -144,19 +157,19 @@ public class UserServiceImpl implements UserService {
list.add(cb.equal(statusField, user.getStatus()));
}
// 创建时间
- if (StrUtil.isNotBlank(searchVo.getStartDate()) && StrUtil.isNotBlank(searchVo.getEndDate())) {
- Date start = DateUtil.parse(searchVo.getStartDate());
- Date end = DateUtil.parse(searchVo.getEndDate());
+ if (CharSequenceUtil.isNotBlank(searchVo.getStartDate()) && CharSequenceUtil.isNotBlank(searchVo.getEndDate())) {
+ final Date start = DateUtil.parse(searchVo.getStartDate());
+ final Date end = DateUtil.parse(searchVo.getEndDate());
list.add(cb.between(createTimeField, start, DateUtil.endOfDay(end)));
}
// 数据权限
- List depIds = securityUtil.getDeparmentIds();
+ final List depIds = securityUtil.getDeparmentIds();
if (depIds != null && depIds.size() > 0) {
list.add(departmentIdField.in(depIds));
}
- Predicate[] arr = new Predicate[list.size()];
+ final Predicate[] arr = new Predicate[list.size()];
cq.where(list.toArray(arr));
return null;
}
@@ -169,33 +182,33 @@ public class UserServiceImpl implements UserService {
@Nullable
@Override
public Predicate toPredicate(Root root, CriteriaQuery cq, CriteriaBuilder cb) {
- Path usernameField = root.get("username");
- Path nicknameField = root.get("nickname");
- Path mobileField = root.get("mobile");
- Path sexField = root.get("sex");
- Path statusField = root.get("status");
- Path createTimeField = root.get("createTime");
- Path inviteCodeField = root.get("inviteCode");
+ final Path usernameField = root.get("username");
+ final Path nicknameField = root.get("nickname");
+ final Path mobileField = root.get("mobile");
+ final Path sexField = root.get("sex");
+ final Path statusField = root.get("status");
+ final Path createTimeField = root.get("createTime");
+ final Path inviteCodeField = root.get("inviteCode");
- List list = new ArrayList<>();
+ final List list = new ArrayList<>();
// 模糊搜素
- if (StrUtil.isNotBlank(user.getUsername())) {
+ if (CharSequenceUtil.isNotBlank(user.getUsername())) {
list.add(cb.like(usernameField, '%' + user.getUsername() + '%'));
}
- if (StrUtil.isNotBlank(user.getNickname())) {
+ if (CharSequenceUtil.isNotBlank(user.getNickname())) {
list.add(cb.like(nicknameField, '%' + user.getNickname() + '%'));
}
- if (StrUtil.isNotBlank(user.getMobile())) {
+ if (CharSequenceUtil.isNotBlank(user.getMobile())) {
list.add(cb.like(mobileField, '%' + user.getMobile() + '%'));
}
// 性别
- if (StrUtil.isNotBlank(user.getSex())) {
+ if (CharSequenceUtil.isNotBlank(user.getSex())) {
list.add(cb.equal(sexField, user.getSex()));
}
// 邀请人
- if (StrUtil.isNotBlank(user.getInviteCode())) {
+ if (CharSequenceUtil.isNotBlank(user.getInviteCode())) {
list.add(cb.equal(inviteCodeField, user.getInviteCode()));
}
// 状态
@@ -203,13 +216,13 @@ public class UserServiceImpl implements UserService {
list.add(cb.equal(statusField, user.getStatus()));
}
// 创建时间
- if (StrUtil.isNotBlank(searchVo.getStartDate()) && StrUtil.isNotBlank(searchVo.getEndDate())) {
- Date start = DateUtil.parse(searchVo.getStartDate());
- Date end = DateUtil.parse(searchVo.getEndDate());
+ if (CharSequenceUtil.isNotBlank(searchVo.getStartDate()) && CharSequenceUtil.isNotBlank(searchVo.getEndDate())) {
+ final Date start = DateUtil.parse(searchVo.getStartDate());
+ final Date end = DateUtil.parse(searchVo.getEndDate());
list.add(cb.between(createTimeField, start, DateUtil.endOfDay(end)));
}
- Predicate[] arr = new Predicate[list.size()];
+ final Predicate[] arr = new Predicate[list.size()];
cq.where(list.toArray(arr));
return null;
}
@@ -241,16 +254,86 @@ public class UserServiceImpl implements UserService {
return userDao.findByRoleName(roleName);
}
- public User findByUserNameAndType(String userName,String type){
- User user = userDao.findByUserNameAndType(userName,type);
+ @Override
+ public User findByUserNameAndType(String userName, String type) {
+ final User user = userDao.findByUserNameAndType(userName, type);
return userToDTO(user);
}
- public User findByMobileAndType(String mobile,String type){
- User user = userDao.findByMobileAndType(mobile,type);
+
+ @Override
+ public User findByMobileAndType(String mobile, String type) {
+ final User user = userDao.findByMobileAndType(mobile, type);
return userToDTO(user);
}
- public List findByShopId(String shopId){
+ @Override
+ public List findByShopId(String shopId) {
return userDao.findByShopId(shopId);
}
+
+ @Override
+ public void subscribeWxServer(WxMpUser user) {
+ // 判断是否绑定用户
+ final String unionid = user.getUnionId();
+ final String openid = user.getOpenId();
+ User wechatUser = findByUnionid(unionid);
+ final Map resultMap = new HashMap<>();
+ if (wechatUser != null) {
+ wechatUser.setOfficialAccountOpenid(openid);
+ } else {
+ try {
+ // 新增用户信息
+ wechatUser = new User();
+ wechatUser.setUnionid(unionid);
+ wechatUser.setOfficialAccountOpenid(openid);
+ wechatUser.setStatus(UserConstant.USER_STATUS_NORMAL);
+ wechatUser = save(wechatUser);
+ // 设置用户角色
+ final UserRole userRole = new UserRole();
+ final PageVo pageVo = new PageVo();
+ pageVo.setPageNumber(1);
+ pageVo.setPageSize(1);
+ final Page roleCustomer = roleService.findByCondition("ROLE_CUSTOMER", PageUtil.initPage(pageVo));
+ final Role role = roleCustomer.getContent().get(0);
+ //客户角色
+ userRole.setRoleId(role.getId());
+ userRole.setRoleName("客户");
+ userRole.setUserId(wechatUser.getId());
+ userRoleService.save(userRole);
+ // 更新客户信息，绑定登录用户
+ // customerService.updateUserId(wechatVo.getCustomId(),wechatUser.getId());
+ // 返回当前登录人的信息
+ resultMap.put("msg", "新增用户信息，并绑定成功！");
+ // resultMap.put("customId", wechatVo.getCustomId());
+ } catch (Exception e) {
+ log.error("公众号关注出现错误，请查看！" + e.getMessage(), e);
+ }
+ }
+ save(wechatUser);
+ }
+
+ @Override
+ public void unSubscribeWxServer(WxMpXmlMessage wxMessage) {
+
+ }
+
+ @Override
+ public User findByUnionid(String unionid) {
+ return userDao.findByUnionid(unionid);
+ }
+
+ @Override
+ public User findByMiniProgramOpenid(String miniProgramOpenid) {
+ return userDao.findByMiniProgramOpenid(miniProgramOpenid);
+ }
+
+ @Override
+ public void setUserPhoneToNull(String userPhone) {
+ userDao.setUserPhoneToNull(userPhone);
+ }
+
+ @Override
+ public void updateUserPhoneById(String userPhone, String userId) {
+ userDao.updateUserPhoneById(userPhone, userId);
+ }
}
diff --git a/hiver-core/src/main/java/cc/hiver/core/shopprint/controller/ShopPrintController.java b/hiver-core/src/main/java/cc/hiver/core/shopprint/controller/ShopPrintController.java
index 02978caa..3fdfe669 100644
--- a/hiver-core/src/main/java/cc/hiver/core/shopprint/controller/ShopPrintController.java
+++ b/hiver-core/src/main/java/cc/hiver/core/shopprint/controller/ShopPrintController.java
@@ -2,13 +2,9 @@ package cc.hiver.core.shopprint.controller;
import cc.hiver.core.common.utils.ResultUtil;
import cc.hiver.core.common.vo.Result;
-import cc.hiver.core.logisticsroute.entity.LogisticsRoute;
-import cc.hiver.core.logisticsroute.service.LogisticsRouteService;
-import cc.hiver.core.logisticsroute.vo.LogisticsRouteQueryVo;
import cc.hiver.core.shopprint.entity.ShopPrint;
import cc.hiver.core.shopprint.service.ShopPrintService;
import cc.hiver.core.shopprint.vo.ShopPrintQueryVo;
-import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -88,4 +84,12 @@ public class ShopPrintController {
final List result = shopPrintService.getShopPrintList(shopPrintQueryVo);
return new ResultUtil>().setData(result);
}
+
+ // 打印图片
+ @RequestMapping(value = "/printImg", method = RequestMethod.POST)
+ @ApiOperation(value = "打印图片")
+ public Result printImg(String imgPath) {
+ final String result = shopPrintService.printImg(imgPath);
+ return new ResultUtil().setData(result);
+ }
}
diff --git a/hiver-core/src/main/java/cc/hiver/core/shopprint/service/ShopPrintService.java b/hiver-core/src/main/java/cc/hiver/core/shopprint/service/ShopPrintService.java
index b5e61d94..c8817b0a 100644
--- a/hiver-core/src/main/java/cc/hiver/core/shopprint/service/ShopPrintService.java
+++ b/hiver-core/src/main/java/cc/hiver/core/shopprint/service/ShopPrintService.java
@@ -10,4 +10,6 @@ public interface ShopPrintService extends IService {
List getShopPrintList(ShopPrintQueryVo shopPrintQueryVo);
+
+ String printImg(String imgPath);
}
diff --git a/hiver-core/src/main/java/cc/hiver/core/shopprint/service/impl/ShopPrintServiceImpl.java b/hiver-core/src/main/java/cc/hiver/core/shopprint/service/impl/ShopPrintServiceImpl.java
index d8bbf00e..318b3afb 100644
--- a/hiver-core/src/main/java/cc/hiver/core/shopprint/service/impl/ShopPrintServiceImpl.java
+++ b/hiver-core/src/main/java/cc/hiver/core/shopprint/service/impl/ShopPrintServiceImpl.java
@@ -1,19 +1,17 @@
package cc.hiver.core.shopprint.service.impl;
-import cc.hiver.core.logisticsroute.mapper.LogisticsRouteMapper;
-import cc.hiver.core.logisticsroute.service.LogisticsRouteService;
-import cc.hiver.core.logisticsuser.entity.LogisticsUser;
-import cc.hiver.core.logisticsuser.mapper.LogisticsUserMapper;
-import cc.hiver.core.logisticsuser.service.LogisticsUserService;
import cc.hiver.core.shopprint.entity.ShopPrint;
import cc.hiver.core.shopprint.mapper.ShopPrintMapper;
import cc.hiver.core.shopprint.service.ShopPrintService;
import cc.hiver.core.shopprint.vo.ShopPrintQueryVo;
-import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import javax.imageio.ImageIO;
+import java.awt.image.BufferedImage;
+import java.net.URL;
import java.util.List;
/**
@@ -22,6 +20,7 @@ import java.util.List;
* @Date: 2024/10/22 22:01
* @Description:
*/
+@Slf4j
@Service
public class ShopPrintServiceImpl extends ServiceImpl implements ShopPrintService {
@@ -29,8 +28,91 @@ public class ShopPrintServiceImpl extends ServiceImpl getShopPrintList(ShopPrintQueryVo shopPrintQueryVo){
+ public List getShopPrintList(ShopPrintQueryVo shopPrintQueryVo) {
return shopPrintMapper.getShopPrintList(shopPrintQueryVo);
}
+ @Override
+ public String printImg(String imgPath) {
+ final URL url;
+ BufferedImage image = null;
+ try {
+ url = new URL(imgPath);
+ image = ImageIO.read(url);
+ } catch (Exception e) {
+ log.error("读取文件错误: " + e.getMessage());
+ }
+ if (image != null) {
+ return drawGraphic(0,0, image);
+ }
+ return "未读取到图片信息！";
+ }
+
+ public static String drawGraphic(int start_x, int start_y, BufferedImage image) {
+ int width = image.getWidth();
+ int height = image.getHeight();
+
+ int col = (width - 1) / 8 + 1;
+
+ String str = "";
+ byte[] arrayOfByte = new byte[width * height];
+
+ int h = 0;
+ //int b1 = 0;
+ int arrindex = 0;
+ //int m = 0;
+
+
+ while (h < height) {
+ for (int w = 0; w < width; w++) {
+ arrindex = h * col + w / 8;
+ System.out.println("w:" + w + ", h:" + h);
+ if ((image.getRGB(w, h) & 0xFFFFFF) < 3092271) {
+ int n = arrindex;
+ byte[] arrayOfByte1 = arrayOfByte;
+
+ arrayOfByte1[n] = (byte) (arrayOfByte1[n] | 128 >> w % 8);
+ } else {
+ int n = arrindex;
+ byte[] arrayOfByte1 = arrayOfByte;
+
+ arrayOfByte1[n] = (byte) (arrayOfByte1[n] & (128 >> w % 8 ^ 0xFFFFFFFF));
+ }
+ }
+ ++h;
+ //if ((++h - b1) * col >= 1024 || h == height) {
+ // str = bbbb(aaaaaa(arrayOfByte, m, arrindex - m + 1));
+ // m = arrindex + 1;
+ // String str1 = "EG " + col + " " + (h - b1) + " " + start_x + " " + (start_y + b1) + " " + str + "\r\n";
+ //
+ // System.out.println(str1);
+ // //b(str1);
+ // b1 = h;
+ // k++;
+ //}
+ }
+
+ str = toHexString(copy(arrayOfByte, 0, arrindex + 1));
+ System.out.println(str);
+ return str;
+ }
+ static String toHexString(byte[] paramArrayOfbyte) {
+ String str = "";
+ for (int i = 0; i < paramArrayOfbyte.length; i++) {
+ String hex = Integer.toHexString(paramArrayOfbyte[i] & 0xFF);
+ if (hex.length() == 1) {
+ hex = '0' + hex;
+ }
+ str = str + hex;
+ }
+ return str;
+ }
+
+ private static byte[] copy(byte[] paramArrayOfbyte, int start, int length) {
+ byte[] arrayOfByte = new byte[length];
+ for (int i = 0; i < length; i++) {
+ arrayOfByte[i] = paramArrayOfbyte[start + i];
+ }
+ return arrayOfByte;
+ }
}
diff --git a/hiver-core/src/main/java/cc/hiver/core/vo/WechatVo.java b/hiver-core/src/main/java/cc/hiver/core/vo/WechatVo.java
new file mode 100644
index 00000000..bb15a0dd
--- /dev/null
+++ b/hiver-core/src/main/java/cc/hiver/core/vo/WechatVo.java
@@ -0,0 +1,28 @@
+package cc.hiver.core.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(chain = true)
+public class WechatVo {
+
+ @ApiModelProperty(value = "jsCode")
+ private String jsCode;
+
+ @ApiModelProperty(value = "grantType")
+ private String grantType = "authorization_code";
+
+ @ApiModelProperty(value = "customId")
+ private String customId;
+
+ @ApiModelProperty(value = "wechatName")
+ private String wechatName;
+
+ @ApiModelProperty(value = "userType")
+ private String userType;
+
+ @ApiModelProperty(value = "userId")
+ private String userId;
+}
diff --git a/hiver-modules/hiver-base/pom.xml b/hiver-modules/hiver-base/pom.xml
index b2ebf1cf..e53e2d71 100644
--- a/hiver-modules/hiver-base/pom.xml
+++ b/hiver-modules/hiver-base/pom.xml
@@ -16,6 +16,18 @@
1.0-SNAPSHOT
compile
+
+
+ org.apache.httpcomponents
+ httpclient
+ 4.5.13
+
+
+
+ com.github.binarywang
+ weixin-java-mp
+ 4.6.0
+
hiver-base
diff --git a/hiver-modules/hiver-base/src/main/java/cc/hiver/base/controller/manage/UserController.java b/hiver-modules/hiver-base/src/main/java/cc/hiver/base/controller/manage/UserController.java
index 22dc6119..8d9a3216 100644
--- a/hiver-modules/hiver-base/src/main/java/cc/hiver/base/controller/manage/UserController.java
+++ b/hiver-modules/hiver-base/src/main/java/cc/hiver/base/controller/manage/UserController.java
@@ -1,9 +1,12 @@
package cc.hiver.base.controller.manage;
import cc.hiver.base.async.AddMessage;
+import cc.hiver.core.common.annotation.SystemLog;
import cc.hiver.core.common.constant.CommonConstant;
+import cc.hiver.core.common.constant.MemberConstant;
import cc.hiver.core.common.constant.SecurityConstant;
import cc.hiver.core.common.constant.UserConstant;
+import cc.hiver.core.common.enums.LogType;
import cc.hiver.core.common.redis.RedisTemplateHelper;
import cc.hiver.core.common.utils.*;
import cc.hiver.core.common.vo.PageVo;
@@ -17,13 +20,22 @@ import cc.hiver.core.entity.UserRole;
import cc.hiver.core.service.*;
import cc.hiver.core.service.mybatis.IUserRoleService;
import cc.hiver.core.vo.RoleDTO;
+import cc.hiver.core.vo.WechatVo;
+import cc.hiver.mall.entity.Shop;
+import cc.hiver.mall.entity.ShopUser;
+import cc.hiver.mall.service.ShopService;
+import cc.hiver.mall.service.ShopUserService;
import cc.hiver.mall.service.mybatis.CustomerService;
import cn.hutool.core.text.CharSequenceUtil;
+import cn.hutool.http.HttpUtil;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.cache.annotation.CacheConfig;
import org.springframework.cache.annotation.CacheEvict;
import org.springframework.data.domain.Page;
@@ -36,9 +48,7 @@ import javax.persistence.PersistenceContext;
import javax.validation.Valid;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -91,6 +101,30 @@ public class UserController {
@Autowired
private CustomerService customerService;
+ @Value("${app.social.wxMini.appId}")
+ private String appId;
+
+ @Value("${app.social.wxMini.appSecret}")
+ private String appSecret;
+
+ private static final Integer TYPE = MemberConstant.MEMBER_PLATFORM_WECHAT;
+
+ @Autowired
+ private ShopUserService shopUserService;
+
+ @Autowired
+ private ShopService shopService;
+
+
+ @Autowired
+ private MemberSocialService memberSocialService;
+
+
+ /**
+ * 微信小程序登录凭证校验
+ */
+ private static final String JSCODETOSESSION_URL = "https://api.weixin.qq.com/sns/jscode2session";
+
@RequestMapping(value = "/info", method = RequestMethod.GET)
@ApiOperation("获取当前登录用户接口")
public Result getUserInfo() {
@@ -141,7 +175,7 @@ public class UserController {
@ApiParam("手机号") @RequestParam String mobile,
@ApiParam("旧密码") @RequestParam String password,
@ApiParam("新密码") @RequestParam String newPass) {
- if(StringUtils.isEmpty(mobile) && StringUtils.isEmpty(newPass)){
+ if (StringUtils.isEmpty(mobile) && StringUtils.isEmpty(newPass)) {
return ResultUtil.error("未修改任何信息！");
}
final User user = userService.findById(userId);
@@ -511,4 +545,191 @@ public class UserController {
}
return ResultUtil.success(message);
}
+
+ /**
+ * 根据userId更新user表mini_program_openid和unionid
+ *
+ * @param user
+ * @return Result
+ * @author 王富康
+ * @date 2024/11/30
+ */
+ @RequestMapping(value = "/updateMiniProgramAndUnionid", method = RequestMethod.POST)
+ @ApiOperation("根据userId更新user表mini_program_openid和unionid")
+ public Result updateMiniProgramAndUnionid(@RequestBody User user) {
+ final User oldUser = userService.findById(user.getId());
+ oldUser.setMiniProgramOpenid(user.getMiniProgramOpenid());
+ oldUser.setUnionid(user.getUnionid());
+ userService.update(oldUser);
+ return ResultUtil.success("更新成功");
+ }
+
+
+ /**
+ * 获取微信小程序认证链接
+ *
+ * @param wechatVo
+ * @return Result
+ * @author 王富康
+ * @date 2024/12/3
+ */
+ @RequestMapping(value = "/login", method = RequestMethod.POST)
+ @ApiOperation("获取微信小程序认证链接")
+ @ResponseBody
+ @SystemLog(description = "微信小程序登录", type = LogType.MEMBER_LOGIN)
+ public Result login(@RequestBody WechatVo wechatVo) {
+ if (StringUtils.isEmpty(wechatVo.getJsCode())) {
+ return ResultUtil.error("您未同意授权");
+ }
+
+ final String jscode2sessionUrl = JSCODETOSESSION_URL + "?appid=" + appId + "&secret=" + appSecret + "&js_code=" + wechatVo.getJsCode() +
+ "&grant_type=" + wechatVo.getGrantType();
+ // 申请openid
+ final String result = HttpUtil.get(jscode2sessionUrl);
+ if (!result.contains("session_key")) {
+ return ResultUtil.error("获取session_key失败");
+ }
+ final JsonObject jsonObject = JsonParser.parseString(result).getAsJsonObject();
+ final String sessionKey = jsonObject.get("session_key").getAsString();
+ final String openId = jsonObject.get("openid").getAsString();
+ final String unionid = jsonObject.get("unionid").getAsString();
+ // 判断是否绑定用户
+ User wechatUser = null;
+ final Map resultMap = new HashMap<>();
+ if(StringUtils.isEmpty(wechatVo.getUserId())){
+ wechatUser = userService.findByUnionid(unionid);
+ }else{
+ wechatUser = userService.findById(wechatVo.getUserId());
+ }
+ if (wechatUser == null) {
+ try {
+ // 新增用户信息
+ wechatUser = new User();
+ wechatUser.setStatus(UserConstant.USER_STATUS_NORMAL);
+ wechatUser = userService.save(wechatUser);
+ // 设置用户角色
+ final UserRole userRole = new UserRole();
+ final PageVo pageVo = new PageVo();
+ pageVo.setPageNumber(1);
+ pageVo.setPageSize(1);
+ final Page roleCustomer = roleService.findByCondition("ROLE_CUSTOMER", PageUtil.initPage(pageVo));
+ final Role role = roleCustomer.getContent().get(0);
+ //客户角色
+ userRole.setRoleId(role.getId());
+ userRole.setRoleName("客户");
+ userRole.setUserId(wechatUser.getId());
+ userRoleService.save(userRole);
+ // 更新客户信息，绑定登录用户
+ customerService.updateUserId(wechatVo.getCustomId(), wechatUser.getId());
+ // 返回当前登录人的信息
+ resultMap.put("msg", "新增用户信息，并绑定成功！");
+ resultMap.put("customId", wechatVo.getCustomId());
+ } catch (Exception e) {
+ return ResultUtil.error(e.getMessage());
+ }
+ } else {
+ // 更新客户信息，绑定登录用户
+ customerService.updateUserId(wechatVo.getCustomId(), wechatUser.getId());
+ }
+ wechatUser.setUnionid(unionid);
+ wechatUser.setWechatName(wechatVo.getWechatName());
+ wechatUser.setMiniProgramOpenid(openId);
+ // 统一更新小程序的一些信息
+ userService.save(wechatUser);
+ // 锁定当前登录用户的类型
+ wechatUser.setType(wechatVo.getUserType());
+ final String accessToken = securityUtil.getToken(userService.userToDTO(wechatUser), true);
+ resultMap.put("accessToken", accessToken);
+ // 返回当前登录人的信息
+ resultMap.put("user", wechatUser);
+
+ // 店铺登录的话，根据登录人查询所有关联的店铺（店铺启用，并且在有效期内）
+ if (UserConstant.USER_TYPE_NORMAL.equals(wechatUser.getType())) {
+ // 获取
+ final List shopUsers = shopUserService.selectByUserId(wechatUser.getId());
+ if (shopUsers != null && !shopUsers.isEmpty()) {
+ // 获取店主手机号
+ for (ShopUser shopUser : shopUsers) {
+ final Shop shop = shopService.findById(shopUser.getShopId());
+ if (shop != null && shop.getShopOwnerId() != null && StringUtils.isNotEmpty(shop.getShopOwnerId())) {
+ final User shopOwner = userService.findById(shop.getShopOwnerId());
+ if (shopOwner != null) {
+ shopUser.setShopOwnerName(shopOwner.getNickname());
+ shopUser.setShopOwnerPhone(shopOwner.getMobile());
+ }
+
+ }
+ }
+ resultMap.put("shopList", shopUsers);
+ } else {
+ return ResultUtil.error("店铺未开通！");
+ }
+ }
+ return ResultUtil.data(resultMap);
+ }
+
+ // 关注公众号-回调
+ // 根据unionid查user表有没有数据，没有就新增一条user数据，同时绑定official_account_openid（公众号id）、unionid，有就更新一下official_account_openid
+ @RequestMapping(value = "/officialAccount", method = RequestMethod.GET)
+ @ApiOperation("关注公众号-回调")
+ public Result officialAccount(String openid, String unionid) {
+ if (StringUtils.isEmpty(unionid)) {
+ return ResultUtil.error("unionid不能为空！");
+ }
+ // 判断是否绑定用户
+ User wechatUser = userService.findByUnionid(unionid);
+ final Map resultMap = new HashMap<>();
+ if (wechatUser != null) {
+ wechatUser.setOfficialAccountOpenid(openid);
+ } else {
+ try {
+ // 新增用户信息
+ wechatUser = new User();
+ wechatUser.setUnionid(unionid);
+ wechatUser.setOfficialAccountOpenid(openid);
+ wechatUser.setStatus(UserConstant.USER_STATUS_NORMAL);
+ wechatUser = userService.save(wechatUser);
+ // 设置用户角色
+ final UserRole userRole = new UserRole();
+ final PageVo pageVo = new PageVo();
+ pageVo.setPageNumber(1);
+ pageVo.setPageSize(1);
+ final Page roleCustomer = roleService.findByCondition("ROLE_CUSTOMER", PageUtil.initPage(pageVo));
+ final Role role = roleCustomer.getContent().get(0);
+ //客户角色
+ userRole.setRoleId(role.getId());
+ userRole.setRoleName("客户");
+ userRole.setUserId(wechatUser.getId());
+ userRoleService.save(userRole);
+ // 更新客户信息，绑定登录用户
+ // customerService.updateUserId(wechatVo.getCustomId(),wechatUser.getId());
+ // 返回当前登录人的信息
+ resultMap.put("msg", "新增用户信息，并绑定成功！");
+ // resultMap.put("customId", wechatVo.getCustomId());
+ } catch (Exception e) {
+ return ResultUtil.error(e.getMessage());
+ }
+ }
+ userService.save(wechatUser);
+ return ResultUtil.data(resultMap);
+ }
+
+ /**
+ * mini_program_openid查询user表的所有信息
+ *
+ * @param miniProgramOpenid
+ * @return Result
+ * @author 王富康
+ * @date 2024/12/18
+ */
+ @RequestMapping(value = "/getUserInfo", method = RequestMethod.POST)
+ @ApiOperation("mini_program_openid查询user表的所有信息")
+ public Result getUserInfo(String miniProgramOpenid) {
+ if (StringUtils.isEmpty(miniProgramOpenid)) {
+ return ResultUtil.error("miniProgramOpenid！");
+ }
+ return ResultUtil.data(userService.findByMiniProgramOpenid(miniProgramOpenid));
+ }
+
+
}
diff --git a/hiver-modules/hiver-base/src/main/java/cc/hiver/base/utils/WeChatUtil.java b/hiver-modules/hiver-base/src/main/java/cc/hiver/base/utils/WeChatUtil.java
new file mode 100644
index 00000000..8e40c49f
--- /dev/null
+++ b/hiver-modules/hiver-base/src/main/java/cc/hiver/base/utils/WeChatUtil.java
@@ -0,0 +1,40 @@
+package cc.hiver.base.utils;
+
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.util.EntityUtils;
+import org.jetbrains.annotations.Nullable;
+
+public class WeChatUtil {
+
+
+ private static final String APP_ID = "wx6d7d4fb58d1502db";
+ private static final String APP_SECRET = "3a2c8cd00926764bbd12fd7361e01f1d";
+ private static final String TOKEN_URL = "https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid={}&secret={}";
+
+ /**
+ * 获取Access Token
+ * @author 王富康
+ * @date 2024/12/19
+ * @return String
+ */
+ @Nullable
+ public static String getAccessToken() throws Exception {
+ final String url = TOKEN_URL.replace("{}", APP_ID).replace("{}", APP_SECRET);
+ final HttpGet request = new HttpGet(url);
+ final CloseableHttpClient httpClient = HttpClients.createDefault();
+ final String result = httpClient.execute(request, httpResponse ->
+ EntityUtils.toString(httpResponse.getEntity()));
+ // 解析JSON获取access_token，这里假设已经通过某种方式(如Jackson, Gson)解析
+ // 这里简单用String.split()模拟解析
+ final String[] parts = result.split(",");
+ for (String part : parts) {
+ if (part.contains("access_token")) {
+ final String[] tokenParts = part.split(":");
+ return tokenParts[1].trim().replace("\"", "");
+ }
+ }
+ return null;
+ }
+}
diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/CustomerController.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/CustomerController.java
index a5c4b93f..b2c2f048 100644
--- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/CustomerController.java
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/CustomerController.java
@@ -226,8 +226,8 @@ public class CustomerController {
@ApiOperation("根据用户id查询客户列表")
public Result findByUserId(String userId,String shopId) {
// shopId从缓存中设置
- final List list = customerService.findByUserId(userId,shopId);
- return new ResultUtil>().setData(list);
+ final List list = customerService.findByUserId(userId,shopId);
+ return new ResultUtil>().setData(list);
}
@RequestMapping(value = "/findByUserName", method = RequestMethod.POST)
@@ -252,11 +252,8 @@ public class CustomerController {
@RequestMapping(value = "/findByUserPhoneAndShopId", method = RequestMethod.POST)
@ApiOperation("根据客户手机号及店铺id精准查询查询客户列表")
public Result findByUserPhoneAndShopId(String userPhone, String shopId) {
- if(StringUtils.isEmpty(userPhone)){
- return ResultUtil.error("用户手机号不能为空");
- }
- if(StringUtils.isEmpty(userPhone)){
- return ResultUtil.error("店铺id不能为空");
+ if(StringUtils.isEmpty(userPhone) && StringUtils.isEmpty(userPhone)){
+ return ResultUtil.error("用户手机号和店铺id不能都为空！");
}
// shopId从缓存中设置
final List list = customerService.findByUserPhoneAndShopId(userPhone, shopId);
@@ -307,4 +304,36 @@ public class CustomerController {
final CustomerDataVo customerData = customerService.getCustomerData(customerPageQuery);
return new ResultUtil().setData(customerData);
}
+
+ /**
+ * 根据customer表id更新userId字段
+ * @author 王富康
+ * @date 2024/11/30
+ * @param customerId
+ * @param userId
+ * @return Result
+ */
+ @RequestMapping(value = "/updateUserId", method = RequestMethod.POST)
+ @ApiOperation("根据customer表id更新userId字段")
+ public Result updateUserId(String customerId, String userId) {
+ if(StringUtils.isEmpty(customerId)){
+ return ResultUtil.error("客户id不能为空");
+ }
+ customerService.updateUserId(customerId, userId);
+ return ResultUtil.success("更新成功！");
+ }
+
+ // 根据userPhone更新userid
+ @RequestMapping(value = "/updateUserIdByUserPhone", method = RequestMethod.POST)
+ @ApiOperation("根据userPhone更新userid")
+ public Result updateUserIdByUserPhone(String userPhone, String userId) {
+ if(StringUtils.isEmpty(userPhone)){
+ return ResultUtil.error("手机号不能为空");
+ }
+ if(StringUtils.isEmpty(userId)){
+ return ResultUtil.error("用户id不能为空");
+ }
+ customerService.updateUserIdByUserPhone(userPhone, userId);
+ return ResultUtil.success("更新成功！");
+ }
}
diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/SaleController.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/SaleController.java
index 3c0520c5..a43e59de 100644
--- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/SaleController.java
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/SaleController.java
@@ -14,6 +14,7 @@ import cc.hiver.core.entity.LogiticsCompany;
import cc.hiver.core.entity.User;
import cc.hiver.core.entity.Worker;
import cc.hiver.core.service.LogiticsCompanyService;
+import cc.hiver.core.service.UserService;
import cc.hiver.core.service.WorkerService;
import cc.hiver.core.vo.WorkerQueryVO;
import cc.hiver.mall.common.constant.OrderConstant;
@@ -107,6 +108,9 @@ public class SaleController {
@Autowired
private DebtService debtService;
+ @Autowired
+ private UserService userService;
+
@RequestMapping(value = "/buy", method = RequestMethod.POST)
@ApiOperation("下单操作")
@@ -238,7 +242,7 @@ public class SaleController {
sale.setCreateBy(currUser.getId());
sale.setCreateByName(currUser.getNickname());
sale.setCreateByPhone(currUser.getMobile());
- if(sale.getCreateTime() == null) {
+ if (sale.getCreateTime() == null) {
sale.setCreateTime(new Date());
}
sale.setDelFlag(CommonConstant.DEL_FLAG_FALSE);
@@ -255,9 +259,9 @@ public class SaleController {
// 回填销售单id
saleReturnDTO.getReturnSale().setSaleId(sale.getId());
// 时间
- if(sale.getCreateTime() == null) {
+ if (sale.getCreateTime() == null) {
saleReturnDTO.getReturnSale().setCreateTime(new Date());
- }else{
+ } else {
saleReturnDTO.getReturnSale().setCreateTime(sale.getCreateTime());
}
// 申请退货
@@ -397,8 +401,12 @@ public class SaleController {
final QueryWrapper queryWrapper = new QueryWrapper<>();
final User user = securityUtil.getCurrUser();
// 查询下游客户的id
- final List customerIdList = customerService.findByUserId(user.getId(),"");
- queryWrapper.in("user_id", customerIdList);
+ final List customerIdList = customerService.findByUserId(user.getId(), "");
+ List customerId = new ArrayList<>();
+ for (Customer customer : customerIdList) {
+ customerId.add(customer.getId());
+ }
+ queryWrapper.in("user_id", customerId);
if (!ObjectUtils.isEmpty(saleVO)) {
if (!StringUtils.isEmpty(saleVO.getPayStatus())) {
queryWrapper.eq("pay_status", saleVO.getPayStatus());
@@ -586,6 +594,16 @@ public class SaleController {
//增加客户信息明细
final String addCustomerId = sale.getUserId();
final Customer customer = customerService.getById(addCustomerId);
+
+ if (customer != null && StringUtils.isNotEmpty(customer.getUserId())) {
+ final User user = userService.get(customer.getUserId());
+ if (user != null) {
+ customer.setMiniProgramOpenid(user.getMiniProgramOpenid());
+ customer.setUnionid(user.getUnionid());
+ customer.setOfficialAccountOpenid(user.getOfficialAccountOpenid());
+ customer.setWechatName(user.getWechatName());
+ }
+ }
saleNewVO.setCustomer(customer);
// 增加物流公司信息
final String transCompanyId = sale.getTransCompany();
@@ -688,10 +706,10 @@ public class SaleController {
startTime = saleVO.getStartTime() == null ? dateText : saleVO.getStartTime();
if (StringUtils.isEmpty(saleVO.getEndTime())) {
// 为空，使用当前日期+1
- endTime = DateUtil.getAfterDayTime(dateText, 1);
+ endTime = DateUtil.addDay(dateText,1);
} else {
// 不为空，使用传参日期+1
- endTime = DateUtil.getAfterDayTime(saleVO.getEndTime(), 1);
+ endTime = DateUtil.addDay(saleVO.getEndTime(), 1);
}
saleAllVO = salesCalculateService.calculateService(startTime, endTime);
// 获取本周营收统计
@@ -1179,11 +1197,11 @@ public class SaleController {
@RequestMapping(value = "/buyAi", method = RequestMethod.POST)
@ApiOperation("同步步Ai开单")
- public Result buyAi(String aiMsg, String customerId,String productId) {
+ public Result buyAi(String aiMsg, String customerId, String productId) {
if (StringUtils.isEmpty(aiMsg)) {
ResultUtil.error("指令不能为空！");
}
- JSONObject jsonObject = saleService.buyAi(aiMsg, customerId, productId);
+ final JSONObject jsonObject = saleService.buyAi(aiMsg, customerId, productId);
return new ResultUtil().setData(jsonObject);
}
diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/mapper/CustomerMapper.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/mapper/CustomerMapper.java
index 85bb3941..538aaf2e 100644
--- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/mapper/CustomerMapper.java
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/mapper/CustomerMapper.java
@@ -39,15 +39,21 @@ public interface CustomerMapper extends BaseMapper {
void delById(String id);
- List findByUserId(@Param("userId") String userId,@Param("shopId") String shopId);
+ List findByUserId(@Param("userId") String userId, @Param("shopId") String shopId);
- Page getCustomerList(Page page,@Param("queryParams") CustomerPageQuery customerPageQuery);
+ Page getCustomerList(Page page, @Param("queryParams") CustomerPageQuery customerPageQuery);
- void updatePhone(@Param("newMobile")String newMobile,@Param("userId") String userId);
+ void updatePhone(@Param("newMobile") String newMobile, @Param("userId") String userId);
boolean batchDeleteCustomer(@Param("idList") List idList);
- List findByUserName(@Param("userName") String userName,@Param("shopId") String shopId);
+ List findByUserName(@Param("userName") String userName, @Param("shopId") String shopId);
- List findByUserPhoneAndShopId(@Param("userPhone") String userPhone,@Param("shopId") String shopId);
+ List findByUserPhoneAndShopId(@Param("userPhone") String userPhone, @Param("shopId") String shopId);
+
+ void updateUserId(@Param("customerId") String customerId, @Param("userId") String userId);
+
+ List getOfficialAccountOpenids(@Param("shopId") String shopId, @Param("userId") String userId, @Param("categoryId") String categoryId, @Param("isAll") String isAll);
+
+ void updateUserIdByUserPhone(@Param("userPhone")String userPhone,@Param("userId") String userId);
}
\ No newline at end of file
diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/Customer.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/Customer.java
index cc465666..17f116ed 100644
--- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/Customer.java
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/Customer.java
@@ -88,4 +88,20 @@ public class Customer implements Serializable {
@ApiModelProperty(value = "排序字段")
private String orderByField;
+ @TableField(exist = false)
+ @ApiModelProperty(value = "小程序id")
+ private String miniProgramOpenid;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "")
+ private String unionid;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "公众号id")
+ private String officialAccountOpenid;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "微信昵称")
+ private String wechatName;
+
}
\ No newline at end of file
diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/pojo/dto/SaleQueryDTO.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/pojo/dto/SaleQueryDTO.java
index 110a744b..59b0a50b 100644
--- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/pojo/dto/SaleQueryDTO.java
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/pojo/dto/SaleQueryDTO.java
@@ -33,6 +33,9 @@ public class SaleQueryDTO implements Serializable {
@ApiModelProperty(value = "客户id")
private String userId;
+ @ApiModelProperty(value = "客户电话")
+ private String userPhone;
+
@ApiModelProperty(value = "客户名称")
private String username;
diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/purchasereturn/service/impl/PurchaseReturnServiceImpl.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/purchasereturn/service/impl/PurchaseReturnServiceImpl.java
index 0c7e050f..82fb31d5 100644
--- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/purchasereturn/service/impl/PurchaseReturnServiceImpl.java
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/purchasereturn/service/impl/PurchaseReturnServiceImpl.java
@@ -149,6 +149,7 @@ public class PurchaseReturnServiceImpl extends ServiceImpl {
boolean deleteById(String id);
- List findByUserId(String userId,String shopId);
+ List findByUserId(String userId, String shopId);
Customer addCustomer(Customer customer);
@@ -29,11 +29,12 @@ public interface CustomerService extends IService {
/**
* 根据客户手机号及店铺id精准查询查询客户列表
- * @author 王富康
- * @date 2024/9/6
+ *
* @param userPhone
* @param shopId
* @return List
+ * @author 王富康
+ * @date 2024/9/6
*/
List findByUserPhoneAndShopId(String userPhone, String shopId);
@@ -41,10 +42,27 @@ public interface CustomerService extends IService {
/**
* 查询客户 拿货（总金额）商品总款数、总件数、退货（总金额）商品总款数、总件数
- * @author 王富康
- * @date 2024/10/24
+ *
* @param customerPageQuery
* @return SupplierDataVo
+ * @author 王富康
+ * @date 2024/10/24
*/
CustomerDataVo getCustomerData(CustomerPageQuery customerPageQuery);
+
+ /**
+ * 跟新客户登录用户id
+ *
+ * @param customerId
+ * @param userId
+ * @return Customer
+ * @author 王富康
+ * @date 2024/11/30
+ */
+ void updateUserId(String customerId, String userId);
+
+ // 获取符合条件的客户公众号id
+ List getOfficialAccountOpenids(String userId, String categoryId, String isAll);
+
+ void updateUserIdByUserPhone(String userPhone, String userId);
}
diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/SalesAndDetailsServiceImpl.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/SalesAndDetailsServiceImpl.java
index bee4e812..a3a06df2 100644
--- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/SalesAndDetailsServiceImpl.java
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/SalesAndDetailsServiceImpl.java
@@ -455,8 +455,9 @@ public class SalesAndDetailsServiceImpl implements SalesAndDetailsService {
String customerId = "";
if (StringUtils.isNotEmpty(saleQueryDTO.getMobile())) {
// 20240906如果前台传了客户id了，不要新增客户了就
+ byMobile = userService.findByMobile(saleQueryDTO.getMobile());
if(StringUtils.isEmpty(saleQueryDTO.getUserId())){
- byMobile = userService.findByMobile(saleQueryDTO.getMobile());
+ // byMobile = userService.findByMobile(saleQueryDTO.getMobile());
if (byMobile == null) {
//默认密码
final String encryptPass = new BCryptPasswordEncoder().encode("123456");
@@ -543,7 +544,14 @@ public class SalesAndDetailsServiceImpl implements SalesAndDetailsService {
dealingsRecordService.save(dealingsRecord);
}else{
// 客户id拿前台传的
- customerId = saleQueryDTO.getUserId();
+ String byMobileMobile = byMobile.getMobile();
+ if(byMobileMobile.equals(saleQueryDTO.getUserId())){
+ customerId = saleQueryDTO.getUserId();
+ }else{
+ // 根据手机号查询的用户id和前台传的不一样，则根据 userPhone 查customer表(所有数据)更新 userid 为传过来的这个
+ customerService.updateUserIdByUserPhone(saleQueryDTO.getMobile(),saleQueryDTO.getUserId());
+ }
+
}
} else {
log.error("下游客户未填写手机号！");
diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/SalesCalculateServiceImpl.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/SalesCalculateServiceImpl.java
index fb714302..0a13a764 100644
--- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/SalesCalculateServiceImpl.java
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/SalesCalculateServiceImpl.java
@@ -207,7 +207,7 @@ public class SalesCalculateServiceImpl implements SalesCalculateService {
String searchDate;
for (int i = -6; i < 1; i++) {
// 查询的日期加一天
- searchDate = DateUtil.getAfterDayTime(todayDateStr, i);
+ searchDate = DateUtil.addDay(todayDateStr, i);
// 店铺id从缓存中获取，并放到数据中去
final String shopId = securityUtil.getShopId();
// 查询日期范围内数据
diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/mybatis/CustomerServiceImpl.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/mybatis/CustomerServiceImpl.java
index 4ca6b60c..5f938467 100644
--- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/mybatis/CustomerServiceImpl.java
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/mybatis/CustomerServiceImpl.java
@@ -84,7 +84,7 @@ public class CustomerServiceImpl extends ServiceImpl i
}
@Override
- public List findByUserId(String userId,String shopId) {
+ public List findByUserId(String userId, String shopId) {
return customerMapper.findByUserId(userId, shopId);
}
@@ -138,12 +138,12 @@ public class CustomerServiceImpl extends ServiceImpl i
final String createBy;
final String createByName;
// shopId从缓存中设置
- if(StringUtils.isEmpty(customer.getShopId())){
+ if (StringUtils.isEmpty(customer.getShopId())) {
shopId = securityUtil.getShopId();
final User user = securityUtil.getCurrUser();
createBy = user.getId();
createByName = user.getNickname();
- }else{
+ } else {
shopId = customer.getShopId();
createBy = customer.getCreateBy();
createByName = customer.getCreateByName();
@@ -219,12 +219,12 @@ public class CustomerServiceImpl extends ServiceImpl i
@Override
public List findByUserName(String userName) {
String shopId = securityUtil.getShopId();
- return customerMapper.findByUserName(userName,shopId);
+ return customerMapper.findByUserName(userName, shopId);
}
@Override
public List findByUserPhoneAndShopId(String userPhone, String shopId) {
- return customerMapper.findByUserPhoneAndShopId(userPhone,shopId);
+ return customerMapper.findByUserPhoneAndShopId(userPhone, shopId);
}
@Override
@@ -232,19 +232,20 @@ public class CustomerServiceImpl extends ServiceImpl i
Map result = new HashMap<>();
// 获取客户购买该商品规格的总件数
Integer buyCount = saleDetailService.getCustomerBuyHistory(productId, attributeList, customerId);
- result.put("buyCount",buyCount);
+ result.put("buyCount", buyCount);
// 获取客户购买该商品退货总件数
Integer returnCount = returnSaleService.getCustomerReturnHistory(productId, attributeList, customerId);
- result.put("returnCount",returnCount);
+ result.put("returnCount", returnCount);
return result;
}
/**
* 查询客户 拿货（总金额）商品总款数、总件数、退货（总金额）商品总款数、总件数
- * @author 王富康
- * @date 2024/10/24
+ *
* @param customerPageQuery
* @return SupplierDataVo
+ * @author 王富康
+ * @date 2024/10/24
*/
@Override
public CustomerDataVo getCustomerData(CustomerPageQuery customerPageQuery) {
@@ -261,4 +262,25 @@ public class CustomerServiceImpl extends ServiceImpl i
customerDataVo.setReturnProductDataVos(returnSaleInfo.getReturnProductDataVos());
return customerDataVo;
}
+
+ @Override
+ public void updateUserId(String customerId, String userId) {
+ customerMapper.updateUserId(customerId, userId);
+ }
+
+ @Override
+ public List getOfficialAccountOpenids(String userId, String categoryId, String isAll) {
+
+ // shopId从缓存中设置
+ final String shopId = securityUtil.getShopId();
+ return customerMapper.getOfficialAccountOpenids(shopId, userId, categoryId, isAll);
+ }
+
+ @Override
+ public void updateUserIdByUserPhone(String userPhone, String userId) {
+ customerMapper.updateUserIdByUserPhone(userPhone, userId);
+ // 根据userPhone获取用户信息
+ userService.setUserPhoneToNull(userPhone);
+ userService.updateUserPhoneById(userPhone, userId);
+ }
}
diff --git a/hiver-modules/hiver-mall/src/main/resources/mapper/CustomerMapper.xml b/hiver-modules/hiver-mall/src/main/resources/mapper/CustomerMapper.xml
index 37d65f49..b9e906cc 100644
--- a/hiver-modules/hiver-mall/src/main/resources/mapper/CustomerMapper.xml
+++ b/hiver-modules/hiver-mall/src/main/resources/mapper/CustomerMapper.xml
@@ -430,10 +430,11 @@
order by no_earn desc
-