no message

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

@@ -1250,7 +1250,9 @@ public class OrderController extends BaseController {
         List<OrderDetail> list = orderDetailService.selectOrderDetailList(orderDetailReq);
         long size = list.stream()
                 .filter(order -> order.getOrderStatus() != 6) // 先过滤状态不等于6的订单
-                .filter(order -> order.getOrderStatus() != 5).count();
+                .filter(order -> order.getOrderStatus() != 5)
+                .filter(order->order.getOrderType()==1&&order.getOrderStatus()!=OrderStatus.GOING.code())
+                .count();
         count += size;
         logger.info("子单超时数量{}", count);
         List<OrderMaster> allList = new ArrayList<>();

ghy-admin/src/main/java/com/ghy/web/controller/worker/WorkerCertificationController.java

@@ -162,6 +162,8 @@ public class WorkerCertificationController extends BaseController
     @ResponseBody
     @Transactional(rollbackFor = Exception.class)
     public AjaxResult appAddCertify(@RequestBody WorkerCertification request) {
+        Worker worker = workerService.selectById(request.getWorkerId());
+        request.setWorkerPhone(worker != null ? worker.getPhone() : null);
         // 将师傅状态设置为冻结
 //        Worker worker = new Worker();
 //        worker.setWorkerId(request.getWorkerId());

ghy-admin/src/main/resources/templates/worker/certification/certification.html

@@ -77,6 +77,10 @@
                     title: '师傅者id',
                     visible: false
                 },
+                {
+                    field: 'workerPhone',
+                    title: '手机号'
+                },
                 {
                     field: 'name',
                     title: '真实姓名'

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

@@ -383,4 +383,11 @@ public class OrderMaster extends BaseEntity {
     private Integer pageSize;
 
     private Integer pageNum;
+
+    /**
+     * 仅用于前端/接口参数传递：
+     * true = 查询结果要展开到当前城市下的所有街道
+     * false/null = 保持原样
+     */
+    private Boolean showAllStreet;
 }

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

@@ -289,8 +289,10 @@ public class AfterServiceRecordServiceImpl implements IAfterServiceRecordService
         log.info("客户是否同意{}，客户操作{}",one.equals(param.getCustomerFinalCheck()),param);
         log.info("修改后的售后订单{}",orderDetail);
         
+        Boolean isCustomerFinalCheck = param.getCustomerFinalCheck()==null;
+
         // 新增：处理客户同意上门重做方案
-        if (param.getCustomerAgreeRedo() != null) {
+        if (param.getCustomerAgreeRedo() != null&&isCustomerFinalCheck) {
             afterServiceRecord.setCustomerAgreeRedo(param.getCustomerAgreeRedo());
             if (param.getUpdateBy() != null) {
                 afterServiceRecord.setUpdateBy(param.getUpdateBy());
@@ -302,7 +304,7 @@ public class AfterServiceRecordServiceImpl implements IAfterServiceRecordService
         }
         
         // 新增：处理师傅重做/补做完成
-        if (param.getWorkerFeedbackResult() != null && param.getWorkerFeedbackResult().equals(3L)) {
+        if (isCustomerFinalCheck&&param.getWorkerFeedbackResult() != null && param.getWorkerFeedbackResult().equals(3L)) {
             afterServiceRecord.setWorkerFeedbackResult(3L);
             afterServiceRecord.setRedoCompleteTime(new Date());
             if (param.getRedoCompleteRemark() != null) {
@@ -320,7 +322,7 @@ public class AfterServiceRecordServiceImpl implements IAfterServiceRecordService
         }
         
         // 新增：处理师傅反馈结果为0或1时，设置redoCompleteTime为当前时间+36小时
-        if (param.getWorkerFeedbackResult() != null && (param.getWorkerFeedbackResult().equals(0L) || param.getWorkerFeedbackResult().equals(1L))) {
+        if (isCustomerFinalCheck&&param.getWorkerFeedbackResult() != null && (param.getWorkerFeedbackResult().equals(0L) || param.getWorkerFeedbackResult().equals(1L))) {
             afterServiceRecord.setWorkerFeedbackResult(param.getWorkerFeedbackResult());
             // 设置当前时间推后36小时
             // Calendar calendar = Calendar.getInstance();
@@ -590,6 +592,7 @@ public class AfterServiceRecordServiceImpl implements IAfterServiceRecordService
                 afterServiceRecord.setUpdateBy(param.getUpdateBy());
             }
             afterServiceRecord.setRedoCompleteTime(null);
+            afterServiceRecord.setWorkerResendPlanTime(null);
               // 设置客户操作时间
             afterServiceRecord.setCustomerOperationTime(new Date());
             afterServiceRecordMapper.updateAfterServiceRecord(afterServiceRecord);

ghy-worker/src/main/java/com/ghy/worker/domain/WorkerCertification.java

@@ -114,4 +114,6 @@ public class WorkerCertification extends BaseEntity
     // province，city，country三者的合并名称
     private String mergerName;
 
+    private String workerPhone;
+
 }

ghy-worker/src/main/resources/mapper/worker/WorkerCertificationMapper.xml

@@ -30,10 +30,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
         <result property="remark"    column="remark"    />
+        <result property="workerPhone"    column="worker_phone"    />
     </resultMap>
 
     <sql id="selectWorkerCertificationVo">
-        select worker_certification_id, worker_id, surname, name, id_card_num, id_card_url_1, id_card_url_2, brand_name, company_size, company_name, business_license_num, business_license_url, company_province_id, company_city_id, company_country_id, company_address, legal_persion_name, legal_persion_phone_num, other_serv, status, create_by, create_time, update_by, update_time, remark from worker_certification
+        select worker_certification_id, worker_id, surname, name, id_card_num, id_card_url_1, id_card_url_2, brand_name, company_size, company_name, business_license_num, business_license_url, company_province_id, company_city_id, company_country_id, company_address, legal_persion_name, legal_persion_phone_num, other_serv, status, create_by, create_time, update_by, update_time, remark, worker_phone from worker_certification
     </sql>
 
     <select id="selectWorkerCertificationList" parameterType="WorkerCertification" resultMap="WorkerCertificationResult">
@@ -98,6 +99,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="remark != null">remark,</if>
+            <if test="workerPhone != null">worker_phone,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="workerId != null">#{workerId},</if>
@@ -124,6 +126,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="remark != null">#{remark},</if>
+            <if test="workerPhone != null">#{workerPhone},</if>
          </trim>
     </insert>
 
@@ -153,6 +156,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="remark != null">remark = #{remark},</if>
+            <if test="workerPhone != null">worker_phone = #{workerPhone},</if>
         </trim>
         where worker_certification_id = #{workerCertificationId}
     </update>