| @@ -50,6 +50,9 @@ spring: | |||||
| auth: true | auth: true | ||||
| starttls: | starttls: | ||||
| enable: true | enable: true | ||||
| socketFactory: | |||||
| port: 465 | |||||
| class: javax.net.ssl.SSLSocketFactory | |||||
| # ROCKETMQ | # ROCKETMQ | ||||
| rocketmq: | rocketmq: | ||||
| nameServer: 127.0.0.1:9876 | nameServer: 127.0.0.1:9876 | ||||
| @@ -48,6 +48,9 @@ spring: | |||||
| auth: true | auth: true | ||||
| starttls: | starttls: | ||||
| enable: true | enable: true | ||||
| socketFactory: | |||||
| port: 465 | |||||
| class: javax.net.ssl.SSLSocketFactory | |||||
| # RABBITMQ | # RABBITMQ | ||||
| rabbitmq: | rabbitmq: | ||||
| host: localhost | host: localhost | ||||
| @@ -48,6 +48,9 @@ spring: | |||||
| auth: true | auth: true | ||||
| starttls: | starttls: | ||||
| enable: true | enable: true | ||||
| socketFactory: | |||||
| port: 465 | |||||
| class: javax.net.ssl.SSLSocketFactory | |||||
| # RABBITMQ | # RABBITMQ | ||||
| rabbitmq: | rabbitmq: | ||||
| host: 127.0.0.1 | host: 127.0.0.1 | ||||
| @@ -50,6 +50,9 @@ spring: | |||||
| auth: true | auth: true | ||||
| starttls: | starttls: | ||||
| enable: true | enable: true | ||||
| socketFactory: | |||||
| port: 465 | |||||
| class: javax.net.ssl.SSLSocketFactory | |||||
| aws: | aws: | ||||
| clientRegion: cn-northwest-1 | clientRegion: cn-northwest-1 | ||||
| bucketName: iformall-net | bucketName: iformall-net | ||||
| @@ -47,6 +47,9 @@ spring: | |||||
| auth: true | auth: true | ||||
| starttls: | starttls: | ||||
| enable: true | enable: true | ||||
| socketFactory: | |||||
| port: 465 | |||||
| class: javax.net.ssl.SSLSocketFactory | |||||
| # RABBITMQ | # RABBITMQ | ||||
| rabbitmq: | rabbitmq: | ||||
| host: localhost | host: localhost | ||||
| @@ -47,6 +47,9 @@ spring: | |||||
| auth: true | auth: true | ||||
| starttls: | starttls: | ||||
| enable: true | enable: true | ||||
| socketFactory: | |||||
| port: 465 | |||||
| class: javax.net.ssl.SSLSocketFactory | |||||
| # RABBITMQ | # RABBITMQ | ||||
| rabbitmq: | rabbitmq: | ||||
| host: 127.0.0.1 | host: 127.0.0.1 | ||||
| @@ -49,6 +49,9 @@ spring: | |||||
| auth: true | auth: true | ||||
| starttls: | starttls: | ||||
| enable: true | enable: true | ||||
| socketFactory: | |||||
| port: 465 | |||||
| class: javax.net.ssl.SSLSocketFactory | |||||
| aws: | aws: | ||||
| clientRegion: cn-northwest-1 | clientRegion: cn-northwest-1 | ||||
| bucketName: iformall-net | bucketName: iformall-net | ||||
| @@ -47,6 +47,9 @@ spring: | |||||
| auth: true | auth: true | ||||
| starttls: | starttls: | ||||
| enable: true | enable: true | ||||
| socketFactory: | |||||
| port: 465 | |||||
| class: javax.net.ssl.SSLSocketFactory | |||||
| # RABBITMQ | # RABBITMQ | ||||
| rabbitmq: | rabbitmq: | ||||
| host: localhost | host: localhost | ||||
| @@ -47,6 +47,9 @@ spring: | |||||
| auth: true | auth: true | ||||
| starttls: | starttls: | ||||
| enable: true | enable: true | ||||
| socketFactory: | |||||
| port: 465 | |||||
| class: javax.net.ssl.SSLSocketFactory | |||||
| # RABBITMQ | # RABBITMQ | ||||
| rabbitmq: | rabbitmq: | ||||
| host: 127.0.0.1 | host: 127.0.0.1 | ||||
| @@ -51,6 +51,9 @@ spring: | |||||
| auth: true | auth: true | ||||
| starttls: | starttls: | ||||
| enable: true | enable: true | ||||
| socketFactory: | |||||
| port: 465 | |||||
| class: javax.net.ssl.SSLSocketFactory | |||||
| rocketmq: | rocketmq: | ||||
| nameServer: 127.0.0.1:9876 | nameServer: 127.0.0.1:9876 | ||||
| producer: | producer: | ||||
| @@ -48,6 +48,9 @@ spring: | |||||
| auth: true | auth: true | ||||
| starttls: | starttls: | ||||
| enable: true | enable: true | ||||
| socketFactory: | |||||
| port: 465 | |||||
| class: javax.net.ssl.SSLSocketFactory | |||||
| # RABBITMQ | # RABBITMQ | ||||
| rabbitmq: | rabbitmq: | ||||
| host: localhost | host: localhost | ||||
| @@ -48,6 +48,9 @@ spring: | |||||
| auth: true | auth: true | ||||
| starttls: | starttls: | ||||
| enable: true | enable: true | ||||
| socketFactory: | |||||
| port: 465 | |||||
| class: javax.net.ssl.SSLSocketFactory | |||||
| # RABBITMQ | # RABBITMQ | ||||
| rabbitmq: | rabbitmq: | ||||
| host: 127.0.0.1 | host: 127.0.0.1 | ||||
| @@ -51,6 +51,9 @@ spring: | |||||
| auth: true | auth: true | ||||
| starttls: | starttls: | ||||
| enable: true | enable: true | ||||
| socketFactory: | |||||
| port: 465 | |||||
| class: javax.net.ssl.SSLSocketFactory | |||||
| aws: | aws: | ||||
| clientRegion: cn-northwest-1 | clientRegion: cn-northwest-1 | ||||
| bucketName: iformall-net | bucketName: iformall-net | ||||
| @@ -48,6 +48,9 @@ spring: | |||||
| auth: true | auth: true | ||||
| starttls: | starttls: | ||||
| enable: true | enable: true | ||||
| socketFactory: | |||||
| port: 465 | |||||
| class: javax.net.ssl.SSLSocketFactory | |||||
| # RABBITMQ | # RABBITMQ | ||||
| rabbitmq: | rabbitmq: | ||||
| host: localhost | host: localhost | ||||
| @@ -48,6 +48,9 @@ spring: | |||||
| auth: true | auth: true | ||||
| starttls: | starttls: | ||||
| enable: true | enable: true | ||||
| socketFactory: | |||||
| port: 465 | |||||
| class: javax.net.ssl.SSLSocketFactory | |||||
| # RABBITMQ | # RABBITMQ | ||||
| rabbitmq: | rabbitmq: | ||||
| host: 127.0.0.1 | host: 127.0.0.1 | ||||
| @@ -1661,13 +1661,13 @@ public class WxChartServiceImpl implements WxChartDataService { | |||||
| Map<String, String> successListMap = successlist.parallelStream().collect(Collectors.toMap(x -> { | Map<String, String> successListMap = successlist.parallelStream().collect(Collectors.toMap(x -> { | ||||
| return x.get("time").toString(); | return x.get("time").toString(); | ||||
| }, x -> { | }, x -> { | ||||
| return (String) x.get("total"); | |||||
| return x.get("total").toString(); | |||||
| })); | })); | ||||
| Map<String, String> verifyListMap = verifyList.parallelStream().collect(Collectors.toMap(x -> { | Map<String, String> verifyListMap = verifyList.parallelStream().collect(Collectors.toMap(x -> { | ||||
| return x.get("time").toString(); | return x.get("time").toString(); | ||||
| }, x -> { | }, x -> { | ||||
| return (String) x.get("total"); | |||||
| return x.get("total").toString(); | |||||
| })); | })); | ||||
| successMap.putAll(successListMap); | successMap.putAll(successListMap); | ||||
| @@ -226,15 +226,19 @@ public class WxOrderGroupServiceImpl implements WxOrderGroupService { | |||||
| List<WxCUser> userList = new ArrayList<>(); | List<WxCUser> userList = new ArrayList<>(); | ||||
| for (WxOrder order : orderList) { | for (WxOrder order : orderList) { | ||||
| WxCUser user = wxCUserMapper.selectByPrimaryKey(order.getCUserId()); | WxCUser user = wxCUserMapper.selectByPrimaryKey(order.getCUserId()); | ||||
| userList.add(user); | |||||
| if (user != null) { | |||||
| userList.add(user); | |||||
| } | |||||
| } | |||||
| if (!userList.isEmpty()) { | |||||
| userList = userList.parallelStream().map(u -> { | |||||
| WxCUser temp = new WxCUser(); | |||||
| temp.setId(u.getId()); | |||||
| temp.setNickName(u.getNickName()); | |||||
| temp.setAvatarUrl(u.getAvatarUrl()); | |||||
| return temp; | |||||
| }).collect(Collectors.toList()); | |||||
| } | } | ||||
| userList = userList.parallelStream().map(u -> { | |||||
| WxCUser temp = new WxCUser(); | |||||
| temp.setId(u.getId()); | |||||
| temp.setNickName(u.getNickName()); | |||||
| temp.setAvatarUrl(u.getAvatarUrl()); | |||||
| return temp; | |||||
| }).collect(Collectors.toList()); | |||||
| couponOrderGroup.put("userList", userList); | couponOrderGroup.put("userList", userList); | ||||
| } | } | ||||
| return new ResultData(couponOrderGroup); | return new ResultData(couponOrderGroup); | ||||