配置正式库

src/main/java/com/sckw/freight/config/RedisConfig.java

@@ -1,58 +1,58 @@
-package com.sckw.freight.config;
-
-
-import com.fasterxml.jackson.annotation.JsonAutoDetect;
-import com.fasterxml.jackson.annotation.PropertyAccessor;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.SerializationFeature;
-import com.fasterxml.jackson.databind.jsontype.impl.LaissezFaireSubTypeValidator;
-import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.data.redis.connection.RedisConnectionFactory;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer;
-import org.springframework.data.redis.serializer.StringRedisSerializer;
-
-/**
- * 注入RedisTemplate<String,Object>
- */
-@Configuration
-public class RedisConfig {
-
-    /**
-     * jackson序列化方式的redisTemplate
-     *
-     * @param redisConnectionFactory
-     * @return
-     */
-    @Bean
-    public RedisTemplate<String, Object> redisTemplate(RedisConnectionFactory redisConnectionFactory) {
-        RedisTemplate<String, Object> redisTemplate = new RedisTemplate<>();
-        redisTemplate.setConnectionFactory(redisConnectionFactory);
-        // 设置值（value）的序列化采用jackson
-        redisTemplate.setValueSerializer(serializer());
-        redisTemplate.setHashValueSerializer(serializer());
-
-        // 设置键（key）的序列化采用StringRedisSerializer。
-        redisTemplate.setKeySerializer(new StringRedisSerializer());
-        redisTemplate.setHashKeySerializer(new StringRedisSerializer());
-        redisTemplate.afterPropertiesSet();
-        return redisTemplate;
-    }
-
-
-    private Jackson2JsonRedisSerializer<Object> serializer() {
-        // 使用Jackson2JsonRedisSerializer来序列化和反序列化redis的value值
-        ObjectMapper objectMapper = new ObjectMapper();
-        // 解决jackson2无法序列化LocalDateTime问题
-        objectMapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
-        objectMapper.registerModule(new JavaTimeModule());
-        // 指定要序列化的域，field,get和set,以及修饰符范围，ANY是都有包括private和public
-        objectMapper.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY);
-
-        // 指定序列化输入的类型，类必须是非final修饰的，final修饰的类，比如String,Integer等会跑出异常
-        objectMapper.activateDefaultTyping(LaissezFaireSubTypeValidator.instance, ObjectMapper.DefaultTyping.NON_FINAL);
-        return new Jackson2JsonRedisSerializer<>(objectMapper, Object.class);
-    }
-}
+//package com.sckw.freight.config;
+//
+//
+//import com.fasterxml.jackson.annotation.JsonAutoDetect;
+//import com.fasterxml.jackson.annotation.PropertyAccessor;
+//import com.fasterxml.jackson.databind.ObjectMapper;
+//import com.fasterxml.jackson.databind.SerializationFeature;
+//import com.fasterxml.jackson.databind.jsontype.impl.LaissezFaireSubTypeValidator;
+//import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+//import org.springframework.context.annotation.Bean;
+//import org.springframework.context.annotation.Configuration;
+//import org.springframework.data.redis.connection.RedisConnectionFactory;
+//import org.springframework.data.redis.core.RedisTemplate;
+//import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer;
+//import org.springframework.data.redis.serializer.StringRedisSerializer;
+//
+///**
+// * 注入RedisTemplate<String,Object>
+// */
+//@Configuration
+//public class RedisConfig {
+//
+//    /**
+//     * jackson序列化方式的redisTemplate
+//     *
+//     * @param redisConnectionFactory
+//     * @return
+//     */
+//    @Bean
+//    public RedisTemplate<String, Object> redisTemplate(RedisConnectionFactory redisConnectionFactory) {
+//        RedisTemplate<String, Object> redisTemplate = new RedisTemplate<>();
+//        redisTemplate.setConnectionFactory(redisConnectionFactory);
+//        // 设置值（value）的序列化采用jackson
+//        redisTemplate.setValueSerializer(serializer());
+//        redisTemplate.setHashValueSerializer(serializer());
+//
+//        // 设置键（key）的序列化采用StringRedisSerializer。
+//        redisTemplate.setKeySerializer(new StringRedisSerializer());
+//        redisTemplate.setHashKeySerializer(new StringRedisSerializer());
+//        redisTemplate.afterPropertiesSet();
+//        return redisTemplate;
+//    }
+//
+//
+//    private Jackson2JsonRedisSerializer<Object> serializer() {
+//        // 使用Jackson2JsonRedisSerializer来序列化和反序列化redis的value值
+//        ObjectMapper objectMapper = new ObjectMapper();
+//        // 解决jackson2无法序列化LocalDateTime问题
+//        objectMapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
+//        objectMapper.registerModule(new JavaTimeModule());
+//        // 指定要序列化的域，field,get和set,以及修饰符范围，ANY是都有包括private和public
+//        objectMapper.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY);
+//
+//        // 指定序列化输入的类型，类必须是非final修饰的，final修饰的类，比如String,Integer等会跑出异常
+//        objectMapper.activateDefaultTyping(LaissezFaireSubTypeValidator.instance, ObjectMapper.DefaultTyping.NON_FINAL);
+//        return new Jackson2JsonRedisSerializer<>(objectMapper, Object.class);
+//    }
+//}

src/main/java/com/sckw/freight/service/freight/impl/KwpLedgerLogisticsServiceImpl.java

@@ -40,6 +40,7 @@ import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -344,12 +345,19 @@ public class KwpLedgerLogisticsServiceImpl extends ServiceImpl<KwpLedgerLogistic
         wrapper.eq(KllOrder::getExecutionStatus, KllOrderExecutionStatusEnum.Finished.getCode());
         wrapper.eq(KllOrder::getLedgerStatus, KllOrderLedgerStatusEnum.NoLedger.getCode());
         List<KllOrder> list = iKllOrderService.list(wrapper);
+
+
         if (list == null || list.isEmpty()) {
-            throw new RuntimeException("保存对账单的物流订单不存在，请检查物流单状态。");
+            throw new RuntimeException("物流订单不存在或状态为已对账。");
         }
         if (list.size() != requestSaveLedgerSettlementInfo.getOrderIds().size()) {
             throw new RuntimeException("保存对账单的物流订单数量和参数数量不一致，请检查物流单所属企业和状态。");
         }
+        Map<Integer, List<KllOrder>> ageGroup = list.stream()
+                .collect(Collectors.groupingBy(KllOrder::getCompanyId));
+        if (ageGroup.size() != 1) {
+            throw new RuntimeException("保存对账单的物流订单企业id不一致，请检查物流单所属企业。");
+        }
         //扣减金额不能大于 总金额
         if (requestSaveLedgerSettlementInfo.getDeductPrice().compareTo(list.stream().map(KllOrder::getTotalPrice).reduce(BigDecimal.ZERO, BigDecimal::add)) > 0) {
             throw new RuntimeException("保存对账单的物流订单扣减金额不能大于 总金额");

src/main/resources/application-dev.yml

@@ -25,18 +25,18 @@ spring:
           username: saas
           password: saas
 
-  data:
-    redis:
-      host: 10.10.10.230
-      password: test
-      port: 6379
-      database: 13
-      lettuce:
-        pool:
-          enabled: true
-          max-active: 8
-          max-idle: 16
-          min-idle: 1
+#  data:
+#    redis:
+#      host: 10.10.10.230
+#      password: test
+#      port: 6379
+#      database: 13
+#      lettuce:
+#        pool:
+#          enabled: true
+#          max-active: 8
+#          max-idle: 16
+#          min-idle: 1
 
 # 日志级别
 logging:

src/main/resources/application-pro.yml

@@ -0,0 +1,59 @@
+
+spring:
+  main:
+    allow-circular-references: true
+  datasource:
+    dynamic:
+      druid:
+        initial-size: 2
+        max-active: 20
+        min-idle: 2
+      primary: freight
+      datasource:
+        freight:
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          url: jdbc:mysql://rm-2vcw922e20158115lvo.mysql.cn-chengdu.rds.aliyuncs.com:3306/shyj_freight?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull
+          username: shyj_freight
+          password: 4qggnfRC@8wTeoDp#33MCz
+        kll:
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          url: jdbc:mysql://rm-2vcw922e20158115lvo.mysql.cn-chengdu.rds.aliyuncs.com:3306/shyj_kuanglala?useUnicode=true&characterEncoding=utf8&allowPublicKeyRetrieval=true&useSSL=false&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull
+          username: shyj_kuanglala
+          password: mer7z#8yoV0$H9YWDXMrJ3z
+        saas:
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          url: jdbc:mysql://rm-2vcw922e20158115lvo.mysql.cn-chengdu.rds.aliyuncs.com:3306/shyj_saas?useUnicode=true&characterEncoding=utf8&allowPublicKeyRetrieval=true&useSSL=false&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull
+          username: shyj_saas
+          password: yTkjJ#1DmqQkfx2@hv1N3o0
+#  data:
+#    redis:
+#      host: 10.10.10.221
+#      password: test
+#      port: 6379
+#      database: 13
+#      lettuce:
+#        pool:
+#          enabled: true
+#          max-active: 8
+#          max-idle: 16
+#          min-idle: 1
+
+# 日志级别
+logging:
+  level:
+    root: debug
+
+
+# mybatis-plus 打印sql
+mybatis-plus:
+  configuration:
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+
+
+# 支付中心 地址
+payCenter:
+  address: http://payment.shyj.sckaiwu.cn/orsimj
+#轮循任务 间隔时长（秒）
+job:
+  sleep: 5
+  enable: false

src/main/resources/application-test.yml

@@ -25,18 +25,18 @@ spring:
           url: jdbc:mysql://10.10.10.221:3306/saas?useUnicode=true&characterEncoding=utf8&allowPublicKeyRetrieval=true&useSSL=false&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull
           username: saas
           password: saas
-  data:
-    redis:
-      host: 10.10.10.221
-      password: test
-      port: 6379
-      database: 13
-      lettuce:
-        pool:
-          enabled: true
-          max-active: 8
-          max-idle: 16
-          min-idle: 1
+#  data:
+#    redis:
+#      host: 10.10.10.221
+#      password: test
+#      port: 6379
+#      database: 13
+#      lettuce:
+#        pool:
+#          enabled: true
+#          max-active: 8
+#          max-idle: 16
+#          min-idle: 1
 
 # 日志级别
 logging: