Merge branch 'KA-券核销-传券优惠金额-周晓航' into qa

# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/coupon/impl/PlatformCouponRelationServiceImpl.java
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
#	order-application-service/src/main/java/cn/freemud/service/impl/SellCouponOrderServiceImpl.java

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java

@@ -3761,7 +3761,7 @@ public class OrderSdkAdapter {
         couponRequest.setStation_id("-1");
         couponRequest.setOperator_id("-1");
         couponRequest.setStore_id(orderBean.getShopId());
-        couponRequest.setMemberId(orderBean.getUserId());
+//        couponRequest.setMemberId(orderBean.getUserId());
         couponRequest.setOpenid(openId);
         // 订单号 替换成唯一序号
         couponRequest.setTrans_id(orderBean.getOid());

order-application-service/src/main/java/cn/freemud/OrderApplication.java

@@ -35,6 +35,7 @@ import org.springframework.context.annotation.EnableAspectJAutoProxy;
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
 import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 import springfox.documentation.swagger2.annotations.EnableSwagger2;
 import tk.mybatis.spring.annotation.MapperScan;
@@ -58,6 +59,7 @@ import java.util.concurrent.ThreadPoolExecutor;
         "cn.freemud.fuyou"
 })
 @EnableAutoConfiguration
+@EnableScheduling
 public class OrderApplication {
 
     private static final String GRAY_VERSION_PROD = "PROD"; //生产版本

order-application-service/src/main/java/cn/freemud/service/coupon/impl/PlatformCouponRelationServiceImpl.java

@@ -146,7 +146,8 @@ public class PlatformCouponRelationServiceImpl implements CouponRelationService
 
                 couponCodeVerificationDto.setOrderTotalAmount(orderBean.getOriginalAmount() == null ? 0L : orderBean.getOriginalAmount().longValue());
                 couponCodeVerificationDto.setOrderPaymentAmount(orderBean.getAmount());
-                couponCodeVerificationDto.setOrderDiscountAmount(orderBean.getOriginalAmount().longValue() - orderBean.getAmount());
+                // KA 【ID1032412】【订单聚合层】核销传入优惠金额之传劵优惠只设置券的优惠金额进行上报
+                couponCodeVerificationDto.setOrderDiscountAmount(accountBean.getPrice());
                 // 核销券新增参数：组织机构ID
                 couponCodeVerificationDto.setChannel_ids(storeService.getOrgIdsArr(orderBean.getCompanyId(), orderBean.getShopId()));
                 // 设置配送券的 transactions

order-application-service/src/main/java/cn/freemud/service/job/PrometheusSchedulerCustomJob.java

+package cn.freemud.service.job;
+
+import com.alibaba.druid.pool.DruidDataSource;
+import io.micrometer.core.instrument.MeterRegistry;
+import org.springframework.amqp.rabbit.connection.CachingConnectionFactory;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.util.Properties;
+import java.util.concurrent.atomic.AtomicInteger;
+
+/**
+ * @author: liubing.
+ * @date: 2021/6/15 15:37
+ */
+@Component
+public class PrometheusSchedulerCustomJob {
+
+    /**
+     * mq当前空闲(缓存)的事务通道的数量。
+     * mq当前空闲(高速缓存)的非事务性通道的数量。
+     * mq同时空闲(缓存)的事务通道的最大数量。
+     * mq非事务性通道的最大数量同时处于空闲状态(缓存)。
+     */
+    private final AtomicInteger idleChannelsNotTxGauge, idleChannelsTxGauge, idleChannelsTxHighWaterGauge, idleChannelsNotTxHighWaterGauge;
+
+    /**
+     * 当前连接数
+     * 最大连接池数量
+     * 最大连接池数量
+     * 最小连接池数量
+     */
+    private final AtomicInteger activeCountGauge, maxActiveGauge, maxIdleGauge, minIdleGauge;
+
+    private final CachingConnectionFactory cachingConnectionFactory;
+    private final DruidDataSource druidDataSource;
+
+
+    public PrometheusSchedulerCustomJob(MeterRegistry meterRegistry, CachingConnectionFactory cachingConnectionFactory, DruidDataSource druidDataSource) {
+        this.cachingConnectionFactory = cachingConnectionFactory;
+        this.druidDataSource = druidDataSource;
+        idleChannelsNotTxGauge = meterRegistry.gauge("rabbitmq_idle_channels_not_tx", new AtomicInteger(0));
+        idleChannelsTxGauge = meterRegistry.gauge("rabbitmq_idle_channels_tx", new AtomicInteger(0));
+        idleChannelsTxHighWaterGauge = meterRegistry.gauge("rabbitmq_idle_channels_tx_high_water", new AtomicInteger(0));
+        idleChannelsNotTxHighWaterGauge = meterRegistry.gauge("rabbitmq_idle_channels_not_tx_high_water", new AtomicInteger(0));
+
+        activeCountGauge = meterRegistry.gauge("db_active_count", new AtomicInteger(0));
+        maxActiveGauge = meterRegistry.gauge("db_max_active", new AtomicInteger(0));
+        maxIdleGauge = meterRegistry.gauge("db_max_idle", new AtomicInteger(0));
+        minIdleGauge = meterRegistry.gauge("db_min_idle", new AtomicInteger(0));
+
+    }
+
+    @Scheduled(fixedRateString = "15000", initialDelayString = "0")
+    public void schedulingTask() {
+        Properties cacheProperties = cachingConnectionFactory.getCacheProperties();
+
+        idleChannelsNotTxGauge.set(Integer.parseInt(cacheProperties.getOrDefault("idleChannelsNotTx", 0).toString()));
+        idleChannelsTxGauge.set(Integer.parseInt(cacheProperties.getOrDefault("idleChannelsTx", 0).toString()));
+        idleChannelsTxHighWaterGauge.set(Integer.parseInt(cacheProperties.getOrDefault("idleChannelsTxHighWater", 0).toString()));
+        idleChannelsNotTxHighWaterGauge.set(Integer.parseInt(cacheProperties.getOrDefault("idleChannelsNotTxHighWater", 0).toString()));
+
+        activeCountGauge.set(druidDataSource.getActiveCount());
+        maxActiveGauge.set(druidDataSource.getMaxActive());
+        maxIdleGauge.set(druidDataSource.getMaxIdle());
+        minIdleGauge.set(druidDataSource.getMinIdle());
+    }
+}

order-management/pom.xml

@@ -40,7 +40,7 @@
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>
             <artifactId>couponcenter-sdk</artifactId>
-            <version>4.1.1.RELEASE</version>
+            <version>1.9.2.RELEASE</version>
             <scope>compile</scope>
         </dependency>
 

shopping-cart-application-service/src/main/java/cn/freemud/ShoppingCartApplication.java

@@ -31,6 +31,7 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.EnableAspectJAutoProxy;
 import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.scheduling.annotation.EnableScheduling;
 import springfox.documentation.swagger2.annotations.EnableSwagger2;
 import tk.mybatis.spring.annotation.MapperScan;
 
@@ -48,6 +49,7 @@ import tk.mybatis.spring.annotation.MapperScan;
         "com.freemud.api.assortment.datamanager.manager"})
 @EnableFeignClients
 @EnableAsync
+@EnableScheduling
 public class ShoppingCartApplication {
     private static final String GRAY_VERSION_PROD = "PROD"; //生产版本
     private static final String GRAY_VERSION_GRAY = "GRAY"; //灰度版本

shopping-cart-application-service/src/main/java/cn/freemud/service/job/PrometheusSchedulerCustomJob.java

+package cn.freemud.service.job;
+
+import com.alibaba.druid.pool.DruidDataSource;
+import io.micrometer.core.instrument.MeterRegistry;
+import org.springframework.amqp.rabbit.connection.CachingConnectionFactory;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.util.Properties;
+import java.util.concurrent.atomic.AtomicInteger;
+
+/**
+ * @author: liubing.
+ * @date: 2021/6/15 15:37
+ */
+@Component
+public class PrometheusSchedulerCustomJob {
+
+    /**
+     * mq当前空闲(缓存)的事务通道的数量。
+     * mq当前空闲(高速缓存)的非事务性通道的数量。
+     * mq同时空闲(缓存)的事务通道的最大数量。
+     * mq非事务性通道的最大数量同时处于空闲状态(缓存)。
+     */
+    private final AtomicInteger idleChannelsNotTxGauge, idleChannelsTxGauge, idleChannelsTxHighWaterGauge, idleChannelsNotTxHighWaterGauge;
+
+    /**
+     * 当前连接数
+     * 最大连接池数量
+     * 最大连接池数量
+     * 最小连接池数量
+     */
+    private final AtomicInteger activeCountGauge, maxActiveGauge, maxIdleGauge, minIdleGauge;
+
+    private final CachingConnectionFactory cachingConnectionFactory;
+    private final DruidDataSource druidDataSource;
+
+
+    public PrometheusSchedulerCustomJob(MeterRegistry meterRegistry, CachingConnectionFactory cachingConnectionFactory, DruidDataSource druidDataSource) {
+        this.cachingConnectionFactory = cachingConnectionFactory;
+        this.druidDataSource = druidDataSource;
+        idleChannelsNotTxGauge = meterRegistry.gauge("rabbitmq_idle_channels_not_tx", new AtomicInteger(0));
+        idleChannelsTxGauge = meterRegistry.gauge("rabbitmq_idle_channels_tx", new AtomicInteger(0));
+        idleChannelsTxHighWaterGauge = meterRegistry.gauge("rabbitmq_idle_channels_tx_high_water", new AtomicInteger(0));
+        idleChannelsNotTxHighWaterGauge = meterRegistry.gauge("rabbitmq_idle_channels_not_tx_high_water", new AtomicInteger(0));
+
+        activeCountGauge = meterRegistry.gauge("db_active_count", new AtomicInteger(0));
+        maxActiveGauge = meterRegistry.gauge("db_max_active", new AtomicInteger(0));
+        maxIdleGauge = meterRegistry.gauge("db_max_idle", new AtomicInteger(0));
+        minIdleGauge = meterRegistry.gauge("db_min_idle", new AtomicInteger(0));
+
+    }
+
+    @Scheduled(fixedRateString = "15000", initialDelayString = "0")
+    public void schedulingTask() {
+        Properties cacheProperties = cachingConnectionFactory.getCacheProperties();
+
+        idleChannelsNotTxGauge.set(Integer.parseInt(cacheProperties.getOrDefault("idleChannelsNotTx", 0).toString()));
+        idleChannelsTxGauge.set(Integer.parseInt(cacheProperties.getOrDefault("idleChannelsTx", 0).toString()));
+        idleChannelsTxHighWaterGauge.set(Integer.parseInt(cacheProperties.getOrDefault("idleChannelsTxHighWater", 0).toString()));
+        idleChannelsNotTxHighWaterGauge.set(Integer.parseInt(cacheProperties.getOrDefault("idleChannelsNotTxHighWater", 0).toString()));
+
+        activeCountGauge.set(druidDataSource.getActiveCount());
+        maxActiveGauge.set(druidDataSource.getMaxActive());
+        maxIdleGauge.set(druidDataSource.getMaxIdle());
+        minIdleGauge.set(druidDataSource.getMinIdle());
+    }
+}