联合商户

gic-platform-enterprise-api/src/main/java/com/gic/enterprise/constant/union/UnionEnterpriseAuthStatusEnum.java

@@ -18,7 +18,8 @@ public enum UnionEnterpriseAuthStatusEnum {
     /**
      * 已解除
      */
-    RELIEVED(3, "已解除");
+    RELIEVED(3, "已解除"),
+    TO_DO_RELIEVE(4, "待解除");
 
     private Integer code;
     private String message;

gic-platform-enterprise-api/src/main/java/com/gic/enterprise/service/UnionEnterpriseAuthApiService.java

@@ -99,6 +99,12 @@ public interface UnionEnterpriseAuthApiService {
      */
     ServiceResponse<String> deleteUnionEnterpriseAuthApp(@NotNull Integer unionEnterpriseAuthAppId);
 
+    /**
+     * 到期发送解除联合通知
+     * @param param
+     * @return
+     */
+    ServiceResponse<Void> relieveTask(String param);
     /********联合商户视角接口***********/
 
     /**

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/dao/mapper/TabSysUnionEnterpriseAuthMapper.java

@@ -87,4 +87,10 @@ public interface TabSysUnionEnterpriseAuthMapper {
     List<OwnEnterpriseAuthListDTO> listOwnEnterpriseAuth(@Param("unionEnterpriseId") Integer unionEnterpriseId,
                                                          @Param("startTime") String startTime,
                                                          @Param("endTime") String endTime);
+
+    /**
+     * 查询全部
+     * @return
+     */
+    List<TabSysUnionEnterpriseAuth> listAll();
 }
\ No newline at end of file

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/UnionEnterpriseAuthService.java

@@ -56,4 +56,10 @@ public interface UnionEnterpriseAuthService {
      * @return
      */
     List<OwnEnterpriseAuthListDTO> listOwnEnterpriseAuth(@NotNull Integer unionEnterpriseId, String startTime, String endTime);
+
+    /**
+     * 查询全部
+     * @return
+     */
+    List<TabSysUnionEnterpriseAuth> listAll();
 }

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/impl/UnionEnterpriseAuthServiceImpl.java

@@ -62,4 +62,9 @@ public class UnionEnterpriseAuthServiceImpl implements UnionEnterpriseAuthServic
         return tabSysUnionEnterpriseAuthMapper.listOwnEnterpriseAuth(unionEnterpriseId, startTime, endTime);
     }
 
+    @Override
+    public List<TabSysUnionEnterpriseAuth> listAll() {
+        return tabSysUnionEnterpriseAuthMapper.listAll();
+    }
+
 }

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

@@ -9,6 +9,7 @@ import com.gic.commons.util.EntityUtil;
 import com.gic.commons.util.PageHelperUtils;
 import com.gic.enterprise.constant.union.UnionEnterpriseAuthDetailStatusEnum;
 import com.gic.enterprise.constant.union.UnionEnterpriseAuthResOperateEnum;
+import com.gic.enterprise.constant.union.UnionEnterpriseAuthStatusEnum;
 import com.gic.enterprise.dto.EnterpriseDTO;
 import com.gic.enterprise.dto.union.*;
 import com.gic.enterprise.entity.TabEnterprise;
@@ -31,6 +32,7 @@ import com.gic.enterprise.exception.CommonException;
 
 import javax.validation.Valid;
 import javax.validation.constraints.NotNull;
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -145,6 +147,7 @@ public class UnionEnterpriseAuthApiServiceImpl implements UnionEnterpriseAuthApi
         dto.setRelieveEffectDate(7);
         dto.setRelieveRemark(relieveReason);
         dto.setUnionEnterpriseAuthId(old.getUnionEnterpriseAuthId());
+        dto.setStatusFlag(UnionEnterpriseAuthStatusEnum.TO_DO_RELIEVE.getCode());
         unionEnterpriseAuthService.update(dto);
 
         //资源状态
@@ -273,6 +276,28 @@ public class UnionEnterpriseAuthApiServiceImpl implements UnionEnterpriseAuthApi
     }
 
     @Override
+    public ServiceResponse<Void> relieveTask(String param) {
+        List<TabSysUnionEnterpriseAuth> list = unionEnterpriseAuthService.listAll();
+        if (CollectionUtils.isNotEmpty(list)) {
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+            for (TabSysUnionEnterpriseAuth temp : list) {
+                if (temp.getRelieveTime() != null && temp.getRelieveEffectDate() != null) {
+                    Calendar calendar = Calendar.getInstance();
+                    calendar.setTime(temp.getRelieveTime());
+                    calendar.add(Calendar.DAY_OF_YEAR, temp.getRelieveEffectDate());
+                    //如果到达解除时间，发通知
+                    if (sdf.format(calendar.getTime()).compareTo(sdf.format(new Date())) >= 0) {
+                        if (UnionEnterpriseAuthStatusEnum.TO_DO_RELIEVE.getCode().equals(temp.getStatusFlag())) {
+                            //todo 发通知
+                        }
+                    }
+                }
+            }
+        }
+        return ServiceResponse.success();
+    }
+
+    @Override
     public ServiceResponse<List<OwnEnterpriseAuthListDTO>> listOwnEnterpriseAuth(@NotNull Integer unionEnterpriseId, String startTime, String endTime) {
         List<OwnEnterpriseAuthListDTO> list = unionEnterpriseAuthService.listOwnEnterpriseAuth(unionEnterpriseId, startTime, endTime);
         if (CollectionUtils.isNotEmpty(list)) {

gic-platform-enterprise-service/src/main/resources/mapper/TabSysUnionEnterpriseAuthMapper.xml

@@ -300,4 +300,13 @@
     and union_enterprise_id = #{unionEnterpriseId}
 
   </select>
+
+  <select id="listAll" resultMap="BaseResultMap">
+    select <include refid="Base_Column_List"></include>
+    from tab_sys_union_enterprise_auth
+
+    where delete_flag = 0
+
+    and status_flag = 4
+  </select>
 </mapper>
\ No newline at end of file

gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/vo/union/OwnEnterpriseListVO.java

@@ -28,7 +28,7 @@ public class OwnEnterpriseListVO implements Serializable{
 
     private String address;
 
-    private String enterpriseId;
+    private Integer enterpriseId;
 
     private String logo;
 
@@ -116,11 +116,11 @@ public class OwnEnterpriseListVO implements Serializable{
         return this;
     }
 
-    public String getEnterpriseId() {
+    public Integer getEnterpriseId() {
         return enterpriseId;
     }
 
-    public OwnEnterpriseListVO setEnterpriseId(String enterpriseId) {
+    public OwnEnterpriseListVO setEnterpriseId(Integer enterpriseId) {
         this.enterpriseId = enterpriseId;
         return this;
     }