添加日志

Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>

shopping-cart-application-service/src/main/java/cn/freemud/demo/entities/bo/goods/ShoppingCartGoodsApportionBO.java

@@ -134,6 +134,8 @@ public class ShoppingCartGoodsApportionBO {
          * 顺序
          */
         private Integer index;
+
+        private Integer couponType;
     }
 
     @Data

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

@@ -16,18 +16,11 @@ package cn.freemud.service.impl;
 import cn.freemud.adapter.CouponAdapter;
 import cn.freemud.adapter.StoreAdapter;
 import cn.freemud.adapter.StoreItemAdapter;
-import cn.freemud.base.constant.Version;
-import cn.freemud.base.entity.BaseResponse;
 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.activity.ActivityQueryResponseDto;
 import cn.freemud.entities.dto.coupon.CouponAvailableRespDto;
-import cn.freemud.entities.dto.openplatform.AddWeixinCardCodeRequestDto;
-import cn.freemud.entities.dto.openplatform.AddWeixinCardCodeResponseDto;
-import cn.freemud.entities.dto.openplatform.AddWeixinCardJudgeRequestDto;
-import cn.freemud.entities.dto.openplatform.AddWeixinCardJudgeResponseDto;
 import cn.freemud.entities.vo.*;
 import cn.freemud.entities.vo.coupon.CouponAvailableReqVo;
 import cn.freemud.entities.vo.coupon.CouponStateVo;
@@ -40,7 +33,10 @@ import cn.freemud.service.CouponService;
 import cn.freemud.service.ItemService;
 import cn.freemud.service.UserService;
 import cn.freemud.service.thirdparty.*;
-import cn.freemud.utils.*;
+import cn.freemud.utils.BarcodeUtil;
+import cn.freemud.utils.LogUtil;
+import cn.freemud.utils.PropertyConvertUtil;
+import cn.freemud.utils.RedisUtil;
 import com.alibaba.fastjson.JSON;
 import com.freemud.application.sdk.api.log.ApiLog;
 import com.freemud.application.sdk.api.productcenter.constant.ResponseConstant;
@@ -48,27 +44,12 @@ import com.freemud.application.sdk.api.productcenter.request.product.valid.Valid
 import com.freemud.application.sdk.api.productcenter.request.product.valid.ValidateShopProductType;
 import com.freemud.application.sdk.api.productcenter.response.ProductResponseDTO;
 import com.freemud.application.sdk.api.productcenter.response.valid.ValiadShopProductResponse;
-//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;
 import com.freemud.application.sdk.api.util.SignUtil;
 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;
 import com.google.common.collect.Maps;
 import com.google.gson.Gson;
-import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.ObjectUtils;
 import org.apache.commons.lang.StringUtils;
@@ -79,10 +60,23 @@ import org.springframework.stereotype.Service;
 import java.time.LocalDate;
 import java.time.LocalTime;
 import java.util.*;
-import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
-import java.util.stream.IntStream;
+
+//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 {
@@ -546,6 +540,10 @@ public class CouponServiceImpl implements CouponService {
     private ActivityClassifyCouponBean returnSuccessAvailiableCoupons(String couponCode, boolean hasGoodsCoupon, ActivityClassifyCouponBean availableCouponResponseVo, List<ActivityCouponBean> usableCoupons,
                                                                       List<ActivityCouponBean> disableCoupons, Map<String, GetMemberCouponListResponseDto.Result.MemberCoupon> memberCouponMap,
                                                                       List<CouponStateVo> couponStateList, String chooseCouponCode) {
+        LogUtil.info("配送券-0--",couponCode,hasGoodsCoupon);
+        LogUtil.info("配送券-1--",availableCouponResponseVo,usableCoupons);
+        LogUtil.info("配送券-3--",disableCoupons,memberCouponMap);
+        LogUtil.info("配送券-4--",couponStateList,chooseCouponCode);
         int disableCouponNum = 0;
         int usableCouponNum = 0;
         for (CouponStateVo couponStateVo : couponStateList) {
@@ -573,7 +571,12 @@ public class CouponServiceImpl implements CouponService {
                 } else if (Objects.equals(couponStateVo.getType(), CouponTypeEnum.TYPE_3.getCode())) {
                     // TODO 折扣券 百分值10 乘以10   前端统一除以100作为操作依据
                     activityCouponBean.setDiscountAmount(couponStateVo.getDiscount() != null ? couponStateVo.getDiscount() * 10 + "" : "0");
+                }else if (Objects.equals(couponStateVo.getType(), CouponTypeEnum.TYPE_5.getCode())) {
+                    // 这里需要加入 配送券逻辑
+                    //activityCouponBean.setDiscountAmount(couponStateVo.getOriginalPrice() + "");
                 }
+
+
                 activityCouponBean.setThresholdDesc("满" + formatAmount((couponStateVo.getMinAmount() == null ? 0 : couponStateVo.getMinAmount()) * 1.00 / 100) + "元可用");
                 activityCouponBean.setActivityDesc("不与其他活动优惠同时享受。");
                 if (StringUtils.isNotBlank(couponStateVo.getMessage())){

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

@@ -602,7 +602,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
 
     /**
      * 购物车商品详情接口
-     *
+     *  配送券入口
      * @param shoppingCartInfoRequestVo
      * @return
      */