调试日志

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

@@ -63,7 +63,7 @@ public class CheckAdapter {
                 useCoupon = false;
             }
             CheckSpqInfoRequestDto checkSpqInfoRequestDto = new CheckSpqInfoRequestDto(bo.getPartnerId(), bo.getShopId(), couponCode, bo.getMenuType());
-            CheckSpqInfoResponseDto checkSpqInfo = null;
+            CheckSpqInfoResponseDto checkSpqInfo;
             if (GoodsTypeEnum.HG_COUPON_GOODS.getGoodsType().equals(cartGoods.getGoodsType())) {
                 checkSpqInfo = couponService.checkSpqInfo(checkSpqInfoRequestDto, cartGoods.getSkuId());
             } else {

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

@@ -104,15 +104,19 @@ public abstract class AbstractAddGoodsService implements AddGoodsService {
     public final ShoppingCartGoodsBO addGoods(BaseAddGoodsBO addGoodsBO) {
         // 基本参数校验
         this.checkParams(addGoodsBO);
+        LogUtil.info("addGoodsBO >>> ",JsonUtil.toJSONString(addGoodsBO),null);
 
         // 获取购物车和加车商品信息
         CheckBussinessRulesBO checkBussinessRulesBO = this.getShoppingCartInfo(addGoodsBO);
+        LogUtil.info("getShoppingCartInfo >>> ",JsonUtil.toJSONString(addGoodsBO),JsonUtil.toJSONString(checkBussinessRulesBO));
 
         // 业务校验,例如商品数量库存之类的信息
         AddGoodsToShoppingCartBO addGoodsToShoppingCartBO = this.checkBusinessRules(addGoodsBO, checkBussinessRulesBO);
+        LogUtil.info("checkBusinessRules >>> ",JsonUtil.toJSONString(Arrays.asList(addGoodsBO,addGoodsBO)),JsonUtil.toJSONString(addGoodsToShoppingCartBO));
 
         // 添加商品到购物车
         DiscountResultBO discountResultBO = this.addGoodsToShoppingCart(addGoodsBO, addGoodsToShoppingCartBO);
+        LogUtil.info("addGoodsToShoppingCart >>> ",JsonUtil.toJSONString(Arrays.asList(addGoodsBO,addGoodsToShoppingCartBO)),JsonUtil.toJSONString(discountResultBO));
 
         // 去促销计算优惠
         CalCostBO calCostBO = this.getDiscountResult(addGoodsBO, discountResultBO);
@@ -330,7 +334,9 @@ public abstract class AbstractAddGoodsService implements AddGoodsService {
      */
     public final AddGoodsToShoppingCartBO checkBusinessRules(BaseAddGoodsBO baseRequestDTO, CheckBussinessRulesBO checkBussinessRulesBO) {
         AddGoodsToShoppingCartBO commAddGoodsToShoppingCartBO = this.checkCommBusinessRules(baseRequestDTO, checkBussinessRulesBO);
+        LogUtil.info("checkCommBusinessRules >>> ",JsonUtil.toJSONString(Arrays.asList(baseRequestDTO,checkBussinessRulesBO)),JsonUtil.toJSONString(commAddGoodsToShoppingCartBO));
         AddGoodsToShoppingCartBO customAddGoodsToShoppingCartBO = this.checkCustomBusinessRules(baseRequestDTO, checkBussinessRulesBO, commAddGoodsToShoppingCartBO);
+        LogUtil.info("checkCustomBusinessRules >>> ",JsonUtil.toJSONString(Arrays.asList(baseRequestDTO,checkBussinessRulesBO)),JsonUtil.toJSONString(customAddGoodsToShoppingCartBO));
         return customAddGoodsToShoppingCartBO;
     }
 
@@ -361,22 +367,31 @@ public abstract class AbstractAddGoodsService implements AddGoodsService {
 
     private AddGoodsToShoppingCartBO checkCommBusinessRules(BaseAddGoodsBO baseRequestDTO, CheckBussinessRulesBO checkBussinessRulesBO) {
         AddGoodsToShoppingCartBO bo = new AddGoodsToShoppingCartBO();
+        LogUtil.info("checkCommBusinessRules111 >>> ",JsonUtil.toJSONString(Arrays.asList(baseRequestDTO,checkBussinessRulesBO)),null);
 
         //购物车添加数量限制
         CartGoods addGoods = baseRequestDTO.getAddGoods();
         this.limitGoodsQty(checkBussinessRulesBO.getCartGoods(), addGoods, baseRequestDTO.getAppId());
+
         // 校验数量, 库存
         this.checkStocks(baseRequestDTO, checkBussinessRulesBO);
+
         // 校验套餐
         this.checkMeal(checkBussinessRulesBO.getCartGoods(), baseRequestDTO.getAddGoods());
 
+
         // 检查商品小料数量
         this.checkMaterialQty(addGoods,checkBussinessRulesBO.getProduct());
 
+
         // 检查校验购物车商品(是否合法,上下架,点餐方式,是否在当前菜单中...),并移除非法商品
         ShoppingCartContext cartContext = convert2ShopingCartContext(baseRequestDTO);
 
+        LogUtil.info("checkShoppingCart1111 >>> ",JsonUtil.toJSONString(Arrays.asList(checkBussinessRulesBO)),null);
+        LogUtil.info("checkShoppingCart2222 >>> ",JsonUtil.toJSONString(Arrays.asList(addGoods)),null);
+        LogUtil.info("checkShoppingCart3333 >>> ",JsonUtil.toJSONString(Arrays.asList(cartContext)),null);
         CheckCartRequest checkCartRequest = shoppingBaseService.checkShoppingCart(checkBussinessRulesBO.getCartGoods(), addGoods, cartContext);
+        LogUtil.info("checkShoppingCart >>> ",null,JsonUtil.toJSONString(checkCartRequest));
 
         checkBussinessRulesBO.setChanged(checkCartRequest.getChanged());
         checkBussinessRulesBO.setToastMsg(checkCartRequest.getToastMsg());
@@ -393,18 +408,18 @@ public abstract class AbstractAddGoodsService implements AddGoodsService {
 
     private void checkMaterialQty(CartGoods addGoods, ProductBO product){
         Integer materialMaxQty = product.getMaxNum();
-        Integer addProductqty = 0;
+        int addProductQty = 0;
         if(CollectionUtils.isNotEmpty(addGoods.getProductMaterialList())){
             for(CartGoods.MaterialGoods materialRequestVo : addGoods.getProductMaterialList()){
-                addProductqty = addProductqty + (materialRequestVo.getQty() == null ? 0 : materialRequestVo.getQty());
+                addProductQty = addProductQty + (materialRequestVo.getQty() == null ? 0 : materialRequestVo.getQty());
             }
 
         }
-        if(materialMaxQty == null || ObjectUtils.equals(materialMaxQty,0) || addProductqty == null || ObjectUtils.equals(addProductqty,0)){
+        if(materialMaxQty == null || ObjectUtils.equals(materialMaxQty, 0) || ObjectUtils.equals(addProductQty, 0)){
             return ;
         }
 
-        if((addProductqty.intValue() < materialMaxQty.intValue()) || (addProductqty.intValue() == materialMaxQty.intValue())){
+        if(addProductQty <= materialMaxQty){
             return ;
         }
         throw new ServiceException(ResponseResult.SHOPPING_CART_MATERIA_QTY_LIMIT_ERR);

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

@@ -915,9 +915,6 @@ public class CouponServiceImpl implements CouponService {
         if (couponDetailResponseDto == null || !couponDetailResponseDto.getResult().equals(ResponseCodeConstant.RESPONSE_SUCCESS_1) || CollectionUtils.isEmpty(couponDetailResponseDto.getDetails())) {
             return null;
         }
-        if (CollectionUtils.isEmpty(couponDetailResponseDto.getDetails())) {
-            return null;
-        }
         boolean productValid = false;
         Integer couponType = 0;
         GetCouponDetailResponseDto.Details couponActivityDetail = null;