Merge remote-tracking branch 'origin/master'

jiangping

2025-07-15 e0754a4e7ae458c6b8fe03fa073f063a657da240

Merge remote-tracking branch 'origin/master'

 server/services/src/main/java/com/doumee/api/system/SystemDictDataController.java

@@ -1,5 +1,6 @@
package com.doumee.api.system;

import com.azure.core.annotation.Post;
import com.doumee.api.BaseController;
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.annotation.pr.PreventRepeat;
@@ -9,6 +10,7 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.common.dto.UpdateSortDTO;
import com.doumee.dao.dto.PlatformConfigDTO;
import com.doumee.dao.system.dto.QuerySystemDictDataDTO;
import com.doumee.dao.system.model.SystemDictData;
import com.doumee.dao.system.vo.SystemDictDataListVO;
@@ -90,4 +92,22 @@
    public ApiResponse<List<SystemDictData>> findByCode (@RequestParam String dictCode) {
        return ApiResponse.success(systemDictDataService.findByDictCode(dictCode));
    }



    @ApiOperation("获取平台配置项")
    @GetMapping("/getPlatformConfig")
    public ApiResponse<PlatformConfigDTO> getPlatformConfig () {
        return ApiResponse.success(systemDictDataService.getPlatformConfigDTO());
    }


    @ApiOperation("更新平台配置项")
    @PostMapping("/updPlatformConfig")
    public ApiResponse updPlatformConfig (@RequestBody PlatformConfigDTO platformConfigDTO) {
        systemDictDataService.updPlatformConfig(platformConfigDTO);
        return ApiResponse.success("操作成功");
    }


}

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

@@ -52,6 +52,7 @@
    public static final String RECEIVE_CANCEL_TIME ="RECEIVE_CANCEL_TIME" ;
    public static final String AUTO_DISPATCH ="AUTO_DISPATCH" ;
    public static final String AUTO_DISPATCH_DISTANCE ="AUTO_DISPATCH_DISTANCE" ;
    public static final String AUTO_CONFIRM ="AUTO_CONFIRM" ;

    public static final String QYWX = "QYWX";
    public static final  Integer ONE = 1;

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

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

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 PlatformConfigDTO {

    @ApiModelProperty(value = "发单方 - æ¯æ—¥å¯å–消次数")
    private String releaseCancelTimes;

    @ApiModelProperty(value = "发单方 - å¯æå‰X小时取消 ï¼ˆå•ä½ï¼šå°æ—¶ï¼‰")
    private String releaseCancelTime;

    @ApiModelProperty(value = "接单方 - æ¯æ—¥å¯å–消次数")
    private String receiveCancelTimes;

    @ApiModelProperty(value = "接单方 - å¯æå‰X小时取消 ï¼ˆå•ä½ï¼šå°æ—¶ï¼‰")
    private String receiveCancelTime;

    @ApiModelProperty(value = "自动派单时间配置（单位分钟）")
    private String autoDispatch;

    @ApiModelProperty(value = "自动派单距离（单位：km）")
    private String autoDispatchDistance;

    @ApiModelProperty(value = "订单修改未确认自动确认时间（单位：分钟）")
    private String autoConfirm;

}

 server/services/src/main/java/com/doumee/service/system/SystemDictDataService.java

@@ -2,6 +2,7 @@

import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.dto.PlatformConfigDTO;
import com.doumee.dao.system.dto.QuerySystemDictDataDTO;
import com.doumee.dao.system.model.SystemDictData;
import com.doumee.dao.system.vo.SystemDictDataListVO;
@@ -98,4 +99,9 @@
     * @return long
     */
    long count(SystemDictData systemDictData);

    PlatformConfigDTO getPlatformConfigDTO();

    void updPlatformConfig(PlatformConfigDTO platformConfigDTO);

}

 server/services/src/main/java/com/doumee/service/system/impl/SystemDictDataServiceImpl.java

@@ -1,8 +1,13 @@
package com.doumee.service.system.impl;

import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.doumee.core.constants.Constants;
import com.doumee.core.exception.BusinessException;
import com.doumee.dao.dto.PlatformConfigDTO;
import com.doumee.dao.system.model.SystemDict;
import com.doumee.dao.system.model.SystemMenu;
import com.doumee.service.system.SystemDictService;
import com.github.pagehelper.Constant;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.doumee.core.model.PageData;
@@ -128,4 +133,84 @@
        Wrapper<SystemDictData> wrapper = new QueryWrapper<>(systemDictData);
        return systemDictDataMapper.selectCount(wrapper);
    }



    @Override
    public PlatformConfigDTO getPlatformConfigDTO(){
        PlatformConfigDTO platformConfigDTO = new PlatformConfigDTO();
        platformConfigDTO.setAutoConfirm("0");
        platformConfigDTO.setReceiveCancelTime("0");
        platformConfigDTO.setReceiveCancelTimes("0");
        platformConfigDTO.setReleaseCancelTimes("0");
        platformConfigDTO.setReleaseCancelTime("0");
        platformConfigDTO.setAutoDispatch("0");
        platformConfigDTO.setAutoDispatchDistance("0");

        List<SystemDictData> systemDictDataList = systemDictDataMapper.selectList(new QueryWrapper<SystemDictData>()
                .lambda().eq(SystemDictData::getDictId,100)
                .in(SystemDictData::getLabel, Constants.AUTO_DISPATCH
                ,Constants.AUTO_CONFIRM,Constants.AUTO_DISPATCH_DISTANCE,Constants.RELEASE_CANCEL_TIME
                ,Constants.RELEASE_CANCEL_TIMES,Constants.RECEIVE_CANCEL_TIMES,Constants.RECEIVE_CANCEL_TIME)
        );
        if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(systemDictDataList)){
            for (SystemDictData systemDictData:systemDictDataList) {
                if(systemDictData.getLabel().equals(Constants.AUTO_DISPATCH)){
                    platformConfigDTO.setAutoDispatch(systemDictData.getCode());
                }else if(systemDictData.getLabel().equals(Constants.AUTO_CONFIRM)){
                    platformConfigDTO.setAutoConfirm(systemDictData.getCode());
                }else if(systemDictData.getLabel().equals(Constants.AUTO_DISPATCH_DISTANCE)){
                    platformConfigDTO.setAutoDispatchDistance(systemDictData.getCode());
                }else if(systemDictData.getLabel().equals(Constants.RELEASE_CANCEL_TIME)){
                    platformConfigDTO.setReleaseCancelTime(systemDictData.getCode());
                }else if(systemDictData.getLabel().equals(Constants.RELEASE_CANCEL_TIMES)){
                    platformConfigDTO.setReleaseCancelTimes(systemDictData.getCode());
                }else if(systemDictData.getLabel().equals(Constants.RECEIVE_CANCEL_TIMES)){
                    platformConfigDTO.setReceiveCancelTimes(systemDictData.getCode());
                }else if(systemDictData.getLabel().equals(Constants.RECEIVE_CANCEL_TIME)){
                    platformConfigDTO.setReceiveCancelTime(systemDictData.getCode());
                }
            }
        }
        return platformConfigDTO;
    }



    @Override
    @Transactional(rollbackFor = {Exception.class, BusinessException.class})
    public void updPlatformConfig(PlatformConfigDTO platformConfigDTO){
        List<SystemDictData> systemDictDataList = systemDictDataMapper.selectList(new QueryWrapper<SystemDictData>()
                .lambda().eq(SystemDictData::getDictId,100)
                .in(SystemDictData::getLabel, Constants.AUTO_DISPATCH
                        ,Constants.AUTO_CONFIRM,Constants.AUTO_DISPATCH_DISTANCE,Constants.RELEASE_CANCEL_TIME
                        ,Constants.RELEASE_CANCEL_TIMES,Constants.RECEIVE_CANCEL_TIMES,Constants.RECEIVE_CANCEL_TIME)
        );
        if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(systemDictDataList)){
            for (SystemDictData systemDictData:systemDictDataList) {
                if(systemDictData.getLabel().equals(Constants.AUTO_DISPATCH)){
                    systemDictData.setCode(platformConfigDTO.getAutoDispatch());
                }else if(systemDictData.getLabel().equals(Constants.AUTO_CONFIRM)){
                    systemDictData.setCode(platformConfigDTO.getAutoConfirm());
                }else if(systemDictData.getLabel().equals(Constants.AUTO_DISPATCH_DISTANCE)){
                    systemDictData.setCode(platformConfigDTO.getAutoDispatchDistance());
                }else if(systemDictData.getLabel().equals(Constants.RELEASE_CANCEL_TIME)){
                    systemDictData.setCode(platformConfigDTO.getReleaseCancelTime());
                }else if(systemDictData.getLabel().equals(Constants.RELEASE_CANCEL_TIMES)){
                    systemDictData.setCode(platformConfigDTO.getReleaseCancelTimes());
                }else if(systemDictData.getLabel().equals(Constants.RECEIVE_CANCEL_TIMES)){
                    systemDictData.setCode(platformConfigDTO.getReceiveCancelTimes());
                }else if(systemDictData.getLabel().equals(Constants.RECEIVE_CANCEL_TIME)){
                    systemDictData.setCode(platformConfigDTO.getReceiveCancelTime());
                }
                systemDictDataMapper.update(new UpdateWrapper<SystemDictData>().lambda()
                        .set(SystemDictData::getCode,systemDictData.getCode())
                        .eq(SystemDictData::getId,systemDictData.getId()));
            }
        }
    }




}