Merge branch 'feature/2.0.5【ID1018638】【C端服务端】活动库存接口调整对接' into 'develop'

【ID1018638】【C端服务端】活动库存接口调整对接

See merge request !6

assortment-ordercenter-sdk/pom.xml

@@ -61,7 +61,7 @@
         <dependency>
             <artifactId>promotioncenter-sdk</artifactId>
             <groupId>com.freemud.application.service.sdk</groupId>
-            <version>2.3.RELEASE</version>
+            <version>2.6.5.SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

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

@@ -1605,6 +1605,9 @@ public class OrderSdkAdapter {
         activityUpdateStockRequest.setPartnerCode(orderBean.getCompanyId());
         activityUpdateStockRequest.setStoreId(orderBean.getShopId());
         activityUpdateStockRequest.setVer("1");
+        // add by miaohui 20201030 for 【ID1018638】【C端服务端】活动库存接口调整对接
+        activityUpdateStockRequest.setUserId(orderBean.getUserId());
+        activityUpdateStockRequest.setOrderCreateTime(DateUtil.getCurrentDate(DateUtil.FORMAT_yyyyMMdd_date));
         return activityUpdateStockRequest;
     }
 

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java

@@ -196,7 +196,9 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
         }
         //TODO 扣减活动库存
         ActivityUpdateStockRequest activityUpdateStockRequest = orderSdkAdapter.convert2ActivityUpdateStockRequest(orderBean, updateStockRequest);
-        if (activityUpdateStockRequest != null && CollectionUtils.isNotEmpty(activityUpdateStockRequest.getStock())) {
+        // update by miaohui 20201030 for 【ID1018638】【C端服务端】活动库存接口调整对接
+        // 原逻辑只检测扣减库存不为空时调用，现改为扣减库存不为空或参加活动不为空时调用
+        if (activityUpdateStockRequest != null && (CollectionUtils.isNotEmpty(activityUpdateStockRequest.getStock()) || CollectionUtils.isNotEmpty(activityUpdateStockRequest.getActivityList()))) {
             BaseResponse activityResponse = promotionSdkService.subtractStock(activityUpdateStockRequest, "");
             ThirdPartyLog.infoConvertJson(System.currentTimeMillis(), System.currentTimeMillis(),
                     "subtractStock", JSONObject.toJSONString(activityUpdateStockRequest), JSONObject.toJSONString(activityResponse));
@@ -267,7 +269,9 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
                                                   List<CreateOrderAccountRequest> accounts, MqMessageRequest mqMessageRequest,String menuType) {
         //扣减活动库存
         ActivityUpdateStockRequest activityUpdateStockRequest = orderSdkAdapter.convert2ActivityUpdateStockRequest(orderBean, updateStockRequest);
-        if (activityUpdateStockRequest != null && CollectionUtils.isNotEmpty(activityUpdateStockRequest.getStock())) {
+        // update by miaohui 20201030 for 【ID1018638】【C端服务端】活动库存接口调整对接
+        // 原逻辑只检测扣减库存不为空时调用，现改为扣减库存不为空或参加活动不为空时调用
+        if (activityUpdateStockRequest != null && (CollectionUtils.isNotEmpty(activityUpdateStockRequest.getStock()) || CollectionUtils.isNotEmpty(activityUpdateStockRequest.getActivityList()))) {
             BaseResponse activityResponse = promotionSdkService.subtractStock(activityUpdateStockRequest, "");
             ThirdPartyLog.infoConvertJson(System.currentTimeMillis(), System.currentTimeMillis(),
                     "subtractStock", JSONObject.toJSONString(activityUpdateStockRequest), JSONObject.toJSONString(activityResponse));

order-application-service/pom.xml

@@ -60,7 +60,7 @@
         <dependency>
             <artifactId>promotioncenter-sdk</artifactId>
             <groupId>com.freemud.application.service.sdk</groupId>
-            <version>2.3.RELEASE</version>
+            <version>2.6.5.SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.sdk.api.assortment</groupId>

order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java

@@ -284,6 +284,9 @@ public class OrderAdapter {
         }
         createOrderDto.setAccounts(CollectionUtils.isNotEmpty(orderAccountDtos) ? orderAccountDtos : Collections.emptyList());
 
+        // update by miaohui 20201030 for 【ID1018638】【C端服务端】活动库存接口调整对接
+        ActivityUpdateStockRequest activityUpdateStockRequest = this.initActivityUpdateStockRequest(activityDiscountsDtos);
+
         //设置库存扣减
         if (CollectionUtils.isNotEmpty(shoppingCartGoodsDto.getStocks())) {
             List<ActivityUpdateStockRequest.StockBeanDto> stocks = new ArrayList<>();
@@ -305,10 +308,10 @@ public class OrderAdapter {
                 }
                 stocks.add(stockBeanDto);
             }
-            ActivityUpdateStockRequest activityUpdateStockRequest = new ActivityUpdateStockRequest();
+
             activityUpdateStockRequest.setStock(stocks);
-            createOrderDto.setActivityUpdateStockRequest(activityUpdateStockRequest);
         }
+        createOrderDto.setActivityUpdateStockRequest(activityUpdateStockRequest);
         createOrderDto.setPayChannelType(createOrderVo.getPayChannelType());
         createOrderDto.setPayChannelType(createOrderVo.getPayChannelType());
         createOrderDto.setOrderPayItemCreateReqList(createOrderVo.getOrderPayItemCreateReqList());
@@ -773,6 +776,10 @@ public class OrderAdapter {
             orderAccountDtos.add(createOrderAccountDto);
         }
         productOrderInfo.setAccounts(CollectionUtils.isNotEmpty(orderAccountDtos) ? orderAccountDtos : Collections.emptyList());
+
+        // update by miaohui 20201030 for 【ID1018638】【C端服务端】活动库存接口调整对接
+        ActivityUpdateStockRequest activityUpdateStockRequest = this.initActivityUpdateStockRequest(activityDiscountsDtos);
+
         //设置库存扣减
         if (CollectionUtils.isNotEmpty(shoppingCartGoodsDto.getStocks())) {
             List<ActivityUpdateStockRequest.StockBeanDto> stocks = new ArrayList<>();
@@ -794,10 +801,9 @@ public class OrderAdapter {
                 }
                 stocks.add(stockBeanDto);
             }
-            ActivityUpdateStockRequest activityUpdateStockRequest = new ActivityUpdateStockRequest();
             activityUpdateStockRequest.setStock(stocks);
-            productOrderInfo.setActivityUpdateStockRequest(activityUpdateStockRequest);
         }
+        productOrderInfo.setActivityUpdateStockRequest(activityUpdateStockRequest);
         return productOrderInfo;
     }
 
@@ -3109,6 +3115,8 @@ public class OrderAdapter {
 //        }
 //        createOrderDto.setAccounts(CollectionUtils.isNotEmpty(orderAccountDtos) ? orderAccountDtos : Collections.emptyList());
 
+        // update by miaohui 20201030 for 【ID1018638】【C端服务端】活动库存接口调整对接
+        ActivityUpdateStockRequest activityUpdateStockRequest = this.initActivityUpdateStockRequest(activityDiscountsDtos);
 
         //设置库存扣减
         if (shoppingCartGoodsResponse != null && CollectionUtils.isNotEmpty(shoppingCartGoodsResponse.getStocks())) {
@@ -3131,10 +3139,9 @@ public class OrderAdapter {
                 }
                 stocks.add(stockBeanDto);
             }
-            ActivityUpdateStockRequest activityUpdateStockRequest = new ActivityUpdateStockRequest();
             activityUpdateStockRequest.setStock(stocks);
-            sdkUpdateOrderProductInfoRequest.setActivityUpdateStockRequest(activityUpdateStockRequest);
         }
+        sdkUpdateOrderProductInfoRequest.setActivityUpdateStockRequest(activityUpdateStockRequest);
         return sdkUpdateOrderProductInfoRequest;
     }
 
@@ -3630,4 +3637,22 @@ public class OrderAdapter {
         deleteOrderDto.setOrderId(oId);
         return deleteOrderDto;
     }
+
+    /**
+     * 初始化扣减活动库存请求对象
+     * add by miaohui 20201030 for 【ID1018638】【C端服务端】活动库存接口调整对接
+     * @return
+     */
+    private ActivityUpdateStockRequest initActivityUpdateStockRequest(List<ActivityDiscountsDto> activityDiscountsDtos) {
+        // 原逻辑只检测扣减库存不为空时调用，现改为扣减库存不为空或参加活动不为空时调用
+        ActivityUpdateStockRequest activityUpdateStockRequest = new ActivityUpdateStockRequest();
+        List<String> activityList = new ArrayList<>();
+        // 只记录订单级别的活动ID
+        if (CollectionUtils.isNotEmpty(activityDiscountsDtos)) {
+            activityList.addAll(activityDiscountsDtos.stream().filter(ad -> StringUtils.isNotBlank(ad.getActivityCode())).map(ActivityDiscountsDto::getActivityCode).distinct().collect(Collectors.toList()));
+        }
+        //设置活动编号
+        activityUpdateStockRequest.setActivityList(CollectionUtils.isNotEmpty(activityList) ? activityList : null);
+        return activityUpdateStockRequest;
+    }
 }