checkAllCartGoodsNew 从购物车sdk迁移到项目中ProductServiceImpl实现类

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

 package cn.freemud.entities.dto;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.freemud.application.sdk.api.couponcenter.backstage.domain.ActiveChannel;
+import com.freemud.application.sdk.api.couponcenter.online.domain.ActiveGroupVO;
+import com.freemud.application.sdk.api.couponcenter.online.domain.CouponProductVO;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -38,6 +41,38 @@ public class GetCouponDetailResponseDto {
          */
         private List<ActiveRedeemTimeInterval> activeRedeemTimeIntervalList;
         private Integer today_available_times;
+
+
+
+//        private String code;
+//        private String activeCode;
+//        private String title;
+//        private Integer type;
+//        private Integer status;
+//        private String create_time;
+//        private String redeem_time;
+//        private Integer storeChannelLimit;
+//        private String valid_start;
+//        private String valid_ends;
+//        private Integer minAmount;
+        private String sendReason;
+        private String cancelReason;
+//        private Active active;
+//        private List<ActiveRestrict> activeRestrictionVOS;
+        private List<ActiveProductSetting> activeProductSetting;
+//        private List<ActiveProduct> activeProduct;
+        private List<ActiveGroupVO> activeGroupVOS;
+        private List<CouponProductVO> couponProductList;
+        private List<ActiveChannel> activeChannels;
+//        private List<ActiveRedeemTimeIntervalVO> activeRedeemTimeIntervalList;
+        private Integer storeLimitLevel;
+        private String limitStoreId;
+//        private Integer today_available_times;
+        private Integer total_available_times;
+        private Integer maxRedeemTime;
+        private Integer availableTimes;
+        private Integer dailyRedeemTime;
+        private Integer dailyAvailableTimes;
     }
     @Data
     public static class Active{

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

@@ -58,6 +58,7 @@ public class ProductTypeBeanDTO {
     private Integer isDishware;
     private Integer weightType;
     private Double weight;
+    private String foreignName;
 
     public Integer getMemberDiscountResult() {
         return this.openMemberDiscount != null && this.openMemberDiscount == 1 ? this.memberDiscount : 100;
@@ -142,6 +143,8 @@ public class ProductTypeBeanDTO {
             private Double weight;
             private Double tax;
             private String taxId;
+            private String foreignProductName;
+            private Integer productType;
         }
     }
 
@@ -161,6 +164,8 @@ public class ProductTypeBeanDTO {
         private Double weight;
         private Double tax;
         private String taxId;
+        private String foreignProductName;
+        private Integer productType;
     }
 
     @Data
@@ -246,6 +251,7 @@ public class ProductTypeBeanDTO {
         protected String unit;
         private Integer openMemberDiscount;
         private Integer memberDiscount;
+        private String foreignProductName;
 
         public Integer getMemberDiscountResult() {
             return this.openMemberDiscount != null && this.openMemberDiscount == 1 ? this.memberDiscount : 100;
@@ -262,6 +268,7 @@ public class ProductTypeBeanDTO {
             private String specName;
             private String specValue;
             private String specValueId;
+            private String foreignSpecValue;
 
             public SkuSpecValue() {
             }

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

@@ -50,6 +50,8 @@ public class AssortmentSdkService {
 
     @Autowired
     private ProductClient storeItemClient;
+    @Autowired
+    private ProductServiceImpl productServiceImpl;
 
     @Value("${mccafe.partner.id}")
     private String mcCafePartnerId;
@@ -294,7 +296,7 @@ public class AssortmentSdkService {
         checkCartRequest.setTrackingNo(LogThreadLocal.getTrackingNo());
         checkCartRequest.setMenuType(BusinessTypeEnum.getByType(menuType).getCode());
         BaseResponse<CheckCartRequest> baseResponse ;
-        baseResponse= shoppingCartService.checkAllCartGoodsNew(checkCartRequest);
+        baseResponse= productServiceImpl.checkAllCartGoodsNew(checkCartRequest);
         if (baseResponse == null) {
             return null;
         }

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

@@ -20,6 +20,7 @@ import cn.freemud.base.util.DateUtil;
 import cn.freemud.constant.ResponseCodeConstant;
 import cn.freemud.demo.manager.coupon.Finals;
 import cn.freemud.entities.dto.*;
+import cn.freemud.entities.dto.coupon.Active;
 import cn.freemud.entities.dto.coupon.CouponAvailableRespDto;
 import cn.freemud.entities.dto.product.ValiadShopProductResponse;
 import cn.freemud.entities.dto.product.ValidateShopProductRequest;
@@ -42,6 +43,7 @@ import cn.freemud.utils.RedisUtil;
 import com.freemud.application.sdk.api.log.ErrorLog;
 import com.freemud.application.sdk.api.productcenter.constant.ResponseConstant;
 import com.freemud.application.sdk.api.util.SignUtil;
+import com.freemud.sdk.api.assortment.shoppingcart.constant.CartResponseConstant;
 import com.freemud.sdk.api.assortment.shoppingcart.enums.BusinessTypeEnum;
 import com.freemud.sdk.api.assortment.shoppingcart.service.impl.ShoppingCartBaseServiceImpl;
 import com.google.common.collect.Lists;
@@ -60,67 +62,26 @@ import java.util.*;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
-//import com.freemud.card.sdk.comm.Finals;
-//import com.freemud.card.sdk.comm.SignUtil;
-//import com.freemud.card.sdk.service.CouponAvailableService;
-//import com.freemud.card.sdk.service.GetCouponService;
-//import com.freemud.card.sdk.service.MemberProductService;
-//import com.freemud.card.sdk.vo.comm.GetCodeRespVo;
-//import com.freemud.card.sdk.vo.comm.GetCouponVo;
-//import com.freemud.card.sdk.vo.coupon.CouponStateVo;
-//import com.freemud.card.sdk.vo.coupon.Product;
-//import com.freemud.card.sdk.vo.coupon.request.CouponAvailableReqVo;
-//import com.freemud.card.sdk.vo.coupon.CreateCouponVo;
-//import com.freemud.card.sdk.vo.coupon.request.MemberAddCouponVo;
-//import com.freemud.card.sdk.vo.coupon.response.MemberBaseRespVo;
-//import com.freemud.sdk.api.assortment.shoppingcart.constant.CartResponseConstant;
 
 @Service
 public class CouponServiceImpl implements CouponService {
 
-    private final Gson gson = new Gson();
-    //@Autowired
-    //private MemberProductClient memberProductClient;
     @Autowired
     private CustomerExtendClient customerExtendClient;
     @Autowired
-    private UserService userService;
-//    @Autowired
-//    private MemberProductService memberProductService;
-    @Autowired
     private CouponAdapter couponAdapter;
     @Autowired
-    private StoreAdapter storeAdapter;
-    @Autowired
     private CouponOnlineClient couponOnlineClient;
-//    @Autowired
-//    private CouponOnlineMCCafeClient couponOnlineMCCafeClient;
-//    @Autowired
-//    private CouponAvailableService couponAvailableService;
-    @Value("${coupon.app.id}")
-    private String appid;
     @Autowired
     private RedisCache redisCache;
     @Autowired
     private CardBinClient cardBinClient;
-//    @Autowired
-//    private CardBinMCCafeClient cardBinMCCafeClient;
     @Autowired
     private ProductClient storeItemClient;
     @Autowired
-    private StoreItemAdapter storeItemAdapter;
-    @Autowired
-    private CouponServiceImpl couponService;
-//    @Autowired
-//    private GetCouponService getCouponService;
-    @Autowired
-    private OpenPlatformClient openPlatformClient;
-    @Autowired
     private ItemService itemService;
     @Autowired
     private CommonService commonService;
-    @Value("${coupon.partner.id}")
-    private String couponPartnerId;
     @Autowired
     private CouponAdapterClient couponAdaptClient;
     @Autowired
@@ -128,6 +89,11 @@ public class CouponServiceImpl implements CouponService {
     @Autowired
     private ShoppingCartBaseServiceImpl shoppingCartBaseService;
 
+
+
+    @Value("${coupon.app.id}")
+    private String appid;
+
     /**
      * 获取优惠券列表
      *
@@ -384,7 +350,7 @@ public class CouponServiceImpl implements CouponService {
     public Map<String, Boolean> couponOrderWay(String partnerId, List<String> activityCodes, Integer orderTye) {
         // 去重
         List<String> activeCodes = new ArrayList<>(new HashSet(activityCodes));
-        String appSecret = couponService.getAppSecret(partnerId);
+        String appSecret = this.getAppSecret(partnerId);
         // 最大15一提交
         int maxNum = 15;
         int count = activeCodes.size() / maxNum;
@@ -751,7 +717,7 @@ public class CouponServiceImpl implements CouponService {
         requestVo.setPartnerId(partnerId);
         requestVo.setCouponCode(couponCode);
         requestVo.setStoreId(requestDto.getStoreId());
-        GetCouponDetailResponseDto couponDetailResponseDto = couponService.getMemberCoupon(requestVo);
+        GetCouponDetailResponseDto couponDetailResponseDto = this.getMemberCoupon(requestVo);
         if (couponDetailResponseDto == null || !couponDetailResponseDto.getResult().equals(ResponseCodeConstant.RESPONSE_SUCCESS_1) || CollectionUtils.isEmpty(couponDetailResponseDto.getDetails())) {
             return null;
         }
@@ -904,7 +870,7 @@ public class CouponServiceImpl implements CouponService {
         requestVo.setPartnerId(partnerId);
         requestVo.setCouponCode(couponCode);
         requestVo.setStoreId(requestDto.getStoreId());
-        GetCouponDetailResponseDto couponDetailResponseDto = couponService.getMemberCoupon(requestVo);
+        GetCouponDetailResponseDto couponDetailResponseDto = this.getMemberCoupon(requestVo);
         if (couponDetailResponseDto == null || !couponDetailResponseDto.getResult().equals(ResponseCodeConstant.RESPONSE_SUCCESS_1) || CollectionUtils.isEmpty(couponDetailResponseDto.getDetails())) {
             return null;
         }
@@ -1009,7 +975,7 @@ public class CouponServiceImpl implements CouponService {
         requestVo.setPartnerId(partnerId);
         requestVo.setCouponCode(couponCode);
         requestVo.setStoreId(requestDto.getStoreId());
-        GetCouponDetailResponseDto couponDetailResponseDto = couponService.getMemberCoupon(requestVo);
+        GetCouponDetailResponseDto couponDetailResponseDto = this.getMemberCoupon(requestVo);
         if (couponDetailResponseDto == null || !couponDetailResponseDto.getResult().equals(ResponseCodeConstant.RESPONSE_SUCCESS_1) || CollectionUtils.isEmpty(couponDetailResponseDto.getDetails())) {
             return null;
         }
@@ -1055,7 +1021,7 @@ public class CouponServiceImpl implements CouponService {
         requestVo.setPartnerId(partnerId);
         requestVo.setCouponCode(couponCode);
         requestVo.setStoreId(requestDto.getStoreId());
-        GetCouponDetailResponseDto couponDetailResponseDto = couponService.getMemberCoupon(requestVo);
+        GetCouponDetailResponseDto couponDetailResponseDto = this.getMemberCoupon(requestVo);
         if (couponDetailResponseDto == null || !couponDetailResponseDto.getResult().equals(ResponseCodeConstant.RESPONSE_SUCCESS_1) || CollectionUtils.isEmpty(couponDetailResponseDto.getDetails())) {
             return null;
         }
@@ -1332,7 +1298,7 @@ public class CouponServiceImpl implements CouponService {
             getMemberCouponListRequestDto.setStatusFlags(Arrays.asList(CouponStatus.STATUS_0.getCode(), CouponStatus.STATUS_2.getCode()));
             getMemberCouponListRequestDto.setPageNum(1);
             getMemberCouponListRequestDto.setPageSize(Integer.MAX_VALUE);
-            List<GetMemberCouponListResponseDto.Result.MemberCoupon> validMemberCouponList = couponService.getValidMemberCouponList(getMemberCouponListRequestDto, couponPromotionVO.getOrderType());
+            List<GetMemberCouponListResponseDto.Result.MemberCoupon> validMemberCouponList = this.getValidMemberCouponList(getMemberCouponListRequestDto, couponPromotionVO.getOrderType());
             validCouponCodeLis = validMemberCouponList.stream().map(GetMemberCouponListResponseDto.Result.MemberCoupon::getCouponCode).collect(Collectors.toList());
         }
         if (CollectionUtils.isEmpty(validCouponCodeLis)){
@@ -1366,7 +1332,7 @@ public class CouponServiceImpl implements CouponService {
         requestVo.setPartnerId(partnerId);
         requestVo.setCouponCode(couponCode);
         requestVo.setStoreId(requestDto.getStoreId());
-        GetCouponDetailResponseDto couponDetailResponseDto = couponService.getMemberCoupon(requestVo);
+        GetCouponDetailResponseDto couponDetailResponseDto = this.getMemberCoupon(requestVo);
         if (couponDetailResponseDto == null || !couponDetailResponseDto.getResult().equals(ResponseCodeConstant.RESPONSE_SUCCESS_1) || CollectionUtils.isEmpty(couponDetailResponseDto.getDetails())) {
             return null;
         }
@@ -1527,4 +1493,27 @@ public class CouponServiceImpl implements CouponService {
     }
 
 
+    /**
+     * 批量查询活动详情
+     *
+     * @param partnerId
+     * @param activityCodes
+     * @param trackingNo
+     * @return
+     */
+    public List<Active> batchQueryActivityInfo(String partnerId, List<String> activityCodes, String trackingNo) {
+        String appSecret = this.getAppSecret(partnerId);
+        BatchQueryActivityInfoRequestDto requestDto = new BatchQueryActivityInfoRequestDto();
+        requestDto.setActiveCode(activityCodes);
+        // 书写逻辑
+        requestDto.setPartnerId(Integer.valueOf(partnerId));
+        String sign = SignUtil.createMD5Sign(requestDto, appSecret);
+        requestDto.setSign(sign);
+        BatchQueryActivityInfoResponseDto batchQueryActivityInfoResponseDto = cardBinClient.batchQueryActivityInfo(requestDto);
+        if (batchQueryActivityInfoResponseDto == null || !CartResponseConstant.SUCCESS.getCode().equals(batchQueryActivityInfoResponseDto.getStatusCode()) || CollectionUtils.isEmpty(batchQueryActivityInfoResponseDto.getActivities())) {
+            return null;
+        }
+        return batchQueryActivityInfoResponseDto.getActivities();
+    }
+
 }