ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/entity/OrderPageCountVO.java
@@ -32,11 +32,14 @@ @ApiModelProperty("再投订单") private Integer reInvestment; @ApiModelProperty("待预约数量") private Integer pending; public OrderPageCountVO() { } public OrderPageCountVO(Integer total, Integer toBeDispatched, Integer stayDoorstep, Integer toBeCompleted, Integer completed, Integer canceled, Integer reInvestment) { Integer completed, Integer canceled, Integer reInvestment,Integer pending) { this.total = total; this.toBeDispatched = toBeDispatched; this.stayDoorstep = stayDoorstep; @@ -44,5 +47,6 @@ this.completed = completed; this.canceled = canceled; this.reInvestment = reInvestment; this.pending = pending; } } ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/AppFranchiseeController.java
@@ -187,7 +187,7 @@ franchiseeWithdraw.setHandle(byId.getNickName()); franchiseeWithdraw.setUpdateTime(new Date()); franchiseeWithdrawService.updateById(franchiseeWithdraw); Franchisee franchisee = franchiseeService.getById(byId.getFranchiseeId()); Franchisee franchisee = franchiseeService.getById(franchiseeWithdraw.getFranchiseeId()); if (auditFranchiseeWithdrawDTO.getStatus()==3){ // 回退运营商余额 TFranchiseeBalanceChange balanceChange = new TFranchiseeBalanceChange(); ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/large/controller/AnalysisIndexRankingDataController.java
New file @@ -0,0 +1,94 @@ package com.ruoyi.admin.large.controller; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.admin.large.base.BasePage; import com.ruoyi.admin.large.model.AnalysisIndexRankingData; import com.ruoyi.admin.large.service.AnalysisIndexRankingDataService; import com.ruoyi.admin.service.SysUserService; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.security.service.TokenService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.List; /** * <p> * 前端控制器 * </p> * * @author xiaochen * @since 2025-04-22 */ @Api(tags = "指标排名") @RestController @RequestMapping("/analysis-index-ranking-data") public class AnalysisIndexRankingDataController { private final AnalysisIndexRankingDataService analysisIndexRankingDataService; private final TokenService tokenService; private final SysUserService sysUserService; @Autowired public AnalysisIndexRankingDataController(AnalysisIndexRankingDataService analysisIndexRankingDataService, TokenService tokenService, SysUserService sysUserService) { this.analysisIndexRankingDataService = analysisIndexRankingDataService; this.tokenService = tokenService; this.sysUserService = sysUserService; } /** * 查询指标排名列表 */ @ApiOperation( value = "查询指标排名列表") @PostMapping(value = "/pageList") public R<Page<AnalysisIndexRankingData>> pageList(@RequestBody BasePage basePage) { Page<AnalysisIndexRankingData> page = analysisIndexRankingDataService.lambdaQuery() .orderByAsc(AnalysisIndexRankingData::getSortBy) .page(Page.of(basePage.getPageNum(), basePage.getPageSize())); return R.ok(page); } /** * 查询指标排名列表 */ @ApiOperation( value = "查询指标排名列表-大屏") @GetMapping(value = "/list") public R<List<AnalysisIndexRankingData>> list() { List<AnalysisIndexRankingData> list = analysisIndexRankingDataService.list(Wrappers.lambdaQuery(AnalysisIndexRankingData.class) .orderByAsc(AnalysisIndexRankingData::getSortBy)); return R.ok(list); } /** * 添加指标排名管理 */ @ApiOperation( value = "添加指标排名") @PostMapping(value = "/add") public R<Boolean> add(@RequestBody AnalysisIndexRankingData dto) { return R.ok(analysisIndexRankingDataService.save(dto)); } /** * 修改指标排名 */ @ApiOperation( value = "修改指标排名") @PostMapping(value = "/update") public R<Boolean> update(@RequestBody AnalysisIndexRankingData dto) { return R.ok(analysisIndexRankingDataService.updateById(dto)); } /** * 删除指标排名 */ @ApiOperation( value = "删除指标排名") @DeleteMapping(value = "/deleteById") public R<Boolean> deleteById(@RequestParam("id") Integer id) { return R.ok(analysisIndexRankingDataService.removeById(id)); } }
New file @@ -0,0 +1,22 @@ package com.ruoyi.admin.large.controller; import io.swagger.annotations.Api; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; /** * <p> * 前端控制器 * </p> * * @author xiaochen * @since 2025-04-22 */ @Api(tags = "上门回收订单") @RestController @RequestMapping("/analysis-order-data") public class AnalysisOrderDataController { }
@@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.admin.entity.SysUser; import com.ruoyi.admin.large.base.BasePage; @@ -55,6 +56,17 @@ } /** * 查询回收分类订单数量统计列表 */ @ApiOperation( value = "查询回收分类订单数量统计列表",notes = "大屏接口") @PostMapping(value = "/list") public R<List<AnalysisRecycleTypeData>> list() { List<AnalysisRecycleTypeData> list = analysisRecycleTypeDataService.list(Wrappers.lambdaQuery(AnalysisRecycleTypeData.class) .orderByDesc(AnalysisRecycleTypeData::getOrderCount)); return R.ok(list); } /** * 添加回收分类订单数量统计管理 */ @ApiOperation( value = "添加回收分类订单数量统计") ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/large/controller/AnalysisServiceIndexChildDataController.java
@@ -47,7 +47,7 @@ /** * 查询服务指标分析渠道商列表 */ @ApiOperation( value = "通过渠道商id查询指标") @ApiOperation( value = "通过渠道商id查询指标-兼容大屏接口",notes = "兼容大屏接口") @GetMapping(value = "/getListByServiceId") public R<List<AnalysisServiceIndexChildData>> getListByServiceId(@RequestParam("serviceIndexId") Integer serviceIndexId) { List<AnalysisServiceIndexChildData> list = analysisServiceIndexChildDataService.list(Wrappers.lambdaQuery(AnalysisServiceIndexChildData.class) ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/large/controller/AnalysisSetDataController.java
New file @@ -0,0 +1,53 @@ package com.ruoyi.admin.large.controller; import com.ruoyi.admin.large.base.BasePage; import com.ruoyi.admin.large.model.AnalysisSetData; import com.ruoyi.admin.large.service.AnalysisSetDataService; import com.ruoyi.common.core.domain.R; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; /** * <p> * 前端控制器 * </p> * * @author xiaochen * @since 2025-04-22 */ @Api(tags = "统计数据设置") @RestController @RequestMapping("/analysis-set-data") public class AnalysisSetDataController { private final AnalysisSetDataService analysisSetDataService; @Autowired public AnalysisSetDataController(AnalysisSetDataService analysisSetDataService) { this.analysisSetDataService = analysisSetDataService; } /** * 查询统计数据设置 */ @ApiOperation( value = "查询统计数据设置-兼容大屏接口") @GetMapping(value = "/getById") public R<AnalysisSetData> getById() { AnalysisSetData analysisSetData = analysisSetDataService.getById(1); return R.ok(analysisSetData); } /** * 修改统计数据设置 */ @ApiOperation( value = "修改统计数据设置") @PostMapping(value = "/update") public R<Boolean> update(@RequestBody AnalysisSetData dto) { return R.ok(analysisSetDataService.updateById(dto)); } }
New file @@ -0,0 +1,16 @@ package com.ruoyi.admin.large.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ruoyi.admin.large.model.AnalysisIndexRankingData; /** * <p> * Mapper 接口 * </p> * * @author xiaochen * @since 2025-04-22 */ public interface AnalysisIndexRankingDataMapper extends BaseMapper<AnalysisIndexRankingData> { } ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/large/mapper/AnalysisOrderDataMapper.java
New file @@ -0,0 +1,16 @@ package com.ruoyi.admin.large.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ruoyi.admin.large.model.AnalysisOrderData; /** * <p> * Mapper 接口 * </p> * * @author xiaochen * @since 2025-04-22 */ public interface AnalysisOrderDataMapper extends BaseMapper<AnalysisOrderData> { } ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/large/mapper/AnalysisSetDataMapper.java
New file @@ -0,0 +1,16 @@ package com.ruoyi.admin.large.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ruoyi.admin.large.model.AnalysisSetData; /** * <p> * Mapper 接口 * </p> * * @author xiaochen * @since 2025-04-22 */ public interface AnalysisSetDataMapper extends BaseMapper<AnalysisSetData> { } ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/large/model/AnalysisIndexRankingData.java
New file @@ -0,0 +1,71 @@ package com.ruoyi.admin.large.model; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import java.io.Serializable; import java.time.LocalDateTime; /** * <p> * * </p> * * @author xiaochen * @since 2025-04-22 */ @Data @EqualsAndHashCode(callSuper = false) @TableName("analysis_index_ranking_data") @ApiModel(value="AnalysisIndexRankingData对象", description="") public class AnalysisIndexRankingData implements Serializable { private static final long serialVersionUID = 1L; @TableId(value = "id", type = IdType.AUTO) private Integer id; @ApiModelProperty(value = "时间") @TableField("rank_time") private LocalDateTime rankTime; @ApiModelProperty(value = "区域") @TableField("rank_area") private String rankArea; @ApiModelProperty(value = "网点") @TableField("rank_outlets") private String rankOutlets; @ApiModelProperty(value = "预约及时率") @TableField("rank_timeliness_rate") private Double rankTimelinessRate; @ApiModelProperty(value = "改约率") @TableField("rank_change_rate") private Double rankChangeRate; @ApiModelProperty(value = "完工率") @TableField("rank_completion_rate") private Double rankCompletionRate; @ApiModelProperty(value = "提及率") @TableField("rank_mentioning_rate") private Double rankMentioningRate; @ApiModelProperty(value = "差评率") @TableField("rank_negative_review_rate") private Double rankNegativeReviewRate; @ApiModelProperty(value = "排名") @TableField("sort_by") private String sortBy; } ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/large/model/AnalysisOrderData.java
New file @@ -0,0 +1,74 @@ package com.ruoyi.admin.large.model; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import java.io.Serializable; import java.time.LocalDateTime; /** * <p> * * </p> * * @author xiaochen * @since 2025-04-22 */ @Data @EqualsAndHashCode(callSuper = false) @TableName("analysis_order_data") @ApiModel(value="AnalysisOrderData对象", description="") public class AnalysisOrderData implements Serializable { private static final long serialVersionUID = 1L; @TableId("id") private Integer id; @ApiModelProperty(value = "订单渠道") @TableField("order_channel") private String orderChannel; @ApiModelProperty(value = "订单编号") @TableField("order_num") private String orderNum; @ApiModelProperty(value = "城市") @TableField("city") private String city; @ApiModelProperty(value = "品类") @TableField("order_category") private String orderCategory; @ApiModelProperty(value = "用户姓名") @TableField("user_name") private String userName; @ApiModelProperty(value = "用户手机号") @TableField("user_phone") private String userPhone; @ApiModelProperty(value = "回收员") @TableField("recycle_person") private String recyclePerson; @ApiModelProperty(value = "日期") @TableField("order_date") private LocalDateTime orderDate; @ApiModelProperty(value = "状态") @TableField("state") private Integer state; @ApiModelProperty(value = "导入时间") @TableField("import_time") private LocalDateTime importTime; } ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/large/model/AnalysisSetData.java
New file @@ -0,0 +1,58 @@ package com.ruoyi.admin.large.model; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import java.io.Serializable; /** * <p> * * </p> * * @author xiaochen * @since 2025-04-22 */ @Data @EqualsAndHashCode(callSuper = false) @TableName("analysis_set_data") @ApiModel(value="AnalysisSetData对象", description="") public class AnalysisSetData implements Serializable { private static final long serialVersionUID = 1L; @TableId(value = "id", type = IdType.AUTO) private Integer id; @ApiModelProperty(value = "回收总订单量初始值") @TableField("recycle_order_start") private Integer recycleOrderStart; @ApiModelProperty(value = "回收总订单量终止值") @TableField("recycle_order_end") private Integer recycleOrderEnd; @ApiModelProperty(value = "总回收重量初始值") @TableField("recycle_weight_start") private Integer recycleWeightStart; @ApiModelProperty(value = "总回收重量终止值") @TableField("recycle_weight_end") private Integer recycleWeightEnd; @ApiModelProperty(value = "减少碳排放量初始值") @TableField("reduce_emission_start") private Integer reduceEmissionStart; @ApiModelProperty(value = "减少碳排放量终止值") @TableField("reduce_emission_end") private Integer reduceEmissionEnd; } ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/large/service/AnalysisIndexRankingDataService.java
New file @@ -0,0 +1,16 @@ package com.ruoyi.admin.large.service; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.admin.large.model.AnalysisIndexRankingData; /** * <p> * 服务类 * </p> * * @author xiaochen * @since 2025-04-22 */ public interface AnalysisIndexRankingDataService extends IService<AnalysisIndexRankingData> { } ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/large/service/AnalysisOrderDataService.java
New file @@ -0,0 +1,16 @@ package com.ruoyi.admin.large.service; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.admin.large.model.AnalysisOrderData; /** * <p> * 服务类 * </p> * * @author xiaochen * @since 2025-04-22 */ public interface AnalysisOrderDataService extends IService<AnalysisOrderData> { } ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/large/service/AnalysisSetDataService.java
New file @@ -0,0 +1,16 @@ package com.ruoyi.admin.large.service; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.admin.large.model.AnalysisSetData; /** * <p> * 服务类 * </p> * * @author xiaochen * @since 2025-04-22 */ public interface AnalysisSetDataService extends IService<AnalysisSetData> { } ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/large/service/impl/AnalysisIndexRankingDataServiceImpl.java
New file @@ -0,0 +1,20 @@ package com.ruoyi.admin.large.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.admin.large.mapper.AnalysisIndexRankingDataMapper; import com.ruoyi.admin.large.model.AnalysisIndexRankingData; import com.ruoyi.admin.large.service.AnalysisIndexRankingDataService; import org.springframework.stereotype.Service; /** * <p> * 服务实现类 * </p> * * @author xiaochen * @since 2025-04-22 */ @Service public class AnalysisIndexRankingDataServiceImpl extends ServiceImpl<AnalysisIndexRankingDataMapper, AnalysisIndexRankingData> implements AnalysisIndexRankingDataService { } ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/large/service/impl/AnalysisOrderDataServiceImpl.java
New file @@ -0,0 +1,20 @@ package com.ruoyi.admin.large.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.admin.large.mapper.AnalysisOrderDataMapper; import com.ruoyi.admin.large.model.AnalysisOrderData; import com.ruoyi.admin.large.service.AnalysisOrderDataService; import org.springframework.stereotype.Service; /** * <p> * 服务实现类 * </p> * * @author xiaochen * @since 2025-04-22 */ @Service public class AnalysisOrderDataServiceImpl extends ServiceImpl<AnalysisOrderDataMapper, AnalysisOrderData> implements AnalysisOrderDataService { } ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/large/service/impl/AnalysisSetDataServiceImpl.java
New file @@ -0,0 +1,20 @@ package com.ruoyi.admin.large.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.admin.large.mapper.AnalysisSetDataMapper; import com.ruoyi.admin.large.model.AnalysisSetData; import com.ruoyi.admin.large.service.AnalysisSetDataService; import org.springframework.stereotype.Service; /** * <p> * 服务实现类 * </p> * * @author xiaochen * @since 2025-04-22 */ @Service public class AnalysisSetDataServiceImpl extends ServiceImpl<AnalysisSetDataMapper, AnalysisSetData> implements AnalysisSetDataService { } ruoyi-service/ruoyi-admin/src/main/resources/mapper/admin/AnalysisRecycleDataMapper.xml
New file @@ -0,0 +1,21 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.ruoyi.admin.large.mapper.AnalysisRecycleDataMapper"> <!-- 通用查询映射结果 --> <resultMap id="BaseResultMap" type="com.ruoyi.admin.large.model.AnalysisRecycleData"> <id column="id" property="id" /> <result column="analysis_value" property="analysisValue" /> <result column="order_count" property="orderCount" /> <result column="analysis_type" property="analysisType" /> <result column="create_time" property="createTime" /> <result column="operator_name" property="operatorName" /> <result column="update_time" property="updateTime" /> </resultMap> <!-- 通用查询结果列 --> <sql id="Base_Column_List"> id, analysis_value, order_count, analysis_type, create_time, operator_name, update_time </sql> </mapper> ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/WorkerOrderCountVO.java
@@ -20,5 +20,7 @@ @ApiModelProperty("已完结订单数") private Integer completed; @ApiModelProperty("待预约数量") private Integer pending; } ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/controller/OrderController.java
@@ -173,14 +173,18 @@ */ @GetMapping("/allowanceMoney") @ApiOperation(value = "补充订单津贴金额", tags = {"用户端-订单"}) public R<Object> allowanceMoney(@RequestParam("orderId") String orderId, @RequestParam("prizeId") String prizeId) { public R<Object> allowanceMoney(@RequestParam("orderId") String orderId, @RequestParam("prizeId") String prizeId, @RequestParam("serveId") String serveId) { Prize data = adminClient.prizeDetail(prizeId).getData(); if (null == data) { return R.fail(adminClient.prizeDetail(prizeId).getMsg()); } String prizeMoney; if (data.getPrizeName().contains(Constants.SUBSIDY_MONEY)) { prizeMoney = data.getPrizeName().substring(Constants.ONE); if (data.getPrizeType() == 1) { // 查询服务回收补贴金 RecoveryServe recoveryServe = recoveryServeService.getById(serveId); prizeMoney = recoveryServe.getRecycleSubsidy().toString(); } else { prizeMoney = "0"; }
