成员许可自动激活回调通知

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

@@ -10,6 +10,7 @@ import com.gic.api.base.commons.Page;
 import com.gic.clerk.api.dto.ClerkDTO;
 import com.gic.clerk.api.service.ClerkService;
 import com.gic.clerk.api.service.PowerService;
+import com.gic.commons.util.DateUtil;
 import com.gic.commons.util.EntityUtil;
 import com.gic.commons.util.ImageUtil;
 import com.gic.enterprise.api.dto.EnterpriseSettingDTO;
@@ -32,11 +33,9 @@ import com.gic.haoban.manage.api.service.StaffApiService;
 import com.gic.haoban.manage.service.config.Config;
 import com.gic.haoban.manage.service.dao.mapper.StaffDepartmentRelatedMapper;
 import com.gic.haoban.manage.service.dao.mapper.StaffMapper;
-import com.gic.haoban.manage.service.entity.TabHaobanDepartment;
-import com.gic.haoban.manage.service.entity.TabHaobanStaff;
-import com.gic.haoban.manage.service.entity.TabHaobanStaffDepartmentRelated;
-import com.gic.haoban.manage.service.entity.TabHaobanSyncErrorLog;
+import com.gic.haoban.manage.service.entity.*;
 import com.gic.haoban.manage.service.service.*;
+import com.gic.haoban.manage.service.service.chat.GroupChatService;
 import com.gic.haoban.manage.service.util.EmojiFilterUtil;
 import com.gic.redis.data.util.RedisUtil;
 import com.gic.thirdparty.cloudfile.CloudFileUtil;
@@ -57,6 +56,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
@@ -105,6 +105,8 @@ public class StaffApiServiceImpl implements StaffApiService {
     private Config config;
     @Autowired
     private QywxOrderApiService qywxOrderApiService;
+    @Autowired
+    private GroupChatService groupChatService;
 
     @Override
     public StaffDTO selectById(String staffId) {
@@ -1036,8 +1038,40 @@ public class StaffApiServiceImpl implements StaffApiService {
         if (StrUtil.isBlank(params)) {
             return com.gic.api.base.commons.ServiceResponse.success(false);
         }
-        //todo 1、解析参数 2、刷新企业微信群列表 3、更新成员信息
+        //1、解析参数 2、刷新企业微信群列表 3、更新成员信息
+        JSONObject object = JSONObject.parseObject(params, JSONObject.class);
+        String infoType = object.getString("infoType");
+        String authCorpId = object.getString("authCorpId");
+        String timeStamp = object.getString("timeStamp");
+        Object accountList = object.get("accountList");
+        JSONObject obj = JSONObject.parseObject(JSON.toJSONString(accountList), JSONObject.class);
+        String activeCode = obj.getString("ActiveCode");
+        String expireTime = obj.getString("ExpireTime");
+        String userId = obj.getString("UserId");
+
+        //将秒级时间戳转换位Date类型
+        SimpleDateFormat formatter = new SimpleDateFormat(DateUtil.FORMAT_DATETIME_19);
+        String date_time = formatter.format(new Date(Long.valueOf(timeStamp) * 1000L));
+        Date timeStampDate = DateUtil.strToDate(date_time, DateUtil.FORMAT_DATETIME_19);
 
+        String date_time1 = formatter.format(new Date(Long.valueOf(expireTime) * 1000L));
+        Date expireTimeDate = DateUtil.strToDate(date_time1, DateUtil.FORMAT_DATETIME_19);
+        if ("auto_activate".equals(infoType)){
+            // 成员许可自动激活回调通知
+            TabHaobanWxEnterprise wxEnterprise = this.wxEnterpriseService.getEnterpriseBycorpId(authCorpId);
+            if (wxEnterprise==null){
+                logger.info("微信企业id—>{}不存在",authCorpId);
+                return com.gic.api.base.commons.ServiceResponse.failure("-9999","微信企业id不存在!");
+            }
+            TabHaobanStaff staff = staffService.selectByUserIdAndEnterpriseId(userId, wxEnterprise.getWxEnterpriseId());
+            if (null == staff){
+                logger.info("成员userid—>{}不存在",userId);
+                return com.gic.api.base.commons.ServiceResponse.failure("-9999","成员userid不存在!");
+            }
+            String staffId = staff.getStaffId();
+            groupChatService.initStaffGroupChat(staffId);
+            staffMapper.updateActiveStatusById(staffId,timeStampDate,expireTimeDate,activeCode);
+        }
         return com.gic.api.base.commons.ServiceResponse.success(true);
     }
 }

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

@@ -272,6 +272,7 @@ public class LicenceOrderApiServiceImpl implements LicenceOrderApiService {
         String date_time = formatter.format(new Date(Long.valueOf(timeStamp) * 1000L));
         Date date = DateUtil.strToDate(date_time, DateUtil.FORMAT_DATETIME_19);
         if (order == null) {
+            RedisUtil.unlock(key);
             return ServiceResponse.success(false);
         }
         if ("license_pay_success".equals(infoType)) {

haoban-manage3-service/src/main/resources/dubbo-haoban-manage-service.xml

@@ -206,5 +206,6 @@
 	<dubbo:reference interface="com.gic.enterprise.api.service.ScreeningDetailService" id="screeningDetailService" timeout="10000" retries="0"/>
 	<dubbo:reference interface="com.gic.wechat.api.service.qywx.QywxOrderApiService" id="qywxOrderApiService" timeout="10000" retries="0"/>
     <dubbo:reference id="pay4WXService" interface="com.gic.thirdparty.api.service.Pay4WXService" timeout="10000" retries="0" check="false"/>
+    <dubbo:reference id="groupChatService" interface="com.gic.haoban.manage.service.service.chat.GroupChatService" timeout="10000" retries="0" check="false"/>
 
 </beans>
\ No newline at end of file