Merge remote-tracking branch 'origin/dev_thirdplatform' into dev

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/BusinessInfoDao.java

@@ -41,4 +41,11 @@ public interface BusinessInfoDao extends BaseDao<BusinessInfoEntity> {
      */
     void insertBusinessInfo(@Param("businessInfoList") List<BusinessInfoFormDTO> businessInfoList);
 
+    /**
+     * @Description  功能开通信息删除
+     * @param
+     * @author zxc
+     */
+    void deleteBusinessInfo(@Param("customerId")String customerId,@Param("clientType")String clientType);
+
 }

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/MiniCategoryInfoDao.java

@@ -41,4 +41,11 @@ public interface MiniCategoryInfoDao extends BaseDao<MiniCategoryInfoEntity> {
      */
     void insertCategoryInfo(@Param("miniCategoryInfoList") List<MiniCategoryInfoFormDTO> miniCategoryInfoList);
 
+    /**
+     * @Description  小程序配置的类目信息删除
+     * @param
+     * @author zxc
+     */
+    void deleteCategoryInfo(@Param("customerId")String customerId,@Param("clientType")String clientType);
+
 }

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/MiniInfoDao.java

@@ -40,6 +40,13 @@ public interface MiniInfoDao extends BaseDao<MiniInfoEntity> {
      */
     void insertMiniInfo(MiniInfoFormDTO formDTO);
 
+    /**
+     * @Description  删除小程序信息
+     * @param formDTO
+     * @author zxc
+     */
+    void deleteMiniInfo(MiniInfoFormDTO formDTO);
+
     /**
      * @Description  根据原始ID查询  customerId 和 clientType
      * @param toUserName

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/MiniNetworkInfoDao.java

@@ -41,4 +41,11 @@ public interface MiniNetworkInfoDao extends BaseDao<MiniNetworkInfoEntity> {
      */
     void insertNetworkInfo(@Param("networkInfoList") List<MiniNetworkInfoFormDTO> networkInfoList);
 
+    /**
+     * @Description  小程序配置的合法域名信息删除
+     * @param
+     * @author zxc
+     */
+    void deleteNetworkInfo(@Param("customerId")String customerId,@Param("clientType")String clientType);
+
 }

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ComponentVerifyTicketServiceImpl.java

@@ -437,6 +437,7 @@ public class ComponentVerifyTicketServiceImpl implements ComponentVerifyTicketSe
             miniInfoFormDTO.setCustomerId(customerId);
             miniInfoFormDTO.setClientType(clientType);
             //基础信息插入
+            miniInfoDao.deleteMiniInfo(miniInfoFormDTO);
             miniInfoDao.insertMiniInfo(miniInfoFormDTO);
             String primaryId = miniInfoFormDTO.getId();
             //todo 功能的开通状况信息插入
@@ -451,6 +452,7 @@ public class ComponentVerifyTicketServiceImpl implements ComponentVerifyTicketSe
                 businessInfoForm.setPrimaryId(primaryId);
                 businessInfoList.add(businessInfoForm);
             });
+            businessInfoDao.deleteBusinessInfo(customerId,clientType);
             businessInfoDao.insertBusinessInfo(businessInfoList);
             //todo 小程序配置的合法域名信息插入
             Map miniProgramInfo = (Map) authorizerInfo.get(ModuleConstant.MINI_PROGRAM_INFO);
@@ -465,6 +467,7 @@ public class ComponentVerifyTicketServiceImpl implements ComponentVerifyTicketSe
                 miniNetworkInfoForm.setPrimaryId(primaryId);
                 networkInfoList.add(miniNetworkInfoForm);
             });
+            miniNetworkInfoDao.deleteNetworkInfo(customerId,clientType);
             miniNetworkInfoDao.insertNetworkInfo(networkInfoList);
             //todo 小程序配置的类目信息插入
             List<MiniCategoryInfoFormDTO> categoryInfoList = new ArrayList<>();
@@ -481,6 +484,7 @@ public class ComponentVerifyTicketServiceImpl implements ComponentVerifyTicketSe
                         categoryInfoList.add(categoryInfo);
                     });
                 });
+                miniCategoryInfoDao.deleteCategoryInfo(customerId, clientType);
                 miniCategoryInfoDao.insertCategoryInfo(categoryInfoList);
             }
         }else {
@@ -501,6 +505,7 @@ public class ComponentVerifyTicketServiceImpl implements ComponentVerifyTicketSe
                 businessInfoForm.setPrimaryId(primaryId);
                 businessInfoList.add(businessInfoForm);
             });
+            businessInfoDao.deleteBusinessInfo(customerId,clientType);
             businessInfoDao.insertBusinessInfo(businessInfoList);
         }
         log.info("保存授权方基本信息结束");

epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/BusinessInfoDao.xml

@@ -24,4 +24,15 @@
             )
         </foreach>
     </insert>
+
+    <!-- 功能开通信息删除 -->
+    <delete id="deleteBusinessInfo">
+        DELETE
+        FROM
+            business_info
+        WHERE
+            del_flag = 0
+            AND customer_id = #{customerId}
+            AND client_type = #{clientType}
+    </delete>
 </mapper>

epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/MiniCategoryInfoDao.xml

@@ -24,4 +24,15 @@
             )
         </foreach>
     </insert>
+
+    <!-- 小程序配置的类目信息删除 -->
+    <delete id="deleteCategoryInfo">
+        DELETE
+        FROM
+            mini_category_info
+        WHERE
+            del_flag = 0
+            AND customer_id = #{customerId}
+            AND client_type = #{clientType}
+    </delete>
 </mapper>

epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/MiniInfoDao.xml

@@ -32,6 +32,17 @@
             )
     </insert>
 
+    <!-- 删除小程序信息 -->
+    <delete id="deleteMiniInfo">
+        DELETE
+        FROM
+            mini_info
+        WHERE
+            del_flag = 0
+            AND customer_id = #{customerId}
+            AND client_type = #{clientType}
+    </delete>
+
     <!-- 根据原始ID查询  customerId 和 clientType -->
     <select id="selectCustomerIdAndClientByToUserName" resultType="com.epmet.dto.result.CustomerIdAndClientResultDTO">
         SELECT

epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/MiniNetworkInfoDao.xml

@@ -24,4 +24,15 @@
             )
         </foreach>
     </insert>
+
+    <!-- 小程序配置的合法域名信息删除 -->
+    <delete id="deleteNetworkInfo">
+        DELETE
+        FROM
+            mini_network_info
+        WHERE
+            del_flag = 0
+            AND customer_id = #{customerId}
+            AND client_type = #{clientType}
+    </delete>
 </mapper>