From 754d5526d180346a3e962ed615e033179876725c Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Mon, 25 Nov 2024 17:54:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E7=A5=A8=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cashier/service/impl/BindServiceImpl.java | 49 ++++++++++---------
 1 file changed, 25 insertions(+), 24 deletions(-)

diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/BindServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/BindServiceImpl.java
index 46c89573..c6978cbd 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/BindServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/BindServiceImpl.java
@@ -52,15 +52,15 @@ public class BindServiceImpl implements BindService {
         String result = HttpUtil.post(url + "cash/subinvoicing", params, 5000);
         JSONObject jsonObject = JSONObject.parseObject(result);
         if (jsonObject.getInteger("code").equals(1)) {
-            if (StringUtils.isNotBlank(shopId)) {
-                if (redisUtils.hasKey(CacheKey.INVOICE_SD_TYPE + shopId)) {
-                    Set<Object> articles = redisUtils.sGet(CacheKey.INVOICE_SD_TYPE + shopId);
-                    if (!articles.contains(params.get("article"))) {
-                        articles.add(params.get("article"));
-                        redisUtils.sSet(CacheKey.INVOICE_SD_TYPE + shopId, articles);
-                    }
-                }
-            }
+//            if (StringUtils.isNotBlank(shopId)) {
+//                if (redisUtils.hasKey(CacheKey.INVOICE_SD_TYPE + shopId)) {
+//                    Set<Object> articles = redisUtils.sGet(CacheKey.INVOICE_SD_TYPE + shopId);
+//                    if (!articles.contains(params.get("article"))) {
+//                        articles.add(params.get("article"));
+//                        redisUtils.sSet(CacheKey.INVOICE_SD_TYPE + shopId, articles);
+//                    }
+//                }
+//            }
             return jsonObject.getJSONObject("data");
         } else {
             throw new BadRequestException(jsonObject.getString("msg"));
@@ -69,7 +69,7 @@ public class BindServiceImpl implements BindService {
 
     @Override
     public JSONObject industry(BindingDto bindingDto) {
-        if (StringUtils.isNotBlank(bindingDto.getArticle())) {
+//        if (StringUtils.isNotBlank(bindingDto.getArticle())) {
             Map<String, Object> params = new HashMap<>();
             params.put("name", bindingDto.getArticle());
             params.put("page", bindingDto.getPage() == null ? 1 : bindingDto.getPage());
@@ -80,20 +80,21 @@ public class BindServiceImpl implements BindService {
             } else {
                 throw new BadRequestException(jsonObject.getString("msg"));
             }
-        } else {
-            Set<String> set = new HashSet<>();
-            JSONObject jsonObject = new JSONObject();
-            if (!redisUtils.hasKey(CacheKey.INVOICE_SD_TYPE + bindingDto.getShopId())) {
-                TbShopInfo tbShopInfo = tbShopInfoRepository.findById(bindingDto.getShopId()).orElseGet(null);
-                TbMerchantAccount account = accountRepository.findByAccount(tbShopInfo.getAccount());
-                set.add(account.getArticle());
-                redisUtils.sSet(CacheKey.INVOICE_SD_TYPE + bindingDto.getShopId(), set);
-                jsonObject.put("articles", set);
-            } else {
-                jsonObject.put("list", redisUtils.sGet(CacheKey.INVOICE_SD_TYPE + bindingDto.getShopId()));
-            }
-            return jsonObject;
-        }
+//        }
+//        else {
+//            Set<String> set = new HashSet<>();
+//            JSONObject jsonObject = new JSONObject();
+//            if (!redisUtils.hasKey(CacheKey.INVOICE_SD_TYPE + bindingDto.getShopId())) {
+//                TbShopInfo tbShopInfo = tbShopInfoRepository.findById(bindingDto.getShopId()).orElseGet(null);
+//                TbMerchantAccount account = accountRepository.findByAccount(tbShopInfo.getAccount());
+//                set.add(account.getArticle());
+//                redisUtils.sSet(CacheKey.INVOICE_SD_TYPE + bindingDto.getShopId(), set);
+//                jsonObject.put("articles", set);
+//            } else {
+//                jsonObject.put("list", redisUtils.sGet(CacheKey.INVOICE_SD_TYPE + bindingDto.getShopId()));
+//            }
+//            return jsonObject;
+//        }
     }
 
     @Override