111

k94314517

2025-07-16 4406bf965a39cf9af71ed822abfce76f64be04f9

111

 server/admin/src/main/java/com/doumee/api/business/PaymentCallback.java

ÎļþÃû´Ó server/web/src/main/java/com/doumee/api/web/PaymentCallback.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.doumee.api.web;
package com.doumee.api.business;

import com.doumee.config.wx.WxMiniConfig;
import com.doumee.core.model.ApiResponse;

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

@@ -44,6 +44,9 @@
    public static final String SERVER_INTRODUCE ="SERVER_INTRODUCE" ;
    public static final String FEE_STANDARDS ="FEE_STANDARDS" ;
    public static final String ABOUT_US ="ABOUT_US" ;
    public static final String SERVER_PHONE ="SERVER_PHONE" ;
    public static final String USER_AGREEMENT ="USER_AGREEMENT" ;
    public static final String PRIVACY_AGREEMENT ="PRIVACY_AGREEMENT" ;


    public static final String RELEASE_CANCEL_TIMES ="RELEASE_CANCEL_TIMES" ;
@@ -500,7 +503,7 @@

        // æ™®é€šæ–¹æ³•
        public static String getName(int index) {
            for (OrdersLog c : OrdersLog.values()) {
            for (workType c : workType.values()) {
                if (c.getKey() == index) {
                    return c.name;
                }

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

@@ -2060,6 +2060,11 @@
        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
        return formatter.format(date);
    }
    public static String getCurrDateTimeShort() {
        Timestamp date = new Timestamp(System.currentTimeMillis());
        SimpleDateFormat formatter = new SimpleDateFormat("yyyyMMddHHmmss");
        return formatter.format(date);
    }

    /**
     * å¾—到当前日期时间,格式为yyyy-MM-dd.

 server/services/src/main/java/com/doumee/dao/vo/UserCenterVO.java

@@ -43,4 +43,12 @@
    @ApiModelProperty(value = "关于我们")
    private String aboutUs;

    @ApiModelProperty(value = "用户协议")
    private String userAgreement;

    @ApiModelProperty(value = "隐私协议")
    private String privacyAgreement;

    @ApiModelProperty(value = "客服电话 å¤šä¸ªä»¥,分割")
    private String serverPhone;
}

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

@@ -12,6 +12,7 @@
import com.doumee.dao.business.model.Member;
import com.doumee.dao.dto.WxPhoneRequest;
import com.doumee.dao.vo.AccountResponse;
import com.doumee.dao.vo.UserCenterVO;
import me.chanjar.weixin.common.error.WxErrorException;
import org.apache.commons.lang3.StringUtils;

@@ -146,4 +147,6 @@
     * @return
     */
    Member getMemberInfo(Integer memberId);

    UserCenterVO getPlatformAboutUs();
}

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

@@ -261,11 +261,11 @@
        if(StringUtils.isBlank(code)){
            throw new BusinessException(ResponseStatus.BAD_REQUEST);
        }
//        try {
        try {
            //获取微信敏感数据
//            WxMaJscode2SessionResult session = WxMiniConfig.wxMaService.getUserService().getSessionInfo(code);
            String openId = code ;//session.getOpenid();
//            String unionId = session.getUnionid();
            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失败！请联系管理员");
            }
@@ -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(), "微信登录异常！请联系管理员");
        }
    }


@@ -288,30 +288,30 @@

    @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 {
            if(Objects.isNull(wxPhoneRequest)
            || StringUtils.isBlank(wxPhoneRequest.getCode())
            || StringUtils.isBlank(wxPhoneRequest.getOpenid())){
                throw new BusinessException(ResponseStatus.BAD_REQUEST);
            }
            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"));
            member.setOpenid(wxPhoneRequest.getOpenid());
            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("");
                member.setCoverImage("1.png");
                member.setWorkerIdentity(Constants.ZERO);
                member.setDriverIdentity(Constants.ZERO);
                member.setChefIdentity(Constants.ZERO);
@@ -324,6 +324,7 @@
                member.setPublishNum(Constants.ZERO.longValue());
                member.setAutoReceiveStatus(Constants.ONE);
                member.setUseIdentity(Constants.ZERO);
                member.setOpenid(wxPhoneRequest.getOpenid());
                memberMapper.insert(member);
            }
            AccountResponse accountResponse = new AccountResponse();
@@ -402,10 +403,6 @@
            userCenterVO.setTaskingTotal(acceptOrders.stream().filter(i->Constants.equalsInteger(i.getStatus(),Constants.ordersStatus.accept.getKey())).collect(Collectors.toList()).size());
            userCenterVO.setDoneTotal(releaseOrders.stream().filter(i->Constants.equalsInteger(i.getStatus(),Constants.ordersStatus.doing.getKey())).collect(Collectors.toList()).size());
        }

        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()));
        member.setUserCenterVO(userCenterVO);
        return member;
    }
@@ -413,6 +410,19 @@



    @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;
    }




}

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

@@ -95,7 +95,16 @@
        Object objects = null;
        this.initVerification(orders);
        orders.setCreateTime(new Date());
        orders.setUpdateTime(orders.getUpdateTime());
        orders.setPayStatus(Constants.ZERO);
        orders.setDeleted(Constants.ZERO);
        orders.setReleaseMemberId(orders.getMember().getId());
        //查询手续费
        Category platformCategory = categoryMapper.selectOne(new QueryWrapper<Category>().lambda().eq(Category::getType,Constants.THREE).eq(Category::getName,orders.getType()).eq(Category::getDeleted,Constants.ZERO).last("limit 1 "));
        if(Objects.isNull(platformCategory)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"未设置平台配置信息");
        }
        orders.setPlatformRata(new BigDecimal(platformCategory.getDetail()).divide(new BigDecimal("100")));
        //订单编号
        orders.setCode(this.getNextCode(orders.getType()));
        Category category = categoryMapper.selectOne(new QueryWrapper<Category>().lambda()
@@ -132,7 +141,7 @@
            multifileMapper.insert(multifileList);
        }
        //更新用户发单量
        memberMapper.update(new UpdateWrapper<Member>().lambda().set(Member::getReceiveNum," (receive_num + 1 )").eq(Member::getId,orders.getMember().getId()));
        memberMapper.update(new UpdateWrapper<Member>().lambda().setSql(" receive_num =  ( receive_num + 1 )").eq(Member::getId,orders.getMember().getId()));

        //创建操作日志
        Constants.OrdersLog ordersLog = Constants.OrdersLog.UPLOAD;
@@ -215,7 +224,6 @@
                || Objects.isNull(orders.getLat())
                || Objects.isNull(orders.getLgt())
                || Objects.isNull(orders.getCategoryId())
                || Objects.isNull(orders.getTotalDays())
                || (Constants.equalsInteger(orders.getType(),Constants.ZERO) && Objects.isNull(orders.getWorkType()))
                || Objects.isNull(orders.getPriceNum1())
                || Objects.isNull(orders.getEstimatedAccount())
@@ -223,19 +231,20 @@
        ){
            throw new BusinessException(ResponseStatus.BAD_REQUEST);
        }
        if((Constants.equalsInteger(orders.getType(),Constants.ZERO) && Constants.equalsInteger(orders.getWorkType(),Constants.ZERO ))
                || (Constants.equalsInteger(orders.getType(),Constants.ZERO) && Constants.equalsInteger(orders.getWorkType(),Constants.TWO)
                        &&Constants.equalsInteger(orders.getCarType(),Constants.TWO))
                || Constants.equalsInteger(orders.getType(),Constants.ONE)
        if( (Constants.equalsInteger(orders.getType(),Constants.ZERO) && Constants.equalsInteger(orders.getWorkType(),Constants.TWO) &&
            ( Constants.equalsInteger(orders.getCarType(),Constants.ZERO) || Constants.equalsInteger(orders.getCarType(),Constants.ONE) ))
            || (Constants.equalsInteger(orders.getType(),Constants.ZERO) && Constants.equalsInteger(orders.getWorkType(),Constants.ONE))
        ){
            if(Objects.isNull(orders.getPriceNum2())){
                throw new BusinessException(ResponseStatus.BAD_REQUEST);
            }
        }else{
            orders.setPriceNum2(Constants.ONE);
        }
        if(Objects.isNull(orders.getPriceNum2())){
            throw new BusinessException(ResponseStatus.BAD_REQUEST);
        }
        orders.setTotalDays(DateUtil.daysBetweenDates(orders.getEndDate(),orders.getStartDate())+1);
        if(Constants.equalsInteger(orders.getType(),Constants.ZERO)){
            if(Constants.equalsInteger(orders.getWorkType(),Constants.TWO)
            && Objects.isNull(orders.getCarType())){
            && ( Objects.isNull(orders.getCarType())  ) ){
                throw new BusinessException(ResponseStatus.BAD_REQUEST);
            }
        }else if(Constants.equalsInteger(orders.getType(),Constants.ONE)){
@@ -527,11 +536,11 @@

            if(Constants.equalsInteger(orders.getCarType(),Constants.ZERO)){
                if(Objects.nonNull(orders.getPriceNum2())) {
                    orders.setOrderContent(orders.getOrderContent() + " | ç”¨è½¦" + orders.getPriceNum2() + "天");
                    orders.setOrderContent(orders.getOrderContent() + " | ç”¨è½¦" + orders.getPriceNum1() + "天");
                }
            }else{
                if(Objects.nonNull(orders.getPriceNum2())) {
                    orders.setOrderContent(orders.getOrderContent() + " | ç”¨è½¦" + orders.getPriceNum2() + "次");
                    orders.setOrderContent(orders.getOrderContent() + " | ç”¨è½¦" + orders.getPriceNum1() + "次");
                }
            }
        }else{
@@ -598,7 +607,7 @@
        orders.setStatus(Constants.ordersStatus.accept.getKey());
        ordersMapper.updateById(orders);
        //更新接单量
        memberMapper.update(new UpdateWrapper<Member>().lambda().set(Member::getPublishNum," (publish_num + 1 )").eq(Member::getId,member.getId()));
        memberMapper.update(new UpdateWrapper<Member>().lambda().setSql(" publish_num = (publish_num + 1 )").eq(Member::getId,member.getId()));

        //创建操作日志
        Constants.OrdersLog ordersLog = Constants.OrdersLog.RECEIVE;
@@ -627,7 +636,7 @@
        if(!Constants.equalsInteger(orders.getStatus(),Constants.ordersStatus.accept.getKey())){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"订单状态已流转,无法进行该操作");
        }
        if(Constants.equalsInteger(orders.getReleaseMemberId(),member.getId())){
        if(!Constants.equalsInteger(orders.getReleaseMemberId(),member.getId())){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"非您的订单无法进行该操作");
        }
        if(Constants.equalsInteger(orders.getIsUpdate(),Constants.ONE)){
@@ -655,8 +664,7 @@
        if(Objects.isNull(updOrderDataDTO)
            || Objects.isNull(updOrderDataDTO.getOrderId())
            || Objects.isNull(updOrderDataDTO.getStartDate())
            || Objects.isNull(updOrderDataDTO.getEndDate())
            || Objects.isNull(updOrderDataDTO.getTotalDays())){
            || Objects.isNull(updOrderDataDTO.getEndDate())){
            throw new BusinessException(ResponseStatus.DATA_EMPTY);
        }
        Orders orders = ordersMapper.selectById(updOrderDataDTO.getOrderId());
@@ -666,7 +674,7 @@
        if(!Constants.equalsInteger(orders.getStatus(),Constants.ordersStatus.accept.getKey())){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"订单状态已流转,无法进行该操作");
        }
        if(Constants.equalsInteger(orders.getReleaseMemberId(),updOrderDataDTO.getMember().getId())){
        if(!Constants.equalsInteger(orders.getReleaseMemberId(),updOrderDataDTO.getMember().getId())){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"非您的订单无法进行该操作");
        }
        if(Constants.equalsInteger(orders.getIsUpdate(),Constants.ONE)){
@@ -709,9 +717,7 @@

    public Long getTotal(Orders orders){
        if(
            (Constants.equalsInteger(orders.getType(),Constants.ZERO) && Constants.equalsInteger(orders.getWorkType(),Constants.ZERO )) ||
                    (Constants.equalsInteger(orders.getType(),Constants.ZERO) && Constants.equalsInteger(orders.getWorkType(),Constants.TWO)
                            &&Constants.equalsInteger(orders.getCarType(),Constants.TWO))
            (Constants.equalsInteger(orders.getType(),Constants.ZERO) && Constants.equalsInteger(orders.getWorkType(),Constants.ZERO ))
            || Constants.equalsInteger(orders.getType(),Constants.ONE)
        ){
            orders.setPriceNum2(Constants.ONE);
@@ -745,7 +751,7 @@
        if(!Constants.equalsInteger(orders.getIsUpdate(),Constants.ONE)){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"订单修改状态已流转，无法进行该操作");
        }
        if(Constants.equalsInteger(orders.getAcceptMemberId(),confirmUpdOrderDTO.getMember().getId())){
        if(!Constants.equalsInteger(orders.getAcceptMemberId(),confirmUpdOrderDTO.getMember().getId())){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"非您的订单无法进行该操作");
        }
        if( Constants.equalsInteger(confirmUpdOrderDTO.getStatus(),Constants.ONE)){
@@ -798,7 +804,7 @@
        || Constants.equalsInteger(orders.getStatus(),Constants.ordersStatus.accept.getKey()))){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"订单状态已流转,无法进行取消");
        }
        if(Constants.equalsInteger(orders.getReleaseMemberId(),member.getId())){
        if(!Constants.equalsInteger(orders.getReleaseMemberId(),member.getId())){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"非您的订单无法进行该操作");
        }
        //待支付用餐订单/待接单订单进行取消
@@ -891,7 +897,7 @@
        if(!Constants.equalsInteger(orders.getStatus(),Constants.ordersStatus.accept.getKey())){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"订单状态已流转,无法进行取消");
        }
        if(Constants.equalsInteger(orders.getAcceptMemberId(),member.getId())){
        if(!Constants.equalsInteger(orders.getAcceptMemberId(),member.getId())){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"非您的订单无法进行该操作");
        }
        //判断是否可修改 å·²å–消次数 ä¸Ž æ—¶é—´é™åˆ¶
@@ -950,9 +956,10 @@
        if(!Constants.equalsInteger(orders.getStatus(),Constants.ordersStatus.doing.getKey())){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"订单状态已流转,无法进行取消");
        }
        if(Constants.equalsInteger(orders.getReleaseMemberId(),doneOrderDTO.getMember().getId())){
        if(!Constants.equalsInteger(orders.getReleaseMemberId(),doneOrderDTO.getMember().getId())){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"非您的订单无法进行该操作");
        }
        orders.setPayAccount(doneOrderDTO.getAmount());
        Object object = null;
        //用餐订单
        if(!Constants.equalsInteger(orders.getType(),Constants.TWO)){
@@ -1012,7 +1019,7 @@
                    .setSql("receive_num = ifnull(receive_num,0) - 1")
                    .eq(Member::getId,orders.getAcceptMemberId()));
        }
Date date = new Date();
        Date date = new Date();
        ordersMapper.update(new UpdateWrapper<Orders>().lambda()
                .set(Orders::getStatus,Constants.ordersStatus.cancel.getKey())
                .set(Orders::getUpdateTime,date)
@@ -1175,15 +1182,19 @@
                //接单方 æˆ‘的订单
                queryWrapper.eq(Orders::getAcceptMemberId,model.getMember().getId());
            }else{
                queryWrapper.eq(Orders::getStatus,Constants.ordersStatus.wait.getKey());
                //接单大厅
                queryWrapper.and(i->
                queryWrapper.and(Constants.equalsInteger(model.getMember().getWorkerIdentity(),Constants.TWO)||Constants.equalsInteger(model.getMember().getDriverIdentity(),Constants.TWO)||Constants.equalsInteger(model.getMember().getChefIdentity(),Constants.TWO),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);

                queryWrapper.apply(!(Constants.equalsInteger(model.getMember().getWorkerIdentity(),Constants.TWO)||Constants.equalsInteger(model.getMember().getDriverIdentity(),Constants.TWO)||Constants.equalsInteger(model.getMember().getChefIdentity(),Constants.TWO))," 1 = 2 "
                );

            }
        }
        for(PageWrap.SortData sortData: pageWrap.getSorts()) {
@@ -1233,41 +1244,44 @@

    //定位距离
    public void getDistance(Member member,Orders orders){
        try{
            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()
                            )
                    );
                }

        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()
                            )
                    );
                }
            }

        }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()
                        )
                );
            }
        }catch (Exception e){
            orders.setDistance(0L);
        }
    }

@@ -1321,7 +1335,7 @@
        if(!Constants.equalsInteger(type,Constants.ZERO)){
            prefix = (Constants.equalsInteger(type,Constants.ONE)?"YH-":"DC-");
        }
        prefix =  DateUtil.getDate(new Date(),"yyyyMMddHHmmss") +"-";
        prefix =  prefix + DateUtil.getCurrDateTimeShort() +"-";

        Integer countNum  = (Integer) redisTemplate.opsForValue().get(Constants.RedisKeys.ORDER_CODE);//RedisUtil.getObject(redisTemplate, Constants.RedisKeys.ORDER_CODE, Integer.class);
        countNum = Constants.formatIntegerNum(countNum)+1;
@@ -1389,9 +1403,9 @@
            );

            memberMapper.update(new UpdateWrapper<Member>().lambda()
                    .set(Member::getScore," ( total_score +" + Constants.FOUR + " ) / (score_order_num + 1 )")
                    .set(Member::getTotalScore," total_score +" + Constants.FOUR)
                    .set(Member::getScoreOrderNum," score_order_num + 1 " ).eq(Member::getId,orders.getAcceptMemberId())
                    .setSql(" score = ( ( total_score +" + Constants.FOUR + " ) / (score_order_num + 1 ) ) ")
                    .setSql(" total_score = ( total_score +" + Constants.FOUR + ")")
                    .setSql(" score_order_num = ( score_order_num + 1 ) " ).eq(Member::getId,orders.getAcceptMemberId())
            );

            //日志存储

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

@@ -167,6 +167,9 @@
    @LoginRequired
    @ApiOperation("分页查询")
    @PostMapping("/page")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true),
    })
    public ApiResponse<PageData<Orders>> findPage (@RequestBody PageWrap<Orders> pageWrap) {
        pageWrap.getModel().setMember(this.getMemberResponse());
        return ApiResponse.success(ordersService.findPageForMini(pageWrap));

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

@@ -10,6 +10,7 @@
import com.doumee.dao.business.model.MemberRevenue;
import com.doumee.dao.dto.WxPhoneRequest;
import com.doumee.dao.vo.AccountResponse;
import com.doumee.dao.vo.UserCenterVO;
import com.doumee.service.business.IdentityInfoService;
import com.doumee.service.business.MemberRevenueService;
import com.doumee.service.business.MemberService;
@@ -46,6 +47,14 @@
    @Autowired
    private MemberRevenueService memberRevenueService;


    @ApiOperation(value = "获取系统配置", notes = "小程序端")
    @GetMapping("/getPlatformAboutUs")
    public ApiResponse<UserCenterVO> getPlatformAboutUs() {
        return  ApiResponse.success("查询成功",memberService.getPlatformAboutUs());
    }


    @LoginRequired
    @ApiOperation(value = "获取个人信息", notes = "小程序端")
    @GetMapping("/getMemberInfo")