bonus
/
Bonus-Cloud-Material-Mall
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

费用清单

This commit is contained in:
sxu 2024-12-18 10:13:52 +08:00
parent 3e8599ddf4
commit 34359bca8e
5 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/mapper/LeaseRepairRecordMapper.java
View File

@ -34,6 +34,8 @@ public interface LeaseRepairRecordMapper {
*/
int insert(LeaseRepairRecord leaseRepairRecord);
int getCountByOrderId(Integer orderId);
int deleteLeaseRepairRecord(LeaseRepairRecord leaseRepairRecord);
/**

17
bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/controller/OrderController.java
View File

@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.text.StrBuilder;
import com.bonus.common.biz.enums.MaStatusEnum;
import com.bonus.common.biz.enums.OrderStatusEnum;
import com.bonus.common.core.utils.DateUtils;
import com.bonus.common.core.web.controller.BaseController;
import com.bonus.common.core.web.domain.AjaxResult;
import com.bonus.common.core.web.page.TableDataInfo;
@ -12,6 +13,8 @@ import com.bonus.material.book.domain.BookCarInfoDto;
import com.bonus.material.contract.domain.BmContract;
import com.bonus.material.contract.service.BmContractService;
import com.bonus.material.device.domain.vo.DevInfoVo;
import com.bonus.material.lease.domain.LeaseRepairRecord;
import com.bonus.material.lease.mapper.LeaseRepairRecordMapper;
import com.bonus.material.order.domain.OrderDetailCostReliefDto;
import com.bonus.material.order.domain.OrderDetailDto;
import com.bonus.material.order.domain.OrderInfoDto;
@ -64,6 +67,9 @@ public class OrderController extends BaseController {
@Resource
private OrderMapper orderMapper;
@Resource
private LeaseRepairRecordMapper leaseRepairRecordMapper;
@Resource
private BmContractService bmContractService;
@ -153,6 +159,17 @@ public class OrderController extends BaseController {
}
}
}
// 检修完结，如果没有记录需要新加一条记录
// if (orderInfoDto.getOrderStatus().equals(OrderStatusEnum.ORDER_REPAIRED.getStatus().toString())) {
// if (leaseRepairRecordMapper.getCountByOrderId(orderInfoDto.getOrderId()) == 0) {
// LeaseRepairRecord leaseRepairRecord = new LeaseRepairRecord();
// leaseRepairRecord.setOrderId(String.valueOf(orderInfoDto.getOrderId()));
// leaseRepairRecord.setCode(orderInfoDto.getOrderCode());
// leaseRepairRecord.setCreateBy(SecurityUtils.getUserId().toString());
// leaseRepairRecord.setCreateTime(DateUtils.getNowDate());
// leaseRepairRecordMapper.insert(leaseRepairRecord);
// }
// }
Integer i = orderMapper.updateOrderStatus(orderInfoDto.getOrderId(), orderInfoDto.getMaIds(), orderInfoDto.getOrderStatus(), userName);
if (i > 0) {
return success();

3
bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/domain/OrderDetailDto.java
View File

@ -28,6 +28,9 @@ public class OrderDetailDto {
@ApiModelProperty(value = "订单id")
private Integer orderId;
@ApiModelProperty(value = "订单code")
private String orderCode;
@ApiModelProperty(value = "设备id")
private Integer maId;

5
bonus-modules/bonus-material-mall/src/main/resources/mapper/material/lease/LeaseRepairRecordMapper.xml
View File

@ -490,4 +490,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
WHERE
lr.order_id = #{orderId}
</select>
<select id="getCountByOrderId" resultType="Integer">
select count(1) from lease_repair_record
where order_id = #{orderId}
</select>
</mapper>

1
bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml
View File

@ -230,6 +230,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectOrderDetailsByOderId" resultType="com.bonus.material.order.domain.OrderDetailDto">
SELECT
mdi.ma_id as maId,
mdi.code as code,
mdi.type_id as typeId,
mdi.device_name,
mt.lease_price as dayLeasePrice,