Skip to content

H
haoban-manage3.0
Commit 2cdeac4d by 徐高华
Options

Merge remote-tracking branch 'origin/master_xgh_会员待开发+商户停用' into 

master-xgh-好办停用

Conflicts:
	haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/StoreController.java
parents ffeddfa8 ae231b39
Showing with 84 additions and 129 deletions
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/WxEnterpriseQwDTO.java
...@@ -10,35 +10,18 @@ public class WxEnterpriseQwDTO implements Serializable { ...@@ -10,35 +10,18 @@ public class WxEnterpriseQwDTO implements Serializable {
private String wxEnterpriseId; private String wxEnterpriseId;
// 好办 助手 // 好办 助手
private String dkCorpid; private String dkCorpid;
private String dkSuiteId;
// 会员小程序dk // 会员小程序dk
private String memberCorpid; private String memberCorpid;
private String memberSuiteId;
// 第三方 // 第三方
private String thirdCorpid; private String thirdCorpid;
// 第三方使用的加密的userid // 第三方使用的加密的userid
public boolean needOpenUserId3th() { public boolean needOpenUserId3th() {
return this.wxSecurityType == 2 || this.wxSecurityType == 3; return this.wxSecurityType == 2 || this.wxSecurityType == 3;
} }
public boolean needOpenUserIdDk() {
return this.wxSecurityType == 2 || this.wxSecurityType == 4 ;
}
public String getDkSuiteId() {
return dkSuiteId;
}
public String getMemberSuiteId() { public boolean needOpenUserIdDk() {
return memberSuiteId; return this.wxSecurityType == 2 || this.wxSecurityType == 4;
}
public void setDkSuiteId(String dkSuiteId) {
this.dkSuiteId = dkSuiteId;
}
public void setMemberSuiteId(String memberSuiteId) {
this.memberSuiteId = memberSuiteId;
} }
public int getWxSecurityType() { public int getWxSecurityType() {
......
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/out/SecretSettingApiService.java
package com.gic.haoban.manage.api.service.out; package com.gic.haoban.manage.api.service.out;
import java.util.List;
import com.gic.haoban.manage.api.dto.SecretSettingDTO; import com.gic.haoban.manage.api.dto.SecretSettingDTO;
/** /**
...@@ -14,4 +16,6 @@ public interface SecretSettingApiService { ...@@ -14,4 +16,6 @@ public interface SecretSettingApiService {
* @return * @return
*/ */
SecretSettingDTO getSecretSetting(String wxEnterpriseId, int secretType); SecretSettingDTO getSecretSetting(String wxEnterpriseId, int secretType);
public List<SecretSettingDTO> exsitGicEidMemberApp(String wxEnterpriseId);
} }
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/SecretSettingMapper.java
package com.gic.haoban.manage.service.dao.mapper; package com.gic.haoban.manage.service.dao.mapper;
import com.gic.haoban.manage.service.entity.TabSecretSetting; import java.util.List;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import java.util.List; import com.gic.haoban.manage.api.dto.SecretSettingDTO;
import com.gic.haoban.manage.service.entity.TabSecretSetting;
@Mapper @Mapper
public interface SecretSettingMapper { public interface SecretSettingMapper {
/** /**
*/ */
int deleteByPrimaryKey(String secretId);
/**
*/
int insert(TabSecretSetting record); int insert(TabSecretSetting record);
/** /**
*/ */
int insertSelective(TabSecretSetting record);
/**
*/
TabSecretSetting selectByPrimaryKey(String secretId); TabSecretSetting selectByPrimaryKey(String secretId);
/** /**
*/ */
int updateByPrimaryKeySelective(TabSecretSetting record); int updateByPrimaryKeySelective(TabSecretSetting record);
/** /**
*/
int updateByPrimaryKey(TabSecretSetting record);
/**
* 获取企业secret配置信息 * 获取企业secret配置信息
* @param wxEnterpriseId * @param wxEnterpriseId
* @return * @return
...@@ -49,5 +40,17 @@ public interface SecretSettingMapper { ...@@ -49,5 +40,17 @@ public interface SecretSettingMapper {
TabSecretSetting getSecretSetting(@Param("wxEnterpriseId") String wxEnterpriseId, TabSecretSetting getSecretSetting(@Param("wxEnterpriseId") String wxEnterpriseId,
@Param("secretType") int secretType, @Param("secretType") int secretType,
@Param("enterpriseId") String enterpriseId); @Param("enterpriseId") String enterpriseId);
/**
*
* @Title: isExsitGicMemberApp
* @Description: 是否已经存在配置的gic会员小程序
* @author xugh
* @param wxEnterpriseId
* @param enterpriseId
* @return
* @throws
*/
List<SecretSettingDTO> exsitGicEidMemberApp(@Param("wxEnterpriseId") String wxEnterpriseId);
} }
\ No newline at end of file
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/SecretSettingService.java
...@@ -4,6 +4,8 @@ import com.gic.haoban.manage.api.dto.SecretSettingDTO; ...@@ -4,6 +4,8 @@ import com.gic.haoban.manage.api.dto.SecretSettingDTO;
import java.util.List; import java.util.List;
import org.apache.ibatis.annotations.Param;
/** /**
* Created 2020/6/3. * Created 2020/6/3.
* *
...@@ -56,4 +58,6 @@ public interface SecretSettingService { ...@@ -56,4 +58,6 @@ public interface SecretSettingService {
* @date 2022-06-27 13:39:58 * @date 2022-06-27 13:39:58
*/ */
SecretSettingDTO getSecretSettingById(String secretId); SecretSettingDTO getSecretSettingById(String secretId);
List<SecretSettingDTO> exsitGicEidMemberApp(String wxEnterpriseId);
} }
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/SecretSettingServiceImpl.java
...@@ -8,6 +8,7 @@ import com.gic.haoban.manage.service.dao.mapper.SecretSettingMapper; ...@@ -8,6 +8,7 @@ import com.gic.haoban.manage.service.dao.mapper.SecretSettingMapper;
import com.gic.haoban.manage.service.entity.TabSecretSetting; import com.gic.haoban.manage.service.entity.TabSecretSetting;
import com.gic.haoban.manage.service.service.SecretSettingService; import com.gic.haoban.manage.service.service.SecretSettingService;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.ibatis.annotations.Param;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -86,4 +87,9 @@ public class SecretSettingServiceImpl implements SecretSettingService { ...@@ -86,4 +87,9 @@ public class SecretSettingServiceImpl implements SecretSettingService {
TabSecretSetting secretSetting = secretSettingMapper.selectByPrimaryKey(secretId); TabSecretSetting secretSetting = secretSettingMapper.selectByPrimaryKey(secretId);
return EntityUtil.changeEntity(SecretSettingDTO.class, secretSetting); return EntityUtil.changeEntity(SecretSettingDTO.class, secretSetting);
} }
@Override
public List<SecretSettingDTO> exsitGicEidMemberApp(String wxEnterpriseId) {
return this.secretSettingMapper.exsitGicEidMemberApp(wxEnterpriseId);
}
} }
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/WxEnterpriseServiceImpl.java
...@@ -70,10 +70,8 @@ public class WxEnterpriseServiceImpl implements WxEnterpriseService { ...@@ -70,10 +70,8 @@ public class WxEnterpriseServiceImpl implements WxEnterpriseService {
qw.setThirdCorpid(app.getCorpid()); qw.setThirdCorpid(app.getCorpid());
}else if(appType.equals(3)) { }else if(appType.equals(3)) {
qw.setDkCorpid(app.getCorpid()); qw.setDkCorpid(app.getCorpid());
qw.setDkSuiteId(app.getSiteId());
}else if(appType.equals(4)) { }else if(appType.equals(4)) {
qw.setMemberCorpid(app.getCorpid()); qw.setMemberCorpid(app.getCorpid());
qw.setMemberSuiteId(app.getSiteId());
} }
}); });
} }
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/SecretSettingApiServiceImpl.java
package com.gic.haoban.manage.service.service.out.impl; package com.gic.haoban.manage.service.service.out.impl;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.gic.haoban.manage.api.dto.SecretSettingDTO; import com.gic.haoban.manage.api.dto.SecretSettingDTO;
import com.gic.haoban.manage.api.service.out.SecretSettingApiService; import com.gic.haoban.manage.api.service.out.SecretSettingApiService;
import com.gic.haoban.manage.service.service.SecretSettingService; import com.gic.haoban.manage.service.service.SecretSettingService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
/** /**
* @author mozhu * @author mozhu
...@@ -19,4 +22,9 @@ public class SecretSettingApiServiceImpl implements SecretSettingApiService { ...@@ -19,4 +22,9 @@ public class SecretSettingApiServiceImpl implements SecretSettingApiService {
public SecretSettingDTO getSecretSetting(String wxEnterpriseId, int secretType) { public SecretSettingDTO getSecretSetting(String wxEnterpriseId, int secretType) {
return secretSettingService.getSecretSetting(wxEnterpriseId, secretType); return secretSettingService.getSecretSetting(wxEnterpriseId, secretType);
} }
@Override
public List<SecretSettingDTO> exsitGicEidMemberApp(String wxEnterpriseId) {
return this.secretSettingService.exsitGicEidMemberApp(wxEnterpriseId);
}
} }
haoban-manage3-service/src/main/resources/mapper/SecretSettingMapper.xml
...@@ -23,10 +23,7 @@ ...@@ -23,10 +23,7 @@
from tab_haoban_secret_setting from tab_haoban_secret_setting
where secret_id = #{secretId,jdbcType=VARCHAR} where secret_id = #{secretId,jdbcType=VARCHAR}
</select> </select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.String">
delete from tab_haoban_secret_setting
where secret_id = #{secretId,jdbcType=VARCHAR}
</delete>
<insert id="insert" parameterType="com.gic.haoban.manage.service.entity.TabSecretSetting"> <insert id="insert" parameterType="com.gic.haoban.manage.service.entity.TabSecretSetting">
insert into tab_haoban_secret_setting (secret_id, wx_enterprise_id, secret_name, insert into tab_haoban_secret_setting (secret_id, wx_enterprise_id, secret_name,
secret_val, enterprise_id, secret_type, secret_val, enterprise_id, secret_type,
...@@ -37,73 +34,7 @@ ...@@ -37,73 +34,7 @@
#{checkFlag,jdbcType=INTEGER}, #{statusFlag,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{checkFlag,jdbcType=INTEGER}, #{statusFlag,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP},
#{updateTime,jdbcType=TIMESTAMP}) #{updateTime,jdbcType=TIMESTAMP})
</insert> </insert>
<insert id="insertSelective" parameterType="com.gic.haoban.manage.service.entity.TabSecretSetting">
insert into tab_haoban_secret_setting
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="secretId != null">
secret_id,
</if>
<if test="wxEnterpriseId != null">
wx_enterprise_id,
</if>
<if test="secretName != null">
secret_name,
</if>
<if test="secretVal != null">
secret_val,
</if>
<if test="enterpriseId != null">
enterprise_id,
</if>
<if test="secretType != null">
secret_type,
</if>
<if test="checkFlag != null">
check_flag,
</if>
<if test="statusFlag != null">
status_flag,
</if>
<if test="createTime != null">
create_time,
</if>
<if test="updateTime != null">
update_time,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="secretId != null">
#{secretId,jdbcType=VARCHAR},
</if>
<if test="wxEnterpriseId != null">
#{wxEnterpriseId,jdbcType=VARCHAR},
</if>
<if test="secretName != null">
#{secretName,jdbcType=VARCHAR},
</if>
<if test="secretVal != null">
#{secretVal,jdbcType=VARCHAR},
</if>
<if test="enterpriseId != null">
#{enterpriseId,jdbcType=VARCHAR},
</if>
<if test="secretType != null">
#{secretType,jdbcType=INTEGER},
</if>
<if test="checkFlag != null">
#{checkFlag,jdbcType=INTEGER},
</if>
<if test="statusFlag != null">
#{statusFlag,jdbcType=INTEGER},
</if>
<if test="createTime != null">
#{createTime,jdbcType=TIMESTAMP},
</if>
<if test="updateTime != null">
#{updateTime,jdbcType=TIMESTAMP},
</if>
</trim>
</insert>
<update id="updateByPrimaryKeySelective" parameterType="com.gic.haoban.manage.service.entity.TabSecretSetting"> <update id="updateByPrimaryKeySelective" parameterType="com.gic.haoban.manage.service.entity.TabSecretSetting">
update tab_haoban_secret_setting update tab_haoban_secret_setting
<set> <set>
...@@ -137,20 +68,6 @@ ...@@ -137,20 +68,6 @@
</set> </set>
where secret_id = #{secretId,jdbcType=VARCHAR} where secret_id = #{secretId,jdbcType=VARCHAR}
</update> </update>
<update id="updateByPrimaryKey" parameterType="com.gic.haoban.manage.service.entity.TabSecretSetting">
update tab_haoban_secret_setting
set wx_enterprise_id = #{wxEnterpriseId,jdbcType=VARCHAR},
secret_name = #{secretName,jdbcType=VARCHAR},
secret_val = #{secretVal,jdbcType=VARCHAR},
enterprise_id = #{enterpriseId,jdbcType=VARCHAR},
secret_type = #{secretType,jdbcType=INTEGER},
check_flag = #{checkFlag,jdbcType=INTEGER},
status_flag = #{statusFlag,jdbcType=INTEGER},
create_time = #{createTime,jdbcType=TIMESTAMP},
update_time = #{updateTime,jdbcType=TIMESTAMP}
where secret_id = #{secretId,jdbcType=VARCHAR}
</update>
<select id="listSecretSetting" resultMap="BaseResultMap"> <select id="listSecretSetting" resultMap="BaseResultMap">
select select
...@@ -171,4 +88,10 @@ ...@@ -171,4 +88,10 @@
</if> </if>
ORDER BY create_time desc LIMIT 1 ORDER BY create_time desc LIMIT 1
</select> </select>
<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>
</mapper> </mapper>
\ No newline at end of file
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/WxEnterpriseController.java
...@@ -60,6 +60,7 @@ import com.gic.haoban.manage.api.service.MaterialApiService; ...@@ -60,6 +60,7 @@ import com.gic.haoban.manage.api.service.MaterialApiService;
import com.gic.haoban.manage.api.service.WxEnterpriseApiService; import com.gic.haoban.manage.api.service.WxEnterpriseApiService;
import com.gic.haoban.manage.api.service.WxEnterpriseRelatedApiService; import com.gic.haoban.manage.api.service.WxEnterpriseRelatedApiService;
import com.gic.haoban.manage.api.service.fee.HaobanQywxFeeApiService; import com.gic.haoban.manage.api.service.fee.HaobanQywxFeeApiService;
import com.gic.haoban.manage.api.service.out.SecretSettingApiService;
import com.gic.haoban.manage.web.config.Config; import com.gic.haoban.manage.web.config.Config;
import com.gic.haoban.manage.web.errCode.HaoBanErrCode; import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
import com.gic.haoban.manage.web.qo.MiniprogramSettingQo; import com.gic.haoban.manage.web.qo.MiniprogramSettingQo;
...@@ -104,6 +105,8 @@ public class WxEnterpriseController extends WebBaseController { ...@@ -104,6 +105,8 @@ public class WxEnterpriseController extends WebBaseController {
private HaobanUserApiService haobanUserApiService ; private HaobanUserApiService haobanUserApiService ;
@Autowired @Autowired
private HaobanQywxFeeApiService haobanQywxFeeApiService; private HaobanQywxFeeApiService haobanQywxFeeApiService;
@Autowired
private SecretSettingApiService secretSettingApiService ;
//授权企业列表 //授权企业列表
@RequestMapping("wxa-enterprise-list") @RequestMapping("wxa-enterprise-list")
...@@ -375,17 +378,32 @@ public class WxEnterpriseController extends WebBaseController { ...@@ -375,17 +378,32 @@ public class WxEnterpriseController extends WebBaseController {
if (StringUtils.isAnyBlank(memberSecret,enterpriseId)) { if (StringUtils.isAnyBlank(memberSecret,enterpriseId)) {
return resultResponse(HaoBanErrCode.ERR_2); return resultResponse(HaoBanErrCode.ERR_2);
} }
String wxEnterpriseId = "";
WebLoginDTO login = AuthWebRequestUtil.getLoginUser(); WebLoginDTO login = AuthWebRequestUtil.getLoginUser();
wxEnterpriseId = login.getWxEnterpriseId(); String wxEnterpriseId = login.getWxEnterpriseId();
WxEnterpriseDTO wxEnterprise = wxEnterpriseApiService.getOne(wxEnterpriseId); WxEnterpriseDTO wxEnterprise = wxEnterpriseApiService.getOne(wxEnterpriseId);
if (wxEnterprise == null) { if (wxEnterprise == null) {
return resultResponse(HaoBanErrCode.ERR_10012); return resultResponse(HaoBanErrCode.ERR_10012);
} }
memberSecret = memberSecret.trim(); memberSecret = memberSecret.trim();
SecretSettingDTO secretSetting = wxEnterpriseApiService.getSecretSettingById(secretId); SecretSettingDTO secretSetting = null ;
if (StringUtils.isBlank(secretId)) { if (StringUtils.isNotBlank(secretId)) {
secretSetting = new SecretSettingDTO(); secretSetting = wxEnterpriseApiService.getSecretSettingById(secretId);
}
if(null == secretSetting) {
secretSetting = new SecretSettingDTO();
}
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) ; WxEnterpriseQwDTO qwDTO = this.wxEnterpriseApiService.getQwInfo(wxEnterpriseId) ;
String token = this.qywxCorpApiService.getToken(qwDTO.getMemberCorpid(), memberSecret); String token = this.qywxCorpApiService.getToken(qwDTO.getMemberCorpid(), memberSecret);
......
haoban-manage3-web/src/main/webapp/WEB-INF/dubbo-haoban-manage-web.xml
...@@ -120,4 +120,6 @@ ...@@ -120,4 +120,6 @@
<dubbo:reference id="logSearchApiService" interface="com.gic.log.record.service.LogSearchApiService" timeout="10000" retries="0" check="false" /> <dubbo:reference id="logSearchApiService" interface="com.gic.log.record.service.LogSearchApiService" timeout="10000" retries="0" check="false" />
<dubbo:reference interface="com.gic.haoban.manage.api.service.fee.HaobanQywxFeeApiService" id="haobanQywxFeeApiService"/> <dubbo:reference interface="com.gic.haoban.manage.api.service.fee.HaobanQywxFeeApiService" id="haobanQywxFeeApiService"/>
<dubbo:reference interface="com.gic.haoban.manage.api.service.ValidationCodeApiService" id="validationCodeApiService"/> <dubbo:reference interface="com.gic.haoban.manage.api.service.ValidationCodeApiService" id="validationCodeApiService"/>
<dubbo:reference interface="com.gic.haoban.manage.api.service.out.SecretSettingApiService" id="secretSettingApiService"/>
</beans> </beans>
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/StoreController.java
...@@ -96,7 +96,7 @@ public class StoreController extends WebBaseController { ...@@ -96,7 +96,7 @@ public class StoreController extends WebBaseController {
*/ */
@IgnoreLogin @IgnoreLogin
@RequestMapping("/store-list") @RequestMapping("/store-list")
public HaobanResponse storeList(String staffId, String wxEnterpriseId, String version) { public HaobanResponse storeList(String staffId, String wxEnterpriseId, String hbversion , String gicEnterpriseId) {
if (StringUtils.isAnyBlank(staffId, wxEnterpriseId)) { if (StringUtils.isAnyBlank(staffId, wxEnterpriseId)) {
return resultResponse(HaoBanErrCode.ERR_2); return resultResponse(HaoBanErrCode.ERR_2);
} }
...@@ -130,6 +130,10 @@ public class StoreController extends WebBaseController { ...@@ -130,6 +130,10 @@ public class StoreController extends WebBaseController {
continue; continue;
} }
String enterpriseId = store.getEnterpriseId(); String enterpriseId = store.getEnterpriseId();
if(StringUtils.isNotBlank(gicEnterpriseId) && !gicEnterpriseId.equals(enterpriseId)) {
logger.info("非当前商户,直接跳过={},{}",gicEnterpriseId,enterpriseId);
continue ;
}
ClerkDTO clerk = clerkService.getClerkByClerkCode(enterpriseId, staffClerkRelationDTO.getClerkCode()); ClerkDTO clerk = clerkService.getClerkByClerkCode(enterpriseId, staffClerkRelationDTO.getClerkCode());
if (clerk == null) { if (clerk == null) {
continue; continue;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment