111

k94314517

2025-07-15 3d5f77b68bf28291c76306b274a230dd726838d2

111

 server/services/src/main/java/com/doumee/core/constants/Constants.java

@@ -64,6 +64,7 @@
    public static final String INENTITY_FILES = "INENTITY_FILES";
    public static final String MEMBER_FILES = "MEMBER_FILES";
    public static final String CATEGORY_FILES = "CATEGORY_FILES";
    public static final String ORDERS_FILES = "ORDERS_FILES";
    public static boolean WORKORDER_SHE_EMAIL_SENDING = false;
    public static  boolean DEALING_COMPANY_SYNC = false ;
    public static  boolean DEALING_MEMBER_SYNC = false ;
@@ -82,7 +83,7 @@
    interface CacheKey {
    }
    public interface RedisKeys {
        public static final String IMPORTING_CATEGORY = "IMPORTING_CATEGORY";
        public static final String ORDER_CODE = "ORDER_CODE";
    }
    /**
     * æ“ä½œç±»åž‹ï¼Œç”¨äºŽåšæŽ¥å£éªŒè¯åˆ†ç»„

 server/services/src/main/java/com/doumee/core/utils/GeoUtils.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,41 @@
package com.doumee.core.utils;

/**
 * Created by IntelliJ IDEA.
 *
 * @Author : Rk
 * @create 2025/7/15 9:57
 */
public class GeoUtils {
    // å°†è§’度转换为弧度
    private static double toRadians(double angle) {
        return angle * Math.PI / 180.0;
    }

    // è®¡ç®—两点间的距离（单位：公里）
    public static double haversineDistance(double lat1, double lon1, double lat2, double lon2) {
        // å°†ç»çº¬åº¦è½¬æ¢ä¸ºå¼§åº¦
        double dLat = toRadians(lat2 - lat1);
        double dLon = toRadians(lon2 - lon1);
        lat1 = toRadians(lat1);
        lat2 = toRadians(lat2);

        // åº”用Haversine公式
        double a = Math.pow(Math.sin(dLat / 2), 2) + Math.pow(Math.sin(dLon / 2), 2) * Math.cos(lat1) * Math.cos(lat2);
        double c = 2 * Math.asin(Math.sqrt(a));
        // åœ°çƒåŠå¾„，单位：公里
        int R = 6371;
        return R * c;
    }

    public static void main(String[] args) {
        double lat1 = 30.660622; // çº½çº¦çº¬åº¦
        double lon1 = 114.172; // çº½çº¦ç»åº¦
        double lat2 = 30.621857; // æ´›æ‰çŸ¶çº¬åº¦
        double lon2 = 114.12311; // æ´›æ‰çŸ¶ç»åº¦

        double distance = haversineDistance(lat1, lon1, lat2, lon2);
        System.out.printf("Distance: %.2f km%n", distance);
    }

}

 server/services/src/main/java/com/doumee/core/utils/redis/RedisConfig.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,61 @@
package com.doumee.core.utils.redis;

import com.fasterxml.jackson.annotation.JsonAutoDetect;
import com.fasterxml.jackson.annotation.PropertyAccessor;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.jsontype.impl.LaissezFaireSubTypeValidator;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.data.redis.connection.RedisConnectionFactory;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer;
import org.springframework.data.redis.serializer.StringRedisSerializer;

/**
 * @author jiangping
 * @date 2021-8-10 14:40:35
 * redis配置
 */
@Configuration
public class RedisConfig {

    @Bean
    @SuppressWarnings("all")
    public RedisTemplate<String, Object> redisTemplate(RedisConnectionFactory factory) {
        RedisTemplate<String, Object> template = new RedisTemplate<String, Object>();
        template.setConnectionFactory(factory);
        Jackson2JsonRedisSerializer jackson2JsonRedisSerializer = new Jackson2JsonRedisSerializer(Object.class);
        ObjectMapper om = new ObjectMapper();
        om.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY);
        om.activateDefaultTyping(LaissezFaireSubTypeValidator.instance, ObjectMapper.DefaultTyping.NON_FINAL);
        jackson2JsonRedisSerializer.setObjectMapper(om);
        StringRedisSerializer stringRedisSerializer = new StringRedisSerializer();
        // key采用String的序列化方式
        template.setKeySerializer(stringRedisSerializer);
        // hash的key也采用String的序列化方式
        template.setHashKeySerializer(stringRedisSerializer);
        // value序列化方式采用jackson
        template.setValueSerializer(jackson2JsonRedisSerializer);
        // hash的value序列化方式采用jackson
        template.setHashValueSerializer(jackson2JsonRedisSerializer);
        template.afterPropertiesSet();
        return template;
    }
}
/*@Configuration
public class RedisConfig {

    *//**
     * @param factory
     * @return è‡ªå®šä¹‰redisTemplate，自带的bean没有序列化器
     *//*
    @Bean
    public RedisTemplate<String, Object> redisTemplate(RedisConnectionFactory factory) {
        RedisTemplate<String, Object> redisTemplate = new RedisTemplate<>();
        redisTemplate.setConnectionFactory(factory);
        redisTemplate.setKeySerializer(new StringRedisSerializer());//设置key的序列化器
        redisTemplate.setValueSerializer(new RedisConverter());//设置值的序列化器
        return redisTemplate;
    }

}*/

 server/services/src/main/java/com/doumee/core/utils/redis/RedisConverter.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,38 @@
package com.doumee.core.utils.redis;
import org.springframework.core.convert.converter.Converter;
import org.springframework.core.serializer.support.DeserializingConverter;
import org.springframework.core.serializer.support.SerializingConverter;
import org.springframework.data.redis.serializer.RedisSerializer;
import org.springframework.data.redis.serializer.SerializationException;

/**
 * @author å½­ä¼Ÿ
 * @date 2018/8/28 9:31
 */
public class RedisConverter implements RedisSerializer<Object> {
    private Converter<Object, byte[]> serializer = new SerializingConverter();//序列化器
    private Converter<byte[], Object> deserializer = new DeserializingConverter();//反序列化器

    @Override
    public byte[] serialize(Object o) throws SerializationException {//将对象序列化成字节数组
        if (o == null) return new byte[0];
        try {
            return serializer.convert(o);
        } catch (Exception e) {
            e.printStackTrace();
            return new byte[0];
        }
    }

    @Override
    public Object deserialize(byte[] bytes) throws SerializationException {//将字节数组反序列化成对象
        if (bytes == null || bytes.length == 0) return null;
        try {
            return deserializer.convert(bytes);
        } catch (Exception e) {
            e.printStackTrace();
            return null;
        }
    }

}

 server/services/src/main/java/com/doumee/core/utils/redis/RedisUtil.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,86 @@
package com.doumee.core.utils.redis;

import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.data.redis.core.StringRedisTemplate;

import java.util.concurrent.TimeUnit;

public class RedisUtil {
    /**
     * æ·»åŠ ä¸€ä¸ªValue为String
     * @param stringRedisTemplate
     * @param key
     * @param str
     */
    public static void addString( StringRedisTemplate stringRedisTemplate, String key, String str) {
        //1,添加一个Value为String
        stringRedisTemplate.opsForValue().set(key, str);

    }

    /**
     * æ ¹æ®key删除字符串缓存
     * @param stringRedisTemplate
     * @param key
     */
    public static void delString( StringRedisTemplate stringRedisTemplate, String key ) {
        //1,添加一个Value为String
        stringRedisTemplate.delete(key);

    }

    /**
     * æ ¹æ®key删除对象数据
     * @param redisTemplate
     * @param key
     */
    public static void deleteObject( RedisTemplate<String, Object> redisTemplate  , String key ) {

        redisTemplate.delete(key);

    }
    /**
     * æ·»åŠ ä¸€ä¸ªValue为对象
     * @param redisTemplate
     * @param key
     * @param obj
     */
    public static void addObject(RedisTemplate<String, Object> redisTemplate  , String key, Object obj) {
        redisTemplate.opsForValue().set(key, obj);
    }
    /**
     * æ·»åŠ ä¸€ä¸ªValue为对象
     * @param redisTemplate
     * @param key
     * @param obj
     */
    public static void addObject(RedisTemplate<String, Object> redisTemplate  , String key, Object obj,long time) {
//        redisTemplate.opsForValue().set(key, obj);
        redisTemplate.opsForValue().set(key,obj,time, TimeUnit.SECONDS);
    }

    /**
     * æ ¹æ®å‚数对象类型，返回相应缓存对象数据
     * @param stringRedisTemplate
     * @param key
     * @return
     */
    public static String getString(StringRedisTemplate stringRedisTemplate, String key){
       String val = stringRedisTemplate.opsForValue().get(key);
        return val;
    }

    /**
     * æ ¹æ®å‚数对象类型，返回相应缓存对象数据
     * @param redisTemplate
     * @param key
     * @param clazz
     * @param <T>
     * @return
     */
    public static <T> T getObject(RedisTemplate<String, Object> redisTemplate  , String key,Class<T> clazz){
        T t = (T) redisTemplate.opsForValue().get(key);
        return t;
    }

}

 server/services/src/main/java/com/doumee/dao/business/OrdersMapper.java

@@ -2,11 +2,12 @@

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.doumee.dao.business.model.Orders;
import com.github.yulichang.base.MPJBaseMapper;

/**
 * @author æ±Ÿè¹„蹄
 * @date 2025/07/09 12:00
 */
public interface OrdersMapper extends BaseMapper<Orders> {
public interface OrdersMapper extends MPJBaseMapper<Orders> {

}

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

@@ -156,7 +156,6 @@
    @ExcelColumn(name="是否接受自动派单:0=否；1=是；")
    private Integer autoReceiveStatus;


    @ApiModelProperty(value = "当前使用身份:0=用工发布方;1=用工接单方;", example = "1")
    @ExcelColumn(name="当前使用身份:0=用工发布方;1=用工接单方;")
    private Integer useIdentity;
@@ -174,4 +173,20 @@
    @TableField(exist = false)
    private Integer type;

    @ApiModelProperty(value = "头像全路径")
    @TableField(exist = false)
    private String fullCoverImage;

    @ApiModelProperty(value = "用工身份", example = "1")
    @TableField(exist = false)
    private IdentityInfo workerIdentityModel;

    @ApiModelProperty(value = "司机身份信息", example = "1")
    @TableField(exist = false)
    private IdentityInfo driverIdentityModel;

    @ApiModelProperty(value = "送餐身份信息", example = "1")
    @TableField(exist = false)
    private IdentityInfo chefIdentityModel;

}

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

@@ -103,4 +103,7 @@
    @TableField(exist = false)
    @ExcelColumn(name="用户openid" ,index = 1,width = 6)
    private String openid;
    @ApiModelProperty(value = "用工类型:0=采摘工;1=分拣工;2=包装工", example = "1")
    @TableField(exist = false)
    private Integer workType;
}

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

@@ -153,7 +153,7 @@
    private String transportUnit;

    @ApiModelProperty(value = "用车终点地址")
    @ExcelColumn(name="用车终点地址")
    @ExcelColumn(name = "用车终点地址")
    private String locationEnd;

    @ApiModelProperty(value = "用车终点经度")
@@ -246,7 +246,7 @@
    private Integer totalDays;

    @ApiModelProperty(value = "取消类型：0=发单方无责取消；1=发单方有责取消；2=系统取消；", example = "1")
    @ExcelColumn(name="取消类型：0=发单方无责取消；1=发单方有责取消；2=系统取消；")
    @ExcelColumn(name = "取消类型：0=发单方无责取消；1=发单方有责取消；2=系统取消；")
    private Integer cancelType;

    @ApiModelProperty(value = "图片")
@@ -261,11 +261,26 @@
    @TableField(exist = false)
    private List<CateringDTO> cateringDTOList;


    @ApiModelProperty(value = "移动端用户",hidden = true)
    @ApiModelProperty(value = "移动端用户", hidden = true)
    @TableField(exist = false)
    private Member member;

    @ApiModelProperty(value = "查询我的订单：0=发单方订单；1=接单方订单；2=接单大厅；", example = "1")
    @TableField(exist = false)
    private Integer queryMyOrderType;


    @ApiModelProperty(value = "需求类型")
    @TableField(exist = false)
    private String categoryName;

    @ApiModelProperty(value = "运输品种")
    @TableField(exist = false)
    private String transportTypeName;

    @ApiModelProperty(value = "距离 å•ä½km")
    @TableField(exist = false)
    private double distance;

}


 server/services/src/main/java/com/doumee/dao/dto/WithdrawalDTO.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,23 @@
package com.doumee.dao.dto;

import com.doumee.dao.business.model.Member;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * Created by IntelliJ IDEA.
 *
 * @Author : Rk
 * @create 2023/3/23 9:50
 */
@Data
@ApiModel("提现申请")
public class WithdrawalDTO {

    @ApiModelProperty(value = "提现金额 (单位：分)")
    private Long amount;

    @ApiModelProperty(value = "用户信息",hidden = true)
    private Member member;
}

 server/services/src/main/java/com/doumee/service/business/OrdersService.java

@@ -126,4 +126,8 @@
    String payNotify(String preOrderId,String paymentNo);

    void platformCancel(Integer orderId, LoginUserInfo loginUserInfo);

    PageData<Orders> findPageForMini(PageWrap<Orders> pageWrap);

    Orders getDetail(Integer id,Integer userType);
}

 server/services/src/main/java/com/doumee/service/business/WithdrawalOrdersService.java

@@ -3,6 +3,8 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.WithdrawalOrders;
import com.doumee.dao.dto.WithdrawalDTO;

import java.util.List;

/**
@@ -94,4 +96,7 @@
     * @return long
     */
    long count(WithdrawalOrders withdrawalOrders);

    void  applyWithdrawal(WithdrawalDTO withdrawalDTO);

}

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

@@ -7,6 +7,7 @@
import com.doumee.dao.business.MemberRevenueMapper;
import com.doumee.dao.business.model.Member;
import com.doumee.dao.business.model.MemberRevenue;
import com.doumee.dao.business.model.Orders;
import com.doumee.service.business.MemberRevenueService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -97,7 +98,9 @@
                .selectAs(Member::getName,MemberRevenue::getMemberName)
                .selectAs(Member::getNickName,MemberRevenue::getMemberNickname)
                .selectAs(Member::getTelephone,MemberRevenue::getMemberPhone)
                .leftJoin(Member.class,Member::getId,MemberRevenue::getMemberId);
                .selectAs(Orders::getWorkType,MemberRevenue::getWorkType)
                .leftJoin(Member.class,Member::getId,MemberRevenue::getMemberId)
                .leftJoin(Orders.class,Orders::getId,MemberRevenue::getObjId);
        Utils.MP.blankToNull(pageWrap.getModel());
        pageWrap.getModel().setDeleted(Constants.ZERO);
        queryWrapper.eq(pageWrap.getModel().getId() != null,MemberRevenue::getId, pageWrap.getModel().getId());

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

@@ -12,7 +12,9 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.GeoUtils;
import com.doumee.core.utils.Utils;
import com.doumee.core.utils.redis.RedisUtil;
import com.doumee.dao.business.*;
import com.doumee.dao.business.model.*;
import com.doumee.dao.dto.*;
@@ -21,14 +23,17 @@
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.yulichang.wrapper.MPJLambdaWrapper;
import com.wechat.pay.java.service.partnerpayments.jsapi.model.Amount;
import com.wechat.pay.java.service.partnerpayments.jsapi.model.Payer;
import com.wechat.pay.java.service.partnerpayments.jsapi.model.PrepayRequest;
import com.wechat.pay.java.service.partnerpayments.jsapi.model.PrepayWithRequestPaymentResponse;
import jodd.util.StringUtil;
import nonapi.io.github.classgraph.json.Id;
import org.apache.poi.sl.image.ImageHeaderEMF;
import org.checkerframework.checker.units.qual.A;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
@@ -70,7 +75,13 @@
    private MemberRevenueMapper memberRevenueMapper;

    @Autowired
    private IdentityInfoMapper identityInfoMapper;

    @Autowired
    private WxMiniUtilService wxMiniUtilService;

    @Autowired
    private RedisTemplate<String, Object> redisTemplate;

    @Override
    @Transactional(rollbackFor = {Exception.class,BusinessException.class})
@@ -79,8 +90,8 @@
        this.initVerification(orders);
        orders.setCreateTime(new Date());
        orders.setPayStatus(Constants.ZERO);
        //TODO è®¢å•ç¼–号规则

        //订单编号
        orders.setCode(this.getNextCode(orders.getType()));
        Category category = categoryMapper.selectOne(new QueryWrapper<Category>().lambda()
                .eq(Category::getDeleted,Constants.ZERO).eq(Category::getType,Constants.THREE)
                .eq(Category::getName,orders.getType())
@@ -1133,4 +1144,182 @@
        return  ("处理成功!");
    }


    @Override
    public PageData<Orders> findPageForMini(PageWrap<Orders> pageWrap) {
        IPage<Orders> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
        MPJLambdaWrapper<Orders> queryWrapper = new MPJLambdaWrapper<>();
        Utils.MP.blankToNull(pageWrap.getModel());
        Orders model = pageWrap.getModel();
        queryWrapper.selectAll(Orders.class)
                .select("c1.name",Orders::getCategoryName)
                .select("c2.name",Orders::getTransportTypeName)
                .leftJoin(" category c1 on t.category_id = c1.id  ")
                .leftJoin(" category c2 on t.TRANSPORT_TYPE_ID = c2.id  ");
        if(Objects.nonNull(model.getQueryMyOrderType())){
            if(Constants.equalsInteger(model.getQueryMyOrderType(),Constants.ZERO)){
                //发单方 æˆ‘的订单
                queryWrapper.eq(Orders::getReleaseMemberId,model.getMember().getId());
            }else if(Constants.equalsInteger(model.getQueryMyOrderType(),Constants.ONE)){
                //接单方 æˆ‘的订单
                queryWrapper.eq(Orders::getAcceptMemberId,model.getMember().getId());
            }else{
                //接单大厅
                queryWrapper.and(i->
                        i.eq(Constants.equalsInteger(model.getMember().getWorkerIdentity(),Constants.TWO),Orders::getType,Constants.ZERO)
                                .or()
                                .eq(Constants.equalsInteger(model.getMember().getDriverIdentity(),Constants.TWO),Orders::getType,Constants.ONE)
                                .or()
                                .eq(Constants.equalsInteger(model.getMember().getChefIdentity(),Constants.TWO),Orders::getType,Constants.TWO)
                );
                queryWrapper.eq(Orders::getStatus,Constants.ONE);
            }
        }
        for(PageWrap.SortData sortData: pageWrap.getSorts()) {
            if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
                queryWrapper.orderByDesc(sortData.getProperty());
            } else {
                queryWrapper.orderByAsc(sortData.getProperty());
            }
        }
        IPage<Orders> iPage = ordersMapper.selectJoinPage(page,Orders.class,queryWrapper);
        if(Objects.nonNull(model.getQueryMyOrderType())&&Constants.equalsInteger(model.getQueryMyOrderType(),Constants.TWO)){
            if(Constants.equalsInteger(model.getMember().getUseIdentity(),Constants.ONE)){
                model.getMember().setWorkerIdentityModel(
                        identityInfoMapper.selectOne(new QueryWrapper<IdentityInfo>().lambda()
                                .eq(IdentityInfo::getMemberId,model.getMember().getId())
                                .eq(IdentityInfo::getType,Constants.ZERO)
                                .eq(IdentityInfo::getAuditStatus,Constants.TWO)
                                .last("limit 1")
                        )
                );
                model.getMember().setDriverIdentityModel(
                        identityInfoMapper.selectOne(new QueryWrapper<IdentityInfo>().lambda()
                                .eq(IdentityInfo::getMemberId,model.getMember().getId())
                                .eq(IdentityInfo::getType,Constants.ONE)
                                .eq(IdentityInfo::getAuditStatus,Constants.TWO)
                                .last("limit 1")
                        )
                );
                model.getMember().setChefIdentityModel(
                        identityInfoMapper.selectOne(new QueryWrapper<IdentityInfo>().lambda()
                                .eq(IdentityInfo::getMemberId,model.getMember().getId())
                                .eq(IdentityInfo::getType,Constants.TWO)
                                .eq(IdentityInfo::getAuditStatus,Constants.TWO)
                                .last("limit 1")
                        )
                );
            }
            for (Orders orders:iPage.getRecords()) {
               this.getDistance(model.getMember(),orders);
            }
        }
        return PageData.from(iPage);
    }




    //定位距离
    public void getDistance(Member member,Orders orders){

        if(Constants.equalsInteger(orders.getType(),Constants.ZERO)){
            if(Objects.nonNull(member.getWorkerIdentityModel())&&Objects.nonNull(member.getWorkerIdentityModel().getLgt())
                    &&Objects.nonNull(member.getWorkerIdentityModel().getLat())){
                orders.setDistance(
                        GeoUtils.haversineDistance(
                                orders.getLgt().doubleValue(),orders.getLat().doubleValue(),
                                member.getWorkerIdentityModel().getLgt().doubleValue(),
                                member.getWorkerIdentityModel().getLat().doubleValue()
                        )
                );
            }

        }else if(Constants.equalsInteger(orders.getType(),Constants.ONE)){
            if(Objects.nonNull(member.getDriverIdentityModel())&&Objects.nonNull(member.getDriverIdentityModel().getLgt())
                    &&Objects.nonNull(member.getDriverIdentityModel().getLat())) {
                orders.setDistance(
                        GeoUtils.haversineDistance(
                                orders.getLgt().doubleValue(), orders.getLat().doubleValue(),
                                member.getDriverIdentityModel().getLgt().doubleValue(),
                                member.getDriverIdentityModel().getLat().doubleValue()
                        )
                );
            }
        }else{
            if(Objects.nonNull(member.getChefIdentityModel())&&Objects.nonNull(member.getChefIdentityModel().getLgt())
                    &&Objects.nonNull(member.getChefIdentityModel().getLat())) {
                orders.setDistance(
                        GeoUtils.haversineDistance(
                                orders.getLgt().doubleValue(),orders.getLat().doubleValue(),
                                member.getChefIdentityModel().getLgt().doubleValue(),
                                member.getChefIdentityModel().getLat().doubleValue()
                        )
                );
            }
        }
    }



    @Override
    public Orders getDetail(Integer id,Integer userType) {
        Orders orders = ordersMapper.selectJoinOne(Orders.class,new MPJLambdaWrapper<Orders>()
                        .selectAll(Orders.class)
                        .select("c1.name",Orders::getCategoryName)
                        .select("c2.name",Orders::getTransportTypeName)
                        .leftJoin(" category c1 on t.category_id = c1.id  ")
                        .leftJoin(" category c2 on t.TRANSPORT_TYPE_ID = c2.id  ")
                        .eq(Orders::getId,id)
                );
        if(Objects.isNull(orders)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY);
        }
        if(Objects.nonNull(userType)){
            Member member = memberMapper.selectById(
                    Constants.equalsInteger(userType,Constants.ZERO)?orders.getReleaseMemberId():orders.getAcceptMemberId()
            );
            if(Objects.nonNull(member)){
                if(org.apache.commons.lang3.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());
                }
                orders.setMember(member);
            }
        }
        List<Multifile> multifileList = multifileMapper.selectList(new QueryWrapper<Multifile>().lambda().eq(Multifile::getObjId,orders.getId())
                .eq(Multifile::getIsdeleted,Constants.ZERO).eq(Multifile::getObjType,Constants.ONE).orderByAsc(Multifile::getId));
        if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(multifileList)){
            String path  = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.RESOURCE_PATH).getCode()
                    +systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.ORDERS_FILES).getCode();
            for (Multifile multifile:multifileList) {
                multifile.setFileurlFull(path + multifile.getFileurl());
            }
            orders.setMultifileList(multifileList);
        }


        return orders;
    }




    public synchronized String  getNextCode(Integer type){
        String prefix = "YG";
        if(!Constants.equalsInteger(type,Constants.ZERO)){
            prefix = (Constants.equalsInteger(type,Constants.ONE)?"YC-":"SC-");
        }
        prefix =  DateUtil.getDate(new Date(),"yyyyMMdd") +"-";
        Integer countNum  = RedisUtil.getObject(redisTemplate, Constants.RedisKeys.ORDER_CODE, Integer.class);
        countNum = Constants.formatIntegerNum(countNum)+1;
        //更新缓存
        RedisUtil.addObject(redisTemplate,Constants.RedisKeys.ORDER_CODE,countNum);
        String nextIndex =Integer.toString( countNum );
        return prefix + org.apache.commons.lang3.StringUtils.leftPad(nextIndex,3,"0");
    }


}

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

@@ -1,10 +1,18 @@
package com.doumee.service.business.impl;

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.MemberMapper;
import com.doumee.dao.business.MemberRevenueMapper;
import com.doumee.dao.business.WithdrawalOrdersMapper;
import com.doumee.dao.business.model.Member;
import com.doumee.dao.business.model.MemberRevenue;
import com.doumee.dao.business.model.WithdrawalOrders;
import com.doumee.dao.dto.WithdrawalDTO;
import com.doumee.service.business.WithdrawalOrdersService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -12,9 +20,12 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;

import java.util.Date;
import java.util.List;
import java.util.Objects;

/**
 * æçŽ°ç”³è¯·è®°å½•Service实现
@@ -26,6 +37,12 @@

    @Autowired
    private WithdrawalOrdersMapper withdrawalOrdersMapper;

    @Autowired
    private MemberMapper memberMapper;

    @Autowired
    private MemberRevenueMapper memberRevenueMapper;

    @Override
    public Integer create(WithdrawalOrders withdrawalOrders) {
@@ -146,4 +163,49 @@
        QueryWrapper<WithdrawalOrders> wrapper = new QueryWrapper<>(withdrawalOrders);
        return withdrawalOrdersMapper.selectCount(wrapper);
    }


    /************************************移动端接口*******************************************/

    /**
     * æçŽ°ç”³è¯·
     * @param withdrawalDTO
     */

    @Override
    @Transactional(rollbackFor = {BusinessException.class,Exception.class})
    public void  applyWithdrawal(WithdrawalDTO withdrawalDTO){
        if(Objects.isNull(withdrawalDTO)
        || Objects.isNull(withdrawalDTO.getAmount())){
            throw new BusinessException(ResponseStatus.BAD_REQUEST);
        }
        Member member = memberMapper.selectById(withdrawalDTO.getMember().getId());
        if(Objects.isNull(member)){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"用户信息异常,请联系管理员");
        }
        if(member.getAmount() < withdrawalDTO.getAmount()){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起，可提现余额不足。");
        }
        WithdrawalOrders withdrawalOrders = new WithdrawalOrders();
        withdrawalOrders.setCreateTime(new Date());
        withdrawalOrders.setMemberId(member.getId());
        withdrawalOrders.setAmount(withdrawalDTO.getAmount());
        withdrawalOrders.setStatus(Constants.ZERO);
        withdrawalOrders.setType(Constants.ZERO);

        //TODO å‘起提现申请



        //更新用户余额


        //存储流水记录



    }



}

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

@@ -4,9 +4,12 @@
import com.doumee.core.annotation.LoginRequired;
import com.doumee.core.annotation.trace.Trace;
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.IdentityInfo;
import com.doumee.dao.business.model.Member;
import com.doumee.dao.business.model.Orders;
import com.doumee.dao.dto.CommentDTO;
import com.doumee.dao.dto.ConfirmUpdOrderDTO;
import com.doumee.dao.dto.DoneOrderDTO;
import com.doumee.dao.dto.UpdOrderDataDTO;
@@ -18,6 +21,7 @@
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

@@ -136,7 +140,7 @@

    @LoginRequired
    @ApiOperation(value = "完成订单 - å‘单方", notes = "小程序端")
    @GetMapping("/doneOrder")
    @PostMapping("/doneOrder")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true),
    })
@@ -146,5 +150,38 @@
    }


    @LoginRequired
    @ApiOperation(value = "订单评价 - å‘单方", notes = "小程序端")
    @PostMapping("/comment")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true),
    })
    public ApiResponse comment(@RequestBody CommentDTO commentDTO) {
        commentDTO.setMember(this.getMemberResponse());
        ordersService.comment(commentDTO);
        return  ApiResponse.success("操作成功");
    }



    @LoginRequired
    @ApiOperation("分页查询")
    @PostMapping("/page")
    public ApiResponse<PageData<Orders>> findPage (@RequestBody PageWrap<Orders> pageWrap) {
        pageWrap.getModel().setMember(this.getMemberResponse());
        return ApiResponse.success(ordersService.findPageForMini(pageWrap));
    }

    @LoginRequired
    @ApiOperation(value = "订单详情", notes = "小程序端")
    @GetMapping("/getDetail")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true),
    })
    public ApiResponse<Orders> getDetail(@RequestParam Integer orderId) {
        return  ApiResponse.success("操作成功",ordersService.getDetail(orderId,this.getMemberResponse().getUseIdentity()));
    }



}

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

@@ -3,17 +3,23 @@
import com.doumee.core.annotation.LoginRequired;
import com.doumee.core.annotation.trace.Trace;
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
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.dto.WxPhoneRequest;
import com.doumee.dao.vo.AccountResponse;
import com.doumee.service.business.IdentityInfoService;
import com.doumee.service.business.MemberRevenueService;
import com.doumee.service.business.MemberService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.checkerframework.checker.units.qual.A;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

@@ -37,8 +43,11 @@
    @Autowired
    private IdentityInfoService identityInfoService;

    @Autowired
    private MemberRevenueService memberRevenueService;

    @LoginRequired
    @ApiOperation(value = "编辑个人信息", notes = "小程序端")
    @ApiOperation(value = "获取个人信息", notes = "小程序端")
    @GetMapping("/getMemberInfo")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true),
@@ -124,4 +133,15 @@
        return  ApiResponse.success("操作成功");
    }


    @LoginRequired
    @ApiOperation("余额明细")
    @PostMapping("/revenuePage")
    public ApiResponse<PageData<MemberRevenue>> revenuePage (@RequestBody PageWrap<MemberRevenue> pageWrap) {
        pageWrap.getModel().setMemberId(this.getMemberId());
        return ApiResponse.success(memberRevenueService.findPage(pageWrap));
    }



}