clunt
/
ghy-all
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

加价单状态更新

This commit is contained in:
clunt 2022-09-25 20:48:09 +08:00
parent 06f2e594fb
commit 8ee2a3ef15
8 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java
View File

@ -11,7 +11,6 @@ import com.ghy.common.enums.OrderStatus;
import com.ghy.common.enums.PayStatus; import com.ghy.common.enums.PayStatus;
import com.ghy.common.utils.ExceptionUtil; import com.ghy.common.utils.ExceptionUtil;
import com.ghy.common.utils.poi.ExcelUtil; import com.ghy.common.utils.poi.ExcelUtil;
import com.ghy.customer.domain.Customer;
import com.ghy.customer.domain.CustomerAddress; import com.ghy.customer.domain.CustomerAddress;
import com.ghy.customer.service.CustomerAddressService; import com.ghy.customer.service.CustomerAddressService;
import com.ghy.customer.service.CustomerService; import com.ghy.customer.service.CustomerService;

2
ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java
View File

@ -12,7 +12,6 @@ import com.ghy.common.enums.ImgType;
import com.ghy.common.utils.ExceptionUtil; import com.ghy.common.utils.ExceptionUtil;
import com.ghy.common.utils.StringUtils; import com.ghy.common.utils.StringUtils;
import com.ghy.common.utils.poi.ExcelUtil; import com.ghy.common.utils.poi.ExcelUtil;
import com.ghy.customer.domain.Customer;
import com.ghy.customer.domain.CustomerAddress; import com.ghy.customer.domain.CustomerAddress;
import com.ghy.customer.service.CustomerAddressService; import com.ghy.customer.service.CustomerAddressService;
import com.ghy.customer.service.CustomerService; import com.ghy.customer.service.CustomerService;
@ -43,7 +42,6 @@ import com.ghy.worker.domain.WorkerCertification;
import com.ghy.worker.service.IWorkerCertificationService; import com.ghy.worker.service.IWorkerCertificationService;
import com.ghy.worker.service.WorkerService; import com.ghy.worker.service.WorkerService;
import com.huifu.adapay.core.exception.BaseAdaPayException; import com.huifu.adapay.core.exception.BaseAdaPayException;
import org.apache.commons.collections.CollectionUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;

1
ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderDetailsResponseVo.java
View File

@ -1,6 +1,5 @@
package com.ghy.web.pojo.vo; package com.ghy.web.pojo.vo;
import com.ghy.common.annotation.Excel;
import com.ghy.common.enums.OrderStatus; import com.ghy.common.enums.OrderStatus;
import com.ghy.common.utils.DateUtils; import com.ghy.common.utils.DateUtils;
import com.ghy.common.utils.ObjectUtils; import com.ghy.common.utils.ObjectUtils;

1
ghy-order/src/main/java/com/ghy/order/mapper/OrderDetailMapper.java
View File

@ -1,7 +1,6 @@
package com.ghy.order.mapper; package com.ghy.order.mapper;
import com.ghy.order.domain.OrderDetail; import com.ghy.order.domain.OrderDetail;
import com.ghy.order.domain.OrderMaster;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;

1
ghy-order/src/main/java/com/ghy/order/service/OrderGoodsService.java
View File

@ -1,6 +1,5 @@
package com.ghy.order.service; package com.ghy.order.service;
import com.ghy.order.domain.OrderDetail;
import com.ghy.order.domain.OrderGoods; import com.ghy.order.domain.OrderGoods;
import java.util.List; import java.util.List;

1
ghy-order/src/main/java/com/ghy/order/service/impl/OrderGoodsServiceImpl.java
View File

@ -1,6 +1,5 @@
package com.ghy.order.service.impl; package com.ghy.order.service.impl;
import com.ghy.order.domain.OrderDetail;
import com.ghy.order.domain.OrderGoods; import com.ghy.order.domain.OrderGoods;
import com.ghy.order.mapper.OrderGoodsMapper; import com.ghy.order.mapper.OrderGoodsMapper;
import com.ghy.order.service.OrderGoodsService; import com.ghy.order.service.OrderGoodsService;

2
ghy-payment/src/main/resources/mapper/financial/FinancialChangeRecordMapper.xml
View File

@ -16,7 +16,7 @@
select id, order_detail_id, change_money, status, pay_status, type, remark from financial_change_record select id, order_detail_id, change_money, status, pay_status, type, remark from financial_change_record
</sql> </sql>
<select id="selectNotPayRecordByDetailId" parameterType="String" resultMap="FinancialChangeRecordResult"> <select id="selectNotPayRecordByDetailId" parameterType="Long" resultMap="FinancialChangeRecordResult">
<include refid="selectFinancialChangeRecordVo" /> <include refid="selectFinancialChangeRecordVo" />
where order_detail_id = #{orderDetailId} and pay_status = 0; where order_detail_id = #{orderDetailId} and pay_status = 0;
</select> </select>

1
ghy-quartz/src/main/java/com/ghy/quartz/service/impl/OrderServiceImpl.java
View File

@ -22,7 +22,6 @@ import org.springframework.util.CollectionUtils;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Calendar;
import java.util.Collections; import java.util.Collections;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;