Skip to content

H
haoban-manage3.0
Commit 44c75af4 by 徐高华
Options

企业活码

parent 2fa1b294
Showing with 300 additions and 80 deletions
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/KeyDataDTO.java
......@@ -16,6 +16,7 @@ public class KeyDataDTO implements Serializable{
private static final long serialVersionUID = 1978554156094100L;
private Long id;
private String enterpriseId ;
private String relationId;
private String dataKey;
private String data;
......@@ -23,7 +24,15 @@ public class KeyDataDTO implements Serializable{
private Integer type;
private java.util.Date createTime;
public String getRelationId() {
public String getEnterpriseId() {
return enterpriseId;
}
public void setEnterpriseId(String enterpriseId) {
this.enterpriseId = enterpriseId;
}
public String getRelationId() {
return relationId;
}
......
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/hm/HmLinkStoreSettingDTO.java
package com.gic.haoban.manage.api.dto.hm;
public class HmLinkStoreSettingDTO {
// 是否开启
private int open;
// 专属
private int zs;
// 协管
private int xg ;
//店长
private int dz;
//店员
private int dy;
private int ndz;
private int ndy;
public int getXg() {
return xg;
}
public void setXg(int xg) {
this.xg = xg;
}
public int getNdz() {
return ndz;
}
public int getNdy() {
return ndy;
}
public void setNdz(int ndz) {
this.ndz = ndz;
}
public void setNdy(int ndy) {
this.ndy = ndy;
}
public int getOpen() {
return open;
......
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/hm/HmLinkWxaDTO.java
......@@ -14,14 +14,36 @@ import java.util.List;
*/
public class HmLinkWxaDTO implements Serializable {
private static final long serialVersionUID = 6473795387449522116L;
private HmPageTemplateDTO page;
// 二维码
private String hmQrcode;
// 自定义门店规则1推荐门店 2附近门店
private int storeType;
// 是否展示省市区门店查询
private boolean selectStoreFlag;
private int selectStoreFlag;
// 推荐的门店列表
private List<HmLinkStoreDTO> storeList;
public String getHmQrcode() {
return hmQrcode;
}
public void setHmQrcode(String hmQrcode) {
this.hmQrcode = hmQrcode;
}
public int getStoreType() {
return storeType;
}
public void setStoreType(int storeType) {
this.storeType = storeType;
}
public List<HmLinkStoreDTO> getStoreList() {
return storeList;
}
......@@ -30,11 +52,11 @@ public class HmLinkWxaDTO implements Serializable {
this.storeList = storeList;
}
public boolean isSelectStoreFlag() {
public int getSelectStoreFlag() {
return selectStoreFlag;
}
public void setSelectStoreFlag(boolean selectStoreFlag) {
public void setSelectStoreFlag(int selectStoreFlag) {
this.selectStoreFlag = selectStoreFlag;
}
......
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/KeyDataApiService.java
......@@ -5,7 +5,7 @@ import com.gic.haoban.manage.api.enums.KeyDataEnum;
public interface KeyDataApiService {
public ServiceResponse<String> saveMobileData(Long linkId, String mobile);
public ServiceResponse<String> saveMobileData(String enterpiseId ,Long linkId, String mobile);
public ServiceResponse<String> getDataByKey(String key, KeyDataEnum dataEnum);
......
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/hm/HmLinkApiService.java
......@@ -32,7 +32,8 @@ public interface HmLinkApiService {
* @return
* @throws
*/
public ServiceResponse<List<HmLinkDTO>> listForSms(String wxEnterpriseId, String enterprieId, String linkName);
public ServiceResponse<List<HmLinkDTO>> listForSms(String wxEnterpriseId, String enterprieId, String linkName,
Integer linkType);
public ServiceResponse<Page<HmLinkDTO>> listPage(HmLinkSearchQDTO qdto, BasePageInfo basePageInfo);
......@@ -43,9 +44,10 @@ public interface HmLinkApiService {
* @Title: getLinkHm
* @Description: 小程序获取展示活码
* @author xugh
* @param whitchStore 1推荐门店 2附件门店 3省市区门店
* @return
* @throws
*/
public ServiceResponse<HmLinkWxaDTO> getLinkHmFromWxa(String enterpriseId, String storeId, String clerkId,
String linkId, String mixPhone, String unionid);
public ServiceResponse<HmLinkWxaDTO> getLinkHmFromWxa(String enterpriseId, Integer whitchStore, String storeId,
String clerkId, String linkId, String mixPhone, String unionid);
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/hm/HmLinkMapper.java
......@@ -41,7 +41,8 @@ public interface HmLinkMapper {
public TabHmLink selectById(Long linkId);
public List<TabHmLink> listForSms(@Param("wxEnterpriseId") String wxEnterpriseId,
@Param("enterpriseId") String enterpriseId, @Param("linkName") String linkName);
@Param("enterpriseId") String enterpriseId, @Param("linkName") String linkName,
@Param("linkType") Integer linkType);
public List<TabHmLink> list(@Param("wxEnterpriseId") String wxEnterpriseId,
@Param("enterpriseId") String enterpriseId, @Param("startDate") Date startDate,
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/entity/TabKeyData.java
......@@ -16,6 +16,7 @@ public class TabKeyData implements Serializable {
private static final long serialVersionUID = 1978554156094100L;
private Long id;
private String enterpriseId ;
private String relationId ;
private String dataKey;
private String data;
......@@ -23,6 +24,14 @@ public class TabKeyData implements Serializable {
private Integer type;
private java.util.Date createTime;
public String getEnterpriseId() {
return enterpriseId;
}
public void setEnterpriseId(String enterpriseId) {
this.enterpriseId = enterpriseId;
}
public String getRelationId() {
return relationId;
}
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/KeyDataService.java
......@@ -5,12 +5,12 @@ import com.gic.haoban.manage.api.enums.KeyDataEnum;
public interface KeyDataService {
public KeyDataDTO saveData(String relationId , String data, KeyDataEnum dataEnum);
public String saveHmData(String unionid, Long linkId, Long hmId);
public KeyDataDTO saveData(String enterpriseId, String relationId, String data, KeyDataEnum dataEnum);
public String saveHmData(String enterpriseId, String unionid, Long linkId, Long hmId);
public KeyDataDTO getDataByKey(String key, KeyDataEnum dataEnum, String relationId);
public String getMobile(String key, String relationId) ;
public String getMobile(String key, String relationId);
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/hm/HmLinkService.java
......@@ -13,7 +13,7 @@ public interface HmLinkService {
public TabHmLink getByLinkId(String wxEnterpriseId, String enterprieId,Long linkId);
public List<HmLinkDTO> listForSms(String wxEnterpriseId, String enterprieId, String linkName);
public List<HmLinkDTO> listForSms(String wxEnterpriseId, String enterprieId, String linkName, Integer linkType);
public HmLinkDTO saveLink(HmLinkDTO dto, List<HmLinkStoreDTO> stoerList);
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/hm/impl/HmLinkServiceImpl.java
......@@ -36,8 +36,8 @@ public class HmLinkServiceImpl implements HmLinkService {
}
@Override
public List<HmLinkDTO> listForSms(String wxEnterpriseId, String enterpriseId, String linkName) {
List<TabHmLink> list = this.linkMapper.listForSms(wxEnterpriseId, enterpriseId, linkName);
public List<HmLinkDTO> listForSms(String wxEnterpriseId, String enterpriseId, String linkName, Integer linkType) {
List<TabHmLink> list = this.linkMapper.listForSms(wxEnterpriseId, enterpriseId, linkName, linkType);
return EntityUtil.changeEntityListByJSON(HmLinkDTO.class, list);
}
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/KeyDataServiceImpl.java
......@@ -30,9 +30,10 @@ public class KeyDataServiceImpl implements KeyDataService {
private TabKeyDataMapper tabKeyDataMapper;
@Override
public KeyDataDTO saveData(String relationId , String data, KeyDataEnum dataEnum) {
public KeyDataDTO saveData(String enterpriseId , String relationId , String data, KeyDataEnum dataEnum) {
KeyDataDTO dto = new KeyDataDTO();
dto.setRelationId(relationId);
dto.setEnterpriseId(enterpriseId);
dto.setDataKey(generateKey(dataEnum));
dto.setCreateTime(new Date());
dto.setId(UniqueIdUtils.uniqueLong());
......@@ -44,12 +45,12 @@ public class KeyDataServiceImpl implements KeyDataService {
}
@Override
public String saveHmData(String unionid, Long linkId, Long hmId) {
public String saveHmData(String enterpriseId , String unionid, Long linkId, Long hmId) {
JSONObject json = new JSONObject();
json.put("unid", unionid);
json.put("ljid", linkId);
json.put("hmid", hmId);
KeyDataDTO data = this.saveData(String.valueOf(linkId), json.toString(), KeyDataEnum.DYNAMIC_HM);
KeyDataDTO data = this.saveData(enterpriseId,String.valueOf(linkId), json.toString(), KeyDataEnum.DYNAMIC_HM);
return data.getDataKey();
}
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/KeyDataApiServiceImpl.java
......@@ -19,11 +19,11 @@ public class KeyDataApiServiceImpl implements KeyDataApiService {
private KeyDataService keyDataService;
@Override
public ServiceResponse<String> saveMobileData(Long linkId, String mobile) {
public ServiceResponse<String> saveMobileData(String enterpiseId , Long linkId, String mobile) {
JSONObject json = new JSONObject();
json.put("ph", mobile);
json.put("ljid", linkId);
KeyDataDTO keyData = this.keyDataService.saveData(String.valueOf(linkId), json.toString(), KeyDataEnum.MOBILE);
KeyDataDTO keyData = this.keyDataService.saveData(enterpiseId,String.valueOf(linkId), json.toString(), KeyDataEnum.MOBILE);
return ServiceResponse.success(keyData.getDataKey());
}
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/hm/HmLinkApiServiceImpl.java
package com.gic.haoban.manage.service.service.out.impl.hm;
import java.util.ArrayList;
import java.util.List;
import java.util.Random;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.gic.api.base.commons.BasePageInfo;
import com.gic.api.base.commons.Page;
import com.gic.api.base.commons.ServiceResponse;
import com.gic.clerk.api.dto.ClerkDTO;
import com.gic.clerk.api.service.ClerkService;
import com.gic.commons.util.EntityUtil;
import com.gic.enterprise.api.service.StoreService;
import com.gic.haoban.manage.api.dto.hm.HmLinkDTO;
......@@ -22,9 +28,11 @@ import com.gic.haoban.manage.api.dto.qdto.hm.HmLinkSearchQDTO;
import com.gic.haoban.manage.api.service.hm.HmLinkApiService;
import com.gic.haoban.manage.service.entity.hm.TabHmLink;
import com.gic.haoban.manage.service.errorcode.HaoBanErrCode;
import com.gic.haoban.manage.service.pojo.bo.hm.HmQrcodeBO;
import com.gic.haoban.manage.service.service.KeyDataService;
import com.gic.haoban.manage.service.service.hm.HmLinkService;
import com.gic.haoban.manage.service.service.hm.HmLinkStoreService;
import com.gic.haoban.manage.service.service.hm.HmQrcodeService;
import com.gic.member.api.dto.es.MemberDataDTO;
import com.gic.member.api.dto.es.MemberStoreClerkDataDTO;
import com.gic.member.api.service.MemberService;
......@@ -49,6 +57,10 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
private ESDataDynamicOperationApiService esApiService;
@Autowired
private StoreService storeService;
@Autowired
private HmQrcodeService hmQrcodeService;
@Autowired
private ClerkService clerkService;
@Override
public ServiceResponse<HmLinkDTO> getByLinkId(String wxEnterpriseId, String enterpriseId, Long linkId) {
......@@ -64,8 +76,9 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
}
@Override
public ServiceResponse<List<HmLinkDTO>> listForSms(String wxEnterpriseId, String enterprieId, String linkName) {
return ServiceResponse.success(this.hmLinkService.listForSms(wxEnterpriseId, enterprieId, linkName));
public ServiceResponse<List<HmLinkDTO>> listForSms(String wxEnterpriseId, String enterprieId, String linkName,
Integer linkType) {
return ServiceResponse.success(this.hmLinkService.listForSms(wxEnterpriseId, enterprieId, linkName, linkType));
}
@Override
......@@ -79,70 +92,190 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
}
@Override
public ServiceResponse<HmLinkWxaDTO> getLinkHmFromWxa(String enterpriseId, String storeId, String clerkId,
String linkId, String mixPhone, String unionid) {
log.info("小程序获取活码={},linkId={},mixPhone={}", enterpriseId, linkId, mixPhone);
Long hmLinkId = Long.parseLong(linkId);
TabHmLink link = this.hmLinkService.getByLinkId(null, null, hmLinkId);
public ServiceResponse<HmLinkWxaDTO> getLinkHmFromWxa(String enterpriseId, Integer whitchStore, String inStoreId,
String inClerkId, String linkIdStr, String mixPhone, String unionid) {
HmQrcodeBO hm = null;
HmLinkWxaDTO retDTO = new HmLinkWxaDTO();
log.info("小程序获取活码={},linkId={},mixPhone={}", enterpriseId, linkIdStr, mixPhone);
Long linkId = Long.parseLong(linkIdStr);
TabHmLink link = this.hmLinkService.getByLinkId(null, null, linkId);
String wxEnterpriseId = link.getWxEnterpriseId();
// 判断导购是否有活码,如果没有返回错误
if (StringUtils.isNotBlank(clerkId)) {
if (StringUtils.isNotBlank(inClerkId)) {
hm = this.getHmFromClerk(inClerkId, wxEnterpriseId);
if (null == hm) {
return ServiceResponse.failure(HaoBanErrCode.ERR_OTHER.getCode(), "导购活码不存在");
}
}
// 直接返回门店的导购活码,如果没有返回错误
if (StringUtils.isNotBlank(storeId)) {
}
HmLinkStoreSettingDTO fwStore = null;
HmLinkStoreSettingDTO xgStore = null;
if (StringUtils.isNotBlank(link.getStoreRuleJson())) {
String storeRuleJson = link.getStoreRuleJson();
JSONObject storeRuleObj = JSONObject.parseObject(storeRuleJson);
fwStore = storeRuleObj.getObject("fw_store", HmLinkStoreSettingDTO.class);
if (null == fwStore || fwStore.getOpen() == 0) {
fwStore = null;
}
xgStore = storeRuleObj.getObject("xg_store", HmLinkStoreSettingDTO.class);
if (null == xgStore || xgStore.getOpen() == 0) {
xgStore = null;
if (null == hm && StringUtils.isNotBlank(inStoreId)) {
String customRuleJson = link.getCustomRuleJson();
log.info("自定义规则={}", customRuleJson);
JSONObject storeRuleObj = JSONObject.parseObject(customRuleJson);
int openFlag = storeRuleObj.getIntValue("open");
if (openFlag == 1) {
int dz = 0, dy = 0;
// 1推荐门店 2附件门店 3省市区门店
int storeType = storeRuleObj.getIntValue("store_type");
// 省市区
if (whitchStore == 3) {
HmLinkStoreSettingDTO cityStore = storeRuleObj.getObject("city_store", HmLinkStoreSettingDTO.class);
dz = cityStore.getDz();
dy = cityStore.getDy();
}
if (whitchStore == 1 || whitchStore == 2) {
HmLinkStoreSettingDTO store = storeRuleObj.getObject("store", HmLinkStoreSettingDTO.class);
if (whitchStore == 2 || (storeType == 1 && whitchStore == 1)) {
// 附近门店 或者 推荐门店
dz = store.getDz();
dy = store.getDy();
} else if (storeType == 2 && whitchStore == 1) {
// 附近门店的推荐门店
dz = store.getNdz();
dy = store.getNdy();
}
}
hm = this.getHmFormStore(wxEnterpriseId, inStoreId, dz, dy);
log.info("获取到的门店配置dz={},dy={},获取的活码={}", dz, dy, JSON.toJSONString(hm));
if (null == hm) {
return ServiceResponse.failure(HaoBanErrCode.ERR_OTHER.getCode(), "导购活码不存在");
}
}
}
// 会员门店
if (StringUtils.isNotEmpty(mixPhone) && (null != fwStore || null != xgStore)) {
String mobile = this.keyDataService.getMobile(mixPhone, linkId);
log.info("小程序获取活码mobile={}", mobile);
String memberId = this.memberService.getMemberIdByPhoneNumber(mobile, enterpriseId);
log.info("小程序获取活码memberId={}", memberId);
MemberDataDTO member = this.getMemberClerk(enterpriseId, memberId);
String mainClerkId = member.getMainClerkId();
List<MemberStoreClerkDataDTO> list = member.getStoreClerkRel() ;
for(int i=0;i<list.size();i++) {
if (null == hm && StringUtils.isNotEmpty(mixPhone)) {
HmLinkStoreSettingDTO fwStore = null;
HmLinkStoreSettingDTO xgStore = null;
if (StringUtils.isNotBlank(link.getStoreRuleJson())) {
String storeRuleJson = link.getStoreRuleJson();
log.info("会员门店规则={}", storeRuleJson);
JSONObject storeRuleObj = JSONObject.parseObject(storeRuleJson);
fwStore = storeRuleObj.getObject("fw_store", HmLinkStoreSettingDTO.class);
if (null == fwStore || fwStore.getOpen() == 0) {
fwStore = null;
}
xgStore = storeRuleObj.getObject("xg_store", HmLinkStoreSettingDTO.class);
if (null == xgStore || xgStore.getOpen() == 0) {
xgStore = null;
}
String mobile = this.keyDataService.getMobile(mixPhone, linkIdStr);
log.info("小程序获取活码mobile={}", mobile);
String memberId = this.memberService.getMemberIdByPhoneNumber(mobile, enterpriseId);
log.info("小程序获取活码memberId={}", memberId);
MemberDataDTO member = this.getMemberClerk(enterpriseId, memberId);
String mainClerkId = member.getMainClerkId();
String mainStoreId = member.getMainStoreId();
// 服务门店
if (null != fwStore) {
if (fwStore.getZs() == 1) {
hm = this.getHmFromClerk(mainClerkId, wxEnterpriseId);
}
if (null == hm) {
hm = this.getHmFormStore(wxEnterpriseId, mainStoreId, fwStore.getDz(), fwStore.getDy());
}
}
// 协管门店
if (null == hm && null != xgStore) {
List<MemberStoreClerkDataDTO> list = member.getStoreClerkRel();
List<String> storeIdList = new ArrayList<>();
// 协管导购
for (MemberStoreClerkDataDTO item : list) {
String clerkId = item.getClerkIdRel();
if (clerkId.equals(mainClerkId)) {
continue;
}
hm = this.getHmFromClerk(clerkId, wxEnterpriseId);
if (null != hm) {
break;
}
storeIdList.add(item.getStoreIdRel());
}
// 店长
if (null == hm && xgStore.getDz() == 1) {
for (String storeId : storeIdList) {
hm = this.getHmFormStore(wxEnterpriseId, storeId, 1, 0);
if (null != hm) {
break;
}
}
}
// 店员
if (null == hm && xgStore.getDy() == 1) {
for (String storeId : storeIdList) {
hm = this.getHmFormStore(wxEnterpriseId, storeId, 0, 1);
if (null != hm) {
break;
}
}
}
}
}
}
if (StringUtils.isNotBlank(link.getCustomRuleJson())) {
if (null == hm && StringUtils.isNotBlank(link.getCustomRuleJson())) {
String customRuleJson = link.getCustomRuleJson();
log.info("自定义规则={}", customRuleJson);
JSONObject storeRuleObj = JSONObject.parseObject(customRuleJson);
int openFlag = storeRuleObj.getIntValue("open");
if (openFlag == 1) {
// 门店规则1推荐门店 2附件门店
int storeType = storeRuleObj.getIntValue("store_type");
List<HmLinkStoreDTO> storeList = this.hmLinkStoreService.listByLinkId(wxEnterpriseId, enterpriseId,
linkId);
log.info("门店规则={},推荐门店列表={}", storeType, JSON.toJSONString(storeList));
HmLinkStoreSettingDTO cityStore = storeRuleObj.getObject("city_store", HmLinkStoreSettingDTO.class);
// 是否开启省市区门店查询
int selectStoreFlag = cityStore.getOpen();
log.info("省市区开启={}", selectStoreFlag);
retDTO.setStoreType(storeType);
retDTO.setStoreList(storeList);
retDTO.setSelectStoreFlag(selectStoreFlag);
}
}
// 查询活码
Long hmId = null;
String key = this.keyDataService.saveHmData(unionid, hmLinkId, hmId);
if (null != hm) {
}
String key = this.keyDataService.saveHmData(enterpriseId,unionid, linkId, 100L);
// 生成动态活码
log.info(JSON.toJSONString(retDTO, true));
return ServiceResponse.success(retDTO);
}
private HmQrcodeBO getHmFromClerk(String clerkId, String wxEnterpriseId) {
if (StringUtils.isBlank(clerkId) || "-1".equals(clerkId)) {
return null;
}
List<HmQrcodeBO> hmList = this.hmQrcodeService.listByClerkId(clerkId, wxEnterpriseId);
if (CollectionUtils.isNotEmpty(hmList)) {
return hmList.get(0);
}
return null;
}
private HmQrcodeBO getHmFormStore(String wxEnterpriseId, String inStoreId, int dz, int dy) {
if (StringUtils.isBlank(inStoreId) || "-1".equals(inStoreId)) {
return null;
}
HmQrcodeBO hm = null;
if (dz == 1) {
ClerkDTO dzClerk = this.clerkService.getClerkLeaderByStoreId(inStoreId);
if (null != dzClerk) {
hm = this.getHmFromClerk(dzClerk.getClerkId(), wxEnterpriseId);
} else {
log.info("店长不存在,storeId={}", inStoreId);
}
}
if (null == hm && dy == 1) {
List<HmQrcodeBO> list = this.hmQrcodeService.listByStoreId(inStoreId, 0);
if (CollectionUtils.isNotEmpty(list)) {
hm = list.get(new Random().nextInt(list.size()));
}
}
return hm;
}
// 冗余会员信息
private MemberDataDTO getMemberClerk(String enterpriseId, String memberId) {
String returnFields = "memberId,mainClerkId,storeClerkRel";
String returnFields = "memberId,mainClerkId,mainStoreId,storeClerkRel";
JSONObject memberObj = this.queryDataSingle(enterpriseId, memberId, returnFields);
if (null == memberObj) {
return null;
......
haoban-manage3-service/src/main/resources/mapper/TabKeyDataMapper.xml
......@@ -4,6 +4,7 @@
<resultMap type="com.gic.haoban.manage.service.entity.TabKeyData"
id="result-map-tabHaobanKeyData">
<result column="id" property="id" />
<result column="enterprise_id" property="enterpriseId" />
<result column="relation_id" property="relationId" />
<result column="data_key" property="dataKey" />
<result column="data" property="data" />
......@@ -14,13 +15,14 @@
data_key,
data,
type,
create_time
create_time , enterpriseId , relation_id
</sql>
<!-- ===================== 新增 ======================== -->
<insert id="insert" parameterType="com.gic.haoban.manage.service.entity.TabKeyData">
<![CDATA[
INSERT INTO tab_haoban_key_data(
id,
enterprise_id,
relation_id ,
data_key,
data,
......@@ -28,6 +30,7 @@
create_time
)VALUES(
#{id},
#{enterpriseId} ,
#{relationId} ,
#{dataKey,jdbcType=VARCHAR},
#{data,jdbcType=VARCHAR},
......
haoban-manage3-service/src/main/resources/mapper/hm/HmLinkMapper.xml
......@@ -118,6 +118,9 @@
<if test="null != linkName">
and name like '%${linkName}%'
</if>
<if test="null != linkType">
and link_type = #{linkType}
</if>
and status_flag = 1
limit 20
</select>
......
haoban-manage3-service/src/test/java/HmLinkTest.java
......@@ -33,7 +33,12 @@ public class HmLinkTest {
@Autowired
private HmLinkStoreService hmLinkStoreService;
@Test
public void getLinkHmFromWxa(){
this.hmLinkApiService.getLinkHmFromWxa("ff8080815dacd3a2015dacd3ef5c0000", null, null, null, "417109414906961921", "ubkCBFK", null) ;
}
@Test
public void saveLinkStore() {
HmLinkStoreDTO dto = new HmLinkStoreDTO();
......@@ -110,7 +115,7 @@ public class HmLinkTest {
@Test
public void test3() {
this.keyDataApiService.saveMobileData(10000L, "15999") ;
this.keyDataApiService.saveMobileData("112",10000L, "15999") ;
System.out.println(this.keyDataApiService.getDataByKey("679f17d8c2e940a28dc484689c0339db", KeyDataEnum.MOBILE));
}
......
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/hm/HmLinkController.java
......@@ -12,6 +12,7 @@ import org.springframework.web.bind.annotation.RestController;
import com.gic.api.base.commons.BasePageInfo;
import com.gic.api.base.commons.Page;
import com.gic.api.base.commons.ServiceResponse;
import com.gic.commons.webapi.reponse.RestResponse;
import com.gic.haoban.base.api.common.pojo.dto.WebLoginDTO;
import com.gic.haoban.common.utils.AuthWebRequestUtil;
import com.gic.haoban.common.utils.HaobanResponse;
......@@ -43,7 +44,7 @@ public class HmLinkController extends WebBaseController {
private WelcomeApiService welcomeApiService;
@RequestMapping("add")
public HaobanResponse save(@RequestBody HmLinkDTO dto) {
public RestResponse save(@RequestBody HmLinkDTO dto) {
WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
dto.setCreatorId(loginUser.getClerkId());
dto.setCreatorName(loginUser.getClerkName());
......@@ -52,35 +53,35 @@ public class HmLinkController extends WebBaseController {
dto.setWxEnterpriseId(loginUser.getWxEnterpriseId());
dto.setEnterpriseId(loginUser.getEnterpriseId());
this.hmLinkApiService.save(dto);
return this.success(null);
return RestResponse.successResult();
}
@RequestMapping("update")
public HaobanResponse update(@RequestBody HmLinkDTO dto) {
public RestResponse update(@RequestBody HmLinkDTO dto) {
WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
dto.setModifierId(loginUser.getClerkId());
dto.setModifierName(loginUser.getClerkName());
this.hmLinkApiService.save(dto);
return this.success(null);
return RestResponse.successResult();
}
@RequestMapping("page")
public HaobanResponse page(HmLinkSearchQDTO qdto, BasePageInfo basePageInfo) {
public RestResponse page(HmLinkSearchQDTO qdto, BasePageInfo basePageInfo) {
WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
qdto.setWxEnterpriseId(loginUser.getWxEnterpriseId());
qdto.setEnterpriseId(loginUser.getEnterpriseId());
ServiceResponse<Page<HmLinkDTO>> page = this.hmLinkApiService.listPage(qdto, basePageInfo);
return this.success(page.getResult());
return RestResponse.successResult(page.getResult());
}
@RequestMapping("detail")
public HaobanResponse detail(Long linkId) {
public RestResponse detail(Long linkId) {
WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
String wxEnterpriseId = loginUser.getWxEnterpriseId();
String enterpriseId = loginUser.getEnterpriseId();
ServiceResponse<HmLinkDTO> linkResp = this.hmLinkApiService.getByLinkId(wxEnterpriseId, enterpriseId, linkId);
if (!linkResp.isSuccess()) {
return this.fail("链接不存在");
return RestResponse.failure("1", "链接不存在");
}
HmLinkDTO link = linkResp.getResult();
Map<String, Object> retMap = new HashMap<>();
......@@ -98,7 +99,7 @@ public class HmLinkController extends WebBaseController {
retMap.put("welcome", resp.getResult());
}
}
return this.success(retMap);
return RestResponse.successResult(retMap);
}
}
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