From bd6229ebd9cb543a22944ecb1142fad92b675dce Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期一, 13 十月 2025 14:26:25 +0800
Subject: [PATCH] bug 修复
---
server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 271 +++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 257 insertions(+), 14 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index 8defece..16cb9e2 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -1,20 +1,50 @@
package com.doumee.service.business.impl;
+import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
+import cn.binarywang.wx.miniapp.bean.WxMaPhoneNumberInfo;
+import com.alibaba.fastjson.JSONObject;
+import com.doumee.biz.system.SystemDictDataBiz;
+import com.doumee.config.jwt.JwtTokenUtil;
+import com.doumee.config.wx.WxMiniConfig;
+import com.doumee.core.constants.Constants;
+import com.doumee.core.constants.ResponseStatus;
+import com.doumee.core.exception.BusinessException;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Utils;
+import com.doumee.dao.business.IdentityInfoMapper;
import com.doumee.dao.business.MemberMapper;
+import com.doumee.dao.business.OrdersMapper;
+import com.doumee.dao.business.model.IdentityInfo;
import com.doumee.dao.business.model.Member;
+import com.doumee.dao.business.model.MemberRevenue;
+import com.doumee.dao.business.model.Orders;
+import com.doumee.dao.dto.WxPhoneRequest;
+import com.doumee.dao.vo.AccountResponse;
+import com.doumee.dao.vo.UserCenterVO;
import com.doumee.service.business.MemberService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.binarywang.wxpay.service.WxPayService;
+import com.github.binarywang.wxpay.service.impl.WxPayServiceImpl;
+import io.swagger.annotations.ApiModelProperty;
+import me.chanjar.weixin.common.error.WxErrorException;
+import nonapi.io.github.classgraph.json.Id;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
+import javax.annotation.Resource;
+import java.util.Date;
import java.util.List;
+import java.util.Objects;
+import java.util.Random;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
/**
* 浼氬憳淇℃伅琛⊿ervice瀹炵幇
@@ -26,6 +56,18 @@
@Autowired
private MemberMapper memberMapper;
+
+ @Autowired
+ private IdentityInfoMapper identityInfoMapper;
+
+ @Autowired
+ private OrdersMapper ordersMapper;
+
+ @Autowired
+ private JwtTokenUtil jwtTokenUtil;
+
+ @Autowired
+ private SystemDictDataBiz systemDictDataBiz;
@Override
public Integer create(Member member) {
@@ -69,7 +111,16 @@
@Override
public Member findById(Integer id) {
- return memberMapper.selectById(id);
+ Member member = memberMapper.selectById(id);
+ if(Objects.isNull(member)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ }
+ if(StringUtils.isNotBlank(member.getCoverImage())){
+ String path = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.RESOURCE_PATH).getCode()
+ +systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.MEMBER_FILES).getCode();
+ member.setFullCoverImage(path + member.getCoverImage());
+ }
+ return member;
}
@Override
@@ -89,6 +140,7 @@
IPage<Member> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
QueryWrapper<Member> queryWrapper = new QueryWrapper<>();
Utils.MP.blankToNull(pageWrap.getModel());
+ pageWrap.getModel().setDeleted(Constants.ZERO);
if (pageWrap.getModel().getId() != null) {
queryWrapper.lambda().eq(Member::getId, pageWrap.getModel().getId());
}
@@ -116,16 +168,16 @@
queryWrapper.lambda().eq(Member::getCoverImage, pageWrap.getModel().getCoverImage());
}
if (pageWrap.getModel().getOpenid() != null) {
- queryWrapper.lambda().eq(Member::getOpenid, pageWrap.getModel().getOpenid());
+ queryWrapper.lambda().like(Member::getOpenid, pageWrap.getModel().getOpenid());
}
if (pageWrap.getModel().getNickName() != null) {
- queryWrapper.lambda().eq(Member::getNickName, pageWrap.getModel().getNickName());
+ queryWrapper.lambda().like(Member::getNickName, pageWrap.getModel().getNickName());
}
if (pageWrap.getModel().getTelephone() != null) {
- queryWrapper.lambda().eq(Member::getTelephone, pageWrap.getModel().getTelephone());
+ queryWrapper.lambda().like(Member::getTelephone, pageWrap.getModel().getTelephone());
}
if (pageWrap.getModel().getName() != null) {
- queryWrapper.lambda().eq(Member::getName, pageWrap.getModel().getName());
+ queryWrapper.lambda().like(Member::getName, pageWrap.getModel().getName());
}
if (pageWrap.getModel().getWorkerIdentity() != null) {
queryWrapper.lambda().eq(Member::getWorkerIdentity, pageWrap.getModel().getWorkerIdentity());
@@ -152,17 +204,11 @@
if (pageWrap.getModel().getLoginTimes() != null) {
queryWrapper.lambda().eq(Member::getLoginTimes, pageWrap.getModel().getLoginTimes());
}
- if (pageWrap.getModel().getReciveNum() != null) {
- queryWrapper.lambda().eq(Member::getReciveNum, pageWrap.getModel().getReciveNum());
- }
if (pageWrap.getModel().getPublishNum() != null) {
queryWrapper.lambda().eq(Member::getPublishNum, pageWrap.getModel().getPublishNum());
}
if (pageWrap.getModel().getScore() != null) {
queryWrapper.lambda().eq(Member::getScore, pageWrap.getModel().getScore());
- }
- if (pageWrap.getModel().getLocaltion() != null) {
- queryWrapper.lambda().eq(Member::getLocaltion, pageWrap.getModel().getLocaltion());
}
if (pageWrap.getModel().getLat() != null) {
queryWrapper.lambda().eq(Member::getLat, pageWrap.getModel().getLat());
@@ -179,9 +225,15 @@
if (pageWrap.getModel().getArea() != null) {
queryWrapper.lambda().eq(Member::getArea, pageWrap.getModel().getArea());
}
- if (pageWrap.getModel().getAutoReciveStatus() != null) {
- queryWrapper.lambda().eq(Member::getAutoReciveStatus, pageWrap.getModel().getAutoReciveStatus());
- }
+ //濡傛灉鏌ヨ鎺ュ崟鏂�
+ queryWrapper.lambda().and(Constants.equalsInteger(pageWrap.getModel().getType(),Constants.ONE ),w1->{
+ w1.eq(Member::getWorkerIdentity,Constants.TWO )
+ .or().eq(Member::getChefIdentity,Constants.TWO )
+ .or().eq(Member::getDriverIdentity,Constants.TWO );
+ });
+ queryWrapper.lambda().ge(pageWrap.getModel().getStartTime()!=null, Member::getCreateTime,pageWrap.getModel().getStartTime());
+ queryWrapper.lambda().le(pageWrap.getModel().getEndTime()!=null,Member::getCreateTime,pageWrap.getModel().getEndTime());
+
for(PageWrap.SortData sortData: pageWrap.getSorts()) {
if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
queryWrapper.orderByDesc(sortData.getProperty());
@@ -197,4 +249,195 @@
QueryWrapper<Member> wrapper = new QueryWrapper<>(member);
return memberMapper.selectCount(wrapper);
}
+
+
+ /***************灏忕▼搴忔帴鍙�*************/
+
+ /**
+ * 寰俊灏忕▼搴忕櫥褰�
+ * @param code
+ * @return
+ */
+ @Override
+ public AccountResponse wxLogin(String code) {
+ if(StringUtils.isBlank(code)){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ try {
+ //鑾峰彇寰俊鏁忔劅鏁版嵁
+ WxMaJscode2SessionResult session = WxMiniConfig.wxMaService.getUserService().getSessionInfo(code);
+ String openId = session.getOpenid();
+ String unionId = session.getUnionid();
+ if (StringUtils.isBlank(openId)) {
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "鑾峰彇openid澶辫触锛佽鑱旂郴绠＄悊鍛�");
+ }
+ Member member = memberMapper.selectOne(new QueryWrapper<Member>().eq("openid", openId).eq("DELETED", Constants.ZERO).last("limit 1"));
+ AccountResponse accountResponse = new AccountResponse();
+ accountResponse.setOpenid(openId);
+ if(Objects.isNull(member)){
+ return accountResponse;
+ }
+ accountResponse.setToken(jwtTokenUtil.generateToken(member));
+ accountResponse.setMember(member);
+ return accountResponse;
+ } catch (WxErrorException e) {
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "寰俊鐧诲綍寮傚父锛佽鑱旂郴绠＄悊鍛�");
+ }
+ }
+
+
+
+
+ @Override
+ public AccountResponse wxAuthPhone(WxPhoneRequest wxPhoneRequest) {
+ if(Objects.isNull(wxPhoneRequest)
+ || StringUtils.isBlank(wxPhoneRequest.getCode())
+ || StringUtils.isBlank(wxPhoneRequest.getOpenid())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ try {
+ WxMaPhoneNumberInfo userPhoneInfo = WxMiniConfig.wxMaService.getUserService().getPhoneNumber(wxPhoneRequest.getCode());
+ String mobile = userPhoneInfo.getPhoneNumber();
+ if(Objects.isNull(mobile)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏈幏鍙栧埌鎵嬫満鍙�");
+ }
+ Member member = memberMapper.selectOne(new QueryWrapper<Member>().lambda().eq(Member::getTelephone,mobile).last("limit 1"));
+ if(Objects.nonNull(member)){
+ memberMapper.update(new UpdateWrapper<Member>().lambda().set(Member::getTelephone,mobile)
+ .set(Member::getOpenid,wxPhoneRequest.getOpenid()).set(Member::getUpdateTime,new Date()).eq(Member::getId,member.getId()));
+ }else{
+ member = new Member();
+ member.setCreateTime(new Date());
+ member.setUpdateTime(member.getCreateTime());
+ member.setDeleted(Constants.ZERO);
+ member.setOpenid(wxPhoneRequest.getOpenid());
+ member.setTelephone(mobile);
+ member.setNickName(mobile);
+// member.setCoverImage("1.png");
+ member.setWorkerIdentity(Constants.ZERO);
+ member.setDriverIdentity(Constants.ZERO);
+ member.setChefIdentity(Constants.ZERO);
+ member.setAmount(Constants.ZERO.longValue());
+ member.setTotalAmount(Constants.ZERO.longValue());
+ member.setStatus(Constants.ZERO);
+ member.setLoginTime(new Date());
+ member.setLoginTimes(Constants.ONE.longValue());
+ member.setReceiveNum(Constants.ZERO.longValue());
+ member.setPublishNum(Constants.ZERO.longValue());
+ member.setAutoReceiveStatus(Constants.ONE);
+ member.setUseIdentity(Constants.ZERO);
+ memberMapper.insert(member);
+ }
+ AccountResponse accountResponse = new AccountResponse();
+ accountResponse.setToken(jwtTokenUtil.generateToken(member));
+ accountResponse.setMember(member);
+ return accountResponse;
+ } catch (Exception e) {
+ e.printStackTrace();
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏈В鏋愬埌鎵嬫満鍙�");
+ }
+ }
+
+
+
+ @Override
+ public void editMemberInfo(Member member){
+ if(Objects.isNull(member)
+ || ( StringUtils.isBlank(member.getCoverImage())
+ && StringUtils.isBlank(member.getName())
+ && StringUtils.isBlank(member.getNickName())
+ && Objects.isNull(member.getAutoReceiveStatus()) )){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ memberMapper.update(new UpdateWrapper<Member>().lambda()
+ .set(StringUtils.isNotBlank(member.getNickName()),Member::getNickName,member.getNickName())
+ .set(StringUtils.isNotBlank(member.getName()),Member::getName,member.getName())
+ .set(StringUtils.isNotBlank(member.getCoverImage()),Member::getCoverImage,member.getCoverImage())
+ .set(Objects.nonNull(member.getAutoReceiveStatus()),Member::getAutoReceiveStatus,member.getAutoReceiveStatus())
+ .set(Member::getUpdateTime,new Date())
+ .eq(Member::getId,member.getId()));
+ }
+
+
+ @Override
+ public void editUseIdentity(Member member){
+ if(Objects.isNull(member)
+ || Objects.isNull(member.getUseIdentity())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ if(Constants.equalsInteger(member.getUseIdentity(),Constants.ZERO)){
+ member.setUseIdentity(Constants.ZERO);
+ memberMapper.update(new UpdateWrapper<Member>().lambda().set(Member::getUseIdentity,Constants.ZERO).eq(Member::getId,member.getId()));
+ }else{
+ if(identityInfoMapper.selectCount(new QueryWrapper<IdentityInfo>().lambda().eq(IdentityInfo::getDeleted,Constants.ZERO)
+ .eq(IdentityInfo::getMemberId,member.getId())
+ .eq(IdentityInfo::getAuditStatus,Constants.TWO))>Constants.ZERO){
+ memberMapper.update(new UpdateWrapper<Member>().lambda().set(Member::getUseIdentity,Constants.ONE).eq(Member::getId,member.getId()));
+ }else{
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"褰撳墠鏃犲彲鐢ㄦ帴鍗曡韩浠�!");
+ }
+ }
+ }
+
+
+ @Override
+ public Member getMemberInfo(Integer memberId){
+ Member member = this.findById(memberId);
+ if(Objects.isNull(member)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ }
+ if(StringUtils.isNotBlank(member.getCoverImage())){
+ String path = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.RESOURCE_PATH).getCode()
+ +systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.MEMBER_FILES).getCode();
+ member.setFullCoverImage(path + member.getCoverImage());
+ }
+ UserCenterVO userCenterVO = new UserCenterVO();
+ userCenterVO.setReleaseTaskTotal(Constants.ZERO);
+ userCenterVO.setWaitReceiveTotal(Constants.ZERO);
+ userCenterVO.setDoingTotal(Constants.ZERO);
+ userCenterVO.setWaitCommentTotal(Constants.ZERO);
+ userCenterVO.setTaskingTotal(Constants.ZERO);
+ userCenterVO.setDoneTotal(Constants.ZERO);
+ userCenterVO.setReceiveTotal(Constants.ZERO);
+ List<Orders> releaseOrders = ordersMapper.selectList(new QueryWrapper<Orders>().lambda().eq(Orders::getDeleted,Constants.ZERO)
+ .eq(Orders::getReleaseMemberId,member.getId()));
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(releaseOrders)){
+ userCenterVO.setReleaseTaskTotal(releaseOrders.size());
+ userCenterVO.setWaitCommentTotal(releaseOrders.stream().filter(i->Constants.equalsInteger(i.getStatus(),Constants.ordersStatus.done.getKey())&&Constants.equalsInteger(i.getCommentStatus(),Constants.ZERO)).collect(Collectors.toList()).size());
+ userCenterVO.setDoingTotal(releaseOrders.stream().filter(i->Constants.equalsInteger(i.getStatus(),Constants.ordersStatus.doing.getKey())).collect(Collectors.toList()).size());
+ userCenterVO.setWaitReceiveTotal(releaseOrders.stream().filter(i->Constants.equalsInteger(i.getStatus(),Constants.ordersStatus.wait.getKey())).collect(Collectors.toList()).size());
+ }
+ List<Orders> acceptOrders = ordersMapper.selectList(new QueryWrapper<Orders>().lambda().eq(Orders::getDeleted,Constants.ZERO).eq(Orders::getAcceptMemberId,member.getId()));
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(acceptOrders)){
+ userCenterVO.setReceiveTotal(acceptOrders.size());
+ userCenterVO.setTaskingTotal(acceptOrders.stream().filter(i->Constants.equalsInteger(i.getStatus(),Constants.ordersStatus.doing.getKey())).collect(Collectors.toList()).size());
+ userCenterVO.setDoneTotal(acceptOrders.stream().filter(i->Constants.equalsInteger(i.getStatus(),Constants.ordersStatus.done.getKey())).collect(Collectors.toList()).size());
+ }
+ member.setUserCenterVO(userCenterVO);
+ return member;
+ }
+
+
+
+
+ @Override
+ public UserCenterVO getPlatformAboutUs(){
+ UserCenterVO userCenterVO = new UserCenterVO();
+ userCenterVO.setAboutUs(StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.ABOUT_US).getCode()));
+ userCenterVO.setFeeStandards(StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.FEE_STANDARDS).getCode()));
+ userCenterVO.setServerIntroduce(StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.SERVER_INTRODUCE).getCode()));
+ userCenterVO.setServerPhone(StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.SERVER_PHONE).getCode()));
+ userCenterVO.setUserAgreement(StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.USER_AGREEMENT).getCode()));
+ userCenterVO.setPrivacyAgreement(StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.PRIVACY_AGREEMENT).getCode()));
+ return userCenterVO;
+ }
+
+ @Override
+ public void logOff(String token,Integer memberId){
+ memberMapper.update(new UpdateWrapper<Member>().lambda().setSql(" openid = null ").eq(Member::getId,memberId));
+ jwtTokenUtil.logoutForH5(token);
+ }
+
+
+
}
--
Gitblit v1.9.3