he2802 1 рік тому
батько
коміт
69894d72e6

+ 3 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/order/vo/OrderListVo.java

@@ -257,4 +257,7 @@ public class OrderListVo {
 
     @ApiModelProperty("服务有效期结束")
     private Long serviceEndTime;
+
+    @ApiModelProperty("经办人订单编号")
+    private String handleOrderSn;
 }

+ 17 - 15
zhongzheng-system/src/main/java/com/zhongzheng/modules/schedule/service/impl/ScheduleServiceImpl.java

@@ -2160,21 +2160,23 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
         List<OrderListVo> list = iOrderService.selectListApp(bo);
         for (OrderListVo orderVo : list) {
             if (orderVo.getCreateTime().longValue() < (new Long(DateUtils.getNowTime() - (24 * 3600))).longValue()) {
-                //超过24小时
-                Order order = new Order();
-                order.setOrderId(orderVo.getOrderId());
-                order.setOrderStatus(-2);
-                order.setUpdateTime(DateUtils.getNowTime());
-                order.setCancelTime(DateUtils.getNowTime());
-                iOrderService.updateById(order);
-                //关闭锁定班级
-                LambdaQueryWrapper<ClassGradeUserTemp> lqwLock = new LambdaQueryWrapper<>();
-                lqwLock.eq(ClassGradeUserTemp::getOrderSn, orderVo.getOrderSn());
-                ClassGradeUserTemp classGradeUserTemp = iClassGradeUserTempService.getOne(lqwLock);
-                if (classGradeUserTemp != null && classGradeUserTemp.getStatus() == ClassGradeUserTemp.STATUS_LOCK) {
-                    classGradeUserTemp.setStatus(ClassGradeUserTemp.STATUS_CLOSE); //
-                    classGradeUserTemp.setUpdateTime(DateUtils.getNowTime());
-                    iClassGradeUserTempService.updateById(classGradeUserTemp);//关闭锁定状态
+                if(Validator.isEmpty(orderVo.getHandleOrderSn())){
+                    //超过24小时
+                    Order order = new Order();
+                    order.setOrderId(orderVo.getOrderId());
+                    order.setOrderStatus(-2);
+                    order.setUpdateTime(DateUtils.getNowTime());
+                    order.setCancelTime(DateUtils.getNowTime());
+                    iOrderService.updateById(order);
+                    //关闭锁定班级
+                    LambdaQueryWrapper<ClassGradeUserTemp> lqwLock = new LambdaQueryWrapper<>();
+                    lqwLock.eq(ClassGradeUserTemp::getOrderSn, orderVo.getOrderSn());
+                    ClassGradeUserTemp classGradeUserTemp = iClassGradeUserTempService.getOne(lqwLock);
+                    if (classGradeUserTemp != null && classGradeUserTemp.getStatus() == ClassGradeUserTemp.STATUS_LOCK) {
+                        classGradeUserTemp.setStatus(ClassGradeUserTemp.STATUS_CLOSE); //
+                        classGradeUserTemp.setUpdateTime(DateUtils.getNowTime());
+                        iClassGradeUserTempService.updateById(classGradeUserTemp);//关闭锁定状态
+                    }
                 }
             }
         }

+ 1 - 0
zhongzheng-system/src/main/resources/mapper/modules/order/OrderMapper.xml

@@ -80,6 +80,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="invoiceStatus" column="invoice_status"/>
         <result property="serviceStartTime" column="service_start_time"/>
         <result property="serviceEndTime" column="service_end_time"/>
+        <result property="handleOrderSn" column="handle_order_sn"/>
     </resultMap>
 
     <select id="getGradePeriod" parameterType="Map" resultType="integer">