返回日志修改

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

@@ -33,6 +33,7 @@ import cn.freemud.service.ItemService;
 import cn.freemud.service.impl.AssortmentSdkService;
 import cn.freemud.service.impl.calculate.CalculationCommonService;
 import cn.freemud.utils.LogUtil;
+import cn.freemud.utils.ResponseUtil;
 import cn.freemud.utils.WebUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -270,12 +271,14 @@ public class AbstractApportionService implements GetShoppingCartGoodsApportionSe
 
         // 用户选择的商品、数量不在促销返回的优惠信息中，返回错误
         if(baseRequestDTO == null ){
-            throw new ServiceException(ResponseResult.SHOPPING_CART_REQUEST_NOT_EMPTY);
+            return ResponseUtil.error(ResponseResult.SHOPPING_CART_REQUEST_NOT_EMPTY.getCode(),ResponseResult.SHOPPING_CART_REQUEST_NOT_EMPTY.getMessage());
+//            throw new ServiceException(ResponseResult.SHOPPING_CART_REQUEST_NOT_EMPTY);
         }
 
 
         if (StringUtils.isEmpty(baseRequestDTO.getShopId())){
-            throw new ServiceException(ResponseResult.SHOPPING_CART_SHOP_ID_NOT_EMPTY);
+            return ResponseUtil.error(ResponseResult.SHOPPING_CART_SHOP_ID_NOT_EMPTY.getCode(),ResponseResult.SHOPPING_CART_SHOP_ID_NOT_EMPTY.getMessage());
+//            throw new ServiceException(ResponseResult.SHOPPING_CART_SHOP_ID_NOT_EMPTY);
         }
 
         return ResponseBuilder.success();

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

@@ -82,7 +82,6 @@ public class AssortmentSdkService {
         cartParamDto.setUserId(userId);
         BaseResponse<com.freemud.sdk.api.assortment.shoppingcart.domain.CartGoods> baseResponse = shoppingCartService.getCartGoods(cartParamDto, LogThreadLocal.getTrackingNo());
         if (baseResponse == null || !ResponseResult.SUCCESS.getCode().equals(baseResponse.getCode()) || baseResponse.getResult() == null) {
-            /*ErrorLog.printLog(SDKCommonBaseContextWare.getAppName(), LogThreadLocal.getTrackingNo(), getClass(),"getCartGoods:" + JSONObject.toJSONString(baseResponse), cartParamDto, Level.ERROR);*/
             ApiLog.printLog("getCartGoods:", SDKCommonBaseContextWare.getAppName(),LogThreadLocal.getTrackingNo(),JSONObject.toJSONString(baseResponse));
             return null;
         }

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

@@ -306,7 +306,8 @@ public class CollageOrderServiceImpl implements CollageOrderService {
         // 因为一个用户在一个商户下只能参加一个拼单，所以通过判断用户在商户下的拼单结束时间确认
         Boolean flag = collageOrderBaseService.isInCollagePartnerMemberList(collageOrderDto);
         if(flag){
-            throw new ServiceException(ResponseResult.COLLAGE_MEMBER_ALREADY_ADD);
+            return ResponseUtil.error(ResponseResult.COLLAGE_MEMBER_ALREADY_ADD.getCode(),ResponseResult.COLLAGE_MEMBER_ALREADY_ADD.getMessage());
+//            throw new ServiceException(ResponseResult.COLLAGE_MEMBER_ALREADY_ADD);
         }
 
         // 设置用户的点餐位

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

@@ -477,7 +477,8 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         // 先验证商品是否存在
         CartGoods cartGoods = assortmentSdkService.getCartGoodsBySdk(partnerId, userId, storeId, cartGoodsUid, "", shoppingCartBaseService);
         if (cartGoods == null) {
-            throw new ServiceException(ResponseResult.SHOPPING_CART_UPDATE_ERROR);
+            return ResponseUtil.error(ResponseResult.SHOPPING_CART_UPDATE_ERROR);
+//            throw new ServiceException(ResponseResult.SHOPPING_CART_UPDATE_ERROR);
         }
         // 检查购物车商品库存数量
         checkUpdateStock(updateShoppingCartGoodsQtyRequestVo, cartGoods);