no message

ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java

@@ -493,6 +493,9 @@ public class OrderController extends BaseController {
         od.setExpectTimeStart(om.getExpectTimeStart());
         od.setExpectTimeEnd(om.getExpectTimeEnd());
         od.setWorkBeginTime(new Date());
+        // 将主单的客户备注和订单图片复制到子单
+        // od.setCustomerRemark(om.getCustomerRemark());
+        od.setOrderImages(om.getOrderImages());
         // 将主单的师傅备注复制到子单
         if(request.getWorkerId().equals(om.getWorkerId())) {
             od.setWorkerRemark(om.getWorkerRemark());
@@ -1638,6 +1641,7 @@ public class OrderController extends BaseController {
             detailOrderList.stream().forEach(detail -> {
                 AfterServiceRecord afterServiceRecordQry = new AfterServiceRecord();
                 afterServiceRecordQry.setOrderDetailId(detail.getId());
+                afterServiceRecordQry.setExcludeAfterServiceFinished(Boolean.TRUE);
                 List<AfterServiceRecord> records = afterServiceRecordService
                         .selectAfterServiceRecordList(afterServiceRecordQry);
                 // 检查子单师傅ID是否与主单师傅ID一致且有售后记录
@@ -1992,6 +1996,7 @@ public class OrderController extends BaseController {
             detailOrderList.stream().forEach(detail -> {
                 AfterServiceRecord afterServiceRecordQry = new AfterServiceRecord();
                 afterServiceRecordQry.setOrderDetailId(detail.getId());
+                afterServiceRecordQry.setExcludeAfterServiceFinished(Boolean.TRUE);
                 List<AfterServiceRecord> records = afterServiceRecordService
                         .selectAfterServiceRecordList(afterServiceRecordQry);
                 // 检查子单师傅ID是否与主单师傅ID一致且有售后记录
@@ -2266,6 +2271,7 @@ public class OrderController extends BaseController {
             // 售后记录
             AfterServiceRecord afterServiceRecord = new AfterServiceRecord();
             afterServiceRecord.setOrderDetailId(detail.getId());
+            afterServiceRecord.setExcludeAfterServiceFinished(true);
             List<AfterServiceRecord> afterServiceRecordList
             =afterServiceRecordService.selectAfterServiceRecordList(afterServiceRecord);
                  orderListResponse.setShowAfterServiceRecord( 1);

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

@@ -567,6 +567,7 @@ public class OrderDetailController extends BaseController {
             orderListResponse.setWorkFinishTime(detail.getWorkFinishTime());
             orderListResponse.setRemark(goods.getRemark());
             orderListResponse.setCustomerRemark(orderMaster.getRemark());
+            orderListResponse.setOrderImages(detail.getOrderImages());
             orderListResponse.setFinishImgList(finishImgList);
             orderListResponse.setWorkerRemark(detail.getRemark());
             orderListResponse.setAfterServiceRecordList(afterServiceRecordList);

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

@@ -1802,6 +1802,7 @@ public class OrderMasterController extends BaseController {
                 }
 
                 OrderStandardDetail orderStandardDetail = new OrderStandardDetail();
+                orderStandardDetail.setOrderImages(orderDetail.getOrderImages());
                 orderStandardDetail.setHandoverImages(orderDetail.getHandoverImages());
                 orderStandardDetail.setHandoverRemark(orderDetail.getHandoverRemark());
                 orderStandardDetail.setDeliveryType(orderDetail.getDeliveryType());

ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderStandardDetail.java

@@ -126,4 +126,7 @@ public class OrderStandardDetail {
 
     
     private String handoverRemark;
+
+    private String orderImages;
+
 }

ghy-order/src/main/java/com/ghy/order/domain/OrderDetail.java

@@ -298,6 +298,12 @@ public class OrderDetail extends BaseEntity {
     @Excel(name = "快递单号")
     private String trackingNumber;
 
+    /**
+     * 订单图片 - 客户下单时上传的图片
+     */
+    @Excel(name = "订单图片")
+    private String orderImages;
+
        //是否立即发货
     private  Integer isQuicklyDelivery;
 }

ghy-order/src/main/java/com/ghy/order/service/impl/OrderMasterServiceImpl.java

@@ -112,8 +112,9 @@ public class OrderMasterServiceImpl implements OrderMasterService {
         OrderMaster oldOrder = this.selectById(orderMaster.getId());
         if ((orderMaster.getOrderStatus() != null && !Objects.equals(oldOrder.getOrderStatus(), orderMaster.getOrderStatus()))
             || orderMaster.getExpectTimeStart() != null && orderMaster.getExpectTimeStart().compareTo(new Date()) > 0) {
-            // 状态变更或者预约时间大于当前时间便清除超时状态
+         
                 orderMaster.setTimeout(0);
+            
         }
         return orderMasterMapper.updateOrderMaster(orderMaster);
     }

ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml

@@ -49,6 +49,7 @@
         <result property="deliveryRemark" column="delivery_remark"/>
         <result property="deliveryImages" column="delivery_images"/>
         <result property="trackingNumber" column="tracking_number"/>
+        <result property="orderImages" column="order_images"/>
     </resultMap>
 
     <sql id="selectOrderDetail">
@@ -93,7 +94,8 @@
                delivery_type,
                delivery_remark,
                delivery_images,
-               tracking_number
+               tracking_number,
+               order_images
         FROM order_detail
     </sql>
 
@@ -140,7 +142,8 @@
                od.delivery_type,
                od.delivery_remark,
                od.delivery_images,
-               od.tracking_number
+               od.tracking_number,
+               od.order_images
         FROM order_detail od
                  LEFT JOIN order_master om ON om.id = od.order_master_id
                  LEFT JOIN customer_address ca ON ca.customer_address_id = om.address_id
@@ -424,6 +427,7 @@
             <if test="deliveryRemark != null">delivery_remark = #{deliveryRemark},</if>
             <if test="deliveryImages != null">delivery_images = #{deliveryImages},</if>
             <if test="trackingNumber != null">tracking_number = #{trackingNumber},</if>
+            <if test="orderImages != null">order_images = #{orderImages},</if>
             update_time = SYSDATE()
         </set>
         WHERE id = #{id}
@@ -493,6 +497,7 @@
         <if test="deliveryRemark != null">delivery_remark,</if>
         <if test="deliveryImages != null">delivery_images,</if>
         <if test="trackingNumber != null">tracking_number,</if>
+        <if test="orderImages != null">order_images,</if>
         <if test="expectTimeStart != null">expect_time_start,</if>
         <if test="expectTimeEnd != null">expect_time_end,</if>
         <if test="workBeginTime != null">work_begin_time,</if>
@@ -523,6 +528,7 @@
         <if test="deliveryRemark != null">#{deliveryRemark},</if>
         <if test="deliveryImages != null">#{deliveryImages},</if>
         <if test="trackingNumber != null">#{trackingNumber},</if>
+        <if test="orderImages != null">#{orderImages},</if>
         <if test="expectTimeStart != null">#{expectTimeStart},</if>
         <if test="expectTimeEnd != null">#{expectTimeEnd},</if>
         <if test="workBeginTime != null">#{workBeginTime},</if>

ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml

@@ -362,7 +362,17 @@
                 </foreach>
             </if>
             <if test="timeout != null">
-                AND om.timeout_ = #{timeout}
+                AND (
+                    om.timeout_ = #{timeout}
+                    OR (
+                        #{timeout} = 1 
+                        AND EXISTS (
+                            SELECT 1 FROM order_detail od 
+                            WHERE od.order_master_id = om.id 
+                            AND od.timeout_ = 1
+                        )
+                    )
+                )
             </if>
             <if test="isCall != null">
                 AND om.is_call = #{isCall}
@@ -477,6 +487,19 @@
             <if test="createBy != null and createBy != ''">
                 AND om.create_by = #{createBy}
             </if>
+            <if test="timeout != null">
+                AND (
+                    om.timeout_ = #{timeout}
+                    OR (
+                        #{timeout} = 1 
+                        AND EXISTS (
+                            SELECT 1 FROM order_detail od 
+                            WHERE od.order_master_id = om.id 
+                            AND od.timeout_ = 1
+                        )
+                    )
+                )
+            </if>
         </where>
     </select>
 
@@ -754,7 +777,17 @@
         from order_master om
         where 1 = 1
         <if test="timeout != null">
-            AND om.timeout_ = #{timeout}
+            AND (
+                om.timeout_ = #{timeout}
+                OR (
+                    #{timeout} = 1 
+                    AND EXISTS (
+                        SELECT 1 FROM order_detail od 
+                        WHERE od.order_master_id = om.id 
+                        AND od.timeout_ = 1
+                    )
+                )
+            )
         </if>
         <if test="isCall != null">
             AND om.is_call = #{isCall}