190 Achegas 3bdd048301 ... 28d6e829ce

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

+ 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);
             }
         }