去除javafx.util.Pair类

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

+package cn.freemud.entities.dto.other;
+
+import lombok.Data;
+
+@Data
+public class ValidCouponBo {
+
+    private String skuId;
+
+    private Integer todayAvailableTimes;
+
+    public ValidCouponBo() {
+    }
+
+    public ValidCouponBo(String skuId, Integer todayAvailableTimes) {
+        this.skuId = skuId;
+        this.todayAvailableTimes = todayAvailableTimes;
+    }
+}

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

@@ -3,7 +3,10 @@ package cn.freemud.service;
 import cn.freemud.adapter.ActivityAdapter;
 import cn.freemud.base.entity.BaseResponse;
 import cn.freemud.constant.ShoppingCartConstant;
-import cn.freemud.entities.dto.*;
+import cn.freemud.entities.dto.ActivityResponseDto;
+import cn.freemud.entities.dto.GetMemberInfoRequestDto;
+import cn.freemud.entities.dto.GetMemberInfoResponseVo;
+import cn.freemud.entities.dto.GoodsBeanDto;
 import cn.freemud.entities.dto.activity.ActivityQueryDto;
 import cn.freemud.entities.dto.activity.ActivityQueryResponseDto;
 import cn.freemud.entities.dto.calculate.ActivityCalculationDiscountRequestDto;
@@ -12,12 +15,9 @@ import cn.freemud.entities.dto.shoppingCart.ShoppingCartGoodsDto;
 import cn.freemud.entities.vo.*;
 import cn.freemud.enums.ActivityTypeEnum;
 import cn.freemud.enums.GoodsTypeEnum;
-import cn.freemud.enums.ResponseResult;
-import cn.freemud.interceptor.ServiceException;
 import com.freemud.application.sdk.api.base.SDKCommonBaseContextWare;
 import com.freemud.application.sdk.api.productcenter.domain.ProductBeanDTO;
 import com.freemud.sdk.api.assortment.shoppingcart.constant.CommonsConstant;
-import javafx.util.Pair;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 
@@ -147,25 +147,25 @@ public interface ShoppingCartNewService {
      * @param goodsId
      * @return
      */
-    default Pair<String, Integer> validCoupon(String partnerId
-            , String storeId
-            , String couponCode
-            , List<Long> productIds
-            , String menuType
-            , String goodsId
-            , CouponProductDto couponProductDto) {
-        String spuId2;
-        CheckSpqInfoRequestDto checkSpqInfoRequestDto = new CheckSpqInfoRequestDto(partnerId, storeId, couponCode, menuType,null);
-        CouponService couponService = SDKCommonBaseContextWare.getBean(CouponService.class);
-        CheckSpqInfoResponseDto checkSpqInfoResponseDto = couponService.checkSpqInfo(checkSpqInfoRequestDto, goodsId);
-        if (checkSpqInfoResponseDto == null) {
-            throw new ServiceException(ResponseResult.SHOPPING_CART_COUPON_MIX_NOT_EXIST);
-        }
-        productIds.add(Long.parseLong(checkSpqInfoResponseDto.getSkuId()));
-        couponProductDto.setType(checkSpqInfoResponseDto.getCouponType());
-        spuId2 = checkSpqInfoResponseDto.getSkuId();
-        return new Pair(spuId2, checkSpqInfoResponseDto.getTodayAvailableTimes());
-    }
+//    default String validCoupon(String partnerId
+//            , String storeId
+//            , String couponCode
+//            , List<Long> productIds
+//            , String menuType
+//            , String goodsId
+//            , CouponProductDto couponProductDto) {
+//        String spuId2;
+//        CheckSpqInfoRequestDto checkSpqInfoRequestDto = new CheckSpqInfoRequestDto(partnerId, storeId, couponCode, menuType,null);
+//        CouponService couponService = SDKCommonBaseContextWare.getBean(CouponService.class);
+//        CheckSpqInfoResponseDto checkSpqInfoResponseDto = couponService.checkSpqInfo(checkSpqInfoRequestDto, goodsId);
+//        if (checkSpqInfoResponseDto == null) {
+//            throw new ServiceException(ResponseResult.SHOPPING_CART_COUPON_MIX_NOT_EXIST);
+//        }
+//        productIds.add(Long.parseLong(checkSpqInfoResponseDto.getSkuId()));
+//        couponProductDto.setType(checkSpqInfoResponseDto.getCouponType());
+//        spuId2 = checkSpqInfoResponseDto.getSkuId();
+//        return spuId2;// checkSpqInfoResponseDto.getTodayAvailableTimes());
+//    }
 
     /**
      * 添加商品券商品

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

@@ -4,6 +4,7 @@ import cn.freemud.adapter.ShoppingCartConvertAdapter;
 import cn.freemud.base.entity.BaseResponse;
 import cn.freemud.constant.ResponseCodeConstant;
 import cn.freemud.entities.dto.*;
+import cn.freemud.entities.dto.other.ValidCouponBo;
 import cn.freemud.entities.dto.product.CheckCartRequest;
 import cn.freemud.entities.dto.product.info.ProductBean;
 import cn.freemud.entities.vo.CartGoods;
@@ -25,7 +26,6 @@ import com.freemud.sdk.api.assortment.shoppingcart.enums.BusinessTypeEnum;
 import com.freemud.sdk.api.assortment.shoppingcart.request.GetProductInfoRequest;
 import com.freemud.sdk.api.assortment.shoppingcart.service.ShoppingCartBaseService;
 import com.freemud.sdk.api.assortment.shoppingcart.service.impl.ShoppingCartBaseServiceImpl;
-import javafx.util.Pair;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -480,8 +480,8 @@ public class AssortmentSdkService {
      * @param goodsId
      * @return
      */
-    public Pair<String, Integer> validCoupon(String partnerId, String storeId, String couponCode, List<Long> productIds
-            , String menuType, String goodsId, CouponProductDto couponProductDto,CartGoods addCartGoods) {
+    public ValidCouponBo validCoupon(String partnerId, String storeId, String couponCode, List<Long> productIds
+            , String menuType, String goodsId, CouponProductDto couponProductDto, CartGoods addCartGoods) {
         CheckSpqInfoRequestDto checkSpqInfoRequestDto = new CheckSpqInfoRequestDto(partnerId, storeId, couponCode, menuType,addCartGoods);
         CouponService couponService = SDKCommonBaseContextWare.getBean(CouponService.class);
         CheckSpqInfoResponseDto checkSpqInfoResponseDto = couponService.checkSpqInfo(checkSpqInfoRequestDto, goodsId);
@@ -501,7 +501,7 @@ public class AssortmentSdkService {
             addCartGoods.setGoodsType(GoodsTypeEnum.COUPON_GOODS.getGoodsType());
             couponProductDto.setType(GoodsTypeEnum.COUPON_GOODS.getGoodsType());
         }
-        return new Pair(spuId2, checkSpqInfoResponseDto.getTodayAvailableTimes());
+        return new ValidCouponBo(spuId2, checkSpqInfoResponseDto.getTodayAvailableTimes());
     }
 
 

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

@@ -4,10 +4,12 @@ import cn.freemud.adapter.ActivityAdapter;
 import cn.freemud.adapter.ShoppingCartConvertAdapter;
 import cn.freemud.base.entity.BaseResponse;
 import cn.freemud.constant.ResponseCodeConstant;
+import cn.freemud.entities.dto.CouponProductDto;
 import cn.freemud.entities.dto.activity.ActivityQueryDto;
 import cn.freemud.entities.dto.calculate.ActivityCalculationDiscountRequestDto;
 import cn.freemud.entities.dto.calculate.ActivityCalculationDiscountResponseDto;
 import cn.freemud.entities.dto.calculate.CalculationDiscountResult;
+import cn.freemud.entities.dto.other.ValidCouponBo;
 import cn.freemud.entities.dto.product.CheckCartRequest;
 import cn.freemud.entities.dto.shoppingCart.ShoppingCartGoodsDto;
 import cn.freemud.entities.vo.*;
@@ -43,7 +45,6 @@ import com.freemud.sdk.api.assortment.shoppingcart.constant.MealClearOperationEn
 import com.freemud.sdk.api.assortment.shoppingcart.domain.CartParamDto;
 import com.freemud.sdk.api.assortment.shoppingcart.enums.BusinessTypeEnum;
 import com.freemud.sdk.api.assortment.shoppingcart.service.impl.MealCartBaseServiceImpl;
-import javafx.util.Pair;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -119,14 +120,19 @@ public class ShoppingCartMealServiceImpl implements ShoppingCartNewService {
         requestVo.setTableNumber(tableNumber);
         CartGoods cartGoods = shoppingCartConvertAdapter.convent2CartGoods(requestVo);
         List<Long> productIds = new ArrayList<>();
+        String couponCode = requestVo.getCouponCode(); // 商品券和换购券券号
+        CouponProductDto couponProductDto = new CouponProductDto();
         //商品skuId或者商品券的商品id
         String spuId2 = spuId;
         if (!spuId.startsWith(CommonsConstant.COUPON_PREFIX)) {
             productIds.add(Long.parseLong(goodsId));
         } else {
+            if(StringUtils.isEmpty(couponCode)){
+                couponCode = spuId.substring(CommonsConstant.COUPON_PREFIX.length());
+            }
             //校验券是否有效
-            Pair<String, Integer> pair = validCoupon(partnerId, storeId, spuId, productIds, BusinessTypeEnum.getByType(requestVo.getMenuType()).getCode(), null, null);
-            spuId2 = pair.getKey();
+            ValidCouponBo validCouponBo = assortmentSdkService.validCoupon(partnerId, storeId, couponCode, productIds,BusinessTypeEnum.getByType(requestVo.getMenuType()).getCode(), skuId, couponProductDto,cartGoods);
+            spuId2 = validCouponBo.getSkuId();
         }
         // 获取商品信息
         List<ProductBeanDTO> productBeanListSpuClass =

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

@@ -31,6 +31,7 @@ import cn.freemud.entities.dto.calculate.*;
 import cn.freemud.entities.dto.openplatform.WeixinProductRequestDto;
 import cn.freemud.entities.dto.openplatform.WeixinProductResponseDto;
 import cn.freemud.entities.dto.order.PackAmountConfig;
+import cn.freemud.entities.dto.other.ValidCouponBo;
 import cn.freemud.entities.dto.pay.*;
 import cn.freemud.entities.dto.product.CheckCartRequest;
 import cn.freemud.entities.dto.shoppingCart.PromotionResultVO;
@@ -84,7 +85,6 @@ import com.freemud.sdk.api.assortment.shoppingcart.enums.BusinessTypeEnum;
 import com.freemud.sdk.api.assortment.shoppingcart.service.ShoppingCartBaseService;
 import com.freemud.sdk.api.assortment.shoppingcart.service.impl.ShoppingCartBaseServiceImpl;
 import com.google.common.collect.Lists;
-import javafx.util.Pair;
 import ma.glasnost.orika.MapperFacade;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.ObjectUtils;
@@ -327,10 +327,10 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
             productIds.add(Long.parseLong(goodsId));
         } else {
             //校验券是否有效  这里是新的商品券支持多商品及换购券
-            Pair<String, Integer> pair = assortmentSdkService.validCoupon(partnerId, storeId, couponCode, productIds,
+            ValidCouponBo validCouponBo = assortmentSdkService.validCoupon(partnerId, storeId, couponCode, productIds,
                     BusinessTypeEnum.getByType(addShoppingCartGoodsRequestVo.getMenuType()).getCode(), skuId, couponProductDto,cartGoods);
-            spuId2 = pair.getKey();
-            todayAvailableTimes = pair.getValue();
+            spuId2 = validCouponBo.getSkuId();
+            todayAvailableTimes = validCouponBo.getTodayAvailableTimes();
             if (StringUtils.isNotBlank(skuId)) {
                 cartGoods.setGoodsId(spuId);
             }