111

k94314517

2025-07-16 4e334f94828bf9842649cfd91399b6ee00fbeef0

111

 server/services/src/main/java/com/doumee/config/jwt/WebMvcConfig.java

@@ -83,7 +83,7 @@
            if(Objects.isNull(member)){
                throw new BusinessException(ResponseStatus.TOKEN_EXCEED_TIME.getCode(),"长时间未操作,请重新登录");
            }
            Integer isDeleted = dao.queryForObject(" select COALESCE(isdeleted,1)  from member where id  = ?", Integer.class, member.getId());
            Integer isDeleted = dao.queryForObject(" select COALESCE(DELETED,1)  from member where id  = ?", Integer.class, member.getId());
            if(isDeleted.equals(Constants.ONE)){
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"用户已删除,请联系管理员");
            }

 server/services/src/main/java/com/doumee/config/shiro/ShiroConfig.java

@@ -92,7 +92,7 @@
        // - 放行swagger
        map.put("/doc.html", "anon");
        map.put("/webjars/**", "anon");
        map.put("/web/api/**", "anon");
        map.put("/web/**", "anon");
        map.put("/swagger-resources/**", "anon");
        map.put("/v2/api-docs/**", "anon");
        // - 其他接口统一拦截

 server/services/src/main/java/com/doumee/dao/business/model/Category.java

@@ -24,6 +24,7 @@
@TableName("`category`")
public class Category {

    @TableId(type = IdType.AUTO)
    @ApiModelProperty(value = "主键", example = "1")
    @ExcelColumn(name="主键")
    private Integer id;

 server/services/src/main/java/com/doumee/dao/business/model/IdentityInfo.java

@@ -23,6 +23,7 @@
@TableName("`identity_info`")
public class IdentityInfo {

    @TableId(type = IdType.AUTO)
    @ApiModelProperty(value = "主键", example = "1")
    @ExcelColumn(name="主键")
    private Integer id;

 server/services/src/main/java/com/doumee/dao/business/model/Member.java

@@ -24,6 +24,7 @@
@TableName("`member`")
public class Member {

    @TableId(type = IdType.AUTO)
    @ApiModelProperty(value = "主键", example = "1")
    @ExcelColumn(name="主键")
    private Integer id;

 server/services/src/main/java/com/doumee/dao/business/model/MemberRevenue.java

@@ -21,6 +21,8 @@
@ApiModel("会员收支记录")
@TableName("`member_revenue`")
public class MemberRevenue {

    @TableId(type = IdType.AUTO)
    @ApiModelProperty(value = "主键", example = "1")
    private Integer id;
    @ApiModelProperty(value = "是否已删除 0未删除 1已删除", example = "1")

 server/services/src/main/java/com/doumee/dao/business/model/Multifile.java

@@ -1,6 +1,8 @@
package com.doumee.dao.business.model;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.TableName;
@@ -18,6 +20,7 @@
@TableName("`multifile`")
public class Multifile {

    @TableId(type = IdType.AUTO)
    @ApiModelProperty(value = "主键", example = "1")
    private Integer id;


 server/services/src/main/java/com/doumee/dao/business/model/OrderLog.java

@@ -20,6 +20,7 @@
@TableName("`order_log`")
public class OrderLog {

    @TableId(type = IdType.AUTO)
    @ApiModelProperty(value = "主键", example = "1")
    @ExcelColumn(name="主键")
    private Integer id;

 server/services/src/main/java/com/doumee/dao/business/model/Orders.java

@@ -25,6 +25,7 @@
@TableName("`orders`")
public class Orders {

    @TableId(type = IdType.AUTO)
    @ApiModelProperty(value = "主键", example = "1")
    private Integer id;

@@ -210,6 +211,15 @@
    @ApiModelProperty(value = "支付时间", example = "1")
    private Date payTime;

    @ApiModelProperty(value = "联系人", example = "1")
    private String linkPhone;

    @ApiModelProperty(value = "联系方式", example = "1")
    private String linkName;

    @ApiModelProperty(value = "车辆规格", example = "1")
    private String carUnit;

    @ApiModelProperty(value = "图片")
    @TableField(exist = false)
    private List<Multifile> multifileList;

 server/services/src/main/java/com/doumee/dao/business/model/ReceiveWeight.java

@@ -23,6 +23,7 @@
@TableName("`receive_weight`")
public class ReceiveWeight {

    @TableId(type = IdType.AUTO)
    @ApiModelProperty(value = "主键", example = "1")
    @ExcelColumn(name="主键")
    private Integer id;

 server/services/src/main/java/com/doumee/dao/business/model/WithdrawalOrders.java

@@ -20,6 +20,7 @@
@TableName("`withdrawal_orders`")
public class WithdrawalOrders {

    @TableId(type = IdType.AUTO)
    @ApiModelProperty(value = "主键", example = "1")
    @ExcelColumn(name="主键")
    private Integer id;

 server/services/src/main/java/com/doumee/service/business/impl/IdentityInfoServiceImpl.java

@@ -52,6 +52,7 @@
    private SystemDictDataBiz systemDictDataBiz;

    @Override
    @Transactional(rollbackFor = {BusinessException.class,Exception.class})
    public Integer create(IdentityInfo identityInfo) {
        if(Objects.isNull(identityInfo)
        || Objects.isNull(identityInfo.getType())
@@ -71,13 +72,22 @@
            throw new BusinessException(ResponseStatus.BAD_REQUEST);
        }
        //查询用户是否已存在当前身份
        if(identityInfoMapper.selectCount(new QueryWrapper<IdentityInfo>().lambda().eq(IdentityInfo::getMemberId,identityInfo.getMemberId())
        if(identityInfoMapper.selectCount(new QueryWrapper<IdentityInfo>().lambda().eq(IdentityInfo::getDeleted,Constants.ZERO).eq(IdentityInfo::getMemberId,identityInfo.getMemberId())
                .eq(IdentityInfo::getType,identityInfo.getType()))>Constants.ZERO){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"已存在该身份请刷新查看！");
        };
        identityInfo.setDeleted(Constants.ZERO);
        identityInfo.setCreateTime(new Date());
        identityInfo.setAuditStatus(Constants.ZERO);
        identityInfo.setUpdateTime(identityInfo.getCreateTime());
        identityInfo.setAuditStatus(Constants.ONE);
        identityInfoMapper.insert(identityInfo);

        memberMapper.update(new UpdateWrapper<Member>().lambda()
                .set(Constants.equalsInteger(identityInfo.getType(),Constants.ZERO),Member::getWorkerIdentity,Constants.ONE)
                .set(Constants.equalsInteger(identityInfo.getType(),Constants.ONE),Member::getDriverIdentity,Constants.ONE)
                .set(Constants.equalsInteger(identityInfo.getType(),Constants.TWO),Member::getChefIdentity,Constants.ONE)
                .eq(Member::getId,identityInfo.getMemberId()));

        return identityInfo.getId();
    }

@@ -101,6 +111,7 @@
    }

    @Override
    @Transactional(rollbackFor = {BusinessException.class,Exception.class})
    public void updateById(IdentityInfo identityInfo) {
        if(Objects.isNull(identityInfo)
                || Objects.isNull(identityInfo.getId())
@@ -131,11 +142,18 @@
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"当前状态无法进行该操作");
        }
        identityInfo.setUpdateTime(new Date());
        identityInfo.setAuditStatus(Constants.ONE);
        identityInfoMapper.updateById(identityInfo);
        memberMapper.update(new UpdateWrapper<Member>().lambda()
                .set(Constants.equalsInteger(identityInfo.getType(),Constants.ZERO),Member::getWorkerIdentity,Constants.ONE)
                .set(Constants.equalsInteger(identityInfo.getType(),Constants.ONE),Member::getDriverIdentity,Constants.ONE)
                .set(Constants.equalsInteger(identityInfo.getType(),Constants.TWO),Member::getChefIdentity,Constants.ONE)
                .eq(Member::getId,identityInfo.getMemberId()));
    }


    @Override
    @Transactional(rollbackFor = {BusinessException.class,Exception.class})
    public void updateLocation(IdentityInfo identityInfo) {
        if(Objects.isNull(identityInfo)
                || Objects.isNull(identityInfo.getId())

 server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java

@@ -261,15 +261,15 @@
        if(StringUtils.isBlank(code)){
            throw new BusinessException(ResponseStatus.BAD_REQUEST);
        }
        try {
//        try {
            //获取微信敏感数据
            WxMaJscode2SessionResult session = WxMiniConfig.wxMaService.getUserService().getSessionInfo(code);
            String openId = session.getOpenid();
            String unionId = session.getUnionid();
//            WxMaJscode2SessionResult session = WxMiniConfig.wxMaService.getUserService().getSessionInfo(code);
            String openId = code ;//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("isdeleted", Constants.ZERO).last("limit 1"));
            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)){
@@ -278,9 +278,9 @@
            accountResponse.setToken(jwtTokenUtil.generateToken(member));
            accountResponse.setMember(member);
            return accountResponse;
        } catch (WxErrorException e) {
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "微信登录异常！请联系管理员");
        }
//        } catch (WxErrorException e) {
//            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "微信登录异常！请联系管理员");
//        }
    }


@@ -348,7 +348,7 @@
                .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::getCoverImage,member.getAutoReceiveStatus())
                .set(Objects.nonNull(member.getAutoReceiveStatus()),Member::getAutoReceiveStatus,member.getAutoReceiveStatus())
                        .set(Member::getUpdateTime,new Date())
                .eq(Member::getId,member.getId()));
    }
@@ -389,14 +389,14 @@
        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));
        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.waitPay.getKey())).collect(Collectors.toList()).size());
            userCenterVO.setDoingTotal(releaseOrders.stream().filter(i->Constants.equalsInteger(i.getStatus(),Constants.ordersStatus.accept.getKey())).collect(Collectors.toList()).size());
            userCenterVO.setWaitCommentTotal(releaseOrders.stream().filter(i->Constants.equalsInteger(i.getStatus(),Constants.ordersStatus.doing.getKey())&&Constants.equalsInteger(i.getCommentStatus(),Constants.ZERO)).collect(Collectors.toList()).size());
        }
        List<Orders> acceptOrders = ordersMapper.selectList(new QueryWrapper<Orders>().lambda().eq(Orders::getDeleted,Constants.ZERO).eq(Orders::getAcceptMemberId,member));
        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.accept.getKey())).collect(Collectors.toList()).size());

 server/services/src/main/java/com/doumee/service/business/impl/OrdersServiceImpl.java

@@ -211,6 +211,7 @@
                || Objects.isNull(orders.getEndDate())
                || StringUtil.isBlank(orders.getLocation())
                || StringUtil.isBlank(orders.getLocationRemark())
                || StringUtil.isBlank(orders.getLinkPhone())
                || Objects.isNull(orders.getLat())
                || Objects.isNull(orders.getLgt())
                || Objects.isNull(orders.getCategoryId())
@@ -243,6 +244,7 @@
                    || Objects.isNull(orders.getTransportNum())
                    || StringUtils.isEmpty(orders.getTransportUnit())
                    || StringUtils.isEmpty(orders.getLocationEnd())
                    || StringUtils.isEmpty(orders.getCarUnit())
                    || Objects.isNull(orders.getLatEnd())
                    || Objects.isNull(orders.getLgtEnd())
                    || CollectionUtils.isEmpty(orders.getWayInfoDTOList())
@@ -392,12 +394,12 @@
            if(Constants.equalsInteger(orders.getWorkType(),Constants.ZERO)){
                orders.setPriceUnit("元/斤");
            }else if(Constants.equalsInteger(orders.getWorkType(),Constants.ONE)){
                orders.setPriceUnit("元/人*天");
                orders.setPriceUnit("元/人/天");
            }else{
                if(Constants.equalsInteger(orders.getCarType(),Constants.ZERO)){
                    orders.setPriceUnit("元/人*天");
                    orders.setPriceUnit("元/人/天");
                }else if(Constants.equalsInteger(orders.getCarType(),Constants.ONE)){
                    orders.setPriceUnit("元/人*小时");
                    orders.setPriceUnit("元/人/小时");
                }else{
                    orders.setPriceUnit("元/斤");
                }

 server/web/src/main/java/com/doumee/api/web/UserApi.java

@@ -133,10 +133,12 @@
        return  ApiResponse.success("操作成功");
    }


    @LoginRequired
    @ApiOperation("余额明细")
    @PostMapping("/revenuePage")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true),
    })
    public ApiResponse<PageData<MemberRevenue>> revenuePage (@RequestBody PageWrap<MemberRevenue> pageWrap) {
        pageWrap.getModel().setMemberId(this.getMemberId());
        return ApiResponse.success(memberRevenueService.findPage(pageWrap));