Merge branch 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa

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

@@ -1220,7 +1220,7 @@ public class OrderAdapter {
                 responseVo.setOidBase64Image(oidBase64Image);
             }
             //设置是否是第三方配送单
-            if (ordersBean.getAddInfo() !=null && StringUtils.isNotEmpty(ordersBean.getAddInfo().getDeliveryId())&& "0".equals(ordersBean.getAddInfo().getDeliveryId())) {
+            if (ordersBean.getAddInfo() !=null && StringUtils.isNotEmpty(ordersBean.getAddInfo().getDeliveryId())&& !"0".equals(ordersBean.getAddInfo().getDeliveryId())) {
                 responseVo.setHasThirdDelivery(true);
                 responseVo.setDeliveryId(ordersBean.getAddInfo().getDeliveryId());
             }

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

@@ -27,6 +27,7 @@ import com.freemud.application.sdk.api.productcenter.domain.ProductBeanDTO;
 import com.freemud.sdk.api.assortment.shoppingcart.constant.CommonsConstant;
 import com.freemud.sdk.api.assortment.shoppingcart.request.CheckCartRequest;
 import com.google.common.collect.Lists;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.ObjectUtils;
 import org.apache.commons.lang.StringUtils;
@@ -38,6 +39,7 @@ import java.util.stream.Collectors;
 import java.util.stream.LongStream;
 
 @Component
+@Slf4j
 public class ShoppingCartConvertAdapter {
 
     private static final String ATTRIBUTEID = "attributeId";
@@ -125,10 +127,10 @@ public class ShoppingCartConvertAdapter {
         cartGoodsDetailDto.setSpecialExtra(cartGoods.getSpecialExtra());
         cartGoodsDetailDto.setClassificationId(cartGoods.getClassificationId());
         cartGoodsDetailDto.setClassificationName(cartGoods.getClassificationName());
-        System.out.println("=============================");
-        System.out.println(cartGoods.getSkuId());
-        System.out.println(mcCafeTablewareSkuId);
-        System.out.println("=============================");
+        log.info("=============================");
+        log.info(cartGoods.getSkuId());
+        log.info(mcCafeTablewareSkuId);
+        log.info("=============================");
         if(mcCafeTablewareSkuId.equals(cartGoods.getSkuId())) {
             cartGoodsDetailDto.setIsTableWare(true);
         }

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/CalculationServiceImpl.java

@@ -31,6 +31,7 @@ import com.freemud.application.sdk.api.storecenter.response.QueryDeliverDetailRe
 import com.freemud.application.sdk.api.storecenter.response.StoreResponse;
 import com.freemud.application.sdk.api.storecenter.service.StoreCenterService;
 import com.freemud.sdk.api.assortment.shoppingcart.enums.BusinessTypeEnum;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -54,6 +55,7 @@ import java.util.stream.Collectors;
  */
 
 @Service
+@Slf4j
 public class CalculationServiceImpl {
 
 
@@ -172,7 +174,7 @@ public class CalculationServiceImpl {
     public void updateShoppingCartGoodsApportion(ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVo, ActivityCalculationDiscountResponseDto.CalculationDiscountResult calculationDiscountResult,
                                                  ShoppingCartGoodsDto shoppingCartGoodsDto, CreateOrderVo.PremiumExchangeActivity premiumExchangeActivity, ShoppingCartInfoRequestVo shoppingCartInfoRequestVo){
 
-        System.out.println(111111+JSON.toJSONString(shoppingCartGoodsDto));
+        log.info(111111+JSON.toJSONString(shoppingCartGoodsDto));
         List<ShoppingCartGoodsDto.CartGoodsDetailDto> cartGoodsDetailDtoList = CollectionUtils.isEmpty(shoppingCartGoodsDto.getProducts()) ? new ArrayList<>() : shoppingCartGoodsDto.getProducts();
         List<ShareDiscountActivityDto> shareDiscountActivityDtoList = CollectionUtils.isEmpty(shoppingCartGoodsDto.getShareDiscountActivityDtos()) ? new ArrayList<>() : shoppingCartGoodsDto.getShareDiscountActivityDtos();
         //设置空
@@ -210,7 +212,7 @@ public class CalculationServiceImpl {
             List<ShoppingCartGoodsDto.CartGoodsDetailDto> cartGoodsDetailDtos = shoppingCartConvertAdapter.convertCartGoods2DetailGoodsList(cartGoods, apportionGoodsList,duplicateGoodsMap);
             cartGoodsDetailDtoList.addAll(cartGoodsDetailDtos);
         }
-        System.out.println(22222222+JSON.toJSONString(shoppingCartGoodsDto));
+        log.info(22222222+JSON.toJSONString(shoppingCartGoodsDto));
         List<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Discount> discounts = calculationDiscountResult == null ? new ArrayList<>() : calculationDiscountResult.getDiscounts();
         List<ActivityDiscountsDto> activityDiscountsDtos = shoppingCartGoodsDto.getActivityDiscountsDtos() == null ? new ArrayList<>() : shoppingCartGoodsDto.getActivityDiscountsDtos();
         for (ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Discount discount : discounts) {
@@ -270,7 +272,7 @@ public class CalculationServiceImpl {
 //        fullPromotionCalculation.updateShoppingCartGoodsApportion(shoppingCartGoodsResponseVo, calculationDiscountResult, shoppingCartGoodsDto,premiumExchangeActivity,shoppingCartInfoRequestVo);
         //限时特价
         timeSaleCalculation.updateShoppingCartGoodsApportion(calculationDiscountResult, shoppingCartGoodsDto);
-        System.out.println(333333333+JSON.toJSONString(shoppingCartGoodsDto));
+        log.info(333333333+JSON.toJSONString(shoppingCartGoodsDto));
 
         CouponPromotionVO couponPromotionVO = new CouponPromotionVO();
 //        couponPromotionVO.setPartnerId("1206");
@@ -281,10 +283,10 @@ public class CalculationServiceImpl {
 //        couponPromotionVO.setFlg(CouponFlag.YES.getCode());
         //优惠券
         couponDiscountCalculation.updateShoppingCartGoodsApportion(calculationDiscountResult, shoppingCartGoodsDto, shoppingCartInfoRequestVo);
-        System.out.println(444444444+JSON.toJSONString(shoppingCartGoodsDto));
+        log.info(444444444+JSON.toJSONString(shoppingCartGoodsDto));
 
         setMealCalculation.updateShoppingCartGoodsApportion(shoppingCartGoodsResponseVo, calculationDiscountResult, shoppingCartGoodsDto);
-        System.out.println(555555555+JSON.toJSONString(shoppingCartGoodsDto));
+        log.info(555555555+JSON.toJSONString(shoppingCartGoodsDto));
 
     }