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

增加单独的售后纠纷查询

This commit is contained in:
cb 2025-09-04 15:27:43 +08:00
parent c7953da901
commit f12121c457
4 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -139,7 +139,13 @@ public class OrderDetailController extends BaseController {
@PostMapping("/list")
@ResponseBody
public TableDataInfo list(OrderDetail orderDetail) {
if (orderDetail.getSearchAfterList() !=null && orderDetail.getSearchAfterList()) {
// 检查是否是售后纠纷查询
if (orderDetail.getOrderStatusName() != null && "售后纠纷".equals(orderDetail.getOrderStatusName())) {
// 直接使用afterServiceStatus字段查询售后纠纷订单
orderDetail.setAfterServiceStatus(1);
orderDetail.setOrderStatus(null); // 清除orderStatus条件，避免冲突
} else if (orderDetail.getSearchAfterList() !=null && orderDetail.getSearchAfterList()) {
// 保持原有的售后查询逻辑
List<?> rows = this.afterServiceList(orderDetail).getRows();
StringBuilder detailIds = new StringBuilder();
if(CollectionUtils.isNotEmpty(rows)){

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

@ -1742,7 +1742,13 @@ public class OrderMasterController extends BaseController {
@PostMapping("/list")
@ResponseBody
public TableDataInfo list(OrderMaster orderMaster) {
if (orderMaster.getSearchAfterList() !=null && orderMaster.getSearchAfterList()) {
// 检查是否是售后纠纷查询
if (orderMaster.getOrderStatusName() != null && "售后纠纷".equals(orderMaster.getOrderStatusName())) {
// 直接使用afterServiceStatus字段查询售后纠纷订单
orderMaster.setAfterServiceStatus(1);
orderMaster.setOrderStatus(null); // 清除orderStatus条件，避免冲突
} else if (orderMaster.getSearchAfterList() !=null && orderMaster.getSearchAfterList()) {
// 保持原有的售后查询逻辑
List<?> rows = this.afterList(orderMaster).getRows();
StringBuilder masterIds = new StringBuilder();
if(CollectionUtils.isNotEmpty(rows)){

4
ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml
View File

@ -30,6 +30,7 @@
<result property="updateBy" column="update_by"/>
<result property="updateTime" column="update_time"/>
<result property="remark" column="remark"/>
<result property="afterServiceStatus" column="after_service_status"/>
<result property="handoverImages" column="handover_images"/>
<result property="handoverRemark" column="handover_remark"/>
<result property="confirmStartTime" column="confirm_start_time"/>
@ -211,6 +212,9 @@
<if test="workBeginTimeEnd != null">
AND od.work_begin_time &lt;= #{workBeginTimeEnd}
</if>
<if test="afterServiceStatus != null">
AND od.after_service_status = #{afterServiceStatus}
</if>
<if test="orderDetailIds != null">
AND od.id in ( ${orderDetailIds} )
</if>

4
ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml
View File

@ -30,6 +30,7 @@
<result property="updateBy" column="update_by"/>
<result property="updateTime" column="update_time"/>
<result property="remark" column="remark"/>
<result property="afterServiceStatus" column="after_service_status"/>
<result property="goodsId" column="goods_id"/>
<result property="goodsBrand" column="goods_brand"/>
<result property="goodsSpecification" column="goods_specification"/>
@ -314,6 +315,9 @@
<if test="updateTimeEnd != null">
AND om.update_time &lt;= #{updateTimeEnd}
</if>
<if test="afterServiceStatus != null">
AND om.after_service_status = #{afterServiceStatus}
</if>
<if test="orderMasterIds != null and orderMasterIds != ''">
AND om.id in (${orderMasterIds})
</if>