活码

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/hm/HmLinkApiService.java

@@ -20,6 +20,8 @@ import com.gic.haoban.manage.api.dto.qdto.hm.HmLinkSearchQDTO;
 public interface HmLinkApiService {
 
     public ServiceResponse<HmLinkDTO> getByLinkId(String wxEnterpriseId, String enterprieId, Long linkId);
+    
+    public ServiceResponse<HmLinkDTO> getByShortCode(String shortCode);
 
     /**
      * 

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/hm/HmLinkMapper.java

@@ -50,8 +50,7 @@ public interface HmLinkMapper {
     * @return
     * @throws
      */
-    public TabHmLink selectByShortCode(@Param("enterpriseId") String enterpriseId,
-            @Param("shortCode") String shortCode);
+    public TabHmLink selectByShortCode(@Param("shortCode") String shortCode);
 
     public List<TabHmLink> listForSms(@Param("wxEnterpriseId") String wxEnterpriseId,
             @Param("enterpriseId") String enterpriseId, @Param("linkName") String linkName,

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/hm/HmLinkService.java

@@ -13,7 +13,7 @@ public interface HmLinkService {
 
     public HmLinkBO getByLinkId(String wxEnterpriseId, String enterprieId,Long linkId);
     
-    public HmLinkBO getByLinkShortCode(String enterprieId,String shortCode);
+    public HmLinkBO getByLinkShortCode(String shortCode);
     
     public HmLinkBO getByLinkIdFormCache(String wxEnterpriseId, String enterprieId,Long linkId);
 

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/hm/impl/HmLinkServiceImpl.java

@@ -52,8 +52,8 @@ public class HmLinkServiceImpl implements HmLinkService {
     }
     
     @Override
-    public HmLinkBO getByLinkShortCode(String enterpriseId, String shortCode) {
-        TabHmLink link = this.linkMapper.selectByShortCode(enterpriseId, shortCode);
+    public HmLinkBO getByLinkShortCode(String shortCode) {
+        TabHmLink link = this.linkMapper.selectByShortCode(shortCode);
         if(null == link) {
             return null ;
         }
@@ -135,7 +135,7 @@ public class HmLinkServiceImpl implements HmLinkService {
         }
         sb.append(PADDING[(int) (Math.random() * totalLength)]);
         String code =  sb.toString();
-        TabHmLink link = this.linkMapper.selectByShortCode(enterpriseId, code) ;
+        TabHmLink link = this.linkMapper.selectByShortCode(code) ;
         if(null == link) {
             return code ;
         }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/hm/HmLinkApiServiceImpl.java

@@ -89,22 +89,32 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
     }
 
     @Override
+    public ServiceResponse<HmLinkDTO> getByShortCode(String shortCode) {
+        HmLinkBO bo = this.hmLinkService.getByLinkShortCode(shortCode);
+        if (null == bo) {
+            return ServiceResponse.failure(HaoBanErrCode.ERR_OTHER.getCode(), "链接不存在");
+        }
+        HmLinkDTO dto = EntityUtil.changeEntityByJSON(HmLinkDTO.class, bo);
+        return ServiceResponse.success(dto);
+    }
+
+    @Override
     public ServiceResponse<List<HmLinkDTO>> listForSms(String wxEnterpriseId, String enterprieId, String linkName,
             Integer linkType) {
-        List<HmLinkBO> list = this.hmLinkService.listForSms(wxEnterpriseId, enterprieId, linkName, linkType) ;
-        List<HmLinkDTO> retList = EntityUtil.changeEntityListByJSON(HmLinkDTO.class, list) ;
+        List<HmLinkBO> list = this.hmLinkService.listForSms(wxEnterpriseId, enterprieId, linkName, linkType);
+        List<HmLinkDTO> retList = EntityUtil.changeEntityListByJSON(HmLinkDTO.class, list);
         return ServiceResponse.success(retList);
     }
 
     @Override
     public ServiceResponse<String> save(HmLinkDTO dto) {
-        String id = this.hmLinkService.saveLink(dto, dto.getStoreList()) ;
+        String id = this.hmLinkService.saveLink(dto, dto.getStoreList());
         return ServiceResponse.success(id);
     }
 
     @Override
     public ServiceResponse<Page<HmLinkDTO>> listPage(HmLinkSearchQDTO qdto, BasePageInfo basePageInfo) {
-        Page<HmLinkBO> page = this.hmLinkService.listPage(qdto, basePageInfo) ;
+        Page<HmLinkBO> page = this.hmLinkService.listPage(qdto, basePageInfo);
         Page<HmLinkDTO> resultPage = PageHelperUtils.changePageToCurrentPage(page, HmLinkDTO.class);
         return ServiceResponse.success(resultPage);
     }
@@ -115,7 +125,7 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
         HmQrcodeBO hm = null;
         HmLinkWxaDTO retDTO = new HmLinkWxaDTO();
         log.info("小程序获取活码={},linkShortCode={},mixPhone={}", enterpriseId, linkShortCode, mixPhone);
-        HmLinkBO link = this.hmLinkService.getByLinkShortCode(enterpriseId, linkShortCode);
+        HmLinkBO link = this.hmLinkService.getByLinkShortCode(linkShortCode);
         if (null == link) {
             log.error("链接记录不存,linkShortCode={}", linkShortCode);
             return ServiceResponse.failure(HaoBanErrCode.ERR_OTHER.getCode(), "链接记录不存");

haoban-manage3-service/src/main/resources/mapper/hm/HmLinkMapper.xml

@@ -115,7 +115,7 @@
   </select>
   
   <select id="selectByShortCode" resultMap="result-map-tabHaobanHmLink">
-    SELECT <include refid="Base_Column_List" /> FROM tab_haoban_hm_link WHERE  enterprise_id=#{enterpriseId} and short_code=#{shortCode} and status_flag = 1
+    SELECT <include refid="Base_Column_List" /> FROM tab_haoban_hm_link WHERE   short_code=#{shortCode} and status_flag = 1
   </select>
   
   <select id="listForSms"  resultMap="result-map-tabHaobanHmLink">