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

Compare commits

base: dianliang:2c8d555fd384ed7be1d06122a3b73cd911f6aadc
Branches Tags
dianliang:master
dianliang:repair
dianliang:insp
dianliang:rescue
dianliang:driver
dianliang:dev
...
compare: dianliang:5c73d31551870bb2c5fc053173a6626d97867ed1
Branches Tags
dianliang:repair
dianliang:master
dianliang:insp
dianliang:rescue
dianliang:driver
dianliang:dev

2 Commits
2c8d555fd3 ... 5c73d31551

Author SHA1 Message Date
PQZ
5c73d31551 Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system 
# Conflicts:
#	dl-module-base/src/main/java/cn/iocoder/yudao/module/order/service/impl/RepairOrderInfoServiceImpl.java
 2024-09-25 19:56:09 +08:00
PQZ
cfea376905 1 2024-09-25 19:53:01 +08:00
3 changed files with 10 additions and 3 deletions
Show Stats Expand all files Collapse all files

5
dl-module-base/src/main/java/cn/iocoder/yudao/module/order/mapper/RepairOrderInfoMapper.java
View File

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

6
dl-module-base/src/main/java/cn/iocoder/yudao/module/order/service/impl/RepairOrderInfoServiceImpl.java
View File

@ -9,9 +9,12 @@ import cn.iocoder.yudao.module.company.service.CompanyService;
import cn.iocoder.yudao.module.custom.service.CustomerBalanceService; import cn.iocoder.yudao.module.custom.service.CustomerBalanceService;
import cn.iocoder.yudao.module.custom.service.CustomerCouponService; import cn.iocoder.yudao.module.custom.service.CustomerCouponService;
import cn.iocoder.yudao.module.order.entity.RepairOrderInfo; import cn.iocoder.yudao.module.order.entity.RepairOrderInfo;
import cn.iocoder.yudao.module.order.mapper.RepairOrderInfoMapper;
import cn.iocoder.yudao.module.order.service.RepairOrderInfoService; import cn.iocoder.yudao.module.order.service.RepairOrderInfoService;
import cn.iocoder.yudao.module.order.vo.*; import cn.iocoder.yudao.module.order.vo.*;
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.module.tickets.entity.Tickets; import cn.iocoder.yudao.module.tickets.entity.Tickets;
import cn.iocoder.yudao.module.tickets.service.TicketsService; import cn.iocoder.yudao.module.tickets.service.TicketsService;
import cn.iocoder.yudao.util.WechatPayConfig; import cn.iocoder.yudao.util.WechatPayConfig;
@ -199,6 +202,7 @@ public class RepairOrderInfoServiceImpl extends ServiceImpl<RepairOrderInfoMappe
* @param orderId 订单主键 * @param orderId 订单主键
* @return * @return
*/ */
@Override
public Map<String,Object> payTransactions(String orderId){ public Map<String,Object> payTransactions(String orderId){
RepairOrderInfo orderInfo = this.getById(orderId); RepairOrderInfo orderInfo = this.getById(orderId);
// 统一参数封装 // 统一参数封装

2
dl-module-base/src/main/resources/mapper/order/RepairOrderInfoMapper.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?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"> <!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.order.mapper.RepairOrderInfoMapper">
<!-- <!--
一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。 一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。