Skip to content

O
order-group
Commit bf8799ba by zhiheng.zhang
Options

日志打印优化

parent e00331d2
Showing with 34 additions and 16 deletions
shopping-cart-application-service/src/main/java/cn/freemud/demo/service/impl/AbstractAddGoodsService.java
......@@ -37,6 +37,7 @@ import cn.freemud.service.impl.AssortmentSdkService;
import cn.freemud.service.impl.calculate.CalculationCommonService;
import cn.freemud.utils.BeanUtil;
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;
......@@ -351,7 +352,8 @@ public abstract class AbstractAddGoodsService implements AddGoodsService {
private BaseResponse checkCommParams(BaseAddGoodsBO baseRequestDTO) {
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);
// throw new ServiceException(ResponseResult.SHOPPING_CART_SHOP_ID_NOT_EMPTY);
}
return ResponseBuilder.success();
......
shopping-cart-application-service/src/main/java/cn/freemud/demo/service/impl/AbstractListCartGoodsService.java
......@@ -28,6 +28,7 @@ import cn.freemud.redis.RedisCache;
import cn.freemud.service.CouponService;
import cn.freemud.service.impl.AssortmentSdkService;
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;
......@@ -273,7 +274,8 @@ public class AbstractListCartGoodsService implements ListCartGoodsService {
private BaseResponse checkCommParams(ListCartGoodsBO baseRequestDTO) {
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);
// throw new ServiceException(ResponseResult.SHOPPING_CART_SHOP_ID_NOT_EMPTY);
}
return ResponseBuilder.success();
......
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/CollageOrderServiceImpl.java
......@@ -335,7 +335,8 @@ public class CollageOrderServiceImpl implements CollageOrderService {
CustomerInfoVo currentUserInfoVo = this.shoppingCartCollageService.getCustomerInfoVo(request.getSessionId());
// 当前用户必须登陆
if (StringUtils.isEmpty(currentUserInfoVo.getMemberId())) {
throw new ServiceException(ResponseResult.NOT_LOGIN);
return ResponseUtil.error(ResponseResult.NOT_LOGIN);
// throw new ServiceException(ResponseResult.NOT_LOGIN);
}
CollageOrderDto collageOrderDto = this.collageOrderAdapter.convert2CollageOrderDto(request);
......@@ -351,13 +352,15 @@ public class CollageOrderServiceImpl implements CollageOrderService {
// 拼单发起人不能退出拼单
if(collageOrder.getCreateCollageUserId().equals(currentUserInfoVo.getMemberId())){
throw new ServiceException(ResponseResult.COLLAGE_CREATE_NOT_OUT_OF);
return ResponseUtil.error(ResponseResult.COLLAGE_CREATE_NOT_OUT_OF);
// throw new ServiceException(ResponseResult.COLLAGE_CREATE_NOT_OUT_OF);
}
// 非邀请人检查是否参加了该邀请人的订单
BaseResponse judge = collageOrderBaseService.judgeMemberAddOneCollage(collageOrderDto);
if(!ResponseResult.SUCCESS.getCode().equals(judge.getCode())){
throw new ServiceException(ResponseResult.COLLAGE_MEMBER_NOT_ADD);
return ResponseUtil.error(ResponseResult.COLLAGE_MEMBER_NOT_ADD);
// throw new ServiceException(ResponseResult.COLLAGE_MEMBER_NOT_ADD);
}
try {
......@@ -375,17 +378,20 @@ public class CollageOrderServiceImpl implements CollageOrderService {
CustomerInfoVo currentUserInfoVo = this.shoppingCartCollageService.getCustomerInfoVo(request.getSessionId());
// 当前用户必须登陆
if (StringUtils.isEmpty(currentUserInfoVo.getMemberId())) {
throw new ServiceException(ResponseResult.NOT_LOGIN);
return ResponseUtil.error(ResponseResult.NOT_LOGIN);
// throw new ServiceException(ResponseResult.NOT_LOGIN);
}
// 只有拼单发起者才能移除拼单人员
if(!currentUserInfoVo.getMemberId().equals(request.getCreateCollageUserId())){
throw new ServiceException(ResponseResult.COLLAGE_MEMBER_NOT_CREATE);
return ResponseUtil.error(ResponseResult.COLLAGE_MEMBER_NOT_CREATE);
// throw new ServiceException(ResponseResult.COLLAGE_MEMBER_NOT_CREATE);
}
// 不能移除自己
if(currentUserInfoVo.getMemberId().equals(request.getRemoveUserId())){
throw new ServiceException(ResponseResult.COLLAGE_CAN_NOT_REMOVE_SELF);
return ResponseUtil.error(ResponseResult.COLLAGE_CAN_NOT_REMOVE_SELF);
// throw new ServiceException(ResponseResult.COLLAGE_CAN_NOT_REMOVE_SELF);
}
CollageOrderDto collageOrderDto = this.collageOrderAdapter.convert2CollageOrderDto(request);
......
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartMallServiceImpl.java
......@@ -254,7 +254,8 @@ public class ShoppingCartMallServiceImpl 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);
......
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
......@@ -330,12 +330,14 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
// 没有查到商品
if (productBeanListSpuClass == null || productBeanListSpuClass.isEmpty()) {
throw new ServiceException(ResponseResult.SHOPPING_CART_PRODUCT_NOT_EXIST);
return ResponseUtil.error(ResponseResult.SHOPPING_CART_PRODUCT_NOT_EXIST);
// throw new ServiceException(ResponseResult.SHOPPING_CART_PRODUCT_NOT_EXIST);
}
// 检查商品小料数量
if (checkMaterialQty(addShoppingCartGoodsRequestVo, productBeanListSpuClass)) {
throw new ServiceException(ResponseResult.SHOPPING_CART_MATERIA_QTY_LIMIT_ERR);
return ResponseUtil.error(ResponseResult.SHOPPING_CART_MATERIA_QTY_LIMIT_ERR);
// throw new ServiceException(ResponseResult.SHOPPING_CART_MATERIA_QTY_LIMIT_ERR);
}
//缓存中获取购物车商品信息
......@@ -452,7 +454,8 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
@Override
public BaseResponse updateGoodsQty(UpdateShoppingCartGoodsQtyRequestVo updateShoppingCartGoodsQtyRequestVo) {
if (StringUtils.isEmpty(updateShoppingCartGoodsQtyRequestVo.getShopId())) {
throw new ServiceException(ResponseResult.SHOPPING_CART_SHOP_ID_NOT_EMPTY);
return ResponseUtil.error(ResponseResult.SHOPPING_CART_SHOP_ID_NOT_EMPTY);
// throw new ServiceException(ResponseResult.SHOPPING_CART_SHOP_ID_NOT_EMPTY);
}
ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVo = new ShoppingCartGoodsResponseVo();
CustomerInfoVo assortmentCustomerInfoVo = getCustomerInfoVo(updateShoppingCartGoodsQtyRequestVo.getSessionId());
......@@ -601,7 +604,8 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
@Override
public BaseResponse getGoodsList(ShoppingCartInfoRequestVo shoppingCartInfoRequestVo) {
if (StringUtils.isEmpty(shoppingCartInfoRequestVo.getShopId())) {
throw new ServiceException(ResponseResult.SHOPPING_CART_SHOP_ID_NOT_EMPTY);
return ResponseUtil.error(ResponseResult.SHOPPING_CART_SHOP_ID_NOT_EMPTY);
// throw new ServiceException(ResponseResult.SHOPPING_CART_SHOP_ID_NOT_EMPTY);
}
if (StringUtils.isEmpty(shoppingCartInfoRequestVo.getVersion())) {
shoppingCartInfoRequestVo.setVersion("");
......@@ -1006,7 +1010,8 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
// 获取购物车商品
List<CartGoods> cartGoodsList = assortmentSdkService.getShoppingCart(partnerId, storeId, userId, null, tableNumber, shoppingCartBaseService);
if (cartGoodsList == null) {
throw new ServiceException(ResponseResult.SHOPPING_CART_GETINFO_INVAILD);
return ResponseUtil.error(ResponseResult.SHOPPING_CART_GETINFO_INVAILD);
// throw new ServiceException(ResponseResult.SHOPPING_CART_GETINFO_INVAILD);
}
/**
* 校验该名店是否有必选商品
......@@ -1014,7 +1019,8 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
* 2. 如果有，则和购物车的商品对比
*/
if (productService.hasRequiredProducts(partnerId, storeId, cartGoodsList, BusinessTypeEnum.getByType(shoppingCartInfoRequestVo.getMenuType()).getCode())) {
throw new ServiceException(ResponseResult.SHOPPING_CART_REQUIRED_PRODUCT_NOT_EXIST);
return ResponseUtil.error(ResponseResult.SHOPPING_CART_REQUIRED_PRODUCT_NOT_EXIST);
// throw new ServiceException(ResponseResult.SHOPPING_CART_REQUIRED_PRODUCT_NOT_EXIST);
}
// check购物车中所有商品(商品是否存在，价格变动，券是否支持当前点餐方式)
......@@ -3106,7 +3112,8 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
public BaseResponse replaceGoodsByShop(ShopGoodsReplaceVo replaceGoodsRequestVo) {
if (StringUtils.isEmpty(replaceGoodsRequestVo.getShopId())
|| StringUtils.isEmpty(replaceGoodsRequestVo.getOldShopId())) {
throw new ServiceException(ResponseResult.SHOPPING_CART_SHOP_ID_NOT_EMPTY);
return ResponseUtil.error(ResponseResult.SHOPPING_CART_SHOP_ID_NOT_EMPTY);
// throw new ServiceException(ResponseResult.SHOPPING_CART_SHOP_ID_NOT_EMPTY);
}
if (replaceGoodsRequestVo.getShopId().equals(replaceGoodsRequestVo.getOldShopId())) {
return ResponseUtil.success();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment