预设二维码列表/机构关联

src/main/java/com/caimei/controller/wechat/WxAuthApi.java

@@ -366,7 +366,7 @@ public class WxAuthApi {
     @ApiOperation("已认证商品详情")
     @ApiImplicitParam(required = false, name = "productId", value = "正品联盟商品Id")
     @GetMapping("/product/details")
-    public ResponseJson<AuthProductVo> getAuthProductDetails(Integer productId) {
+    public ResponseJson<AuthProductVo> getAuthProductDetails(String productId) {
         return authProductService.getAuthProductDetails(productId);
     }
 

src/main/java/com/caimei/mapper/cmMapper/AuthProductMapper.java

@@ -125,4 +125,6 @@ public interface AuthProductMapper {
     List<ProductListVo> getPronductInfo(Integer authId, Integer authUserId);
 
     Integer getNewestRelationId();
+
+    Integer findProductByQr(String substring);
 }

src/main/java/com/caimei/service/auth/AuthProductService.java

@@ -129,7 +129,7 @@ public interface AuthProductService {
      * @param productId     商品id
      * @return
      */
-    ResponseJson<AuthProductVo> getAuthProductDetails(Integer productId);
+    ResponseJson<AuthProductVo> getAuthProductDetails(String productId);
 
     /**
      * 保存设备分类

src/main/java/com/caimei/service/auth/impl/AuthClubServiceImpl.java

@@ -57,43 +57,43 @@ public class AuthClubServiceImpl implements AuthClubService {
     }
 
     @Override
-    public ResponseJson<PageInfo<ClubUserVo>> getClubUserList(Integer authUserId, String mobile, String name, Integer status, Integer pageNum, Integer pageSize,Integer authenticationStatus) {
-       //判断筛选条件是否是认证机构
-        if(null==authenticationStatus){
+    public ResponseJson<PageInfo<ClubUserVo>> getClubUserList(Integer authUserId, String mobile, String name, Integer status, Integer pageNum, Integer pageSize, Integer authenticationStatus) {
+        //判断筛选条件是否是认证机构
+        if (null == authenticationStatus) {
             //查询全部
             PageHelper.startPage(pageNum, pageSize);
             List<ClubUserVo> clubUserList = clubMapper.getAllCertifiedClubUserList(authUserId, mobile, name, status);
             clubUserList.forEach(clubUserVo -> {
-                if(null!=clubUserVo.getAuthId()){
+                if (null != clubUserVo.getAuthId()) {
                     clubUserVo.setAuthenticationStatus("1");
-                }else {
+                } else {
                     clubUserVo.setAuthenticationStatus("0");
                 }
             });
             PageInfo<ClubUserVo> pageData = new PageInfo<>(clubUserList);
             return ResponseJson.success(pageData);
         }
-        if(authenticationStatus==0){
+        if (authenticationStatus == 0) {
             //查询未认证的机构
             PageHelper.startPage(pageNum, pageSize);
-            List<ClubUserVo> clubUserList = clubMapper.getNotCertifiedClubUserList(authUserId, mobile, name, status,authenticationStatus);
+            List<ClubUserVo> clubUserList = clubMapper.getNotCertifiedClubUserList(authUserId, mobile, name, status, authenticationStatus);
             clubUserList.forEach(clubUserVo -> {
-                if(null!=clubUserVo.getAuthId()){
+                if (null != clubUserVo.getAuthId()) {
                     clubUserVo.setAuthenticationStatus("1");
-                }else {
+                } else {
                     clubUserVo.setAuthenticationStatus("0");
                 }
             });
             PageInfo<ClubUserVo> pageData = new PageInfo<>(clubUserList);
             return ResponseJson.success(pageData);
-        }else{
+        } else {
             //查询已认证的机构
             PageHelper.startPage(pageNum, pageSize);
             List<ClubUserVo> clubUserList = clubMapper.getClubUserList(authUserId, mobile, name, status);
             clubUserList.forEach(clubUserVo -> {
-                if(null!=clubUserVo.getAuthId()){
+                if (null != clubUserVo.getAuthId()) {
                     clubUserVo.setAuthenticationStatus("1");
-                }else {
+                } else {
                     clubUserVo.setAuthenticationStatus("0");
                 }
             });
@@ -151,7 +151,7 @@ public class AuthClubServiceImpl implements AuthClubService {
         clubDetail.setProductList(wxProductList);
         // 操作医师列表
         List<WxDoctorListVo> doctorList = doctorMapper.getWxDoctorList(null, authId, 1, null);
-        doctorList.forEach(doctor->{
+        doctorList.forEach(doctor -> {
             List<String> tagList = doctorMapper.getTagList(doctor.getDoctorId());
             doctor.setTagList(tagList);
         });
@@ -200,7 +200,7 @@ public class AuthClubServiceImpl implements AuthClubService {
             } else {
                 shopName = shop.getShopName();
             }
-            String content = "（"+ shopName +"）您认证通登录密码为：rzt123456，请勿泄漏于他人。【采美网提供技术支持】";
+            String content = "（" + shopName + "）您认证通登录密码为：rzt123456，请勿泄漏于他人。【采美网提供技术支持】";
             Boolean sendSms = SmsUtils.sendSms(1, mobile, content);
             if (!sendSms) {
                 log.info("供应商添加机构用户-密码发送失败，手机号:" + mobile);
@@ -219,28 +219,29 @@ public class AuthClubServiceImpl implements AuthClubService {
 
     /**
      * 认证通1.7.7ROSS挑战赛挑战赛活动开启期间新增用户短信发送
+     *
      * @param authUserId
      */
-    public void smsRossRound(Integer authUserId,String mobile){
+    public void smsRossRound(Integer authUserId, String mobile) {
         //获取手机号码
 //        List<RossChallengeRoundVo> roundByAuthUserID = authMapper.getRoundByAuthUserID(authUserId);
 //        List<ClubUserVo> clubUserList = clubMapper.getClubUserList(authUserId, null, null, null);
         //如果活动已经开始了，则用户报名成功后向用户发送短信
-        if(null!=authUserId){
+        if (null != authUserId) {
             ChallengeActivityVo activityTime = authMapper.getActivityTime(authUserId);
-            String shortLink =getShortLink(8, 3, zpServer+"/12/ross/activity/challenge");
+            String shortLink = getShortLink(8, 3, zpServer + "/12/ross/activity/challenge");
             //判断活动是否开启
-            if(null!=activityTime &&null!=authUserId&&null!=activityTime.getStatus()&&activityTime.getStatus()==1){
+            if (null != activityTime && null != authUserId && null != activityTime.getStatus() && activityTime.getStatus() == 1) {
                 //获取供应商名称
-                String authParty=authMapper.getAuthparty(authUserId);
-                if(authUserId==12){
-                    authParty="西班牙ROSS";
+                String authParty = authMapper.getAuthparty(authUserId);
+                if (authUserId == 12) {
+                    authParty = "西班牙ROSS";
                 }
                 //生成短连接
                 //短信类型：1通知短信，2验证码短信，3营销短信
-                Integer type=3;
-                String conn="[" + authParty + "]尊敬的会员，ROSS视频挑战赛报名通道已开启，点此进入www.caimei365.com/t/"+shortLink+" ROSS认证通，了解详情。【采美网提供技术支持】";
-                if(StringUtils.isNotEmpty(mobile)){
+                Integer type = 3;
+                String conn = "[" + authParty + "]尊敬的会员，ROSS视频挑战赛报名通道已开启，点此进入www.caimei365.com/t/" + shortLink + " ROSS认证通，了解详情。【采美网提供技术支持】";
+                if (StringUtils.isNotEmpty(mobile)) {
                     Boolean aBoolean = SmsUtils.sendSms(type, mobile, conn);
 //                    if(aBoolean){
 //                        log.info("挑战赛短信发送成功"+mobile);
@@ -270,6 +271,7 @@ public class AuthClubServiceImpl implements AuthClubService {
         clubMapper.insertShortLink(markId, shortLink, url);
         return shortLink;
     }
+
     @Override
     public ResponseJson deleteClubUser(Integer clubUserId) {
         clubMapper.deleteClubUser(clubUserId);
@@ -300,7 +302,7 @@ public class AuthClubServiceImpl implements AuthClubService {
         } else {
             shopName = shop.getShopName();
         }
-        String content = "（"+ shopName +"）您认证通登录密码为：rzt123456，请勿泄漏于他人。【采美网提供技术支持】";
+        String content = "（" + shopName + "）您认证通登录密码为：rzt123456，请勿泄漏于他人。【采美网提供技术支持】";
         Boolean sendSms = SmsUtils.sendSms(1, mobile, content);
         if (!sendSms) {
             log.info("机构用户重置密码发送失败，手机号:" + mobile);
@@ -316,13 +318,14 @@ public class AuthClubServiceImpl implements AuthClubService {
         List<WxClubListVo> starClubList = clubMapper.getWxStarClubList(authUserId);
         return ResponseJson.success(starClubList);
     }
+
     @Override
-    public ResponseJson saveBindAuth(Integer authId,String authParty,Integer authUserId,Integer clubUserId){
-        clubMapper.saveBindAuth(authId,authParty,authUserId,clubUserId);
+    public ResponseJson saveBindAuth(Integer authId, String authParty, Integer authUserId, Integer clubUserId) {
+        clubMapper.saveBindAuth(authId, authParty, authUserId, clubUserId);
         //1.7.7ross挑战赛新加逻辑：更新机构信息到挑战赛表
-        clubMapper.upAuthByid(clubUserId,authId);
+        clubMapper.upAuthByid(clubUserId, authId);
         //1.7.7ross挑战赛新加逻辑：更新机构信息到视频表
-        clubMapper.upVideoAuthByid(clubUserId,authId);
+        clubMapper.upVideoAuthByid(clubUserId, authId);
         return ResponseJson.success("绑定机构成功");
     }
 }

src/main/java/com/caimei/service/auth/impl/AuthProductServiceImpl.java

@@ -149,13 +149,13 @@ public class AuthProductServiceImpl implements AuthProductService {
         String productImage = productSaveDto.getProductImage();
         String snCode = productSaveDto.getSnCode();
         String certificateImage = productSaveDto.getCertificateImage();
-        String authImageLogo=productSaveDto.getAuthImageLogo();
+        String authImageLogo = productSaveDto.getAuthImageLogo();
         Integer certificateImageType = productSaveDto.getCertificateImageType();
         Integer createBy = productSaveDto.getCreateBy();
         String purchaseWay = productSaveDto.getPurchaseWay();
         String invoiceImage = productSaveDto.getInvoiceImage();
         Integer source = null == productSaveDto.getSource() ? 1 : productSaveDto.getSource();
-        List<String> snList=productSaveDto.getSnList();
+        List<String> snList = productSaveDto.getSnList();
         List<ProductParamPo> paramList = productSaveDto.getParamList();
         if (null == authId) {
             return ResponseJson.error("参数异常，请输入授权id", null);
@@ -207,7 +207,7 @@ public class AuthProductServiceImpl implements AuthProductService {
                 if (null != productIdBySnCode) {
                     return ResponseJson.error("该商品SN码已存在，请重新输入", null);
                 }
-            } else if (2 == authType){
+            } else if (2 == authType) {
                 // 关联设备
                 productId = productIdBySnCode;
                 // 检测机构是否已关联该设备
@@ -216,7 +216,7 @@ public class AuthProductServiceImpl implements AuthProductService {
                     return ResponseJson.error("不能重复关联同一台设备");
                 }
             }
-        }else {
+        } else {
             // 编辑
             dbRelation = authProductMapper.getProductRelation(relationId, null, null);
             dbProduct = authProductMapper.getProductFormData(relationId);
@@ -229,7 +229,7 @@ public class AuthProductServiceImpl implements AuthProductService {
                     if (null != productIdBySnCode && !productIdBySnCode.equals(productId)) {
                         return ResponseJson.error("该商品SN码已存在，请重新输入", null);
                     }
-                } else if (2 == authType){
+                } else if (2 == authType) {
                     productId = productIdBySnCode;
                     // 检测机构是否已关联该设备
                     ProductRelationVo productRelation = authProductMapper.getProductRelation(null, productId, authId);
@@ -237,7 +237,7 @@ public class AuthProductServiceImpl implements AuthProductService {
                         return ResponseJson.error("不能重复关联同一台设备");
                     }
                 }
-            } else if (2 == dbRelation.getAuthType()){
+            } else if (2 == dbRelation.getAuthType()) {
                 // 原本为关联设备
                 if (1 == authType) {
                     // 设备id为null
@@ -277,14 +277,14 @@ public class AuthProductServiceImpl implements AuthProductService {
         product.setCertificateImageType(certificateImageType);
         product.setAuthImageLogo(authImageLogo);
         String authDate = productSaveDto.getAuthDate();
-        product.setAuthDate(null!=authDate&&""!=authDate?authDate:null);
+        product.setAuthDate(null != authDate && "" != authDate ? authDate : null);
         // 购买渠道
         product.setPurchaseWay(purchaseWay);
         // 发票图片
         product.setInvoiceImage(invoiceImage);
         // 供应商保存，直接上线；机构保存，需要供应商审核通过后才上线
         if (1 == authType) {
-            product.setShopAuditStatus(1 ==   source ? 1 : 2);
+            product.setShopAuditStatus(1 == source ? 1 : 2);
             if (null != dbProduct && 1 != dbProduct.getAuditStatus()) {
                 // 被驳回的数据，编辑变为待审核状态
                 product.setStatus(2);
@@ -318,9 +318,9 @@ public class AuthProductServiceImpl implements AuthProductService {
                 authProductMapper.updateProductByProductId(product);
             }
             // 插入机构设备关联关系
-             authProductMapper.insertProductRelation(authId, product.getProductId(), authType);
+            authProductMapper.insertProductRelation(authId, product.getProductId(), authType);
             //查询最新关联id
-            relationId=authProductMapper.getNewestRelationId();
+            relationId = authProductMapper.getNewestRelationId();
         } else {
             if (1 == dbRelation.getAuthType()) {
                 // 更新设备
@@ -381,37 +381,38 @@ public class AuthProductServiceImpl implements AuthProductService {
         }
         return ResponseJson.success("保存授权商品成功");
     }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public  ResponseJson saveProductAndRelaTion(Integer authId,List<String> snlist,Integer authType) throws IOException{
+    public ResponseJson saveProductAndRelaTion(Integer authId, List<String> snlist, Integer authType) throws IOException {
         //判断机构关联id是否有值（有则机构关联关联了其他机构属于新增操作，无则属于编辑操作）
         String relaId = authProductMapper.getRelationId(authId);
-        List<Integer>  listSnId=new ArrayList<>();
-        if(null!=relaId&&!"".equals(relaId)){
+        List<Integer> listSnId = new ArrayList<>();
+        if (null != relaId && !"".equals(relaId)) {
             //根据sn码获取产品id
-            for(int i=0;i<snlist.size();i++){
+            for (int i = 0; i < snlist.size(); i++) {
                 List<ProductPo> List = authProductMapper.getSnList(snlist.get(i));
                 //判断本身机构下的设备和关联机构下 设备有不有重复的
-                if(List.get(0).getAuthId()!=authId){
+                if (List.get(0).getAuthId() != authId) {
                     listSnId.add(List.get(0).getProductId());
                 }
             }
             //根据产品id插入机构设备关联关系
-            for(int i=0;i<snlist.size();i++){
+            for (int i = 0; i < snlist.size(); i++) {
                 authProductMapper.insertProductRelation(authId, listSnId.get(i), authType);
             }
             return ResponseJson.success("保存授权商品成功");
-        }else{
+        } else {
             //根据sn码获取产品id
-            for(int i=0;i<snlist.size();i++){
+            for (int i = 0; i < snlist.size(); i++) {
                 List<ProductPo> List = authProductMapper.getSnList(snlist.get(i));
                 //判断本身机构下的设备和关联机构下 设备有不有重复的
-                if(List.get(0).getAuthId()!=authId){
+                if (List.get(0).getAuthId() != authId) {
                     listSnId.add(List.get(0).getProductId());
                 }
             }
             //根据产品id插入机构设备关联关系
-            for(int i=0;i<snlist.size();i++){
+            for (int i = 0; i < snlist.size(); i++) {
                 authProductMapper.insertProductRelation(authId, listSnId.get(i), authType);
             }
             return ResponseJson.success("保存授权商品成功");
@@ -444,6 +445,7 @@ public class AuthProductServiceImpl implements AuthProductService {
         }
         return null;
     }
+
     public String generateAuthImageLogo(TemplateVo authTemplate, ProductFormVo product) {
         if (null != authTemplate) {
             // 根据模板id设置相关数据
@@ -471,7 +473,7 @@ public class AuthProductServiceImpl implements AuthProductService {
         return null;
     }
 
-    private Map<String,Object> getTemplateInfo(TemplateVo template, ProductFormVo product) {
+    private Map<String, Object> getTemplateInfo(TemplateVo template, ProductFormVo product) {
         HashMap<String, Object> map = new HashMap<>();
         Integer templateId = template.getTemplateId();
         if (1 == templateId) {
@@ -519,7 +521,7 @@ public class AuthProductServiceImpl implements AuthProductService {
             // 添加二维码信息
             if (StringUtils.isNotEmpty(template.getQrPosition())) {
 //                String qrCodeLink = wwwServer + "/product/auth/product-" + product.getProductId() + ".html";
-                String qrCodeLink = zpapiServer + "/"+product.getCreateBy()+"/"+product.getPrefix()+"/approve/device/detail?id=" + product.getProductId() ;
+                String qrCodeLink = zpapiServer + "/" + product.getCreateBy() + "/" + product.getPrefix() + "/approve/device/detail?id=" + product.getProductId();
                 map.put("addQr1_link", qrCodeLink);
                 map.put("addQr1_size", template.getQrSize());
                 String[] split = template.getQrPosition().split(",");
@@ -532,7 +534,7 @@ public class AuthProductServiceImpl implements AuthProductService {
         return map;
     }
 
-    private Map<String,Object> getTemplateLogoInfo(TemplateVo template, ProductFormVo product) {
+    private Map<String, Object> getTemplateLogoInfo(TemplateVo template, ProductFormVo product) {
         HashMap<String, Object> map = new HashMap<>();
         Integer templateId = template.getTemplateId();
         if (1 == templateId) {
@@ -596,7 +598,7 @@ public class AuthProductServiceImpl implements AuthProductService {
         return map;
     }
 
-    private String addWaterMark(String image,Integer type) throws IOException {
+    private String addWaterMark(String image, Integer type) throws IOException {
         //type:1pc,2applets
         ClassPathResource classPathResource = new ClassPathResource("/images/newPcWaterMark.png");
         InputStream inputStreamImg = classPathResource.getInputStream();
@@ -645,8 +647,8 @@ public class AuthProductServiceImpl implements AuthProductService {
             paramList = authProductMapper.getParamsByProductId(productForm.getProductId());
         }
         productForm.setParamList(paramList);
-        if(null!=productForm.getAuthDates()){
-            SimpleDateFormat simpleDateFormat=new SimpleDateFormat("yyyy-MM-dd");
+        if (null != productForm.getAuthDates()) {
+            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
             String authDate = simpleDateFormat.format(productForm.getAuthDates());
             productForm.setAuthDate(authDate);
         }
@@ -661,7 +663,7 @@ public class AuthProductServiceImpl implements AuthProductService {
     @Override
     public ResponseJson updateAllWaterMark() {
         List<ProductPo> productList = authProductMapper.getAllImage();
-        productList.forEach(product->{
+        productList.forEach(product -> {
             try {
                 if (StringUtils.isNotEmpty(product.getImage())) {
                     //商品图片添加水印
@@ -775,7 +777,7 @@ public class AuthProductServiceImpl implements AuthProductService {
         }
         PageHelper.startPage(pageNum, pageSize);
         List<WxProductListVo> productList = authProductMapper.getWxProductList(listType, authId, authParty, productTypeId, snCode);
-        productList.forEach(product->{
+        productList.forEach(product -> {
             List<WxClubListVo> clubList = authProductMapper.getProductClubList(product.getProductId());
             product.setClubList(clubList);
         });
@@ -784,16 +786,23 @@ public class AuthProductServiceImpl implements AuthProductService {
     }
 
     @Override
-    public ResponseJson<AuthProductVo> getAuthProductDetails(Integer productId) {
-        AuthProductVo authProduct = authProductMapper.getAuthProductByProductId(productId);
+    public ResponseJson<AuthProductVo> getAuthProductDetails(String productId) {
+        Integer pid = 0;
+        if (productId.startsWith("HC")) {
+            String substring = productId.substring(2);
+            pid = authProductMapper.findProductByQr(substring);
+        }else{
+            pid = Integer.valueOf(productId);
+        }
+        AuthProductVo authProduct = authProductMapper.getAuthProductByProductId(pid);
         if (null == authProduct) {
             return ResponseJson.error("商品不存在", null);
         }
-        authProduct.setClubList(authProductMapper.getProductClubList(productId));
+        authProduct.setClubList(authProductMapper.getProductClubList(pid));
         // 商品参数
-        authProduct.setParamList(authProductMapper.getAuthProductParams(productId));
+        authProduct.setParamList(authProductMapper.getAuthProductParams(pid));
         // 增加扫码次数
-        authProductMapper.addScanCount(productId);
+        authProductMapper.addScanCount(pid);
         return ResponseJson.success(authProduct);
     }
 
@@ -838,8 +847,8 @@ public class AuthProductServiceImpl implements AuthProductService {
             // 创建时间
             productType.setCreateTime(new Date());
             // 设备分类图片添加水印
-            productType.setPcImage(addWaterMark(productType.getImage(),1));
-            productType.setAppletsImage(addWaterMark(productType.getImage(),2));
+            productType.setPcImage(addWaterMark(productType.getImage(), 1));
+            productType.setAppletsImage(addWaterMark(productType.getImage(), 2));
             // 插入设备分类
             authProductMapper.insertProductType(productType);
         } else {
@@ -897,16 +906,16 @@ public class AuthProductServiceImpl implements AuthProductService {
         List<ProductTypeListVo> productList = authProductMapper.getProductTypeList(listType, authUserId, name, status, auditStatus);
         //如果是手机号则进行脱敏处理
         //手机号脱敏处理（脱敏规则: 保留前三后四, 比如15638296218置换为156****6218）
-        if(null!=productList&&productList.size()>0){
+        if (null != productList && productList.size() > 0) {
             productList.forEach(authVo -> {
                 //判断是否是手机号
-                String phoneNumber=authVo.getCreateBy();
-                if(StringUtils.isNotEmpty(phoneNumber)){
+                String phoneNumber = authVo.getCreateBy();
+                if (StringUtils.isNotEmpty(phoneNumber)) {
 //                    boolean matches = phoneNumber.matches("^[1][3,4,5,7,8,9][0-9]{9}$");
 //                    if(matches){
-                        //脱敏处理
-                            phoneNumber = phoneNumber.replaceAll("(\\w{3})\\w*(\\w{4})", "$1****$2");
-                            authVo.setCreateBy(phoneNumber);
+                    //脱敏处理
+                    phoneNumber = phoneNumber.replaceAll("(\\w{3})\\w*(\\w{4})", "$1****$2");
+                    authVo.setCreateBy(phoneNumber);
 //                    }
                 }
             });
@@ -959,7 +968,7 @@ public class AuthProductServiceImpl implements AuthProductService {
 
     @Override
     public ResponseJson<ProductFormVo> getProductInfo(Integer productId, String snCode) {
-        ProductFormVo product =  authProductMapper.getProductInfo(productId, snCode);
+        ProductFormVo product = authProductMapper.getProductInfo(productId, snCode);
         if (null == product) {
             return ResponseJson.error(-1, "设备SN码不存在", null);
         }
@@ -976,7 +985,7 @@ public class AuthProductServiceImpl implements AuthProductService {
     public ResponseJson<List<ProductListVo>> getSnCodeList(Integer authUserId, Integer authId, Integer downStatus, String productName, String sncode, String authParty) {
         List<ProductListVo> snCodeList = new ArrayList<>();
         List<Integer> liallSn = authProductMapper.getAllSn(authId);
-        List<String> allSnlist =liallSn.size()==0?null: authProductMapper.getAllSnlist(liallSn);
+        List<String> allSnlist = liallSn.size() == 0 ? null : authProductMapper.getAllSnlist(liallSn);
         //判断机构筛选下拉框 0全部，1与其他机构关联
         if (1 == downStatus) {
             //判断该机构是否与其他机构关联
@@ -985,11 +994,11 @@ public class AuthProductServiceImpl implements AuthProductService {
             if (!"".equals(relationId) && null != relationId) {
                 relationIdList = relationId.split(",");
                 //获取该机构下relationIdList的sn码
-                snCodeList = authProductMapper.getSnCodeList(authUserId, authId, relationIdList, allSnlist,  productName,  sncode,  authParty);
+                snCodeList = authProductMapper.getSnCodeList(authUserId, authId, relationIdList, allSnlist, productName, sncode, authParty);
             }
-        }else {
+        } else {
             //获取该机构下所有的sn码
-            snCodeList = authProductMapper.getSnCodeList(authUserId, authId, null, allSnlist,  productName,  sncode,  authParty);
+            snCodeList = authProductMapper.getSnCodeList(authUserId, authId, null, allSnlist, productName, sncode, authParty);
         }
 
         return ResponseJson.success(snCodeList);
@@ -1002,7 +1011,7 @@ public class AuthProductServiceImpl implements AuthProductService {
         return ResponseJson.success();
     }
 
-    public ResponseJson<List<ProductListVo>> getPronductInfo( Integer authId,Integer authUserId){
+    public ResponseJson<List<ProductListVo>> getPronductInfo(Integer authId, Integer authUserId) {
         List<ProductListVo> pronductInfo = authProductMapper.getPronductInfo(authId, authUserId);
         return ResponseJson.success(pronductInfo);
     }

src/main/resources/mapper/AuthProductMapper.xml

@@ -583,4 +583,12 @@
     <select id="getNewestRelationId" resultType="java.lang.Integer">
     select id from cm_brand_product_relation order by id desc limit 1
     </select>
+    <select id="findProductByQr" resultType="java.lang.Integer">
+        SELECT cap.id
+        FROM cm_brand_auth_product cap
+        LEFT JOIN cm_brand_product_relation cbr ON cap.id = cbr.productId
+        LEFT JOIN cm_brand_auth_qrcode cbq ON cbq.authId = cbr.authId
+        WHERE cbq.id = #{substring}
+        LIMIT 1
+    </select>
 </mapper>