会员小程序

haoban-manage3-service/src/main/resources/mapper/SecretSettingMapper.xml

@@ -89,8 +89,8 @@
     ORDER BY create_time desc LIMIT 1
   </select>
   
-  <select id="exsitGicEidMemberApp" resultType="String">
-  	select enterprise_id from tab_haoban_secret_setting where wx_enterprise_id = #{wxEnterpriseId,jdbcType=VARCHAR} 
+  <select id="exsitGicEidMemberApp" resultType="com.gic.haoban.manage.api.dto.SecretSettingDTO">
+  	select enterprise_id enterpriseId , secret_id secretId  from tab_haoban_secret_setting where wx_enterprise_id = #{wxEnterpriseId,jdbcType=VARCHAR} 
   	and status_flag = 1 and secret_type = 4 and enterprise_id is not null
   </select>
   

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/WxEnterpriseController.java

@@ -392,9 +392,18 @@ public class WxEnterpriseController extends WebBaseController {
         if(null == secretSetting) {
            secretSetting = new SecretSettingDTO();
         }
-        List<SecretSettingDTO> eidList = this.secretSettingApiService.exsitGicEidMemberApp(wxEnterpriseId) ;
-        if(CollectionUtils.isNotEmpty(eidList) && eidList.contains(enterpriseId)) {
-           
+        List<SecretSettingDTO> enList = this.secretSettingApiService.exsitGicEidMemberApp(wxEnterpriseId) ;
+        if(CollectionUtils.isNotEmpty(enList)) {
+            Map<String,SecretSettingDTO> map = enList.stream().collect(Collectors.toMap(SecretSettingDTO::getEnterpriseId, dto->dto,(k1,k2)->k1));
+            if(StringUtils.isEmpty(secretId)) {
+                if(null != map.get(enterpriseId)) {
+                    return this.fail("此商户小程序已存在") ;
+                }
+            }else {
+                if(null != map.get(enterpriseId) && !secretId.equals(map.get(enterpriseId).getSecretId())) {
+                    return this.fail("此商户小程序已存在") ;
+                }
+            }
         }
         WxEnterpriseQwDTO qwDTO = this.wxEnterpriseApiService.getQwInfo(wxEnterpriseId) ;
         String token = this.qywxCorpApiService.getToken(qwDTO.getMemberCorpid(), memberSecret);