TRX il y a 1 an
Parent
commit
c5ff9aceda

+ 4 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/visitor/VisitorMainSearch.java

@@ -37,6 +37,10 @@ public class VisitorMainSearch extends SuperSearch {
     @Schema(description = "是否离开")
     private Boolean isLeave = Boolean.FALSE;
     //-------------------------------申请信息start--------------------
+
+    @Schema(description = "是否已审核")
+    private Boolean isReViewed;
+
     @Schema(description = "申请人userId")
     private String applyUserId;
 

+ 4 - 0
FullCardServer/src/main/java/com/zhongshu/card/server/core/dao/visitor/impl/VisitorMainDaoImpl.java

@@ -57,6 +57,10 @@ public class VisitorMainDaoImpl extends BaseImpl implements VisitorMainDaoExtend
             criteria.and("projectOid").is(param.getProjectOid());
         }
 
+        if (param.getIsReViewed() != null) {
+            criteria.and("isReViewed").is(param.getIsReViewed());
+        }
+
         if (StringUtils.isNotEmpty(param.getSceneComponentId())) {
             criteria.and("sceneComponentId").is(param.getSceneComponentId());
         }

+ 5 - 0
FullCardServer/src/main/java/com/zhongshu/card/server/core/domain/mqtt/MqttConfig.java

@@ -18,11 +18,16 @@ import org.springframework.data.mongodb.core.mapping.Document;
 @NoArgsConstructor
 @NonLeaked
 public class MqttConfig extends SuperMain {
+
     @Schema(description = "地址")
     private String url;
+
     @Schema(description = "用户名")
     private String userName;
+
     @Schema(description = "密码")
     private String passWord;
+
+    @Schema(description = "端口")
     private String port;
 }

+ 23 - 0
FullCardServer/src/main/java/com/zhongshu/card/server/core/domain/notice/NoticeInfo.java

@@ -0,0 +1,23 @@
+package com.zhongshu.card.server.core.domain.notice;
+
+import com.zhongshu.card.server.core.domain.base.SuperMain;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.checkerframework.common.aliasing.qual.NonLeaked;
+import org.springframework.data.mongodb.core.mapping.Document;
+
+/**
+ * 消息中心
+ *
+ * @author TRX
+ * @date 2025/2/19
+ */
+@Data
+@Document
+@AllArgsConstructor
+@NoArgsConstructor
+@NonLeaked
+public class NoticeInfo extends SuperMain {
+
+}

+ 1 - 1
FullCardServer/src/main/java/com/zhongshu/card/server/core/domain/payment/ExpenseFlow.java

@@ -54,7 +54,7 @@ public class ExpenseFlow extends SuperMain {
     private String token;
 
     @Indexed
-    @Schema(description = "订单的总体状态")
+    @Schema(description = "订单的总体状态,待付款、支付中、已支付、已退款")
     private OrderState orderState;
 
     @Schema(description = "订单创建类型, 是消费还是查询余额")

+ 3 - 0
FullCardServer/src/main/java/com/zhongshu/card/server/core/domain/visitor/VisitorMain.java

@@ -57,6 +57,9 @@ public class VisitorMain extends SuperMain {
     @DBRef(lazy = true)
     private OrganizationUser organizationUser;
 
+    @Schema(description = "是否已审核")
+    private Boolean isReViewed = Boolean.FALSE;
+
     @Schema(description = "审核时间")
     private Long reviewTime;
 

+ 3 - 0
FullCardServer/src/main/java/com/zhongshu/card/server/core/service/visitor/VisitorMainService.java

@@ -179,6 +179,7 @@ public class VisitorMainService extends SuperPermissService {
             entity = new VisitorMain();
             initEntityNoCheckOid(entity);
             entity.setState(VisitorState.WaitReView);
+            entity.setIsReViewed(Boolean.FALSE);
         }
         BeanUtils.copyProperties(param, entity);
 
@@ -269,6 +270,7 @@ public class VisitorMainService extends SuperPermissService {
         visitorMain.setState(VisitorState.Refuse);
         visitorMain.setReviewRemark(param.getReviewRemark());
         visitorMain.setReViewSuccess(Boolean.FALSE);
+        visitorMain.setIsReViewed(Boolean.TRUE);
         visitorMainDao.save(visitorMain);
         return ResultContent.buildSuccess();
     }
@@ -318,6 +320,7 @@ public class VisitorMainService extends SuperPermissService {
         visitorMain.setState(VisitorState.WaitVisit);
         visitorMain.setReviewRemark(param.getReviewRemark());
         visitorMain.setReViewSuccess(Boolean.TRUE);
+        visitorMain.setIsReViewed(Boolean.TRUE);
         if (ObjectUtils.isNotEmpty(param.getDeviceIds())) {
             List<DeviceInfo> deviceInfos = deviceInfoService.getDevicesByDeviceIds(param.getDeviceIds());
             visitorMain.setDeviceInfos(deviceInfos);