重构

shopping-cart-application-service/src/main/java/cn/freemud/demo/entities/AddGoodsToShoppingCartBO.java

@@ -13,6 +13,9 @@ public class AddGoodsToShoppingCartBO {
 
     private List<CartGoods> cartGoods;
 
+    private Boolean isMember;
+
+
     /**
      * 前端用来提示的信息
      */

shopping-cart-application-service/src/main/java/cn/freemud/demo/entities/CalCostBO.java

 package cn.freemud.demo.entities;
 
+import cn.freemud.entities.dto.calculate.CalculationSharingDiscountRequestDto;
 import cn.freemud.entities.vo.CartGoods;
 import lombok.Data;
 

shopping-cart-application-service/src/main/java/cn/freemud/demo/entities/CheckBussinessRulesBO.java

@@ -17,6 +17,8 @@ public class CheckBussinessRulesBO {
 
     private ProductBO product;
 
+    private Boolean isMember;
+
     private List<CartGoods> cartGoods;
 
     /**

shopping-cart-application-service/src/main/java/cn/freemud/demo/entities/CustomerInfo.java

+package cn.freemud.demo.entities;
+
+import lombok.Data;
+
+@Data
+public class CustomerInfo {
+
+    private String userId;
+
+    private Boolean isMember;
+
+}

shopping-cart-application-service/src/main/java/cn/freemud/demo/entities/DiscountResultBO.java

@@ -10,6 +10,9 @@ public class DiscountResultBO {
 
     List<CartGoods> cartGoods;
 
+    private Boolean isMember;
+
+
     /**
      * 前端用来提示的信息
      */

shopping-cart-application-service/src/main/java/cn/freemud/demo/entities/GetCalculationDiscountBO.java

@@ -63,16 +63,16 @@ public class GetCalculationDiscountBO {
     /**
      * 优惠券集合
      */
-    private List<CalculationSharingDiscountRequestDto.CalculationDiscountCoupon> coupons;
+    private List<CalculationDiscountCoupon> coupons;
     /**
      * 商品集合
      */
-    private List<CalculationSharingDiscountRequestDto.CalculationDiscountGoods> goods;
+    private List<CalculationDiscountGoods> goods;
 
     /**
      * 已选换购活动集合
      */
-    private List<CalculationSharingDiscountRequestDto.CalculationActivityReqVO> selectActivityList;
+    private List<CalculationActivityReqVO> selectActivityList;
 
 
     private Long distributionFee;
@@ -129,13 +129,13 @@ public class GetCalculationDiscountBO {
         /**
          * 加料
          */
-        private List<CalculationSharingDiscountRequestDto.CalculationDiscountGoods.Material> smallMaterial;
+        private List<CalculationDiscountGoods.Material> smallMaterial;
         private String spuId;
 
         /**
          * 套餐固定商品组
          */
-        private List<CalculationSharingDiscountRequestDto.CalculationDiscountGoods.GroupCombox> groupCombox;
+        private List<CalculationDiscountGoods.GroupCombox> groupCombox;
         /**
          * 是否计算套餐
          */
@@ -147,7 +147,7 @@ public class GetCalculationDiscountBO {
                 return true;
             if (o == null || getClass() != o.getClass())
                 return false;
-            CalculationSharingDiscountRequestDto.CalculationDiscountGoods that = (CalculationSharingDiscountRequestDto.CalculationDiscountGoods) o;
+            CalculationDiscountGoods that = (CalculationDiscountGoods) o;
             return Objects.equals(goodsId, that.goodsId) &&
                     Objects.equals(category, that.category) &&
                     Objects.equals(cartGoodsUid, that.cartGoodsUid) &&

shopping-cart-application-service/src/main/java/cn/freemud/demo/entities/GetStoreBO.java

 package cn.freemud.demo.entities;
 
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 @Data
+@AllArgsConstructor
+@NoArgsConstructor
 public class GetStoreBO {
 
     private String partnerId;

shopping-cart-application-service/src/main/java/cn/freemud/demo/manager/customer/CustomerManager.java

 package cn.freemud.demo.manager.customer;
 
+import cn.freemud.demo.entities.CustomerInfo;
 import cn.freemud.demo.entities.QueryReceiveAddressByIdBO;
 import cn.freemud.demo.entities.ReceiveAddressBO;
 import org.springframework.stereotype.Service;
@@ -7,9 +8,9 @@ import org.springframework.stereotype.Service;
 @Service
 public class CustomerManager {
 
-    public String getUserId(String sessionId, CustomerService customerService) {
-        String userId = customerService.getUserId(sessionId);
-        return userId;
+    public CustomerInfo getUserInfo(String sessionId, CustomerService customerService) {
+        CustomerInfo userInfoByUserId = customerService.getUserInfoByUserId(sessionId);
+        return userInfoByUserId;
     }
 
     public ReceiveAddressBO queryReceiveAddressById(QueryReceiveAddressByIdBO queryReceiveAddressByIdBO, CustomerService customerService) {

shopping-cart-application-service/src/main/java/cn/freemud/demo/manager/customer/CustomerService.java

 package cn.freemud.demo.manager.customer;
 
 import cn.freemud.base.entity.BaseResponse;
+import cn.freemud.demo.entities.CustomerInfo;
 import cn.freemud.demo.entities.QueryReceiveAddressByIdBO;
 import cn.freemud.demo.entities.ReceiveAddressBO;
 import cn.freemud.entities.dto.user.GetSessionUserInfoDto;
@@ -10,7 +11,7 @@ import cn.freemud.interceptor.ServiceException;
 
 public interface CustomerService {
 
-    String getUserId(String sessionId);
+    CustomerInfo getUserInfoByUserId(String sessionId);
 
     ReceiveAddressBO queryReceiveAddressById(QueryReceiveAddressByIdBO queryReceiveAddressByIdBO);
 

shopping-cart-application-service/src/main/java/cn/freemud/demo/manager/customer/KgdCustomerServceImpl.java

@@ -2,6 +2,7 @@ package cn.freemud.demo.manager.customer;
 
 import cn.freemud.base.entity.BaseResponse;
 import cn.freemud.demo.adapter.manager.CustomerDTO2BOAdapter;
+import cn.freemud.demo.entities.CustomerInfo;
 import cn.freemud.demo.entities.QueryReceiveAddressByIdBO;
 import cn.freemud.demo.entities.ReceiveAddressBO;
 import cn.freemud.entities.dto.user.GetSessionUserInfoDto;
@@ -12,6 +13,7 @@ import cn.freemud.service.thirdparty.CustomerApplicationClient;
 import com.freemud.application.sdk.api.membercenter.request.QueryReceiveAddressRequest;
 import com.freemud.application.sdk.api.membercenter.response.QueryReceiveAddressResponse;
 import com.freemud.application.sdk.api.membercenter.service.MemberCenterService;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -29,7 +31,7 @@ public class KgdCustomerServceImpl implements CustomerService {
 
 
     @Override
-    public String getUserId(String sessionId) {
+    public CustomerInfo getUserInfoByUserId(String sessionId) {
         GetSessionUserInfoDto getSessionUserInfoDto = new GetSessionUserInfoDto();
         getSessionUserInfoDto.setIsGetPaid(true);
         getSessionUserInfoDto.setSessionId(sessionId);
@@ -37,7 +39,18 @@ public class KgdCustomerServceImpl implements CustomerService {
         if (!ResponseResult.SUCCESS.getCode().equals(sessionUserInfo.getCode()) || sessionUserInfo.getResult() == null) {
             throw new ServiceException(ResponseResult.NOT_LOGIN);
         }
-        return sessionUserInfo.getResult().getSessionId();
+        CustomerInfoVo result = sessionUserInfo.getResult();
+        CustomerInfo customerInfo = new CustomerInfo();
+
+        if(CollectionUtils.isEmpty(result.getMemberPaids())){
+            customerInfo.setIsMember(false);
+        } else {
+            boolean isMember = result.getMemberPaids().stream().anyMatch(item -> item.getExpiryTime().getTime() > System.currentTimeMillis());
+            customerInfo.setIsMember(isMember);
+
+        }
+        customerInfo.setUserId(result.getSessionId());
+        return customerInfo;
     }
 
     @Override

shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/CartGoods.java

@@ -89,6 +89,11 @@ public class CartGoods {
      */
     private String couponName;
 
+    /**
+     * 活动号
+     */
+    private String activityCode;
+
     private String spuId;
     private String skuId;
     /**