no message

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

@@ -859,6 +859,7 @@ public class OrderBaseLogic {
      *
      * @param orderBaseId
      */
+    @Transactional
     public void active(String orderBaseId) {
         PgOrderBase pgOrderBase = pgOrderBaseService.getById(orderBaseId);
         if (pgOrderBase == null) {
@@ -880,9 +881,27 @@ public class OrderBaseLogic {
 //        if (StringUtils.isNotBlank(pgOrderBase.getWorkerId())) {
 //            orderBaseStatus = OrderBaseStatusEnum.FWZ;
 //        }
-        pgOrderBase.setOrderStatus(orderBaseStatus.getKey());
-        pgOrderBase.setOrderStatusText(orderBaseStatus.getRemark());
-        pgOrderBase.updateById();
+        pgOrderWorkerService.lambdaUpdate()
+                .eq(PgOrderWorker::getOrderBaseId, orderBaseId)
+                .remove();
+
+        pgOrderBaseService.lambdaUpdate()
+                .set(PgOrderBase::getWorkerId, null)
+                .set(PgOrderBase::getWorkerNumber, null)
+                .set(PgOrderBase::getWorkerIdcard, null)
+                .set(PgOrderBase::getWorkerName, null)
+                .set(PgOrderBase::getWorkerMobile, null)
+                .set(PgOrderBase::getWorkerIdList, null)
+                .set(PgOrderBase::getDispatchTime, null)
+                .set(PgOrderBase::getOrderStatus, orderBaseStatus.getKey())
+                .set(PgOrderBase::getOrderStatusText, orderBaseStatus.getRemark())
+                .set(PgOrderBase::getUpdateBy, CommonUtils.getNickName())
+                .set(PgOrderBase::getUpdateTime, DateUtil.date())
+                .eq(PgOrderBase::getId, orderBaseId)
+                .update();
+//        pgOrderBase.setOrderStatus(orderBaseStatus.getKey());
+//        pgOrderBase.setOrderStatusText(orderBaseStatus.getRemark());
+//        pgOrderBase.updateById();
         orderLogLogic.addLog(orderBaseId, "激活工单", "激活工单", "");
     }