取消工单增加完工时间和网点完工时间清空

mall-server-api/src/main/java/com/gree/mall/manager/logic/workorder/OrderBaseLogic.java

@@ -1041,9 +1041,17 @@ public class OrderBaseLogic {
         if (OrderBaseStatusEnum.isOver().contains(pgOrderBase.getOrderStatus())) {
             throw new RemoteServiceException("已完工不可取消");
         }
-        pgOrderBase.setOrderStatus(OrderBaseStatusEnum.YQX.getKey());
-        pgOrderBase.setOrderStatusText(OrderBaseStatusEnum.YQX.getRemark());
-        pgOrderBase.updateById();
+//        pgOrderBase.setOrderStatus(OrderBaseStatusEnum.YQX.getKey());
+//        pgOrderBase.setOrderStatusText(OrderBaseStatusEnum.YQX.getRemark());
+//        pgOrderBase.updateById();
+        pgOrderBaseService.lambdaUpdate()
+                .set(PgOrderBase::getOverDate, null)
+                .set(PgOrderBase::getOverTime, null)
+                .set(PgOrderBase::getWebsitOverTime, null)
+                .set(PgOrderBase::getOrderStatus, OrderBaseStatusEnum.YQX.getKey())
+                .set(PgOrderBase::getOrderStatusText, OrderBaseStatusEnum.YQX.getRemark())
+                .eq(PgOrderBase::getId, orderBaseId)
+                .update();
 
         orderLogLogic.addLog(orderBaseId, "取消工单", "取消工单", "");
     }