更新！

FullCardClient/src/main/java/com/zhongshu/card/client/model/pay/WeChatPrepayParam.java

@@ -18,8 +18,8 @@ public class WeChatPrepayParam {
     @Schema(description = "用户id")
     private String userId;
 
-    @Schema(description = "openid")
-    private String openid;
+    @Schema(description = "openId")
+    private String openId;
 
     @Schema(description = "金额")
     private long total;

FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/WxOrderPrePayParam.java

@@ -13,5 +13,5 @@ public class WxOrderPrePayParam {
     private String id;
 
     @Schema(description = "openid")
-    private String openid;
+    private String openId;
 }

FullCardServer/src/main/java/com/zhongshu/card/server/core/domain/visitor/VisitorMain.java

@@ -83,7 +83,7 @@ public class VisitorMain extends SuperMain {
 
     //-------------------------------申请信息start--------------------
 
-    @Schema(description = "用户类型")
+    @Schema(description = "用户类型，如：系统用户、临时用户")
     private UserFromType userFromType;
 
     @Schema(description = "临时用户id")

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/payment/ExpenseFlowServiceImpl.java

@@ -411,7 +411,10 @@ public class ExpenseFlowServiceImpl extends SuperService implements ExpenseFlowS
         if (!orderPayModel.isSuccess()) {
             return ResultContent.buildFail(orderPayModel.getPayMsg());
         }
-
+        String openId = param.getOpenId();
+        if (StringUtils.isEmpty(openId)) {
+            openId = getOpenId();
+        }
         WxOrderPrePayResult result = new WxOrderPrePayResult();
         result.setId(param.getId());
         String key = PaymentType.WeChatPay.name();
@@ -423,7 +426,7 @@ public class ExpenseFlowServiceImpl extends SuperService implements ExpenseFlowS
             prepayParam.setProjectOid(expenseFlow.getProjectOid());
             prepayParam.setOid(expenseFlow.getShopOid());
             prepayParam.setUserId(getCurrentUserId());
-            prepayParam.setOpenid(param.getOpenid());
+            prepayParam.setOpenId(openId);
             prepayParam.setDescription("扫码下单支付");
             prepayParam.setOrderNo(expenseFlow.getPaymentNo());
             prepayParam.setTotal(expenseFlow.getPayAmount().longValue());

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/projectAbout/OrgUserFaceService.java

@@ -218,6 +218,12 @@ public class OrgUserFaceService extends SuperService {
         return ResultContent.buildSuccess();
     }
 
+    /**
+     * 同步人脸信息
+     *
+     * @param orgUserFace
+     * @return
+     */
     private ResultContent<String> syncFace(OrgUserFace orgUserFace) {
         String updateFaceFileId = orgUserFace.getUpdateFaceFileId();
         String userId = orgUserFace.getUserId();

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/visitor/VisitorMainService.java

@@ -86,6 +86,12 @@ public class VisitorMainService extends SuperPermissService {
     @Autowired
     private OrgUserFaceService orgUserFaceService;
 
+    /**
+     * 保存访客申请
+     *
+     * @param param
+     * @return
+     */
     public ResultContent saveInfo(VisitorMainParam param) {
         if (StringUtils.isEmpty(param.getSceneComponentId())) {
             return ResultContent.buildFail("sceneComponentId 不能为空");
@@ -111,6 +117,14 @@ public class VisitorMainService extends SuperPermissService {
         if (endTime <= System.currentTimeMillis()) {
             return ResultContent.buildFail("访问结束时间不能小于当前时间");
         }
+        String openid = param.getOpenId();
+        if (StringUtils.isEmpty(openid)) {
+            openid = getOpenId();
+        }
+        if (StringUtils.isEmpty(openid)) {
+            return ResultContent.buildFail("openid不能为空");
+        }
+        param.setOpenId(openid);
 
         // 所属组件信息
         String sceneComponentId = param.getSceneComponentId();
@@ -127,6 +141,7 @@ public class VisitorMainService extends SuperPermissService {
             return ResultContent.buildFail("projectOid 信息为空");
         }
 
+        // 访客组件配置
         VisitorSetting visitorSetting = visitorSettingDao.findTopBySceneComponentIdAndProjectOid(sceneComponentId, projectOid);
         if (ObjectUtils.isEmpty(visitorSetting)) {
             return ResultContent.buildFail("访客组件参数未配置");
@@ -138,12 +153,12 @@ public class VisitorMainService extends SuperPermissService {
             return ResultContent.buildFail(conformFaceContent.getMsg());
         }
 
-        // 判断
+        // 判断访客是否存在
         UserAccount visitorUserAccount = userCountDao.findTopByUserId(param.getVisitorUserId());
         if (ObjectUtils.isEmpty(visitorUserAccount)) {
             return ResultContent.buildFail("被访人不存在");
         }
-        OrganizationUser organizationUser = organizationUserService.getUserInProjectBindOrgUserInfo(projectOid, visitorUserAccount);
+        OrganizationUser organizationUser = organizationUserService.getUserTopInProjectBindOrgUserInfo(projectOid, visitorUserAccount);
 
         VisitorMain entity = null;
         if (StringUtils.isNotEmpty(param.getId())) {