Merge branch 'feature/2.0.4-集点改造' into qa

# Conflicts:
#	order-application-service/src/main/java/cn/freemud/entities/dto/shoppingCart/ShoppingCartGoodsDto.java
#	shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/shoppingCart/ShoppingCartGoodsDto.java
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/BaseCreateOrderRequest.java

@@ -206,6 +206,20 @@ public class BaseCreateOrderRequest extends BaseConfig {
          * 会员规则ID
          */
         private String ruleId;
+
+        private SendPoint point;
+
+    }
+
+    @Data
+    public static class SendPoint{
+
+        private String activityCode;
+        private Date endTime;
+        private Integer sendPoint;
+        private Integer maxNum;
+        private Integer validityDateDays;
+
     }
 
 }

order-application-service/pom.xml

@@ -20,7 +20,7 @@
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>
             <artifactId>sdk-common-base</artifactId>
-            <version>1.5.2.RELEASE</version>
+            <version>1.5.3.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.sdk.api.assortment</groupId>

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

@@ -300,9 +300,19 @@ public class OrderAdapter {
             createOrderDto.setActivityUpdateStockRequest(activityUpdateStockRequest);
         }
         createOrderDto.setPayChannelType(createOrderVo.getPayChannelType());
+
+        createOrderDto.setOtherInfo(getOrderOtherInfo(shoppingCartGoodsDto));
         return createOrderDto;
     }
 
+    private BaseCreateOrderRequest.OrderOtherInfo getOrderOtherInfo(ShoppingCartGoodsDto shoppingCartGoodsDto) {
+        BaseCreateOrderRequest.SendPoint sendPoint = new BaseCreateOrderRequest.SendPoint();
+        BeanUtil.convertBean(shoppingCartGoodsDto.getSendPoint(), sendPoint);
+        BaseCreateOrderRequest.OrderOtherInfo orderOtherInfo = new BaseCreateOrderRequest.OrderOtherInfo();
+        orderOtherInfo.setPoint(sendPoint);
+        return orderOtherInfo;
+    }
+
     private List<CreateOrderAccountRequest> getMaterialAccounts(CreateOrderProductRequest createOrderProductDto, ShoppingCartGoodsDto.CartGoodsDetailDto material) {
         List<CreateOrderAccountRequest> orderAccountDtos = createOrderProductDto.getAccounts();
         if (CollectionUtils.isEmpty(orderAccountDtos)){

order-application-service/src/main/java/cn/freemud/entities/dto/shoppingCart/ShoppingCartGoodsDto.java

@@ -8,6 +8,7 @@ import lombok.Data;
 import org.apache.commons.collections4.CollectionUtils;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -100,6 +101,12 @@ public class ShoppingCartGoodsDto {
      */
     private Long payCardFee;
 
+
+    /**
+     * 送集点
+     */
+    private SendPoint sendPoint;
+
     @Data
     public static class CartGoodsDetailDto {
         /**
@@ -261,4 +268,16 @@ public class ShoppingCartGoodsDto {
 
     }
 
+    @Data
+    public static class SendPoint{
+
+        private String activityCode;
+        private Date endTime;
+        private Integer sendPoint;
+        private Integer maxNum;
+        private Integer validityDateDays;
+
+
+    }
+
 }

shopping-cart-application-service/pom.xml

@@ -30,7 +30,7 @@
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>
             <artifactId>sdk-common-base</artifactId>
-            <version>1.5.2.RELEASE</version>
+            <version>1.5.3.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>

shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/ActivityCalculationDiscountResponseDto.java

 package cn.freemud.entities.dto;
 
+import cn.freemud.entities.dto.shoppingCart.SendPoint;
 import cn.freemud.entities.vo.SubtractStockVO;
+import com.freemud.application.sdk.api.promotioncenter.dto.promotion.DiscountDTO;
+import com.freemud.application.sdk.api.promotioncenter.dto.promotion.SendCouponsDTO;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -104,6 +108,8 @@ public class ActivityCalculationDiscountResponseDto {
          */
         private Long payCardFee;
 
+        private SendPoint sendPoint;
+
 
         @Data
         public static class ActivityPrompt {
@@ -166,6 +172,19 @@ public class ActivityCalculationDiscountResponseDto {
              *  1-运费券 2-运费月卡券 3-月卡券 4-万能券 5-啡常月享卡 6-通用券
              */
             private Integer extendType;
+
+            private SendPointDto sendPointVo;
+
+            private Date endTime;
+        }
+
+        @Data
+        public static class SendPointDto{
+            private String activityCode;
+            private Integer sendPoint;
+            private Integer maxNum;
+            private Integer exchangeNum;
+            private Integer validityDateDays;
         }
 
         @Data

shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/shoppingCart/SendPoint.java

+package cn.freemud.entities.dto.shoppingCart;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class SendPoint {
+
+    private String activityCode;
+    private Date endTime;
+    private Integer sendPoint;
+    private Integer maxNum;
+    private Integer validityDateDays;
+
+}

shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/shoppingCart/ShoppingCartGoodsDto.java

@@ -11,6 +11,7 @@ import lombok.Data;
 import org.apache.commons.collections4.CollectionUtils;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -126,6 +127,11 @@ public class ShoppingCartGoodsDto {
      * 麦咖啡-咖啡月卡价格
      */
     private Long payCardFee;
+    /**
+     * 送集点
+     */
+    private SendPoint sendPoint;
+
 
     @Data
     public static class CartGoodsDetailDto {
@@ -323,4 +329,5 @@ public class ShoppingCartGoodsDto {
         }
 
     }
+
 }

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

@@ -26,6 +26,7 @@ import cn.freemud.entities.dto.calculate.CalculationSharingDiscountRequestDto;
 import cn.freemud.entities.dto.calculate.CalculationSharingDiscountResponseDto;
 import cn.freemud.entities.dto.openplatform.WeixinProductRequestDto;
 import cn.freemud.entities.dto.openplatform.WeixinProductResponseDto;
+import cn.freemud.entities.dto.shoppingCart.SendPoint;
 import cn.freemud.entities.dto.shoppingCart.ShoppingCartGoodsDto;
 import cn.freemud.entities.dto.user.GetSessionUserInfoDto;
 import cn.freemud.entities.vo.*;
@@ -50,6 +51,7 @@ import com.freemud.api.assortment.datamanager.entity.db.AssortmentOpenPlatformPa
 import com.freemud.api.assortment.datamanager.entity.db.AssortmentOpenPlatformPartnerWxappConfig;
 import com.freemud.api.assortment.datamanager.manager.AssortmentOpenPlatformPartnerStoreDeliveryConfigManager;
 import com.freemud.api.assortment.datamanager.manager.customer.AssortmentCustomerInfoManager;
+import com.freemud.application.sdk.api.log.ApiLog;
 import com.freemud.application.sdk.api.log.ErrorLog;
 import com.freemud.application.sdk.api.log.LogThreadLocal;
 import com.freemud.application.sdk.api.membercenter.request.QueryReceiveAddressRequest;
@@ -59,6 +61,7 @@ import com.freemud.application.sdk.api.paymentcenter.client.request.SVCCardAmoun
 import com.freemud.application.sdk.api.paymentcenter.client.response.SVCCardAmountResponse;
 import com.freemud.application.sdk.api.paymentcenter.client.service.PaymentNewService;
 import com.freemud.application.sdk.api.productcenter.domain.ProductBeanDTO;
+import com.freemud.application.sdk.api.promotioncenter.dto.promotion.DiscountDTO;
 import com.freemud.application.sdk.api.storecenter.request.QueryDeliveryRequest;
 import com.freemud.application.sdk.api.storecenter.request.StoreInfoRequest;
 import com.freemud.application.sdk.api.storecenter.response.QueryDeliverDetailResponse;
@@ -835,6 +838,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
             shoppingCartGoodsDto.setThresholdAmount(shoppingCartGoodsResponseVo.getThresholdAmount());
             shoppingCartGoodsDto.setIsDiscountDelivery(shoppingCartGoodsResponseVo.getIsDiscountDelivery());
             shoppingCartGoodsDto.setDiscountDeliveryActivityCode(shoppingCartGoodsResponseVo.getDiscountDeliveryActivityCode());
+            shoppingCartGoodsDto.setSendPoint(calculationDiscountResult.getSendPoint());
         }
         return ResponseUtil.success(shoppingCartGoodsDto);
     }
@@ -976,6 +980,11 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         // 返回成功
         if (activityCalculationDiscountResponseDto != null && StringUtils.equals(activityCalculationDiscountResponseDto.getStatusCode(), ResponseCodeConstant.RESPONSE_SUCCESS_STR)) {
             ActivityCalculationDiscountResponseDto.CalculationDiscountResult result = activityCalculationDiscountResponseDto.getResult();
+            List<Integer> activityTypes = result.getDiscounts().stream().map(ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Discount::getType).collect(Collectors.toList());
+            if (activityTypes.contains(221)) {
+                ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Discount discountDTO = result.getDiscounts().stream().filter(d -> 221 == d.getType()).findFirst().get();
+                convert2SendPoint(result, discountDTO);
+            }
             result.setValidCouponMap(validCouponMap);
             result.setDeliveryAmount(distributionFee);
             result.setDistributionFee(result.getDistributionFee());
@@ -995,6 +1004,19 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         throw new ServiceException(ResponseResult.OPERATE_TOO_OFTEN);
     }
 
+    private void convert2SendPoint(ActivityCalculationDiscountResponseDto.CalculationDiscountResult result, ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Discount discountDTO) {
+        SendPoint sendPoint = result.getSendPoint();
+        ActivityCalculationDiscountResponseDto.CalculationDiscountResult.SendPointDto sendPointVo = discountDTO.getSendPointVo();
+        if (sendPointVo != null){
+            sendPoint.setMaxNum(sendPointVo.getMaxNum());
+            sendPoint.setSendPoint(sendPointVo.getSendPoint());
+            sendPoint.setValidityDateDays(sendPoint.getValidityDateDays());
+        }
+        sendPoint.setActivityCode(discountDTO.getActivityCode());
+        sendPoint.setEndTime(discountDTO.getEndTime());
+
+    }
+
     /**
      * 将calculationDiscountGoods 封装后加入 calculationDiscountGoodsList
      *

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

@@ -14,6 +14,8 @@ package cn.freemud.service.thirdparty;
 
 import cn.freemud.entities.dto.*;
 import cn.freemud.entities.dto.activity.ActivityQueryResponseDto;
+import com.freemud.application.sdk.api.base.BaseResponse;
+import com.freemud.application.sdk.api.promotioncenter.response.CalculationDiscountResponseDTO;
 import org.springframework.cloud.netflix.feign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;