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

assortment-ordercenter-sdk/pom.xml

@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>assortment-ordercenter-sdk</artifactId>
-    <version>1.9.4-SNAPSHOT</version>
+    <version>2.1.76-RELEASE</version>
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -38,7 +38,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>ordercenter-sdk</artifactId>
-            <version>1.4.0-SNAPSHOT</version>
+            <version>1.3.63.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>

assortment-ordercenter-sdk/readme.md

@@ -150,4 +150,5 @@
 | 2.1.72-RELEASE |  券码所券  | 张跃 | 2021-06-21|
 | 2.1.73-RELEASE |  预计送达时间逻辑添加  | 周晓航 | 2021-06-24|
 | 2.1.74-RELEASE |  麦咖啡p7v2  | xukang | 2021-06-24|
-| 2.1.75-RELEASE |  集点活动改造  | 张志恒 | 2021-06-28|
\ No newline at end of file
+| 2.1.75-RELEASE |  集点活动改造  | 张志恒 | 2021-06-28|
+| 2.1.76-RELEASE |  开放平台取消订单调用oms| 张志恒 | 2021-07-01|
\ No newline at end of file

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

@@ -3651,6 +3651,7 @@ public class OrderSdkAdapter {
         // 订单号 替换成唯一序号
         couponLockRequest.setPartnerId(orderBean.getCompanyId());
         couponLockRequest.setOrderId(orderBean.getOid());
+        //couponLockRequest.setCouponCode(accountBean.getAccountId());
         List<CouponLockRequest.CouponLockInfo> infos = new ArrayList<>();
         couponCodes.forEach(s -> {
             CouponLockRequest.CouponLockInfo info = new CouponLockRequest.CouponLockInfo();

call-back-service/pom.xml

@@ -94,12 +94,9 @@
         </dependency>
         <!-- promtheus  -->
         <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-actuator</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.micrometer</groupId>
-            <artifactId>micrometer-registry-prometheus</artifactId>
+            <groupId>com.freemud.springboot</groupId>
+            <artifactId>fm-springboot-start-actuator</artifactId>
+            <version>1.0.14</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.nepxion</groupId>

order-application-service/pom.xml

@@ -49,12 +49,12 @@
         <dependency>
             <artifactId>couponcenter-sdk</artifactId>
             <groupId>com.freemud.application.service.sdk</groupId>
-            <version>4.1.2-SNAPSHOT</version>
+            <version>4.1.3.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>assortment-ordercenter-sdk</artifactId>
-            <version>1.9.4-SNAPSHOT</version>
+            <version>2.1.76-RELEASE</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>
@@ -133,7 +133,7 @@
         <dependency>
             <artifactId>assortment-data-manager</artifactId>
             <groupId>com.freemud.sdk.api.assortment</groupId>
-            <version>5.5.12.SNAPSHOT</version>
+            <version>5.5.8.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>cn.freemud.commons</groupId>

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

@@ -28,7 +28,9 @@ import cn.freemud.entities.dto.MCCafeDeliveryBaseResponse;
 import cn.freemud.entities.dto.PayAccessResponse;
 import cn.freemud.entities.dto.*;
 import cn.freemud.entities.dto.QueryOrdersResponseDto.DataBean.OrderBean;
-import cn.freemud.entities.dto.activity.*;
+import cn.freemud.entities.dto.activity.PayGiftCheckAndJoinResponseDto;
+import cn.freemud.entities.dto.activity.PayGiftCheckAndJoinResponseObj;
+import cn.freemud.entities.dto.activity.PayGitCheckAndJoinRequestDto;
 import cn.freemud.entities.dto.delivery.OrderRemindRequestDto;
 import cn.freemud.entities.dto.delivery.QueryDeliveryAmountResponseDto;
 import cn.freemud.entities.dto.delivery.QueryLocusRiderTrackDto;
@@ -1342,10 +1344,8 @@ public class OrderServiceImpl implements Orderservice {
         }catch (Exception e){
             ApiLog.error("error to /promotionActivity/payGiftShareCheckAndJoin ", payGitRequestDto, e);
         }
-
     }
 
-
     private void orderStatusTracking(QueryOrdersResponse.DataBean.OrderBean orderBean, OrderStatusTrackingInfoDto orderStatusTrackingInfoByOid) {
         List<OrderStatusTrackingInfoDto.OrderStatusTrackingInfo> data = orderStatusTrackingInfoByOid.getData();
         if (CollectionUtils.isNotEmpty(data)) {

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

@@ -30,7 +30,7 @@ public class PrometheusSchedulerCustomJob {
      * 最大连接池数量
      * 最小连接池数量
      */
-    private final AtomicInteger activeCountGauge, maxActiveGauge, maxIdleGauge, minIdleGauge;
+    private final AtomicInteger activeCountGauge, maxActiveGauge, maxIdleGauge, minIdleGauge,poolingCountGauge;
 
     private final CachingConnectionFactory cachingConnectionFactory;
     private final DruidDataSource druidDataSource;
@@ -45,6 +45,7 @@ public class PrometheusSchedulerCustomJob {
         idleChannelsNotTxHighWaterGauge = meterRegistry.gauge("rabbitmq_idle_channels_not_tx_high_water", new AtomicInteger(0));
 
         activeCountGauge = meterRegistry.gauge("db_active_count", new AtomicInteger(0));
+        poolingCountGauge = meterRegistry.gauge("db_pooling_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));
@@ -61,6 +62,7 @@ public class PrometheusSchedulerCustomJob {
         idleChannelsNotTxHighWaterGauge.set(Integer.parseInt(cacheProperties.getOrDefault("idleChannelsNotTxHighWater", 0).toString()));
 
         activeCountGauge.set(druidDataSource.getActiveCount());
+        poolingCountGauge.set(druidDataSource.getPoolingCount());
         maxActiveGauge.set(druidDataSource.getMaxActive());
         maxIdleGauge.set(druidDataSource.getMaxIdle());
         minIdleGauge.set(druidDataSource.getMinIdle());

order-management/pom.xml

@@ -65,7 +65,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>assortment-ordercenter-sdk</artifactId>
-            <version>2.1.75-RELEASE</version>
+            <version>2.1.76-RELEASE</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

ordercenter-sdk/pom.xml

@@ -8,7 +8,7 @@
         <version>1.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.3.63.RELEASE</version>
     <artifactId>ordercenter-sdk</artifactId>
 
     <dependencies>

ordercenter-sdk/readme.md

@@ -93,4 +93,5 @@
 | 1.3.59.RELEASE | 取餐码迁移至聚合层 | 王航航 | 2021-06-07 |
 | 1.3.60.RELEASE | 预计送达时间字段添加 | 周晓航 | 2021-06-24 |
 | 1.3.61.RELEASE | 麦咖啡p7v2 | xukang | 2021-06-24 |
-| 1.3.62.RELEASE | 集点活动改造 | 张志恒 | 2021-06-28 |
\ No newline at end of file
+| 1.3.62.RELEASE | 集点活动改造 | 张志恒 | 2021-06-28 |
+| 1.3.63.RELEASE | 开放平台取消订单调用oms | 张志恒 | 2021-07-01 |
\ No newline at end of file

shopping-cart-application-service/pom.xml

@@ -61,7 +61,7 @@
         <dependency>
             <artifactId>assortment-data-manager</artifactId>
             <groupId>com.freemud.sdk.api.assortment</groupId>
-            <version>5.5.15-SNAPSHOT</version>
+            <version>5.5.15.RESEALE</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>

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

@@ -76,7 +76,6 @@ public class ShoppingCartController {
     /**
      * 从微信卡券向购物车中添加商品
      */
-    @ApiAnnotation
     @PostMapping(value = "/addGoodsByCard")
     @LogIgnore(logMessage = "addGoodsByCard")
     public BaseResponse addGoodsByCard(@Validated @LogParams @RequestBody AddGoodsByWeixinCardRequestVo request) {
@@ -86,7 +85,6 @@ public class ShoppingCartController {
     /**
      * 向购物车中添加商品
      */
-    @ApiAnnotation
     @IsConvertEN
     @PostMapping(value = "/addGoods")
     @LogIgnore(excludeStatusCodes = {ResponseCodeConstant.RESPONSE_SUCCESS_STR},logMessage = "addGoods")
@@ -103,7 +101,6 @@ public class ShoppingCartController {
     /**
      * 修改购物车中商品数量
      */
-    @ApiAnnotation
     @IsConvertEN
     @PostMapping(value = "/updateGoodsQty")
     @LogIgnore(logMessage = "updateGoodsQty")
@@ -120,7 +117,6 @@ public class ShoppingCartController {
     /**
      * 查询购物车信息
      */
-    @ApiAnnotation
     @IsConvertEN
     @PostMapping(value = "/listCartGoods")
     @LogIgnore(logMessage = "listCartGoods")
@@ -143,7 +139,6 @@ public class ShoppingCartController {
      * 查询购车信息无配送费
      * SVC卡支付check，check购物车金额加配送费小于储值卡金额
      */
-    @ApiAnnotation
     @PostMapping(value = "/listCartGoodsCheck")
     @LogIgnore(excludeStatusCodes = {ResponseCodeConstant.RESPONSE_SUCCESS_STR},logMessage = "listCartGoodsCheck")
     public BaseResponse listCartGoodsCheck(@Validated @LogParams @RequestBody ShoppingCartInfoRequestVo request) {
@@ -166,7 +161,6 @@ public class ShoppingCartController {
     /**
      * 清空购物车
      */
-    @ApiAnnotation
     @IsConvertEN
     @PostMapping(value = "/clearCartGoods")
     @LogIgnore(logMessage = "clearCartGoods")
@@ -188,7 +182,6 @@ public class ShoppingCartController {
      * @param getShoppingCartGoodsApportionRequestVo
      * @return
      */
-    @ApiAnnotation
     @IsConvertEN
     @PostMapping(value = "/getShoppingCartGoodsApportion")
     @LogIgnore(logMessage = "getShoppingCartGoodsApportion")
@@ -246,7 +239,6 @@ public class ShoppingCartController {
     /**
      * 线下订单查询接口
      */
-    @ApiAnnotation
     @PostMapping(value = "/getMemberInfo")
     @LogIgnore(excludeStatusCodes = {ResponseCodeConstant.RESPONSE_SUCCESS_STR},logMessage = "/getMemberInfo")
     public BaseResponse getMemberInfo(@LogParams @RequestBody GetMemberInfoRequestDto request) {
@@ -256,7 +248,6 @@ public class ShoppingCartController {
     /**
      * 结算页获取是否展示订单那备注配置
      */
-    @ApiAnnotation
     @PostMapping(value = "/getOpenStoreIappWxappConfig")
     @LogIgnore(excludeStatusCodes = {ResponseCodeConstant.RESPONSE_SUCCESS_STR},logMessage = "/getOpenStoreIappWxappConfig")
     public BaseResponse getOpenStoreIappWxappConfig(@LogParams @RequestBody OpenStoreIappWxappConfigRequestVo request) {
@@ -266,7 +257,6 @@ public class ShoppingCartController {
     /**
      * 结算页获取加价购活动商品列表
      */
-    @ApiAnnotation
     @PostMapping(value = "/premiumExchange")
     @LogIgnore(excludeStatusCodes = {ResponseCodeConstant.RESPONSE_SUCCESS_STR},logMessage = "/premiumExchange")
     public BaseResponse premiumExchange(@LogParams @RequestBody @Validated PremiumExchangeRequestVo request) {
@@ -275,7 +265,6 @@ public class ShoppingCartController {
     /**
      * 券码查询购物车商品信息(平台结算页可用券列表用)
      */
-    @ApiAnnotation
     @PostMapping(value = "/getCartInfoByUser")
     @LogIgnore(excludeStatusCodes = {ResponseCodeConstant.RESPONSE_SUCCESS_STR},logMessage = "/getCartInfoByUser")
     public BaseResponse getCartInfoByUser(@LogParams @RequestBody @Validated CouponAvailableRequestVo request) {
@@ -286,13 +275,27 @@ public class ShoppingCartController {
      * 【C端服务端】批量一键加购
      * 替换老门店的商品到切换的门店下
      */
-    @ApiAnnotation
     @PostMapping(value = "/replaceGoodsByShop")
     @LogIgnore(excludeStatusCodes = {ResponseCodeConstant.RESPONSE_SUCCESS_STR},logMessage = "/replaceGoodsByShop")
     public BaseResponse replaceGoodsByShop(@LogParams @RequestBody @Validated ShopGoodsReplaceVo request) {
         return SDKCommonBaseContextWare.getBean(ShoppingCartNewServiceImpl.class).replaceGoodsByShop(request);
     }
 
+    /**
+     *  校验 代金券/ 折扣券互斥
+     * @param couponCodes
+     * @return
+     */
+    private BaseResponse  verifyCouponCodes (List<ShoppingCartInfoRequestVo.couponCode> couponCodes){
+        if (CollectionUtils.isNotEmpty(couponCodes) && couponCodes.size() > 1) {
+            long count = couponCodes.stream().filter(c -> c.getCouponType().compareTo(CouponTypeEnum.TYPE_1.getCode()) == 0
+                    || c.getCouponType().compareTo(CouponTypeEnum.TYPE_3.getCode()) == 0).count();
+            if (count > 2) {
+                return ResponseUtil.error(ResponseResult.SHOPPING_CART_COUPON_MUTUAL_EXCLUSION);
+            }
+        }
+        return null;
+    }
 
     @Autowired
     private ShoppingCartBaseServiceImpl shoppingCartService;
@@ -301,7 +304,6 @@ public class ShoppingCartController {
     /**
      * 测试用，后续删除
      */
-    @ApiAnnotation
     @PostMapping(value = "/test/putCache")
     @LogIgnore(excludeStatusCodes = {ResponseCodeConstant.RESPONSE_SUCCESS_STR},logMessage = "/putCache")
     public BaseResponse putCache(@LogParams @RequestBody @Validated PutCacheVo request) {
@@ -319,19 +321,4 @@ public class ShoppingCartController {
         return new BaseResponse("1","100","");
     }
 
-    /**
-     *  校验 代金券/ 折扣券互斥
-     * @param couponCodes
-     * @return
-     */
-    private BaseResponse  verifyCouponCodes (List<ShoppingCartInfoRequestVo.couponCode> couponCodes){
-        if (CollectionUtils.isNotEmpty(couponCodes) && couponCodes.size() > 1) {
-            long count = couponCodes.stream().filter(c -> c.getCouponType().compareTo(CouponTypeEnum.TYPE_1.getCode()) == 0
-                    || c.getCouponType().compareTo(CouponTypeEnum.TYPE_3.getCode()) == 0).count();
-            if (count > 2) {
-                return ResponseUtil.error(ResponseResult.SHOPPING_CART_COUPON_MUTUAL_EXCLUSION);
-            }
-        }
-        return null;
-    }
 }

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

@@ -30,7 +30,7 @@ public class PrometheusSchedulerCustomJob {
      * 最大连接池数量
      * 最小连接池数量
      */
-    private final AtomicInteger activeCountGauge, maxActiveGauge, maxIdleGauge, minIdleGauge;
+    private final AtomicInteger activeCountGauge, maxActiveGauge, maxIdleGauge, minIdleGauge,poolingCountGauge;
 
     private final CachingConnectionFactory cachingConnectionFactory;
     private final DruidDataSource druidDataSource;
@@ -45,6 +45,7 @@ public class PrometheusSchedulerCustomJob {
         idleChannelsNotTxHighWaterGauge = meterRegistry.gauge("rabbitmq_idle_channels_not_tx_high_water", new AtomicInteger(0));
 
         activeCountGauge = meterRegistry.gauge("db_active_count", new AtomicInteger(0));
+        poolingCountGauge = meterRegistry.gauge("db_pooling_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));
@@ -61,6 +62,7 @@ public class PrometheusSchedulerCustomJob {
         idleChannelsNotTxHighWaterGauge.set(Integer.parseInt(cacheProperties.getOrDefault("idleChannelsNotTxHighWater", 0).toString()));
 
         activeCountGauge.set(druidDataSource.getActiveCount());
+        poolingCountGauge.set(druidDataSource.getPoolingCount());
         maxActiveGauge.set(druidDataSource.getMaxActive());
         maxIdleGauge.set(druidDataSource.getMaxIdle());
         minIdleGauge.set(druidDataSource.getMinIdle());