联合商户授权，日志信息冗余

gic-platform-enterprise-api/src/main/java/com/gic/enterprise/dto/union/UnionEnterpriseAuthDTO.java

@@ -102,6 +102,11 @@ public class UnionEnterpriseAuthDTO implements Serializable{
      */
     private Integer deleteFlag;
 
+    /**
+     * 冗余字段。解除联合操作日志信息.TransmitDataDTO transmitDataDTO = TransmitDataHolder.get();
+     */
+    private String logParams;
+
     public Integer getUnionEnterpriseAuthId() {
         return unionEnterpriseAuthId;
     }
@@ -264,6 +269,15 @@ public class UnionEnterpriseAuthDTO implements Serializable{
         return this;
     }
 
+    public String getLogParams() {
+        return logParams;
+    }
+
+    public UnionEnterpriseAuthDTO setLogParams(String logParams) {
+        this.logParams = logParams;
+        return this;
+    }
+
     @Override
     public String toString() {
         return "UnionEnterpriseAuthDTO{" +
@@ -285,6 +299,7 @@ public class UnionEnterpriseAuthDTO implements Serializable{
                 ", createTime=" + createTime +
                 ", updateTime=" + updateTime +
                 ", deleteFlag=" + deleteFlag +
+                ", logParams=" + logParams +
                 '}';
     }
 }
\ No newline at end of file

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/entity/TabSysUnionEnterpriseAuth.java

@@ -100,6 +100,11 @@ public class TabSysUnionEnterpriseAuth {
      */
     private Integer deleteFlag;
 
+    /**
+     * 冗余字段。解除联合操作日志信息.TransmitDataDTO transmitDataDTO = TransmitDataHolder.get();
+     */
+    private String logParams;
+
     public Integer getUnionEnterpriseAuthId() {
         return unionEnterpriseAuthId;
     }
@@ -261,4 +266,13 @@ public class TabSysUnionEnterpriseAuth {
         this.deleteFlag = deleteFlag;
         return this;
     }
+
+    public String getLogParams() {
+        return logParams;
+    }
+
+    public TabSysUnionEnterpriseAuth setLogParams(String logParams) {
+        this.logParams = logParams;
+        return this;
+    }
 }
\ No newline at end of file

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

@@ -176,7 +176,8 @@ public class UnionEnterpriseAuthApiServiceImpl implements UnionEnterpriseAuthApi
         unionEnterpriseAuthResDetailService.initUnionEnterpriseAuthResDetail(old.getUnionEnterpriseAuthId());
 
         //授权通知(用户域)
-        resourceGroupApiService.syncResourceAuthChangeMQ(dto.getOwnEnterpriseId(), dto.getUnionEnterpriseId(), resourceGroupDTO, oldResourceGroupDTO, resourceGroupChangeType);
+        TransmitDataDTO transmitDataDTO = TransmitDataHolder.get();
+        resourceGroupApiService.syncResourceAuthChangeMQ(dto.getOwnEnterpriseId(), dto.getUnionEnterpriseId(), resourceGroupDTO, oldResourceGroupDTO, resourceGroupChangeType, JSON.toJSONString(transmitDataDTO));
         //门店通知
         if (resourceGroupDTO.getStoreResource() != null) {
             ExecutorPoolSingleton.getInstance().executeTask(new Runnable() {
@@ -219,9 +220,10 @@ public class UnionEnterpriseAuthApiServiceImpl implements UnionEnterpriseAuthApi
         }
         //todo 重新授权
         //门店资源
-        String authKey = detail.getAuthKey();
-        storeAuthorizationApiService.reAuthStore(authKey);
-
+        if (UnionEnterpriseAuthResTypeEnum.STORE.getCode() == resourceType) {
+            String authKey = detail.getAuthKey();
+            storeAuthorizationApiService.reAuthStore(authKey);
+        }
         //日志
         unionEnterpriseAuthResLogService.saveUnionEnterpriseAuthResLog(old.getUnionEnterpriseAuthId(),
                 resourceType, UnionEnterpriseAuthResOperateEnum.RE_AUTH.getMessage());
@@ -251,6 +253,10 @@ public class UnionEnterpriseAuthApiServiceImpl implements UnionEnterpriseAuthApi
         dto.setRelieveRemark(relieveReason);
         dto.setUnionEnterpriseAuthId(old.getUnionEnterpriseAuthId());
         dto.setStatusFlag(UnionEnterpriseAuthStatusEnum.TO_DO_RELIEVE.getCode());
+
+        TransmitDataDTO transmitDataDTO = TransmitDataHolder.get();
+        dto.setLogParams(JSON.toJSONString(transmitDataDTO));
+
         unionEnterpriseAuthService.update(dto);
         //资源状态
         unionEnterpriseAuthResDetailService.relieveUnion(old.getUnionEnterpriseAuthId());
@@ -466,7 +472,7 @@ public class UnionEnterpriseAuthApiServiceImpl implements UnionEnterpriseAuthApi
 
                             storeAuthorizationApiService.cancelStoreAll(temp.getUnionEnterpriseId(), temp.getOwnEnterpriseId());
 
-                            TransmitDataDTO transmitDataDTO = TransmitDataHolder.get();
+                            TransmitDataDTO transmitDataDTO = (TransmitDataDTO) JSON.parse(temp.getLogParams());
                             authorizationEnterConfApiService.delAuthorizationEnterpriseConf(temp.getUnionEnterpriseId(), temp.getOwnEnterpriseId(), transmitDataDTO);
 
                             userGroupPermissionApiService.relieveUnionEnterprise(temp.getUnionEnterpriseId(), temp.getOwnEnterpriseId());

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

@@ -20,12 +20,13 @@
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
     <result column="delete_flag" jdbcType="INTEGER" property="deleteFlag" />
+    <result column="log_params" jdbcType="VARCHAR" property="logParams" />
   </resultMap>
   <sql id="Base_Column_List">
     union_enterprise_auth_id, own_enterprise_id, union_enterprise_id, status_flag, last_union_time, 
     last_relieve_time, relieve_time, relieve_effect_date, relieve_remark, resource_group_id, 
     auditee_group, account_group, data_encry_field, user_edit_auth, white_list_auth, 
-    create_time, update_time, delete_flag
+    create_time, update_time, delete_flag, log_params
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select 
@@ -40,14 +41,14 @@
       relieve_remark, resource_group_id, auditee_group, 
       account_group, data_encry_field, user_edit_auth, 
       white_list_auth, create_time, update_time, 
-      delete_flag)
+      delete_flag, log_params)
     values (#{unionEnterpriseAuthId,jdbcType=INTEGER}, #{ownEnterpriseId,jdbcType=INTEGER}, 
       #{unionEnterpriseId,jdbcType=INTEGER}, #{statusFlag,jdbcType=INTEGER}, #{lastUnionTime,jdbcType=TIMESTAMP}, 
       #{lastRelieveTime,jdbcType=TIMESTAMP}, #{relieveTime,jdbcType=TIMESTAMP}, #{relieveEffectDate,jdbcType=INTEGER}, 
       #{relieveRemark,jdbcType=VARCHAR}, #{resourceGroupId,jdbcType=INTEGER}, #{auditeeGroup,jdbcType=VARCHAR}, 
       #{accountGroup,jdbcType=VARCHAR}, #{dataEncryField,jdbcType=VARCHAR}, #{userEditAuth,jdbcType=VARCHAR}, 
       #{whiteListAuth,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, 
-      #{deleteFlag,jdbcType=INTEGER})
+      #{deleteFlag,jdbcType=INTEGER}, #{logParams,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.gic.enterprise.entity.TabSysUnionEnterpriseAuth">
     insert into tab_sys_union_enterprise_auth
@@ -106,6 +107,9 @@
       <if test="deleteFlag != null">
         delete_flag,
       </if>
+      <if test="logParams != null">
+        log_params,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="unionEnterpriseAuthId != null">
@@ -162,6 +166,9 @@
       <if test="deleteFlag != null">
         #{deleteFlag,jdbcType=INTEGER},
       </if>
+      <if test="logParams != null">
+        #{logParams,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.gic.enterprise.entity.TabSysUnionEnterpriseAuth">
@@ -218,6 +225,9 @@
       <if test="deleteFlag != null">
         delete_flag = #{deleteFlag,jdbcType=INTEGER},
       </if>
+      <if test="logParams != null">
+        log_params = #{logParams,jdbcType=VARCHAR},
+      </if>
     </set>
     where union_enterprise_auth_id = #{unionEnterpriseAuthId,jdbcType=INTEGER}
   </update>
@@ -239,7 +249,8 @@
       white_list_auth = #{whiteListAuth,jdbcType=INTEGER},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP},
-      delete_flag = #{deleteFlag,jdbcType=INTEGER}
+      delete_flag = #{deleteFlag,jdbcType=INTEGER},
+      log_params = #{logParams,jdbcType=VARCHAR}
     where union_enterprise_auth_id = #{unionEnterpriseAuthId,jdbcType=INTEGER}
   </update>