dianliang/lanan-system
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: dianliang:94f046d44ca7474f3d3a41f63be4f04c0a9ded41
Branches Tags
dianliang:master
dianliang:repair
dianliang:insp
dianliang:rescue
dianliang:driver
dianliang:dev
..
compare: dianliang:1be40d9bb6ad55de09bb3d7d1af8c084f740649a
Branches Tags
dianliang:master
dianliang:repair
dianliang:insp
dianliang:rescue
dianliang:driver
dianliang:dev

No commits in common. "94f046d44ca7474f3d3a41f63be4f04c0a9ded41" and "1be40d9bb6ad55de09bb3d7d1af8c084f740649a" have entirely different histories.
94f046d44c ... 1be40d9bb6

17 changed files with 114 additions and 105 deletions
Show Stats Expand all files Collapse all files

16
dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/CustomerBalanceService.java
View File

@ -21,17 +21,6 @@ public interface CustomerBalanceService extends IService<CustomerBalance> {
*/
String createCustomerBalance(@Valid CustomerBalanceSaveReqVO createReqVO);
/**
* 更新用户余额信息
*
* @param cusId 用户id
* @param orderId 订单id
* @param activeId 活动id
* @author PQZ
* @date 21:04 2024/9/23
**/
void saveBalance(String cusId, String orderId, String activeId);
/**
* 更新用户积分（余额）
*
@ -41,11 +30,10 @@ public interface CustomerBalanceService extends IService<CustomerBalance> {
/**
* 根据用户id更新用户余额表
*
* @param balance CustomerBalance
* @return void
* @author PQZ
* @date 11:56 2024/9/21
* @param balance CustomerBalance
* @return void
**/
void updateByCusId(CustomerBalance balance);

20
dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/impl/CustomerBalanceServiceImpl.java
View File

@ -5,9 +5,7 @@ import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
import cn.iocoder.yudao.module.custom.entity.CustomerBalance;
import cn.iocoder.yudao.module.custom.mapper.CustomerBalanceMapper;
import cn.iocoder.yudao.module.custom.service.CustomerBalanceService;
import cn.iocoder.yudao.module.custom.service.CustomerMainService;
import cn.iocoder.yudao.module.custom.vo.CustomerBalanceSaveReqVO;
import cn.iocoder.yudao.module.custom.vo.CustomerMainRespVO;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
@ -27,9 +25,6 @@ public class CustomerBalanceServiceImpl extends ServiceImpl<CustomerBalanceMappe
@Resource
private CustomerBalanceMapper customerBalanceMapper;
@Resource
private CustomerMainService customerMainService;
@Override
public String createCustomerBalance(CustomerBalanceSaveReqVO createReqVO) {
@ -40,21 +35,6 @@ public class CustomerBalanceServiceImpl extends ServiceImpl<CustomerBalanceMappe
return customerBalance.getId();
}
/**
* 更新用户余额信息
*
* @param cusId 用户id
* @param orderId 订单id
* @param activeId 活动id
* @author PQZ
* @date 21:04 2024/9/23
**/
@Override
public void saveBalance(String cusId, String orderId, String activeId) {
//查询当前登录用户信息
CustomerMainRespVO customer = customerMainService.getCustomerById(cusId);
}
@Override
public void updateCustomerBalance(CustomerBalanceSaveReqVO updateReqVO) {
// 更新

20
dl-module-base/src/main/java/cn/iocoder/yudao/module/order/vo/RepairOrderInfoRespVO.java
View File

@ -1,20 +0,0 @@
package cn.iocoder.yudao.module.order.vo;
import cn.iocoder.yudao.module.order.entity.RepairOrderInfo;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@Schema(description = "管理后台 - 维修模块 订单 Response VO")
@Data
@ExcelIgnoreUnannotated
public class RepairOrderInfoRespVO extends RepairOrderInfo {
/** 订单状态（工单的状态） */
private String status;
//订单描述
private String description;
}

12
dl-module-base/src/main/java/cn/iocoder/yudao/module/order/vo/RepairOrderInfoSaveReqVO.java
View File

@ -1,12 +0,0 @@
package cn.iocoder.yudao.module.order.vo;
import cn.iocoder.yudao.module.order.entity.RepairOrderInfo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@Schema(description = "管理后台 - 维修模块 订单新增/修改 Request VO")
@Data
public class RepairOrderInfoSaveReqVO extends RepairOrderInfo {
}

2
dl-module-repair/src/main/java/cn/iocoder/yudao/module/app/apy/RepairPayApi.java
View File

@ -1,7 +1,7 @@
package cn.iocoder.yudao.module.app.apy;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.module.order.service.RepairOrderInfoService;
import cn.iocoder.yudao.module.project.service.RepairOrderInfoService;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;

6
dl-module-repair/src/main/java/cn/iocoder/yudao/module/app/order/admin/RepairOrderAPI.java
View File

@ -1,9 +1,9 @@
package cn.iocoder.yudao.module.app.order.admin;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.module.order.entity.RepairOrderInfo;
import cn.iocoder.yudao.module.order.service.RepairOrderInfoService;
import cn.iocoder.yudao.module.order.vo.RepairOrderInfoRespVO;
import cn.iocoder.yudao.module.project.entity.RepairOrderInfo;
import cn.iocoder.yudao.module.project.service.RepairOrderInfoService;
import cn.iocoder.yudao.module.project.vo.RepairOrderInfoRespVO;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.v3.oas.annotations.Operation;
import org.springframework.context.annotation.Lazy;

11
dl-module-base/src/main/java/cn/iocoder/yudao/module/order/controller/admin/RepairOrderInfoController.java → dl-module-repair/src/main/java/cn/iocoder/yudao/module/project/controller/admin/RepairOrderInfoController.java
View File

@ -1,11 +1,12 @@
package cn.iocoder.yudao.module.order.controller.admin;
package cn.iocoder.yudao.module.project.controller.admin;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.module.order.entity.RepairOrderInfo;
import cn.iocoder.yudao.module.order.service.RepairOrderInfoService;
import cn.iocoder.yudao.module.order.vo.RepairOrderInfoPageReqVO;
import cn.iocoder.yudao.module.order.vo.RepairOrderInfoRespVO;
import cn.iocoder.yudao.module.project.entity.RepairOrderInfo;
import cn.iocoder.yudao.module.project.service.RepairOrderInfoService;
import cn.iocoder.yudao.module.project.vo.RepairOrderInfoPageReqVO;
import cn.iocoder.yudao.module.project.vo.RepairOrderInfoRespVO;
import cn.iocoder.yudao.module.project.vo.RepairOrderInfoSaveReqVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.v3.oas.annotations.Operation;

10
dl-module-repair/src/main/java/cn/iocoder/yudao/module/project/controller/admin/RepairPayController.java
View File

@ -1,14 +1,22 @@
package cn.iocoder.yudao.module.project.controller.admin;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.module.order.service.RepairOrderInfoService;
import cn.iocoder.yudao.module.project.service.RepairOrderInfoService;
import cn.iocoder.yudao.module.project.vo.RepairProjectPageReqVO;
import cn.iocoder.yudao.module.project.vo.RepairProjectRespVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
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 javax.annotation.Resource;
import java.util.Map;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;

15
dl-module-base/src/main/java/cn/iocoder/yudao/module/order/entity/RepairOrderInfo.java → dl-module-repair/src/main/java/cn/iocoder/yudao/module/project/entity/RepairOrderInfo.java
View File

@ -1,13 +1,18 @@
package cn.iocoder.yudao.module.order.entity;
package cn.iocoder.yudao.module.project.entity;
import cn.iocoder.yudao.framework.tenant.core.db.TenantBaseDO;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.*;
import java.util.*;
import java.math.BigDecimal;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.*;
import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
/**
* 维修模块 订单 DO

6
dl-module-base/src/main/java/cn/iocoder/yudao/module/order/mapper/RepairOrderInfoMapper.java → dl-module-repair/src/main/java/cn/iocoder/yudao/module/project/mapper/RepairOrderInfoMapper.java
View File

@ -1,6 +1,8 @@
package cn.iocoder.yudao.module.order.vo;
package cn.iocoder.yudao.module.project.mapper;
import cn.iocoder.yudao.module.order.entity.RepairOrderInfo;
import cn.iocoder.yudao.module.project.entity.RepairOrderInfo;
import cn.iocoder.yudao.module.project.vo.RepairOrderInfoPageReqVO;
import cn.iocoder.yudao.module.project.vo.RepairOrderInfoRespVO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

10
dl-module-base/src/main/java/cn/iocoder/yudao/module/order/service/RepairOrderInfoService.java → dl-module-repair/src/main/java/cn/iocoder/yudao/module/project/service/RepairOrderInfoService.java
View File

@ -1,10 +1,10 @@
package cn.iocoder.yudao.module.order.service;
package cn.iocoder.yudao.module.project.service;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.module.order.entity.RepairOrderInfo;
import cn.iocoder.yudao.module.order.vo.RepairOrderInfoPageReqVO;
import cn.iocoder.yudao.module.order.vo.RepairOrderInfoRespVO;
import cn.iocoder.yudao.module.order.vo.RepairOrderInfoSaveReqVO;
import cn.iocoder.yudao.module.project.entity.RepairOrderInfo;
import cn.iocoder.yudao.module.project.vo.RepairOrderInfoPageReqVO;
import cn.iocoder.yudao.module.project.vo.RepairOrderInfoRespVO;
import cn.iocoder.yudao.module.project.vo.RepairOrderInfoSaveReqVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;

24
dl-module-base/src/main/java/cn/iocoder/yudao/module/order/service/impl/RepairOrderInfoServiceImpl.java → dl-module-repair/src/main/java/cn/iocoder/yudao/module/project/service/impl/RepairOrderInfoServiceImpl.java
View File

@ -1,28 +1,35 @@
package cn.iocoder.yudao.module.order.service.impl;
package cn.iocoder.yudao.module.project.service.impl;
import cn.hutool.core.util.ObjectUtil;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.module.order.entity.RepairOrderInfo;
import cn.iocoder.yudao.module.order.service.RepairOrderInfoService;
import cn.iocoder.yudao.module.order.vo.RepairOrderInfoMapper;
import cn.iocoder.yudao.module.order.vo.RepairOrderInfoPageReqVO;
import cn.iocoder.yudao.module.order.vo.RepairOrderInfoRespVO;
import cn.iocoder.yudao.module.order.vo.RepairOrderInfoSaveReqVO;
import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
import cn.iocoder.yudao.module.project.entity.RepairOrderInfo;
import cn.iocoder.yudao.module.project.mapper.RepairOrderInfoMapper;
import cn.iocoder.yudao.module.project.service.RepairOrderInfoService;
import cn.iocoder.yudao.module.project.vo.RepairOrderInfoPageReqVO;
import cn.iocoder.yudao.module.project.vo.RepairOrderInfoRespVO;
import cn.iocoder.yudao.module.project.vo.RepairOrderInfoSaveReqVO;
import cn.iocoder.yudao.module.tickets.entity.DlRepairTickets;
import cn.iocoder.yudao.module.tickets.service.DlRepairTicketsService;
import cn.iocoder.yudao.module.tickets.vo.DlRepairTicketsRespVO;
import cn.iocoder.yudao.util.WechatPayConfig;
import cn.iocoder.yudao.util.WechatPayRequest;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.commons.lang3.ObjectUtils;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
import javax.annotation.Resource;
import java.time.LocalDateTime;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
@ -38,6 +45,9 @@ public class RepairOrderInfoServiceImpl extends ServiceImpl<RepairOrderInfoMappe
@Resource
private RepairOrderInfoMapper repairOrderInfoMapper;
@Resource
@Lazy
private DlRepairTicketsService ticketsService;
@Resource
private WechatPayConfig wechatPayConfig;
@Resource

4
dl-module-base/src/main/java/cn/iocoder/yudao/module/order/vo/RepairOrderInfoPageReqVO.java → dl-module-repair/src/main/java/cn/iocoder/yudao/module/project/vo/RepairOrderInfoPageReqVO.java
View File

@ -1,6 +1,6 @@
package cn.iocoder.yudao.module.order.vo;
package cn.iocoder.yudao.module.project.vo;
import cn.iocoder.yudao.module.order.entity.RepairOrderInfo;
import cn.iocoder.yudao.module.project.entity.RepairOrderInfo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;

26
dl-module-repair/src/main/java/cn/iocoder/yudao/module/project/vo/RepairOrderInfoRespVO.java Normal file
View File

@ -0,0 +1,26 @@
package cn.iocoder.yudao.module.project.vo;
import cn.iocoder.yudao.module.project.entity.RepairOrderInfo;
import cn.iocoder.yudao.module.tickets.vo.DlRepairTicketsRespVO;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.util.*;
import java.math.BigDecimal;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
import com.alibaba.excel.annotation.*;
@Schema(description = "管理后台 - 维修模块 订单 Response VO")
@Data
@ExcelIgnoreUnannotated
public class RepairOrderInfoRespVO extends RepairOrderInfo {
/** 订单状态（工单的状态） */
private String status;
/** 工单信息（包含子表） */
private DlRepairTicketsRespVO tickets;
//订单描述
private String description;
}

17
dl-module-repair/src/main/java/cn/iocoder/yudao/module/project/vo/RepairOrderInfoSaveReqVO.java Normal file
View File

@ -0,0 +1,17 @@
package cn.iocoder.yudao.module.project.vo;
import cn.iocoder.yudao.module.project.entity.RepairOrderInfo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.util.*;
import javax.validation.constraints.*;
import java.math.BigDecimal;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
@Schema(description = "管理后台 - 维修模块 订单新增/修改 Request VO")
@Data
public class RepairOrderInfoSaveReqVO extends RepairOrderInfo {
}

8
dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTicketsServiceImpl.java
View File

@ -7,18 +7,20 @@ import cn.iocoder.yudao.common.RepairErrorCodeConstants;
import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
import cn.iocoder.yudao.module.custom.service.CustomerMainService;
import cn.iocoder.yudao.module.custom.vo.CustomerMainRespVO;
import cn.iocoder.yudao.module.order.service.RepairOrderInfoService;
import cn.iocoder.yudao.module.order.vo.RepairOrderInfoSaveReqVO;
import cn.iocoder.yudao.module.other.entity.DlRepairOther;
import cn.iocoder.yudao.module.other.service.DlRepairOtherService;
import cn.iocoder.yudao.module.project.entity.RepairOrderInfo;
import cn.iocoder.yudao.module.project.entity.RepairProject;
import cn.iocoder.yudao.module.project.entity.RepairWares;
import cn.iocoder.yudao.module.project.service.RepairOrderInfoService;
import cn.iocoder.yudao.module.project.service.RepairProjectService;
import cn.iocoder.yudao.module.project.service.RepairWaresService;
import cn.iocoder.yudao.module.project.vo.RepairOrderInfoSaveReqVO;
import cn.iocoder.yudao.module.system.api.dept.DeptApi;
import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
import cn.iocoder.yudao.module.system.api.dict.DictDataApi;
import cn.iocoder.yudao.module.system.api.dict.dto.DictDataRespDTO;
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
import cn.iocoder.yudao.module.tickets.entity.DlRepairTickets;
import cn.iocoder.yudao.module.tickets.entity.DlRepairTitem;
import cn.iocoder.yudao.module.tickets.mapper.DlRepairTicketsMapper;
@ -36,8 +38,10 @@ import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.util.List;
import java.util.Optional;
import java.util.Set;
import java.util.stream.Collectors;

6
dl-module-base/src/main/resources/mapper/order/RepairOrderInfoMapper.xml → dl-module-repair/src/main/resources/mapper/project/RepairOrderInfoMapper.xml
View File

@ -1,6 +1,6 @@
<?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="cn.iocoder.yudao.module.order.vo.RepairOrderInfoMapper">
<mapper namespace="cn.iocoder.yudao.module.project.mapper.RepairOrderInfoMapper">
<!--
一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。
@ -9,7 +9,7 @@
文档可见：https://www.iocoder.cn/MyBatis/x-plugins/
-->
<select id="queryListPage" resultType="cn.iocoder.yudao.module.order.vo.RepairOrderInfoRespVO">
<select id="queryListPage" resultType="cn.iocoder.yudao.module.project.vo.RepairOrderInfoRespVO">
SELECT
roi.*
FROM
@ -34,7 +34,7 @@
</where>
</select>
<select id="getOrderPageByStatus" resultType="cn.iocoder.yudao.module.order.vo.RepairOrderInfoRespVO">
<select id="getOrderPageByStatus" resultType="cn.iocoder.yudao.module.project.vo.RepairOrderInfoRespVO">
select roi.*,drt.tickets_work_status as status from repair_order_info roi left join dl_repair_tickets drt on
roi.goods_id = drt.id
where roi.deleted = '0'