Merge remote-tracking branch 'origin/master'

jiangping

2025-07-15 528c681b62b56aca151beba65a95c2173c903334

Merge remote-tracking branch 'origin/master'

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

@@ -4,6 +4,7 @@
import com.doumee.core.annotation.excel.ExcelExporter;
import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.Orders;
@@ -11,6 +12,7 @@
import com.github.xiaoymin.knife4j.core.util.CollectionUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -80,11 +82,6 @@
    @RequiresPermissions("business:orders:exportExcel")
    public void exportExcel (@RequestBody PageWrap<Orders> pageWrap, HttpServletResponse response) {
        List<Orders> ordersList = ordersService.findPage(pageWrap).getRecords();





        ExcelExporter.build(Orders.class).export(ordersList, "订单信息记录", response);
    }

@@ -94,4 +91,15 @@
    public ApiResponse findById(@PathVariable Integer id) {
        return ApiResponse.success(ordersService.findById(id));
    }

    @ApiOperation("平台取消订单")
    @GetMapping("/cancel")
    @RequiresPermissions("business:orders:update")
    public ApiResponse cancel(@RequestParam Integer id) {
        LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        ordersService.platformCancel(id,loginUserInfo);
        return ApiResponse.success("操作成功");
    }


}

 server/services/src/main/java/com/doumee/config/wx/SendWxMessage.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,60 @@
package com.doumee.config.wx;

import com.alibaba.fastjson.JSONObject;
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.constants.Constants;
import com.doumee.core.utils.DateUtil;
import lombok.extern.slf4j.Slf4j;
import me.chanjar.weixin.common.error.WxErrorException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;
import org.springframework.web.client.RestTemplate;

import java.util.Date;
import java.util.HashMap;
import java.util.Map;

/**
 * Created by IntelliJ IDEA.
 *
 * @Author : Rk
 * @create 2022/12/7 17:27
 */
@Service
@Slf4j
public class SendWxMessage {

    private static String goodsOrderUrl = "pages/settlementDetails/settlementDetails?goodsOrderId=";

    @Autowired
    private SystemDictDataBiz systemDictDataBiz;

    public  void  bookingsCancel(String openid, String goodsOrderId, String accessToken, String bikeCode, Date startTime, Date endTime) throws WxErrorException {
        RestTemplate restTemplate = new RestTemplate();
        log.info("微信小程序->微信消息通知  -> accessToken：{}",accessToken);
        //这里简单起见我们每次都获取最新的access_token（时间开发中，应该在access_token快过期时再重新获取）
        String url = "https://api.weixin.qq.com/cgi-bin/message/subscribe/send?access_token="+WxMiniConfig.wxMaService.getAccessToken();
        //拼接推送的模版
        WxMsgVO wxMsgVo = new WxMsgVO();
        //用户的openid（要发送给那个用户）
        wxMsgVo.setTouser(openid);
        //订阅消息模板id
//        wxMsgVo.setTemplate_id(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.TIME_OUT_TEMPID).getCode());
        Map<String, TemplateData> m = new HashMap<>(4);
        m.put("character_string1", new TemplateData(bikeCode));
        //解锁时间
        m.put("date3", new TemplateData(DateUtil.getFomartDate(startTime,"yyyy/MM/dd HH:mm")));
        //上锁时间
        m.put("date4", new TemplateData(DateUtil.getFomartDate(endTime,"yyyy/MM/dd HH:mm")));
        //温馨提醒
        m.put("thing5", new TemplateData("临时锁车已超过最大时长，已自动还车"));
        wxMsgVo.setPage(goodsOrderUrl + goodsOrderId);
        wxMsgVo.setData(m);
        ResponseEntity<String> responseEntity =
                restTemplate.postForEntity(url, wxMsgVo, String.class);
        log.info("微信小程序->微信消息通知 ä¸´æ—¶é”è½¦è¶…时：{}", JSONObject.toJSONString(responseEntity));
    }


}

 server/services/src/main/java/com/doumee/config/wx/TemplateData.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,19 @@
package com.doumee.config.wx;

import lombok.Data;

/**
 * Created by IntelliJ IDEA.
 *
 * @Author : Rk
 * @create 2022/12/7 17:28
 */
@Data
public class TemplateData {
    private String value;

    public TemplateData(String value) {
        this.value = value;
    }

}

 server/services/src/main/java/com/doumee/config/wx/WxMiniUtilService.java

@@ -54,7 +54,7 @@
        withdrawalOrdersMapper.insert(withdrawalOrders);
        CreateRequest request = new CreateRequest();
        request.setOutTradeNo(orders.getCode());
        request.setOutRefundNo("refund_"+orders.getCode());
        request.setOutRefundNo(withdrawalOrders.getId().toString());
        request.setSubMchid(WxMiniConfig.wxProperties.getSubMchId());
        request.setNotifyUrl(WxMiniConfig.wxProperties.getRefundNotifyUrl());
        AmountReq amountReq = new AmountReq();

 server/services/src/main/java/com/doumee/config/wx/WxMsgVO.java

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

import lombok.Data;

import java.util.Map;

/**
 * Created by IntelliJ IDEA.
 *
 * @Author : Rk
 * @create 2022/12/7 17:27
 */
@Data
public class WxMsgVO {
    //用户openId
    private String touser;
    //模版id
    private String template_id;
    //推送文字
    private Map<String , TemplateData> data;
    //跳转路径 ï¼Œé»˜è®¤è·³è½¬åˆ°å°ç¨‹åºé¦–页
    private String page="pages/index/index";
}

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

@@ -411,6 +411,8 @@
        COMMENT(10, "发单方-评价完成","{userName}完成评价",0),
        SYSTEM_CANCEL(11, "系统-订单取消","系统取消",2),
        RELEASE_CANCEL(12, "发单方-订单取消","{userName}已手动取消订单",0),
        AUTO_COMMENT(13, "系统-自动评价","超出7日未评价，系统已自动评价",2),
        AUTO_AGREE(14, "系统-自动同意","接单方超时未处理，已自动同意",2),

        ;
        // æˆå‘˜å˜é‡
@@ -525,4 +527,50 @@
    }


    public  enum ordersStatus {
        waitPay(0, "待支付"),
        wait(1, "待接单"),
        accept(2, "已接单"),
        doing(3, "进行中"),
        done(4, "已完成"),
        cancel(99, "包装工"),
        ;
        // æˆå‘˜å˜é‡
        private int key;
        private String name;

        // æž„造方法
        ordersStatus(int key, String name) {
            this.name = name;
            this.key = key;
        }

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

        public void setName(String name) {
            this.name = name;
        }

        public int getKey() {
            return key;
        }

        public void setKey(int key) {
            this.key = key;
        }

    }

}

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

@@ -187,6 +187,9 @@
    @ApiModelProperty(value = "是否已修改:0=否；1=是；2=已确认;", example = "1")
    private Integer isUpdate;

    @ApiModelProperty(value = "修改时间", example = "1")
    private Integer isUpdateTime;

    @ApiModelProperty(value = "接单方黑名单member:id å¤šä¸ªä»¥,分割")
    private String blackReceive;

@@ -206,6 +209,9 @@
    @TableField(exist = false)
    private List<OrderLog> orderLogList;

    @ApiModelProperty(value = "订单状态描述", example = "1")
    @TableField(exist = false)
    private String statusName;


    @ApiModelProperty(value = "途经点")

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

@@ -94,4 +94,7 @@
     * @return long
     */
    long count(Category category);


    List<Category> getCategoryList(Integer type);
}

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

@@ -9,6 +9,7 @@
import com.doumee.dao.dto.ConfirmUpdOrderDTO;
import com.doumee.dao.dto.DoneOrderDTO;
import com.doumee.dao.dto.UpdOrderDataDTO;
import com.wechat.pay.java.service.refund.model.RefundNotification;

import java.util.List;

@@ -130,4 +131,10 @@
    PageData<Orders> findPageForMini(PageWrap<Orders> pageWrap);

    Orders getDetail(Integer id,Integer userType);

    void refundCallback(RefundNotification refundNotification);

    void autoComment();

    void autoConfirm();
}

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

@@ -248,4 +248,20 @@
        QueryWrapper<Category> wrapper = new QueryWrapper<>(category);
        return categoryMapper.selectCount(wrapper);
    }

    @Override
    public List<Category> getCategoryList(Integer type){
        List<Category> categoryList = categoryMapper.selectList(new QueryWrapper<Category>().lambda().eq(Category::getDeleted,Constants.ZERO).eq(Category::getStatus,Constants.ZERO)
                .eq(Objects.nonNull(type),Category::getType,type));
        if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(categoryList)){
            for (Category category:categoryList) {
                if(StringUtils.isNotBlank(category.getDetail())){
                    category.setDetailList(JSONArray.parseArray(category.getDetail()));
                }
            }
        }
        return categoryList;
    }


}

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

@@ -392,15 +392,15 @@
        List<Orders> releaseOrders = ordersMapper.selectList(new QueryWrapper<Orders>().lambda().eq(Orders::getDeleted,Constants.ZERO).eq(Orders::getReleaseMemberId,member));
        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.ZERO)).collect(Collectors.toList()).size());
            userCenterVO.setDoingTotal(releaseOrders.stream().filter(i->Constants.equalsInteger(i.getStatus(),Constants.TWO)).collect(Collectors.toList()).size());
            userCenterVO.setWaitCommentTotal(releaseOrders.stream().filter(i->Constants.equalsInteger(i.getStatus(),Constants.THREE)&&Constants.equalsInteger(i.getCommentStatus(),Constants.ZERO)).collect(Collectors.toList()).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));
        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.TWO)).collect(Collectors.toList()).size());
            userCenterVO.setDoneTotal(releaseOrders.stream().filter(i->Constants.equalsInteger(i.getStatus(),Constants.THREE)).collect(Collectors.toList()).size());
            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()));

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

@@ -27,7 +27,9 @@
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 com.wechat.pay.java.service.refund.model.RefundNotification;
import jodd.util.StringUtil;
import lombok.With;
import nonapi.io.github.classgraph.json.Id;
import org.apache.poi.sl.image.ImageHeaderEMF;
import org.checkerframework.checker.units.qual.A;
@@ -38,11 +40,13 @@
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;

import javax.annotation.Resource;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
import java.util.Objects;
import java.util.UUID;
import java.util.concurrent.TimeUnit;

/**
 * è®¢å•ä¿¡æ¯è®°å½•Service实现
@@ -77,7 +81,13 @@
    private IdentityInfoMapper identityInfoMapper;

    @Autowired
    private WithdrawalOrdersMapper withdrawalOrdersMapper;

    @Autowired
    private WxMiniUtilService wxMiniUtilService;

    @Resource
    private RedisTemplate<String,Object> redisTemplate;

    @Override
    @Transactional(rollbackFor = {Exception.class,BusinessException.class})
@@ -98,11 +108,11 @@
        }
        //用餐订单
        if(Constants.equalsInteger(orders.getType(),Constants.TWO)){
            orders.setStatus(Constants.ZERO);
            orders.setStatus(Constants.ordersStatus.waitPay.getKey());
            //唤起支付业务
            objects = this.getWxPayResponse(orders,orders.getMember().getOpenid());
        }else{
            orders.setStatus(Constants.ONE);
            orders.setStatus(Constants.ordersStatus.wait.getKey());
        }
        ordersMapper.insert(orders);
        if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(orders.getMultifileList())){
@@ -449,11 +459,12 @@
        queryWrapper.eq(Objects.nonNull(model.getType()),Orders::getType, model.getType());
        queryWrapper.eq(Objects.nonNull(model.getStatus()),Orders::getStatus, model.getStatus());
        queryWrapper.eq(Objects.nonNull(model.getAcceptType()),Orders::getAcceptType, model.getAcceptType());
        queryWrapper.like(org.apache.commons.lang3.StringUtils.isNotBlank(model.getReleaseName()),"m1.name", model.getReleaseName());
        queryWrapper.apply(org.apache.commons.lang3.StringUtils.isNotBlank(model.getAcceptName())," i.LINK_NAME like '%"+model.getAcceptName()+"%' or i.company_name like '%"+model.getAcceptName()+"%' ");
        queryWrapper.apply(org.apache.commons.lang3.StringUtils.isNotBlank(model.getReleaseName()),"m1.name", model.getReleaseName());
        queryWrapper.apply(org.apache.commons.lang3.StringUtils.isNotBlank(model.getAcceptName()),"( i.LINK_NAME like '%"+model.getAcceptName()+"%' or i.company_name like '%"+model.getAcceptName()+"%' or i.TELEPHONE like '%"+model.getAcceptName()+"%' ) ");
        IPage<Orders> iPage = ordersMapper.selectJoinPage(page,Orders.class,queryWrapper);
        for (Orders orders:iPage.getRecords()) {
           this.getOrderContent(orders);
           orders.setStatusName(Constants.ordersStatus.getName(orders.getStatus()));
        }
        return PageData.from(iPage);
    }
@@ -516,7 +527,7 @@
        if(Objects.isNull(orders)||Constants.equalsInteger(orders.getDeleted(),Constants.ONE)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY);
        }
        if(!Constants.equalsInteger(orders.getStatus(),Constants.ONE)){
        if(!Constants.equalsInteger(orders.getStatus(),Constants.ordersStatus.wait.getKey())){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"订单状态已流转,无法进行该操作");
        }
        if(Constants.equalsInteger(orders.getReleaseMemberId(),member.getId())){
@@ -540,7 +551,7 @@
        orders.setAcceptType(Constants.ZERO);
        orders.setAcceptTime(new Date());
        orders.setAcceptMemberId(member.getId());
        orders.setStatus(Constants.TWO);
        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()));
@@ -569,7 +580,7 @@
        if(Objects.isNull(orders)||Constants.equalsInteger(orders.getDeleted(),Constants.ONE)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY);
        }
        if(!Constants.equalsInteger(orders.getStatus(),Constants.TWO)){
        if(!Constants.equalsInteger(orders.getStatus(),Constants.ordersStatus.accept.getKey())){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"订单状态已流转,无法进行该操作");
        }
        if(Constants.equalsInteger(orders.getReleaseMemberId(),member.getId())){
@@ -579,7 +590,7 @@
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"订单修改待确认，无法进行该操作");
        }
        orders.setUpdateTime(new Date());
        orders.setStatus(Constants.THREE);
        orders.setStatus(Constants.ordersStatus.doing.getKey());
        orders.setWorkStartTime(new Date());
        ordersMapper.updateById(orders);

@@ -608,7 +619,7 @@
        if(Objects.isNull(orders)||Constants.equalsInteger(orders.getDeleted(),Constants.ONE)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY);
        }
        if(!Constants.equalsInteger(orders.getStatus(),Constants.TWO)){
        if(!Constants.equalsInteger(orders.getStatus(),Constants.ordersStatus.accept.getKey())){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"订单状态已流转,无法进行该操作");
        }
        if(Constants.equalsInteger(orders.getReleaseMemberId(),updOrderDataDTO.getMember().getId())){
@@ -638,6 +649,7 @@
                .set(Orders::getEndDate,updOrderDataDTO.getEndDate())
                .set(Orders::getTotalDays,updOrderDataDTO.getTotalDays())
                .set(Orders::getIsUpdate,Constants.ONE)
                .set(Orders::getIsUpdateTime,"now()")
                .set(Orders::getUpdateTime,"now()")
                .set(Orders::getEstimatedAccount,total)
                .eq(Orders::getId,orders.getId())
@@ -683,7 +695,7 @@
        if(Objects.isNull(orders)||Constants.equalsInteger(orders.getDeleted(),Constants.ONE)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY);
        }
        if(!Constants.equalsInteger(orders.getStatus(),Constants.TWO)){
        if(!Constants.equalsInteger(orders.getStatus(),Constants.ordersStatus.accept.getKey())){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"订单状态已流转,无法进行该操作");
        }
        if(!Constants.equalsInteger(orders.getIsUpdate(),Constants.ONE)){
@@ -706,7 +718,7 @@
            ordersMapper.update(new UpdateWrapper<Orders>().lambda()
                    .set(Orders::getIsUpdate,Constants.TWO)
                    .set(Orders::getUpdateTime,"now()")
                    .set(Orders::getStatus,Constants.ONE)
                    .set(Orders::getStatus,Constants.ordersStatus.wait.getKey())
                    .set(Orders::getAcceptMemberId,null)
                    .set(Orders::getAcceptType,null)
                    .eq(Orders::getId,orders.getId())
@@ -737,9 +749,9 @@
        if(Objects.isNull(orders)||Constants.equalsInteger(orders.getDeleted(),Constants.ONE)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY);
        }
        if(!(Constants.equalsInteger(orders.getStatus(),Constants.ONE)
                ||Constants.equalsInteger(orders.getStatus(),Constants.ZERO)
        || Constants.equalsInteger(orders.getStatus(),Constants.TWO))){
        if(!(Constants.equalsInteger(orders.getStatus(),Constants.ordersStatus.wait.getKey())
                ||Constants.equalsInteger(orders.getStatus(),Constants.ordersStatus.waitPay.getKey())
        || Constants.equalsInteger(orders.getStatus(),Constants.ordersStatus.accept.getKey()))){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"订单状态已流转,无法进行取消");
        }
        if(Constants.equalsInteger(orders.getReleaseMemberId(),member.getId())){
@@ -754,15 +766,14 @@
                withdrawalOrders.setCreateTime(new Date());
                withdrawalOrders.setMemberId(orders.getReleaseMemberId());
                withdrawalOrders.setAmount(orders.getPayAccount());
                withdrawalOrders.setWxExternalNo("refund_"+orders.getCode());
                withdrawalOrders.setStatus(Constants.ONE);
                withdrawalOrders.setStatus(Constants.ZERO);
                withdrawalOrders.setDoneTime(new Date());
                withdrawalOrders.setType(Constants.ONE);
                withdrawalOrders.setObjId(orders.getId());
                wxMiniUtilService.wxRefund(withdrawalOrders,orders);
            }
            ordersMapper.update(new UpdateWrapper<Orders>().lambda()
                    .set(Orders::getStatus,99)
                    .set(Orders::getStatus,Constants.ordersStatus.cancel.getKey())
                    .set(Orders::getUpdateTime,"now()")
                    .set(Orders::getCancelTime,"now()")
                    .set(Orders::getCancelType,Constants.ZERO)
@@ -773,7 +784,7 @@
            Integer totalCancelTimes = Integer.valueOf(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.RELEASE_CANCEL_TIMES).getCode());
            Long cancelTimes = ordersMapper.selectCount(new QueryWrapper<Orders>().lambda()
                    .apply(" DATE(cancel_time) = DATE(NOW()) ")
                    .eq(Orders::getStatus,99)
                    .eq(Orders::getStatus,Constants.ordersStatus.cancel.getKey())
                    .eq(Orders::getReleaseMemberId,orders.getReleaseMemberId()));
            //查询取消次数
            if(totalCancelTimes<=cancelTimes){
@@ -800,7 +811,7 @@
                wxMiniUtilService.wxRefund(withdrawalOrders,orders);
            }
            ordersMapper.update(new UpdateWrapper<Orders>().lambda()
                    .set(Orders::getStatus,99)
                    .set(Orders::getStatus,Constants.ordersStatus.cancel.getKey())
                    .set(Orders::getUpdateTime,"now()")
                    .set(Orders::getCancelTime,"now()")
                    .set(Orders::getCancelType,Constants.ONE)
@@ -833,7 +844,7 @@
        if(Objects.isNull(orders)||Constants.equalsInteger(orders.getDeleted(),Constants.ONE)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY);
        }
        if(!Constants.equalsInteger(orders.getStatus(),Constants.TWO)){
        if(!Constants.equalsInteger(orders.getStatus(),Constants.ordersStatus.accept.getKey())){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"订单状态已流转,无法进行取消");
        }
        if(Constants.equalsInteger(orders.getAcceptMemberId(),member.getId())){
@@ -857,7 +868,7 @@
        }
        ordersMapper.update(new UpdateWrapper<Orders>().lambda()
                .set(Orders::getUpdateTime,"now()")
                .set(Orders::getStatus,Constants.ONE)
                .set(Orders::getStatus,Constants.ordersStatus.wait.getKey())
                .set(Orders::getAcceptMemberId,null)
                .set(Orders::getAcceptType,null)
                .eq(Orders::getId,orders.getId())
@@ -892,7 +903,7 @@
        if(Objects.isNull(orders)||Constants.equalsInteger(orders.getDeleted(),Constants.ONE)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY);
        }
        if(!Constants.equalsInteger(orders.getStatus(),Constants.THREE)){
        if(!Constants.equalsInteger(orders.getStatus(),Constants.ordersStatus.doing.getKey())){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"订单状态已流转,无法进行取消");
        }
        if(Constants.equalsInteger(orders.getReleaseMemberId(),doneOrderDTO.getMember().getId())){
@@ -909,7 +920,7 @@
            //唤起支付业务
            object = this.getWxPayResponse(orders,orders.getMember().getOpenid());
        }else{
            orders.setStatus(Constants.FOUR);
            orders.setStatus(Constants.ordersStatus.done.getKey());
            //日志存储
            Constants.OrdersLog ordersLog = Constants.OrdersLog.DONE;
            this.saveOrderLog(orders,ordersLog,
@@ -928,8 +939,8 @@
        if(Objects.isNull(orders)||Constants.equalsInteger(orders.getDeleted(),Constants.ONE)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY);
        }
        if(!(Constants.equalsInteger(orders.getStatus(),Constants.ONE)||Constants.equalsInteger(orders.getStatus(),Constants.TWO)
            ||Constants.equalsInteger(orders.getStatus(),Constants.THREE))){
        if(!(Constants.equalsInteger(orders.getStatus(),Constants.ordersStatus.wait.getKey())||Constants.equalsInteger(orders.getStatus(),Constants.ordersStatus.accept.getKey())
                ||Constants.equalsInteger(orders.getStatus(),Constants.ordersStatus.doing.getKey())||Constants.equalsInteger(orders.getStatus(),Constants.ordersStatus.waitPay.getKey()))){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"订单状态已流转,无法进行取消");
        }
        //如果已支付 åˆ™éœ€è¦è¿›è¡Œé€€æ¬¾
@@ -955,7 +966,7 @@
        }

        ordersMapper.update(new UpdateWrapper<Orders>().lambda()
                .set(Orders::getStatus,99)
                .set(Orders::getStatus,Constants.ordersStatus.cancel.getKey())
                .set(Orders::getUpdateTime,"now()")
                .set(Orders::getCancelTime,"now()")
                .set(Orders::getCancelType,Constants.TWO)
@@ -984,7 +995,7 @@
                ||Constants.equalsInteger(orders.getDeleted(),Constants.ONE)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY);
        }
        if(!Constants.equalsInteger(orders.getStatus(),Constants.FOUR)){
        if(!Constants.equalsInteger(orders.getStatus(),Constants.ordersStatus.done.getKey())){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"订单状态已流转,无法进行评价");
        }
        if(Constants.equalsInteger(orders.getCommentStatus(),Constants.ONE)){
@@ -1033,7 +1044,7 @@
                //处理支付完成逻辑
                ordersMapper.update(new UpdateWrapper<Orders>().lambda()
                        .set(Orders::getUpdateTime,"now()")
                        .set(Orders::getStatus,Constants.ONE)
                        .set(Orders::getStatus,Constants.ordersStatus.wait)
                        .set(Orders::getPayStatus,Constants.ONE)
                        .set(Orders::getWxExternalNo,paymentNo)
                        .eq(Orders::getId,orders.getId())
@@ -1253,22 +1264,111 @@
    }




    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");
        return null;
        String prefix = "YG";
        if(!Constants.equalsInteger(type,Constants.ZERO)){
            prefix = (Constants.equalsInteger(type,Constants.ONE)?"YH-":"DC-");
        }
        prefix =  DateUtil.getDate(new Date(),"yyyyMMddHHmmss") +"-";

        Integer countNum  = (Integer) redisTemplate.opsForValue().get(Constants.RedisKeys.ORDER_CODE);//RedisUtil.getObject(redisTemplate, Constants.RedisKeys.ORDER_CODE, Integer.class);
        countNum = Constants.formatIntegerNum(countNum)+1;
        //更新缓存
        redisTemplate.opsForValue().set(Constants.RedisKeys.ORDER_CODE,countNum);
        String nextIndex =Integer.toString( countNum );
        return prefix + org.apache.commons.lang3.StringUtils.leftPad(nextIndex,3,"0");
    }


    @Override
    @Transactional(rollbackFor = {Exception.class,BusinessException.class})
    public void refundCallback(RefundNotification refundNotification){
        WithdrawalOrders withdrawalOrders = withdrawalOrdersMapper.selectById(refundNotification.getOutRefundNo());
        if(Objects.isNull(withdrawalOrders)||!Constants.equalsInteger(withdrawalOrders.getStatus(),Constants.ZERO)){
            return;
        }
        withdrawalOrders.setWxExternalNo(refundNotification.getTransactionId());
        withdrawalOrders.setUpdateTime(new Date());
        withdrawalOrders.setDoneTime(withdrawalOrders.getUpdateTime());
        if (!"SUCCESS".equals(refundNotification.getRefundStatus().name())) {
            // å¦‚果退款状态不正确，修改退款单状态
            withdrawalOrders.setStatus(Constants.TWO);
        }else{
            withdrawalOrders.setStatus(Constants.ONE);
        }
        //更新退款单状态
        withdrawalOrdersMapper.updateById(withdrawalOrders);
    }



    //todo è‡ªåŠ¨æ´¾å•
    public void autoGrabOrders(){


    }

    //自动评价 è®¢å•å®Œæˆ7天后自动评价4星
    @Override
    @Transactional(rollbackFor = {Exception.class,BusinessException.class})
    public void autoComment(){
        List<Orders> ordersList = ordersMapper.selectList(new QueryWrapper<Orders>().lambda()
                .eq(Orders::getStatus,Constants.FOUR).eq(Orders::getCommentStatus,Constants.ZERO)
                .apply(" DATE_ADD(finish_time, INTERVAL 7 DAY) < now() ")
                .last("limit 100")
        );

        for (Orders orders:ordersList) {
            ordersMapper.update(new UpdateWrapper<Orders>().lambda()
                    .set(Orders::getCommentStatus,Constants.ONE)
                    .set(Orders::getUpdateTime,"now()")
                    .set(Orders::getCommentTime,"now()")
                    .set(Orders::getCommentLevel,Constants.FOUR)
                    .set(Orders::getCommentType,Constants.ZERO)
                    .eq(Orders::getId,orders.getId())
            );

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

            //日志存储
            Constants.OrdersLog ordersLog = Constants.OrdersLog.AUTO_COMMENT;
            this.saveOrderLog(orders,ordersLog,
                    ordersLog.getInfo(),orders.getAcceptMemberId(),null);
        }
    }


    //自动确认 è®¢å•ä¿®æ”¹åŽè‹¥æœªå¤„理 æ ¹æ®é…ç½®è‡ªåŠ¨å¤„理
    @Override
    @Transactional(rollbackFor = {Exception.class,BusinessException.class})
    public void autoConfirm(){
        String autoConfirmTime = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.AUTO_CONFIRM).getCode();
        List<Orders> ordersList = ordersMapper.selectList(new QueryWrapper<Orders>().lambda()
                .eq(Orders::getStatus,Constants.ordersStatus.accept).eq(Orders::getIsUpdate,Constants.ONE)
                .apply(" DATE_ADD(IS_UPDATE_TIME, INTERVAL "+autoConfirmTime+" MINUTE) < now() ")
                .last("limit 100")
        );
        if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(ordersList)){
            for (Orders orders:ordersList) {
                ordersMapper.update(new UpdateWrapper<Orders>().lambda()
                        .set(Orders::getIsUpdate,Constants.TWO)
                        .set(Orders::getUpdateTime,"now()")
                        .eq(Orders::getId,orders.getId())
                );
                //记录同意修改的日志
                Constants.OrdersLog ordersLog = Constants.OrdersLog.AUTO_AGREE;
                this.saveOrderLog(orders,ordersLog,
                        ordersLog.getInfo(),orders.getAcceptMemberId(),null);
            }
        }
    }





}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,47 @@
package com.doumee.api.web;

import com.doumee.core.annotation.trace.Trace;
import com.doumee.core.model.ApiResponse;
import com.doumee.dao.business.model.Category;
import com.doumee.dao.vo.AccountResponse;
import com.doumee.service.business.CategoryService;
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.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;

import java.util.List;

/**
 * Created by IntelliJ IDEA.
 *
 * @Author : Rk
 * @create 2025/7/15 15:49
 */
@Api(tags = "配置类接口")
@Trace(exclude = true)
@RestController
@RequestMapping("/web/orders")
@Slf4j
public class ConfigApi extends ApiController{

    @Autowired
    private CategoryService categoryService;

    @ApiOperation(value = "获取分类列表", notes = "小程序端")
    @GetMapping("/getCategoryList")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "type", value = "类型:0=品种配置;1=车辆类型配置;2=餐标配置;3=手续费配置;", required = true)
    })
    public ApiResponse<List<Category>> getCategoryList(@RequestParam Integer type) {
        return  ApiResponse.success("操作成功",categoryService.getCategoryList(type));
    }


}

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

@@ -31,7 +31,7 @@
 * @Author : Rk
 * @create 2025/7/10 9:29
 */
@Api(tags = "1、订单业务")
@Api(tags = "订单业务")
@Trace(exclude = true)
@RestController
@RequestMapping("/web/orders")

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

@@ -146,7 +146,7 @@
            RefundNotification result = parser.parse(requestParam, RefundNotification.class);
//            if ("SUCCESS".equals(result.getRefundStatus().name())) {
                // æ”¯ä»˜æˆåŠŸge
//                     goodsorderService.closeGoodsorderDone(result);
                     ordersService.refundCallback(result);
//            }
            return ApiResponse.success("处理成功");
        } catch (Exception e) {