190 Commits 3bdd048301 ... 28d6e829ce

Autore SHA1 Messaggio Data
  xuchaolang 28d6e829ce Merge branch 'master' of http://gogs.efunbox.cn:3000/Rankin/rankin 6 anni fa
  xuchaolang 56ef2ae8da Fix bug, check idList if empty while find in repo 6 anni fa
  guozhaoshun 1a88c54723 fix tag support update typeCode,merchant; 6 anni fa
  guozhaoshun 7d2928ebf6 fix poster 6 anni fa
  guozhaoshun c8a3defbf6 fix poster 6 anni fa
  guozhaoshun fef1be4ad4 fix saveRemoteResource 6 anni fa
  guozhaoshun 2232e69783 fix poster 6 anni fa
  guozhaoshun d64df3cd1d fix poster 6 anni fa
  guozhaoshun c6323af106 Merge branch 'dev001' 6 anni fa
  xuchaolang 33f4ed14cc cms-web-api, /resource PUT, id pass in body 6 anni fa
  xuchaolang 42d7a7fde9 web-api, /package/<pid>, return goods 6 anni fa
  xuchaolang 80337f7aee Merge branch 'master' of http://gogs.efunbox.cn:3000/Rankin/rankin 6 anni fa
  xuchaolang e0359d50e8 Accomplish /user/messages/productExpiredAlert, /package/<pid> 6 anni fa
  xuchaolang 4f2db3edf5 Merge branch 'master' of http://gogs.efunbox.cn:3000/Rankin/rankin 6 anni fa
  xuchaolang a6153d0f3e ProductService.getRelatedPackages, filter offline pkgs by status 6 anni fa
  xuchaolang 5b06485ee2 return code in /product/<pid>/relatedPkg, move shopQR into Goods 6 anni fa
  xuchaolang a6a6614946 ProductService.getRelatedPkgs, set goods 6 anni fa
  xuchaolang 4c631931cd ProductService.getRelatedPackges, check pkgId but not productId while scaning relatedPkgs 6 anni fa
  xuchaolang 6991a10393 ProductService, move ProductController from controller.cms package to controller package 6 anni fa
  xuchaolang c6b6a14078 Accomplish Api /product/<pid>/relatedPkg 6 anni fa
  xuchaolang e06c345575 Add /merchant prefix to Api /merchant/<merchantId>/posters 6 anni fa
  xuchaolang cdc99ef674 service /user/<uid>/product/valid Resturn [] while user have no valid products 6 anni fa
  xuchaolang 9e62064f53 Print product Log while get valid product from service 6 anni fa
  xuchaolang 9ca21fe5ad Print User 6 anni fa
  xuchaolang 6d90ff45c9 Temporarily add /user/product/valid in product service 6 anni fa
  xuchaolang 027257e268 Merge branch 'dev.3.0' 6 anni fa
  guozhaoshun 279f88c027 change TagTypeController /controller/app to /controller/ 6 anni fa
  guozhaoshun f3ca8a50f5 add support video upload 6 anni fa
  guozhaoshun d8011a4be3 tag create/update support tagType 6 anni fa
  guozhaoshun 2f51c018ab tagType 6 anni fa
  guozhaoshun 3d0665565c Tag create/update support typeCode 6 anni fa
  guozhaoshun 671925bb7c merchant product name change source 6 anni fa
  guozhaoshun 4f4b2067cd add /tagType/{code} 6 anni fa
  guozhaoshun 150ce1a65d add 6 anni fa
  guozhaoshun ebb60529f4 add 6 anni fa
  xuchaolang fdcb5a30ea Fix getTagType request mapping value 6 anni fa
  xuchaolang bb4f968336 restore pom.xml 6 anni fa
  xuchaolang c3df828bef check if sign is empty while get it from header 6 anni fa
  xuchaolang 00103a8f10 use Authentication while sign not Exist, For compatition with 2.x app verions 6 anni fa
  guozhaoshun e35f33f816 recover yml 6 anni fa
  guozhaoshun 967949bded test commit 6 anni fa
  guozhaoshun eec791684a Merge remote-tracking branch 'origin/master' into dev 6 anni fa
  guozhaoshun 75b5a94017 repair bug 6 anni fa
  xuchaolang e554490545 skip shelf in relatedSupport 6 anni fa
  xuchaolang 0ee63c8bde set dateDesc,openTime,closeTime 6 anni fa
  xuchaolang 1cf7041a5d fix /training/{id} request map bug 6 anni fa
  xuchaolang a5feaf286d change service api /app/training/{id} to /training/{id} 6 anni fa
  xuchaolang d55840f63b TrainingController add log 6 anni fa
  xuchaolang 150e531e17 check productid is null in findByIds 6 anni fa
  xuchaolang c01366a887 fix training update 6 anni fa
  xuchaolang 926e20469b return Training type in ProductService 6 anni fa
  xuchaolang c35e78559c training.get only return training entity 6 anni fa
  xuchaolang ba6772a241 add traing cms api 6 anni fa
  xuchaolang 2a2b0f02ff add traing cms api 6 anni fa
  xuchaolang 0839854e30 加入/training/<id>接口 6 anni fa
  xuchaolang 1c593901be add course title to course/lesson 6 anni fa
  huodongdong 8fb41e9d7e fix 6 anni fa
  huodongdong 33dfe9086d fix white user search 6 anni fa
  huodongdong 12ee9bd962 fix white user search request body 6 anni fa
  huodongdong 46bb611eac fix 6 anni fa
  huodongdong a7c33c52fe fix feign pathvariable error 6 anni fa
  huodongdong 7450e47d4f fix 6 anni fa
  huodongdong c9ecf201a9 add merchantId of white user 6 anni fa
  huodongdong 8bb7d1122a add merchant name of white user 6 anni fa
  huodongdong 50a2dd42d0 add api binder cms white user 6 anni fa
  huodongdong ac39c034af add white user model 6 anni fa
  huodongdong 2798495bf0 add white user table 6 anni fa
  huodongdong e03a581e5a fix 6 anni fa
  huodongdong de4cb52101 cms log level 6 anni fa
  huodongdong 445c3c5ae5 cms delete redis app login data 6 anni fa
  huodongdong 83fe73e0b3 add cms unbind device 6 anni fa
  huodongdong db8ea62107 fix tag product sort bug 6 anni fa
  huodongdong aeee85f461 add timeout session 6 anni fa
  huodongdong 973392ebf0 fix 6 anni fa
  huodongdong 6757e24f70 remove session 6 anni fa
  huodongdong 938ebbaf0c fix lesson search 6 anni fa
  huodongdong f37e9b6eb4 fix lesson empty exception 6 anni fa
  huodongdong c635cbc670 add log 6 anni fa
  huodongdong 9edd40418a fix 6 anni fa
  huodongdong 9637fee49d fix group code 6 anni fa
  huodongdong 27c762f9a1 add field of merchant simple 6 anni fa
  huodongdong 473394bd12 fix 6 anni fa
  huodongdong 9e1fe10b8f fix video url error 6 anni fa
  huodongdong 190f0e601b fix bing terminal field null and log error 6 anni fa
  huodongdong c27e8c256a add web login force 6 anni fa
  huodongdong 73c7c88a25 fix terminal name 6 anni fa
  huodongdong 19d3c3e4f7 modifiy terminal name to campusName + terminalName 6 anni fa
  huodongdong fb221ea346 fix campus name remove - 6 anni fa
  huodongdong c561799f73 fix 6 anni fa
  huodongdong e9f308a413 fix 6 anni fa
  huodongdong 5bc08795d5 fix 6 anni fa
  huodongdong 69fe592df2 fix 6 anni fa
  huodongdong 74f882a885 完成pushmsg push 6 anni fa
  huodongdong 9585210305 complete app api 6 anni fa
  huodongdong ed9f6583d9 fix device_code null 6 anni fa
  huodongdong 8b7fc151e6 refresh token not signature 6 anni fa
  huodongdong 53d28c7191 fix api recommend 6 anni fa
  huodongdong 1c36c05943 fix recommend 6 anni fa
  huodongdong 9bca91cc2a add refresh token 6 anni fa
  huodongdong 05927ed824 remove test intercepter, same the terminal user id 6 anni fa
  huodongdong b96f1f4298 fix 6 anni fa
  huodongdong 5913d3072d valid login 6 anni fa
  huodongdong 9c3aaf41f5 fix 6 anni fa
  huodongdong b300458a22 fix 6 anni fa
  huodongdong 5a764d1100 fix 6 anni fa
  huodongdong c817e33b16 add status terminal user filter search 6 anni fa
  huodongdong 4c5881db37 add product merchantId when search 6 anni fa
  huodongdong ca84c38189 add tag sort 6 anni fa
  huodongdong f813b6b318 deploy 6 anni fa
  huodongdong cfbbf4c3c8 fix header and option request bug 6 anni fa
  huodongdong 61522ff50e fix 6 anni fa
  huodongdong 1f54a29d64 fix receive 6 anni fa
  huodongdong 0a7d232e36 web api stash and fix charge 6 anni fa
  huodongdong 8dfc0d3ea3 fix 6 anni fa
  huodongdong b1908c474c add code and name order goods 6 anni fa
  huodongdong 4f2560e16a order detail api 6 anni fa
  huodongdong 1cd5f51282 fix transactional 6 anni fa
  huodongdong 74b94275b4 add charge 6 anni fa
  huodongdong a71b1653d0 add charge api 6 anni fa
  huodongdong 9f8ce28658 fix MySQL5DialectUTF8 6 anni fa
  huodongdong 29fbd94fa5 fix create table utf8 6 anni fa
  huodongdong 23569b09dd fix 6 anni fa
  huodongdong 2e49f4d8bd fix 6 anni fa
  huodongdong 42bb7557bd modified yml config 6 anni fa
  huodongdong 54ebcd3e0c fix 6 anni fa
  huodongdong 43b3b23379 add merchantPrice of pakcageProductVo 6 anni fa
  huodongdong af3de4ab65 add merchant price of product in package 6 anni fa
  huodongdong c73ae0883f add category of courseware 6 anni fa
  huodongdong e3bc647fdb fix 6 anni fa
  huodongdong 504b10c476 config test 6 anni fa
  huodongdong 4ddca8254e profile act 6 anni fa
  huodongdong cc65c80444 test 6 anni fa
  huodongdong 7ed2337ea0 add sub title 6 anni fa
  huodongdong c36277375e modified cancel order api 6 anni fa
  huodongdong 08bd31ccdf order search to post feign 6 anni fa
  huodongdong c2cabfc0ac add goods type auto 6 anni fa
  huodongdong 6b8d5122d3 same order status and order detail status 6 anni fa
  huodongdong 75c5cd1338 fix 7 anni fa
  huodongdong 4ef6d6bb47 add terminal user address 7 anni fa
  huodongdong aa34b15a14 add merchant product list package info 7 anni fa
  huodongdong 049d6eb4c8 add oderdetail and snapshot search api 7 anni fa
  huodongdong d6aef08774 fix log 7 anni fa
  huodongdong 30ccda2563 complete task 7 anni fa
  huodongdong 4a50d6038c size 7 anni fa
  huodongdong db4847d06a fix name 7 anni fa
  huodongdong aa15ceede3 fix 7 anni fa
  huodongdong b28be55f44 add status of goods package when put on sale 7 anni fa
  huodongdong d20807fba1 fix 7 anni fa
  huodongdong 072ea17be3 add sort when put on sale product 7 anni fa
  huodongdong 21aa6d4df2 add cms merchantProduct 7 anni fa
  huodongdong 466c98dfe4 add package update and on sale goods relation add and update 7 anni fa
  huodongdong fc7f9598dd fix lesson api cms 7 anni fa
  huodongdong bd88622c1f fix 7 anni fa
  huodongdong 503a8f4481 fix lesson warelist 7 anni fa
  huodongdong 3c50ba20cd add tag and group info 7 anni fa
  huodongdong ea7d4da2c7 no 7 anni fa
  huodongdong 72c1434dc3 @Modifying remove clearAutomatically=true 7 anni fa
  huodongdong 72ae842ea9 add status product create 7 anni fa
  huodongdong f99e29af74 fix 7 anni fa
  huodongdong 47afdb4c32 product search string format error 7 anni fa
  huodongdong 6b421cec99 fix support 7 anni fa
  huodongdong 446296f16f fix ware data structure 7 anni fa
  huodongdong 187f7f622b 订单分拆初版 7 anni fa
  huodongdong ac7e27719b modified table name and createtime 7 anni fa
  huodongdong 97e636322c api web test remove token check 7 anni fa
  huodongdong 012209cc64 fix resource name 7 anni fa
  huodongdong 723cceb4bb fix 7 anni fa
  huodongdong 3214cf4a72 fix pom config 7 anni fa
  huodongdong 76798122fa fix pom config 7 anni fa
  huodongdong 7f082bf582 fix pom build config 7 anni fa
  huodongdong 120f9de598 tmp 7 anni fa
  huodongdong 1fe47abcc0 complete pay ok 7 anni fa
  huodongdong 2bd43244b7 save 7 anni fa
  huodongdong 857b5bb181 add package 7 anni fa
  huodongdong 3b6e896596 complete product and goods recoding 7 anni fa
  huodongdong 225693bfc7 product idea period 1 7 anni fa
  huodongdong f15b6dbe00 stash 7 anni fa
  huodongdong bbb144a1c9 campus and termianl user complete 7 anni fa
  huodongdong 2ddd9d23e8 add cms web 7 anni fa
  huodongdong 31ca7939f3 tag 7 anni fa
  huodongdong 98f4431dcf version 1.0 dev 7 anni fa
  huodongdong 1d57b2f9f0 shit commit and reset 7 anni fa
  huodongdong 34a6cad675 nothing 7 anni fa
  huodongdong d69395e6a7 version 1.1: id string and relation; hibernate relation 7 anni fa
  huodongdong e428f275b5 resource service complete 7 anni fa
  huodongdong 2f57ba34a8 first version 7 anni fa
  huodongdong 05dfbac277 fix 7 anni fa
  huodongdong bdc9fa3299 rename 7 anni fa
  huodongdong 08fb34581d add ignore 7 anni fa
  huodongdong dd01ec7ace first framework 7 anni fa

+ 13 - 10
rankin-product-service/src/main/java/cn/rankin/productservice/service/app/ItemService.java

@@ -91,22 +91,25 @@ public class ItemService {
             for (SupportReference supportReference : supportReferenceList) {
                 supportIdList.add(supportReference.getTid());
             }
+
             if (!CollectionUtils.isEmpty(supportIdList)) {
                 List<MerchantProduct> merchantProductList = merchantProductRepository.findByPidsAndMerchantId(supportIdList, merchantId);
                 List<String> idList = new ArrayList<>();
                 merchantProductList.forEach(item -> idList.add(item.getPid()));
-                List<Support> supportList = supportRepository.findByIds(idList, BaseStatusEnum.NORMAL);
-                Map<String, Support> supportMap = ListUtil.convert(supportList, "id", Support.class);
-                List<ItemVo> itemVoList = new ArrayList<>();
-                for (String itemId : supportIdList) {
-                    Support item = supportMap.get(itemId);
-                    if (item == null) {
-                        continue;
+                if (!idList.isEmpty()) {
+                    List<Support> supportList = supportRepository.findByIds(idList, BaseStatusEnum.NORMAL);
+                    Map<String, Support> supportMap = ListUtil.convert(supportList, "id", Support.class);
+                    List<ItemVo> itemVoList = new ArrayList<>();
+                    for (String itemId : supportIdList) {
+                        Support item = supportMap.get(itemId);
+                        if (item == null) {
+                            continue;
+                        }
+                        ItemVo itemVo = convert(item);
+                        itemVoList.add(itemVo);
                     }
-                    ItemVo itemVo = convert(item);
-                    itemVoList.add(itemVo);
+                    supportItemVo.setRelatedSupports(itemVoList);
                 }
-                supportItemVo.setRelatedSupports(itemVoList);
             }
         }