fix：时间更改

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/WxEnterpriseApiServiceImpl.java

@@ -357,15 +357,20 @@ public class WxEnterpriseApiServiceImpl implements WxEnterpriseApiService {
         BeanUtils.copyProperties(staffPrivacyUseLogDTO, staffPrivacyUseLogBO);
         String staffId = staffPrivacyUseLogDTO.getStaffId();
         if (StringUtils.isBlank(staffId) || "-1".equals(staffId)) {
-            StaffPrivacyUseLogBO privacyUseLogBO = staffPrivacyUseLogService.getByUserId(staffPrivacyUseLogDTO.getWxOpenUseId());
-            if (privacyUseLogBO == null) {
-                staffPrivacyUseLogService.insert(staffPrivacyUseLogBO);
+            String wxOpenUseId = staffPrivacyUseLogDTO.getWxOpenUseId();
+            StaffPrivacyUseLogBO privacyUseLogBO = staffPrivacyUseLogService.getByUserId(wxOpenUseId);
+            if (privacyUseLogBO != null) {
+                log.info("用户已经同意过隐私协议,wxOpenUseId:{}", wxOpenUseId);
+                return;
             }
+            staffPrivacyUseLogService.insert(staffPrivacyUseLogBO);
         } else {
             StaffPrivacyUseLogBO privacyUseLog = staffPrivacyUseLogService.getByStaffId(staffId);
-            if (privacyUseLog == null) {
-                staffPrivacyUseLogService.insert(staffPrivacyUseLogBO);
+            if (privacyUseLog != null) {
+                log.info("用户已经同意过隐私协议,staffId:{}", staffId);
+                return;
             }
+            staffPrivacyUseLogService.insert(staffPrivacyUseLogBO);
         }
     }
 }

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/WxEnterpriseInfoController.java

@@ -130,8 +130,8 @@ public class WxEnterpriseInfoController extends WebBaseController {
         if (loginStaff == null) {
             WellDoneLoginInfoVO wellDoneLoginInfoVo = new WellDoneLoginInfoVO();
             wellDoneLoginInfoVo.setWxOpenUseId(userId);
-          //  StaffPrivacyUseLogDTO staffPrivacyUseLogDTO = staffApiService.getStaffPrivacyByUserId(userId);
-            wellDoneLoginInfoVo.setPrivacyUseFlag(1);
+            StaffPrivacyUseLogDTO staffPrivacyUseLogDTO = staffApiService.getStaffPrivacyByUserId(userId);
+            wellDoneLoginInfoVo.setPrivacyUseFlag(staffPrivacyUseLogDTO == null ? 0 : 1);
             wellDoneLoginInfoVo.setStaffId("-1");
             return resultResponse(HaoBanErrCode.ERR_1, wellDoneLoginInfoVo);
         }
@@ -177,8 +177,8 @@ public class WxEnterpriseInfoController extends WebBaseController {
         wellDoneLoginInfoVo.setPhoneNumber(loginStaff.getPhoneNumber());
         wellDoneLoginInfoVo.setNationcode(loginStaff.getNationCode());
         wellDoneLoginInfoVo.setWxUserId(loginStaff.getWxUserId());
-       // StaffPrivacyUseLogDTO staffPrivacyUseLogDTO = staffApiService.getStaffPrivacyByStaffId(staffId);
-        wellDoneLoginInfoVo.setPrivacyUseFlag(1);
+        StaffPrivacyUseLogDTO staffPrivacyUseLogDTO = staffApiService.getStaffPrivacyByStaffId(staffId);
+        wellDoneLoginInfoVo.setPrivacyUseFlag(staffPrivacyUseLogDTO == null ? 0 : 1);
         return resultResponse(HaoBanErrCode.ERR_1, wellDoneLoginInfoVo);
     }
 
@@ -215,11 +215,6 @@ public class WxEnterpriseInfoController extends WebBaseController {
      */
     private RestResponse<String> wellDoneTouristsLogin(StaffLoginQO staffLoginQO, HttpServletRequest request, String staffId, String wxOpenUseId) {
         logger.info("游客登录,wxOpenUseId:{}", wxOpenUseId);
-        //登录和刷新token兼容
-        String headerToken = AuthRequestWellDoneUtil.getHeaderToken();
-        if (StringUtils.isNotBlank(headerToken)) {
-            return getRefreshTokenResult(getRefreshToken());
-        }
         Map<String, String> map = new HashMap<>();
         map.put("staffId", "-1");
         map.put("wxOpenUseId", wxOpenUseId);
@@ -274,11 +269,7 @@ public class WxEnterpriseInfoController extends WebBaseController {
         if (StringUtils.isBlank(phoneNumber)) {
             return RestResponse.failure(String.valueOf(HaoBanErrCode.ERR_600002.getCode()), HaoBanErrCode.ERR_600002.getMsg());
         }
-        //登录和刷新token兼容
-        String headerToken = AuthRequestWellDoneUtil.getHeaderToken();
-        if (StringUtils.isNotBlank(headerToken)) {
-            return getRefreshTokenResult(getRefreshToken());
-        }
+
         Map<String, String> map = new HashMap<>();
         map.put("staffId", staffId);
         map.put("wxEnterpriseId", staffDTO.getWxEnterpriseId());
@@ -291,6 +282,7 @@ public class WxEnterpriseInfoController extends WebBaseController {
         privacyUseLogDTO.setWxEnterpriseId(staffDTO.getWxEnterpriseId());
         privacyUseLogDTO.setPhoneNumber(phoneNumber);
         privacyUseLogDTO.setWxUserId(staffDTO.getWxUserId());
+        privacyUseLogDTO.setWxOpenUseId(staffDTO.getWxOpenUseId());
         wxEnterpriseApiService.wellDoneLoginAddPrivacy(privacyUseLogDTO);
         return RestResponse.successResult(token);
     }