Browse Source

Merge remote-tracking branch 'origin/develop' into develop

release_toaliyun_real
luozukai 7 years ago
parent
commit
037bd8aab5
17 changed files with 59 additions and 10 deletions
  1. +3
    -0
      mallinkAdmin/src/main/resources/application-dev.yml
  2. +3
    -0
      mallinkAdmin/src/main/resources/application-prod.yml
  3. +3
    -0
      mallinkAdmin/src/main/resources/application-test.yml
  4. +3
    -0
      mallinkBApi/src/main/resources/application-dev.yml
  5. +3
    -0
      mallinkBApi/src/main/resources/application-prod.yml
  6. +3
    -0
      mallinkBApi/src/main/resources/application-test.yml
  7. +3
    -0
      mallinkCApi/src/main/resources/application-dev.yml
  8. +3
    -0
      mallinkCApi/src/main/resources/application-prod.yml
  9. +3
    -0
      mallinkCApi/src/main/resources/application-test.yml
  10. +3
    -0
      mallinkMQConsumer/src/main/resources/application-dev.yml
  11. +3
    -0
      mallinkMQConsumer/src/main/resources/application-prod.yml
  12. +3
    -0
      mallinkMQConsumer/src/main/resources/application-test.yml
  13. +3
    -0
      mallinkSchedule/src/main/resources/application-dev.yml
  14. +3
    -0
      mallinkSchedule/src/main/resources/application-prod.yml
  15. +3
    -0
      mallinkSchedule/src/main/resources/application-test.yml
  16. +2
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java
  17. +12
    -8
      mallinkService/src/main/java/com/iformall/service/impl/WxOrderGroupServiceImpl.java

+ 3
- 0
mallinkAdmin/src/main/resources/application-dev.yml View File

@@ -50,6 +50,9 @@ spring:
auth: true
starttls:
enable: true
socketFactory:
port: 465
class: javax.net.ssl.SSLSocketFactory
# ROCKETMQ
rocketmq:
nameServer: 127.0.0.1:9876


+ 3
- 0
mallinkAdmin/src/main/resources/application-prod.yml View File

@@ -48,6 +48,9 @@ spring:
auth: true
starttls:
enable: true
socketFactory:
port: 465
class: javax.net.ssl.SSLSocketFactory
# RABBITMQ
rabbitmq:
host: localhost


+ 3
- 0
mallinkAdmin/src/main/resources/application-test.yml View File

@@ -48,6 +48,9 @@ spring:
auth: true
starttls:
enable: true
socketFactory:
port: 465
class: javax.net.ssl.SSLSocketFactory
# RABBITMQ
rabbitmq:
host: 127.0.0.1


+ 3
- 0
mallinkBApi/src/main/resources/application-dev.yml View File

@@ -50,6 +50,9 @@ spring:
auth: true
starttls:
enable: true
socketFactory:
port: 465
class: javax.net.ssl.SSLSocketFactory
aws:
clientRegion: cn-northwest-1
bucketName: iformall-net


+ 3
- 0
mallinkBApi/src/main/resources/application-prod.yml View File

@@ -47,6 +47,9 @@ spring:
auth: true
starttls:
enable: true
socketFactory:
port: 465
class: javax.net.ssl.SSLSocketFactory
# RABBITMQ
rabbitmq:
host: localhost


+ 3
- 0
mallinkBApi/src/main/resources/application-test.yml View File

@@ -47,6 +47,9 @@ spring:
auth: true
starttls:
enable: true
socketFactory:
port: 465
class: javax.net.ssl.SSLSocketFactory
# RABBITMQ
rabbitmq:
host: 127.0.0.1


+ 3
- 0
mallinkCApi/src/main/resources/application-dev.yml View File

@@ -49,6 +49,9 @@ spring:
auth: true
starttls:
enable: true
socketFactory:
port: 465
class: javax.net.ssl.SSLSocketFactory
aws:
clientRegion: cn-northwest-1
bucketName: iformall-net


+ 3
- 0
mallinkCApi/src/main/resources/application-prod.yml View File

@@ -47,6 +47,9 @@ spring:
auth: true
starttls:
enable: true
socketFactory:
port: 465
class: javax.net.ssl.SSLSocketFactory
# RABBITMQ
rabbitmq:
host: localhost


+ 3
- 0
mallinkCApi/src/main/resources/application-test.yml View File

@@ -47,6 +47,9 @@ spring:
auth: true
starttls:
enable: true
socketFactory:
port: 465
class: javax.net.ssl.SSLSocketFactory
# RABBITMQ
rabbitmq:
host: 127.0.0.1


+ 3
- 0
mallinkMQConsumer/src/main/resources/application-dev.yml View File

@@ -51,6 +51,9 @@ spring:
auth: true
starttls:
enable: true
socketFactory:
port: 465
class: javax.net.ssl.SSLSocketFactory
rocketmq:
nameServer: 127.0.0.1:9876
producer:


+ 3
- 0
mallinkMQConsumer/src/main/resources/application-prod.yml View File

@@ -48,6 +48,9 @@ spring:
auth: true
starttls:
enable: true
socketFactory:
port: 465
class: javax.net.ssl.SSLSocketFactory
# RABBITMQ
rabbitmq:
host: localhost


+ 3
- 0
mallinkMQConsumer/src/main/resources/application-test.yml View File

@@ -48,6 +48,9 @@ spring:
auth: true
starttls:
enable: true
socketFactory:
port: 465
class: javax.net.ssl.SSLSocketFactory
# RABBITMQ
rabbitmq:
host: 127.0.0.1


+ 3
- 0
mallinkSchedule/src/main/resources/application-dev.yml View File

@@ -51,6 +51,9 @@ spring:
auth: true
starttls:
enable: true
socketFactory:
port: 465
class: javax.net.ssl.SSLSocketFactory
aws:
clientRegion: cn-northwest-1
bucketName: iformall-net


+ 3
- 0
mallinkSchedule/src/main/resources/application-prod.yml View File

@@ -48,6 +48,9 @@ spring:
auth: true
starttls:
enable: true
socketFactory:
port: 465
class: javax.net.ssl.SSLSocketFactory
# RABBITMQ
rabbitmq:
host: localhost


+ 3
- 0
mallinkSchedule/src/main/resources/application-test.yml View File

@@ -48,6 +48,9 @@ spring:
auth: true
starttls:
enable: true
socketFactory:
port: 465
class: javax.net.ssl.SSLSocketFactory
# RABBITMQ
rabbitmq:
host: 127.0.0.1


+ 2
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java View File

@@ -1661,13 +1661,13 @@ public class WxChartServiceImpl implements WxChartDataService {
Map<String, String> successListMap = successlist.parallelStream().collect(Collectors.toMap(x -> {
return x.get("time").toString();
}, x -> {
return (String) x.get("total");
return x.get("total").toString();
}));

Map<String, String> verifyListMap = verifyList.parallelStream().collect(Collectors.toMap(x -> {
return x.get("time").toString();
}, x -> {
return (String) x.get("total");
return x.get("total").toString();
}));

successMap.putAll(successListMap);


+ 12
- 8
mallinkService/src/main/java/com/iformall/service/impl/WxOrderGroupServiceImpl.java View File

@@ -226,15 +226,19 @@ public class WxOrderGroupServiceImpl implements WxOrderGroupService {
List<WxCUser> userList = new ArrayList<>();
for (WxOrder order : orderList) {
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);
}
return new ResultData(couponOrderGroup);


Loading…
Cancel
Save