会员价联调

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

@@ -1166,6 +1166,9 @@ public class OrderSdkAdapter {
             case "FULL_DISTRIBUTION_FEE":
                 type=1014;
                 break;
+            case "MEMBER_PRICE_DISCOUNT":
+                type=220;
+                break;
             default:
                 break;
         }
@@ -1867,6 +1870,8 @@ public class OrderSdkAdapter {
                 break;
             case 205:
                 newOrderAccountType=OldOrderAccountType.TOTAL_DISCOUNT.getCode();
+            case 220:
+                newOrderAccountType=OldOrderAccountType.MEMBER_PRICE_DISCOUNT.getCode();
             default:
                 break;
         }

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/enums/OldOrderAccountType.java

@@ -37,7 +37,8 @@ public enum OldOrderAccountType {
     FULL_DISTRIBUTION_FEE(1014, "满减配送费", "FULL_DISTRIBUTION_FEE"),
     NEW_USER_DISCOUNT(101, "新用户立减", "NEW_USER_DISCOUNT"),
     PRICE_DEDUCTION_COUPON(103, "抵价券", "PRICE_DEDUCTION_COUPON"),
-    TOTAL_DISCOUNT(205, "优惠总金额", "TOTAL_DISCOUNT");
+    TOTAL_DISCOUNT(205, "优惠总金额", "TOTAL_DISCOUNT"),
+    MEMBER_PRICE_DISCOUNT(220, "会员价优惠", "MEMBER_PRICE_DISCOUNT");
     private Integer code;
 
     private String desc;

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/enums/QueryOrderAccountType.java

@@ -36,7 +36,8 @@ public enum QueryOrderAccountType {
     TOTAL_DISCOUNT("TOTAL_DISCOUNT", "优惠总金额"),
     ONLINE_PAY("ONLINE_PAY", "线上支付"),
     FULL_DISTRIBUTION_FEE("FULL_DISTRIBUTION_FEE", "满减配送费"),
-    OFFLINE_PAY("OFFLINE_PAY", "线下支付");
+    OFFLINE_PAY("OFFLINE_PAY", "线下支付"),
+    MEMBER_PRICE_DISCOUNT("MEMBER_PRICE_DISCOUNT","会员价优惠");
     private String code;
 
     private String desc;

assortment-shoppingcart-sdk/pom.xml

@@ -42,7 +42,7 @@
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>
             <artifactId>productcenter-sdk</artifactId>
-            <version>2.8.0-SNAPSHOT</version>
+            <version>2.9.3-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/adapter/ShoppingCartAdapter.java

@@ -71,6 +71,7 @@ public class ShoppingCartAdapter {
             //可选搭配&固定搭配
             productType.setComboProductTypeList(getValidateSkuProductType(cartGoods.getProductComboList()));
             productType.setProductGroupTypeList(getValidateSkuProductType(cartGoods.getProductGroupList()));
+            productType.setMemberDiscount(cartGoods.getMemberDiscount());
             validateShopProductRequest.getProductTypeList().add(productType);
         }
         return validateShopProductRequest;
@@ -279,6 +280,7 @@ public class ShoppingCartAdapter {
             cartGoods.setStockLimit(isSkuProduct ? ObjectUtils.equals(1, skuProduct.getStockLimit()) : ObjectUtils.equals(1, spuProduct.getStockLimit()));
             cartGoods.setCustomerCode(isSkuProduct ? skuProduct.getCustomerCode() : spuProduct.getCustomerCode());
             cartGoods.setRiseSell(isSkuProduct?skuProduct.getRiseSell():spuProduct.getRiseSell());
+            cartGoods.setMemberDiscount(isSkuProduct?skuProduct.getMemberDiscountResult():spuProduct.getMemberDiscountResult());
 
             String skuSpecName = "";
             if (isSkuProduct && CollectionUtils.isNotEmpty(skuProduct.getSkuSpecValues())) {

assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/domain/CartGoods.java

@@ -138,6 +138,11 @@ public class CartGoods {
      * 无起售份数默认值1
      */
     private Integer riseSell;
+    /**
+     * 折扣比例
+     * 例如8折为80
+     */
+    private Integer memberDiscount;
 
     /**
      * 套餐固定商品

order-application-service/pom.xml

@@ -40,7 +40,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>assortment-ordercenter-sdk</artifactId>
-            <version>1.4.9.RELEASE</version>
+            <version>1.5.0.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>

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

@@ -2032,6 +2032,9 @@ public class OrderAdapter {
         if (ActivityTypeEnum.TYPE_14.getCode().equals(activityType)) {
             return OldOrderAccountType.FULL_DISTRIBUTION_FEE;
         }
+        if (ActivityTypeEnum.TYPE_320.getCode().equals(activityType)){
+            return OldOrderAccountType.MEMBER_PRICE_DISCOUNT;
+        }
         return OldOrderAccountType.BUYM_SENDN;
     }
 

order-application-service/src/main/java/cn/freemud/enums/ActivityTypeEnum.java

@@ -50,7 +50,8 @@ public enum ActivityTypeEnum {
     TYPE_200(200, "X元Y件"),
     TYPE_PACKAGE(900, "包装费"),
     TYPE_DELIVERY(901, "配送费"),
-    TYPE_211(211, "套餐优惠");
+    TYPE_211(211, "套餐优惠"),
+    TYPE_320(320, "会员价优惠");
 
     private Integer code;
 

shopping-cart-application-service/pom.xml

@@ -35,7 +35,7 @@
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>
             <artifactId>productcenter-sdk</artifactId>
-            <version>2.8.0-SNAPSHOT</version>
+            <version>2.9.3-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>

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

@@ -63,6 +63,10 @@ public class ActivityCalculationDiscountRequestDto {
     private List<CalculationDiscountGoods> goods;
 
     private Long distributionFee;
+    /**
+     * 是否是会员
+     */
+    private Boolean isMember;
 
     @Data
     public static class CalculationDiscountCoupon {
@@ -94,6 +98,11 @@ public class ActivityCalculationDiscountRequestDto {
          * 原价（分）
          */
         private Long originalPrice;
+        /**
+         * 折扣比例
+         * 例如8折为80
+         */
+        private Integer memberDiscount;
 
         @Override
         public boolean equals(Object o) {

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

+package cn.freemud.entities.dto.user;
+
+import lombok.Data;
+
+/**
+ * All rights Reserved, Designed By www.freemud.cn
+ *
+ * @version V1.0
+ * @Title: GetSessionUserInfoDto
+ * @Package cn.freemud.entities.dto.user
+ * @Description:
+ * @author: shuhu.hou
+ * @date: 2020/5/25 15:50
+ * @Copyright: 2020 www.freemud.cn Inc. All rights reserved.
+ * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
+ */
+@Data
+public class GetSessionUserInfoDto {
+    private String sessionId;
+    private boolean isGetPaid;
+}

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

@@ -145,6 +145,11 @@ public class CartGoods {
      */
     private Integer riseSell;
     /**
+     * 折扣比例
+     * 例如8折为80
+     */
+    private Integer memberDiscount;
+    /**
      * 套餐固定商品
      */
     private List<ComboxGoods> productComboList;

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

+package cn.freemud.entities.vo;
+
+import lombok.Data;
+import org.apache.commons.collections4.CollectionUtils;
+
+import java.util.List;
+
+/**
+ * All rights Reserved, Designed By www.freemud.cn
+ *
+ * @version V1.0
+ * @Title: CustomerInfoVo
+ * @Package cn.freemud.entities.vo
+ * @Description:
+ * @author: shuhu.hou
+ * @date: 2020/5/25 15:35
+ * @Copyright: 2020 www.freemud.cn Inc. All rights reserved.
+ * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
+ */
+@Data
+public class CustomerInfoVo {
+    private String openId;
+    private String unionId;
+    private String wxAppId;
+    private String appSecret;
+    private String sessionKey;
+    private String nickName;
+    private String photoUrl;
+    private String mobile;
+    private String memberId;
+    private String partnerId;
+    private Boolean newMember;
+    private String sessionId;
+    private String tableNumber;
+    private String iappId;
+    private String storeId;
+    private String devBrand;
+    private String devModel;
+    private String channel;
+    private String accessToken;
+    private String alipayUserId;
+    private String appId;
+    private String thirdPartyPartnerID;
+    private String thirdPartyMemberID;
+    /** 付费会员卡列表 **/
+    private List<MemberPaidDetailVo> memberPaids;
+    /** 判断是否为付费会员 **/
+    public boolean isMemberPaid(){
+        if(CollectionUtils.isEmpty(memberPaids)){
+            return false;
+        }
+        return memberPaids.stream().anyMatch(item -> item.getExpiryTime().getTime() > System.currentTimeMillis());
+    }
+}

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

+package cn.freemud.entities.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class MemberPaidDetailVo {
+
+    private String id;
+    private String paidId;
+    private String paidName;
+    private Date openTime;
+    private Date expiryTime;
+}

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

@@ -93,6 +93,7 @@ public interface ShoppingCartNewService {
                                                                                                             String userId,
                                                                                                             String appId,
                                                                                                             Integer orderType,
+                                                                                                            boolean isMember,
                                                                                                             List<CartGoods> cartGoodsList,
                                                                                                             List<ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon> coupons,
                                                                                                             List<ShoppingCartInfoRequestVo.SendGoods> sendGoodsList,String menuType,Long distributionFee);

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

@@ -416,7 +416,7 @@ public class ShoppingCartMallServiceImpl implements ShoppingCartNewService {
 
     @Override
     public ActivityCalculationDiscountResponseDto.CalculationDiscountResult getActivityCalculationDiscountResponse(
-            String partnerId, String storeId, String userId, String appId, Integer orderType, List<CartGoods> cartGoodsList,
+            String partnerId, String storeId, String userId, String appId, Integer orderType,boolean isMember, List<CartGoods> cartGoodsList,
             List<ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon> coupons, List<ShoppingCartInfoRequestVo.SendGoods> sendGoodsList,String menuType,Long distributionFee) {
         return null;
     }

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

@@ -490,7 +490,7 @@ public class ShoppingCartMealServiceImpl implements ShoppingCartNewService {
 
     @Override
     public ActivityCalculationDiscountResponseDto.CalculationDiscountResult
-    getActivityCalculationDiscountResponse(String partnerId, String storeId, String userId, String appId, Integer orderType,
+    getActivityCalculationDiscountResponse(String partnerId, String storeId, String userId, String appId, Integer orderType,boolean isMember,
                                            List<CartGoods> cartGoodsList, List<ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon> coupons, List<ShoppingCartInfoRequestVo.SendGoods> sendGoodsList,String menuType,Long distributionFee) {
         return null;
     }

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

@@ -26,6 +26,7 @@ import cn.freemud.entities.dto.activity.ShareDiscountActivityDto;
 import cn.freemud.entities.dto.openplatform.WeixinProductRequestDto;
 import cn.freemud.entities.dto.openplatform.WeixinProductResponseDto;
 import cn.freemud.entities.dto.shoppingCart.ShoppingCartGoodsDto;
+import cn.freemud.entities.dto.user.GetSessionUserInfoDto;
 import cn.freemud.entities.vo.*;
 import cn.freemud.enums.*;
 import cn.freemud.interceptor.ServiceException;
@@ -96,10 +97,8 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
     private StoreItemClient storeItemClient;
     @Autowired
     private ActivityClient activityClient;
-
     @Autowired
     private ItemService itemService;
-
     @Autowired
     private ShoppingCartNewBaseService shoppingCartNewBaseService;
     @Autowired
@@ -128,7 +127,6 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
     private AssortmentCustomerInfoManager customerInfoManager;
     @Autowired
     private PaymentNewService paymentNewService;
-    //会员SDK
     @Autowired
     private MemberCenterService memberCenterService;
     @Autowired
@@ -137,10 +135,8 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
     private StoreServiceImpl storeService;
     @Autowired
     private StoreCenterService storeCenterService;
-
     @Autowired
     private CommonService commonService;
-
     @Autowired
     private ProductService productService;
     @Autowired
@@ -218,7 +214,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
     public BaseResponse addGoods(AddShoppingCartGoodsRequestVo addShoppingCartGoodsRequestVo) {
         ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVo = new ShoppingCartGoodsResponseVo();
         // 获取用户信息
-        AssortmentCustomerInfoVo assortmentCustomerInfoVo = customerInfoManager.getCustomerInfoByObject(addShoppingCartGoodsRequestVo.getSessionId());
+        CustomerInfoVo assortmentCustomerInfoVo =getCustomerInfoVo(addShoppingCartGoodsRequestVo.getSessionId());
         UserLoginInfoDto userLoginInfoDto = convert2UserLoginInfoDto(assortmentCustomerInfoVo);
         String userId = userLoginInfoDto.getMemberId();
         String partnerId = addShoppingCartGoodsRequestVo.getPartnerId();
@@ -272,7 +268,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
 
         // 获取优惠信息
         ActivityCalculationDiscountResponseDto.CalculationDiscountResult calculationDiscountResult
-                =getCalculationDiscountResult(menuType,partnerId,storeId,userId,appId,userLoginInfoDto.getWxAppid(),orderType,allCartGoodsList,new ArrayList(),new ArrayList<>(),null,deliveryAmount);
+                =getCalculationDiscountResult(menuType,partnerId,storeId,userId,appId,userLoginInfoDto.getWxAppid(),orderType,assortmentCustomerInfoVo.isMemberPaid(), allCartGoodsList,new ArrayList(),new ArrayList<>(),null,deliveryAmount);
 
 
         // 当商品数量被设为0时
@@ -327,7 +323,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
     @Override
     public BaseResponse updateGoodsQty(UpdateShoppingCartGoodsQtyRequestVo updateShoppingCartGoodsQtyRequestVo) {
         ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVo = new ShoppingCartGoodsResponseVo();
-        AssortmentCustomerInfoVo assortmentCustomerInfoVo = customerInfoManager.getCustomerInfoByObject(updateShoppingCartGoodsQtyRequestVo.getSessionId());
+        CustomerInfoVo assortmentCustomerInfoVo = getCustomerInfoVo(updateShoppingCartGoodsQtyRequestVo.getSessionId());
         UserLoginInfoDto userLoginInfoDto = convert2UserLoginInfoDto(assortmentCustomerInfoVo);
         String userId = userLoginInfoDto.getMemberId();
         String partnerId = updateShoppingCartGoodsQtyRequestVo.getPartnerId();
@@ -364,7 +360,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         Long deliveryAmount = calculateDeliveryAmount(receiveId,partnerId,storeId,userLoginInfoDto.getWxAppid());
         // 获取优惠信息
         ActivityCalculationDiscountResponseDto.CalculationDiscountResult calculationDiscountResult
-                =getCalculationDiscountResult(menuType,partnerId,storeId,userId,appId,userLoginInfoDto.getWxAppid(),orderType,cartGoodsList,new ArrayList(),new ArrayList<>(),null,deliveryAmount);
+                =getCalculationDiscountResult(menuType,partnerId,storeId,userId,appId,userLoginInfoDto.getWxAppid(),orderType,assortmentCustomerInfoVo.isMemberPaid(),cartGoodsList,new ArrayList(),new ArrayList<>(),null,deliveryAmount);
         if (calculationDiscountResult == null) {
             shoppingCartGoodsResponseVo.setProducts(cartGoodsList);
 //            return shoppingCartGoodsResponseVo;
@@ -429,7 +425,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
     public BaseResponse getGoodsList(ShoppingCartInfoRequestVo shoppingCartInfoRequestVo) {
         ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVo = new ShoppingCartGoodsResponseVo();
         // 获取用户信息
-        AssortmentCustomerInfoVo assortmentCustomerInfoVo = customerInfoManager.getCustomerInfoByObject(shoppingCartInfoRequestVo.getSessionId());
+        CustomerInfoVo assortmentCustomerInfoVo = getCustomerInfoVo(shoppingCartInfoRequestVo.getSessionId());
         UserLoginInfoDto userLoginInfoDto = convert2UserLoginInfoDto(assortmentCustomerInfoVo);
         String userId = userLoginInfoDto.getMemberId();
         String partnerId = shoppingCartInfoRequestVo.getPartnerId();
@@ -465,7 +461,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         Long deliveryAmount = calculateDeliveryAmount(receiveId,partnerId,storeId,userLoginInfoDto.getWxAppid());
 
         // 获取优惠信息
-        ActivityCalculationDiscountResponseDto.CalculationDiscountResult calculationDiscountResult = getCalculationDiscountResult(menuType,partnerId,storeId,userId,appId,userLoginInfoDto.getWxAppid(),orderType,cartGoodsList,coupons,null,shoppingCartInfoRequestVo.getReceiveId(),deliveryAmount);
+        ActivityCalculationDiscountResponseDto.CalculationDiscountResult calculationDiscountResult = getCalculationDiscountResult(menuType,partnerId,storeId,userId,appId,userLoginInfoDto.getWxAppid(),orderType,assortmentCustomerInfoVo.isMemberPaid(),cartGoodsList,coupons,null,shoppingCartInfoRequestVo.getReceiveId(),deliveryAmount);
 
         if (calculationDiscountResult == null) {
             shoppingCartGoodsResponseVo.setProducts(cartGoodsList);
@@ -520,7 +516,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
      */
     @Override
     public BaseResponse clear(ShoppingCartClearRequestVo shoppingCartClearRequestVo) {
-        AssortmentCustomerInfoVo userLoginInfoDto = customerInfoManager.getCustomerInfoByObject(shoppingCartClearRequestVo.getSessionId());
+        CustomerInfoVo userLoginInfoDto =getCustomerInfoVo(shoppingCartClearRequestVo.getSessionId());
         String appId = shoppingCartClearRequestVo.getAppId();
         if (StringUtils.isBlank(appId)) {
             return ResponseUtil.error(ResponseResult.PARAMETER_MISSING, "appId不能为空");
@@ -555,7 +551,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         ShoppingCartGoodsDto shoppingCartGoodsDto = new ShoppingCartGoodsDto();
         ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVo = new ShoppingCartGoodsResponseVo();
         // 获取用户信息
-        AssortmentCustomerInfoVo assortmentCustomerInfoVo = customerInfoManager.getCustomerInfoByObject(shoppingCartInfoRequestVo.getSessionId());
+        CustomerInfoVo assortmentCustomerInfoVo = getCustomerInfoVo(shoppingCartInfoRequestVo.getSessionId());
         UserLoginInfoDto userLoginInfoDto = convert2UserLoginInfoDto(assortmentCustomerInfoVo);
         String userId = userLoginInfoDto.getMemberId();
         String partnerId = shoppingCartInfoRequestVo.getPartnerId();
@@ -630,7 +626,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
 
         Long deliveryAmount = calculateDeliveryAmount(receiveId,partnerId,storeId,userLoginInfoDto.getWxAppid());
         // 获取优惠信息
-        ActivityCalculationDiscountResponseDto.CalculationDiscountResult calculationDiscountResult = getCalculationDiscountResult(menuType,partnerId,storeId,userId,appId,userLoginInfoDto.getWxAppid(),orderType,cartGoodsList,coupons,sendGoodsList,shoppingCartInfoRequestVo.getReceiveId(),deliveryAmount);
+        ActivityCalculationDiscountResponseDto.CalculationDiscountResult calculationDiscountResult = getCalculationDiscountResult(menuType,partnerId,storeId,userId,appId,userLoginInfoDto.getWxAppid(),orderType,assortmentCustomerInfoVo.isMemberPaid(),cartGoodsList,coupons,sendGoodsList,shoppingCartInfoRequestVo.getReceiveId(),deliveryAmount);
 
         ActivityQueryDto activityQueryDto = activityAdapter.getActivityQueryDto(partnerId, storeId, userId, appId, shoppingCartInfoRequestVo.getOrderType());
 
@@ -711,8 +707,8 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
      * @return
      */
     public ActivityCalculationDiscountResponseDto.CalculationDiscountResult getActivityCalculationDiscountResponse(
-            String partnerId, String storeId, String userId, String wxAppid, Integer orderType, List<CartGoods> cartGoodsList,String menuType, Long distributionFee) {
-        return getActivityCalculationDiscountResponse(partnerId, storeId, userId, wxAppid, orderType, cartGoodsList, new ArrayList<>(), new ArrayList<>(),menuType,distributionFee);
+            String partnerId, String storeId, String userId, String wxAppid, Integer orderType,boolean isMember, List<CartGoods> cartGoodsList,String menuType, Long distributionFee) {
+        return getActivityCalculationDiscountResponse(partnerId, storeId, userId, wxAppid, orderType,isMember, cartGoodsList, new ArrayList<>(), new ArrayList<>(),menuType,distributionFee);
     }
 
     /**
@@ -725,7 +721,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
      */
     @Override
     public ActivityCalculationDiscountResponseDto.CalculationDiscountResult getActivityCalculationDiscountResponse(
-            String partnerId, String storeId, String userId, String appId, Integer orderType, List<CartGoods> cartGoodsList,
+            String partnerId, String storeId, String userId, String appId, Integer orderType,boolean isMember, List<CartGoods> cartGoodsList,
             List<ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon> coupons,
             List<ShoppingCartInfoRequestVo.SendGoods> sendGoodsList,String menuType,Long distributionFee) {
 
@@ -738,7 +734,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
             String cartGoodsUid = cartGoods.getCartGoodsUid();
             // 商品不是商品券
             if (!cartGoodsUid.startsWith(CommonsConstant.COUPON_PREFIX)) {
-                this.addCalculationDiscountGoods(calculationDiscountGoodsList, cartGoods.getGoodsId(), cartGoods.getQty(), cartGoods.getFinalPrice());
+                this.addCalculationDiscountGoods(calculationDiscountGoodsList, cartGoods.getGoodsId(), cartGoods.getQty(), cartGoods.getFinalPrice(),cartGoods.getMemberDiscount());
             }
             // 商品是商品券
             else {
@@ -762,13 +758,13 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
                 coupons.add(coupon);
                 // 添加商品券代表的商品
                 String goodsId = StringUtils.isEmpty(checkSpqInfoResponseDto.getSkuId()) ? checkSpqInfoResponseDto.getSpuId() : checkSpqInfoResponseDto.getSkuId();
-                this.addCalculationDiscountGoods(calculationDiscountGoodsList, goodsId, 1, checkSpqInfoResponseDto.getPrice());
+                this.addCalculationDiscountGoods(calculationDiscountGoodsList, goodsId, 1, checkSpqInfoResponseDto.getPrice(),100);
             }
         }
         // 当加价购商品不为空时
         if (CollectionUtils.isNotEmpty(sendGoodsList)) {
             for (ShoppingCartInfoRequestVo.SendGoods sendGoods : sendGoodsList) {
-                this.addCalculationDiscountGoods(calculationDiscountGoodsList, sendGoods.getGoodsId(), sendGoods.getQty(), sendGoods.getOriginalPrice());
+                this.addCalculationDiscountGoods(calculationDiscountGoodsList, sendGoods.getGoodsId(), sendGoods.getQty(), sendGoods.getOriginalPrice(),100);
             }
         }
         calculationDiscountGoodsList.removeIf(calculationDiscountGoods -> (calculationDiscountGoods.getGoodsQuantity().equals(0)));
@@ -780,6 +776,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         activityCalculationDiscountRequestDto.setCoupons(coupons);
         activityCalculationDiscountRequestDto.setOrgIds(commonService.getOrgIds(partnerId, storeId));
         activityCalculationDiscountRequestDto.setDistributionFee(distributionFee);
+        activityCalculationDiscountRequestDto.setIsMember(isMember);
         ActivityCalculationDiscountResponseDto activityCalculationDiscountResponseDto;
         try {
             activityCalculationDiscountResponseDto = activityClient.calculationDiscount(activityCalculationDiscountRequestDto);
@@ -807,11 +804,12 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
      * @param originalPrice
      */
     private void addCalculationDiscountGoods(List<ActivityCalculationDiscountRequestDto.CalculationDiscountGoods> calculationDiscountGoodsList,
-                                             String goodsId, Integer goodsQuantity, Long originalPrice) {
+                                             String goodsId, Integer goodsQuantity, Long originalPrice,Integer memberDiscount) {
         ActivityCalculationDiscountRequestDto.CalculationDiscountGoods calculationDiscountGoods = new ActivityCalculationDiscountRequestDto.CalculationDiscountGoods();
         calculationDiscountGoods.setGoodsId(goodsId);
         calculationDiscountGoods.setGoodsQuantity(goodsQuantity);
         calculationDiscountGoods.setOriginalPrice(originalPrice);
+        calculationDiscountGoods.setMemberDiscount(memberDiscount);
         this.addCalculationDiscountGoods(calculationDiscountGoodsList, calculationDiscountGoods);
     }
 
@@ -1333,7 +1331,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         shoppingCartGoodsResponseVo.setCardDiscountAmount(firstCouponAmount);
     }
 
-    private UserLoginInfoDto convert2UserLoginInfoDto(AssortmentCustomerInfoVo assortmentCustomerInfoVo) {
+    private UserLoginInfoDto convert2UserLoginInfoDto(CustomerInfoVo assortmentCustomerInfoVo) {
         if (assortmentCustomerInfoVo == null || assortmentCustomerInfoVo.getMemberId() == null) {
             throw new ServiceException(ResponseResult.NOT_LOGIN);
         }
@@ -1503,7 +1501,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
      * 获取优惠
      */
     private ActivityCalculationDiscountResponseDto.CalculationDiscountResult getCalculationDiscountResult(String menuType
-            ,String partnerId,String storeId,String userId,String appId,String wxappid,Integer orderType
+            ,String partnerId,String storeId,String userId,String appId,String wxappid,Integer orderType,boolean isMember
             ,List<CartGoods> cartGoodsList,List<ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon> coupons
             ,List<ShoppingCartInfoRequestVo.SendGoods> sendGoodsList,String receiveId,Long deliveryAmount){
         // 获取优惠信息
@@ -1511,9 +1509,9 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         //外卖场景下 查询门店配送信息
         if(BusinessTypeEnum.SAAS_DELIVERY.getCode().equals(menuType)){
 
-            calculationDiscountResult = this.getActivityCalculationDiscountResponse(partnerId, storeId, userId, appId, orderType, cartGoodsList, coupons, sendGoodsList,BusinessTypeEnum.getByType(menuType).getCode(),deliveryAmount);
+            calculationDiscountResult = this.getActivityCalculationDiscountResponse(partnerId, storeId, userId, appId, orderType,isMember, cartGoodsList, coupons, sendGoodsList,BusinessTypeEnum.getByType(menuType).getCode(),deliveryAmount);
         }else{
-            calculationDiscountResult = this.getActivityCalculationDiscountResponse(partnerId, storeId, userId, appId, orderType, cartGoodsList, coupons, sendGoodsList,BusinessTypeEnum.getByType(menuType).getCode(),null);
+            calculationDiscountResult = this.getActivityCalculationDiscountResponse(partnerId, storeId, userId, appId, orderType,isMember, cartGoodsList, coupons, sendGoodsList,BusinessTypeEnum.getByType(menuType).getCode(),null);
         }
 
         return calculationDiscountResult;
@@ -1534,4 +1532,15 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
 
     }
 
+    private CustomerInfoVo getCustomerInfoVo(String sessionId) {
+        GetSessionUserInfoDto getSessionUserInfoDto = new GetSessionUserInfoDto();
+        getSessionUserInfoDto.setGetPaid(true);
+        getSessionUserInfoDto.setSessionId(sessionId);
+        BaseResponse<CustomerInfoVo> sessionUserInfo = customerApplicationClient.getSessionUserInfo(getSessionUserInfoDto);
+        if (!ResponseResult.SUCCESS.getCode().equals(sessionUserInfo.getCode()) || sessionUserInfo.getResult() == null) {
+            throw new ServiceException(ResponseResult.NOT_LOGIN);
+        }
+        return sessionUserInfo.getResult();
+    }
+
 }

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

@@ -3,6 +3,8 @@ package cn.freemud.service.thirdparty;
 import cn.freemud.base.entity.BaseResponse;
 import cn.freemud.entities.dto.GetPaidRuleRequestDto;
 import cn.freemud.entities.dto.GetPaidRuleResponseDto;
+import cn.freemud.entities.dto.user.GetSessionUserInfoDto;
+import cn.freemud.entities.vo.CustomerInfoVo;
 import org.springframework.cloud.netflix.feign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -24,4 +26,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 public interface CustomerApplicationClient {
     @PostMapping(value = "/membercard/getPaidRule")
     BaseResponse<GetPaidRuleResponseDto> getPaidRule(GetPaidRuleRequestDto getPaidRuleRequestDto);
+
+    @PostMapping(value = "/user/getSessionUserInfo")
+    BaseResponse<CustomerInfoVo>getSessionUserInfo(GetSessionUserInfoDto getSessionUserInfoDto);
 }