同步资源回调调整

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/union/UnionEnterpriseAuthResDetailApiServiceImpl.java

@@ -4,6 +4,7 @@ import com.gic.api.base.commons.ServiceResponse;
 import com.gic.enterprise.constant.union.UnionEnterpriseAuthDetailStatusEnum;
 import com.gic.enterprise.constant.union.UnionEnterpriseAuthResOperateEnum;
 import com.gic.enterprise.constant.union.UnionEnterpriseAuthResTypeEnum;
+import com.gic.enterprise.constant.union.UnionEnterpriseAuthStatusEnum;
 import com.gic.enterprise.dto.union.UnionEnterpriseAuthDTO;
 import com.gic.enterprise.entity.TabSysUnionEnterpriseAuth;
 import com.gic.enterprise.entity.TabSysUnionEnterpriseAuthResDetail;
@@ -90,17 +91,25 @@ public class UnionEnterpriseAuthResDetailApiServiceImpl implements UnionEnterpri
                     UnionEnterpriseAuthResOperateEnum.RELIEVED.getMessage(), new Date(), null);
         }
         //如果是，则判断其他资源是否已经完成
+        UnionEnterpriseAuthDTO dto = new UnionEnterpriseAuthDTO();
+        dto.setUnionEnterpriseAuthId(old.getUnionEnterpriseAuthId());
+
         if (isAllRelieveSuccess && isAllDealSuccess(old.getUnionEnterpriseAuthId(), UnionEnterpriseAuthResTypeEnum.STORE.getCode(), false)) {
             //更新最新联合时间（）
-            UnionEnterpriseAuthDTO dto = new UnionEnterpriseAuthDTO();
-            dto.setUnionEnterpriseAuthId(old.getUnionEnterpriseAuthId());
             dto.setLastRelieveTime(new Date());
-            unionEnterpriseAuthService.update(dto);
+            dto.setStatusFlag(UnionEnterpriseAuthStatusEnum.RELIEVED.getCode());
+        } else {
+            dto.setStatusFlag(UnionEnterpriseAuthStatusEnum.RELIEVING.getCode());
         }
+        unionEnterpriseAuthService.update(dto);
         unionEnterpriseAuthResDetailService.union(detail.getUnionEnterpriseAuthResDetailId(), authStatus, null, null);
         return ServiceResponse.success();
     }
 
+    private void unionCommon(Integer authStatus, Integer ownEnterpriseId, Integer unionEnterpriseId, String authKey, String remark) {
+
+    }
+
     /**
      * 其他资源是否授权成功/解除成功
      * @param unionEnterpriseAuthId