优化

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/DynamicCommentServiceImpl.java

@@ -32,7 +32,6 @@ import org.springframework.context.annotation.Lazy;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -115,7 +114,6 @@ public class DynamicCommentServiceImpl implements DynamicCommentService, com.che
       Map<Long, UserDTO> longUserBaseInfoMap = userService.queryUserByIds(
           userIds);
       log.info("远程查询用户信息成功:{}", longUserBaseInfoMap);
-      List<String> resourceKey = new ArrayList<>();
       records.forEach(e -> {
         e.setUserDTO(longUserBaseInfoMap == null ? new UserDTO() :
             longUserBaseInfoMap.get(e.getUserId()));

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/FavoriteServiceImpl.java

@@ -11,13 +11,13 @@ import com.chelvc.cloud.vehicle.server.dao.FavoriteMapper;
 import com.chelvc.cloud.vehicle.server.entity.Favorite;
 import com.chelvc.cloud.vehicle.server.service.FavoriteService;
 import com.chelvc.framework.base.context.SessionContextHolder;
+import com.chelvc.framework.base.exception.ResourceUnavailableException;
 import com.chelvc.framework.base.util.ResourceUtils;
 import com.chelvc.framework.common.model.Pagination;
 import lombok.NonNull;
 import org.apache.dubbo.config.annotation.DubboService;
 import org.springframework.util.CollectionUtils;
 
-import java.sql.Wrapper;
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;
@@ -66,6 +66,9 @@ public class FavoriteServiceImpl extends ServiceImpl<FavoriteMapper, Favorite> i
                 .eq(Favorite::getUserId, userId)
                 .eq(Favorite::getContentId, id).one();
         ResourceUtils.available(favorite != null, "收藏信息不存在");
+        if(favorite == null || favorite.getUserId() == null){
+            throw new ResourceUnavailableException("非法操作");
+        }
         ResourceUtils.available(Objects.equals(favorite.getUserId(), SessionContextHolder.getId()), "非法操作");
         this.baseMapper.deleteFavorite(id,userId);
     }

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/HotMerchantServiceImpl.java

@@ -1,8 +1,7 @@
 package com.chelvc.cloud.vehicle.server.service.impl;
+
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.chelvc.cloud.vehicle.api.dto.MerchantDTO;
-import com.chelvc.cloud.vehicle.api.param.HotMerchantModifyParam;
-import com.chelvc.cloud.vehicle.server.copier.HotMerchantCopier;
 import com.chelvc.cloud.vehicle.server.dao.HotMerchantMapper;
 import com.chelvc.cloud.vehicle.server.entity.HotMerchant;
 import com.chelvc.cloud.vehicle.server.service.HotMerchantService;
@@ -37,8 +36,7 @@ public class HotMerchantServiceImpl extends ServiceImpl<HotMerchantMapper, HotMe
 
     @Override
     public List<MerchantDTO> listHotMerchant(){
-        List<MerchantDTO> merchantList = this.baseMapper.listHotMerchant();
-        return merchantList;
+        return this.baseMapper.listHotMerchant();
     }
 
 

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/IncomeRecordServiceImpl.java

@@ -29,7 +29,7 @@ public class IncomeRecordServiceImpl extends ServiceImpl<IncomeRecordMapper, Inc
         incomeRecord.setCreateTime(new Date());
         incomeRecord.setUpdateTime(new Date());
         incomeRecord.setInviterId(userId);
-        List<IncomeRecord> recordList = this.lambdaQuery().eq(IncomeRecord :: getInviteeId,userId).list();
+        //List<IncomeRecord> recordList = this.lambdaQuery().eq(IncomeRecord :: getInviteeId,userId).list();
 
         this.save(incomeRecord);
         return incomeRecord.getId();

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/MerchantAuthServiceImpl.java

@@ -3,19 +3,12 @@ package com.chelvc.cloud.vehicle.server.service.impl;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.chelvc.cloud.vehicle.api.dto.MerchantAuthDTO;
-import com.chelvc.cloud.vehicle.api.dto.NoticeDTO;
 import com.chelvc.cloud.vehicle.api.param.MerchantAuthModifyParam;
 import com.chelvc.cloud.vehicle.api.param.MerchantAuthPagingParam;
-import com.chelvc.cloud.vehicle.api.param.NoticeModifyParam;
-import com.chelvc.cloud.vehicle.api.param.NoticePagingParam;
 import com.chelvc.cloud.vehicle.server.copier.MerchantAuthCopier;
-import com.chelvc.cloud.vehicle.server.copier.NoticeCopier;
 import com.chelvc.cloud.vehicle.server.dao.MerchantAuthMapper;
-import com.chelvc.cloud.vehicle.server.dao.NoticeMapper;
 import com.chelvc.cloud.vehicle.server.entity.MerchantAuth;
-import com.chelvc.cloud.vehicle.server.entity.Notice;
 import com.chelvc.cloud.vehicle.server.service.MerchantAuthService;
-import com.chelvc.cloud.vehicle.server.service.NoticeService;
 import com.chelvc.framework.base.context.SessionContextHolder;
 import com.chelvc.framework.base.util.ResourceUtils;
 import com.chelvc.framework.common.model.Pagination;

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/OmsCartItemServiceImpl.java

@@ -1,7 +1,6 @@
 package com.chelvc.cloud.vehicle.server.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.chelvc.cloud.vehicle.api.dto.CartPromotionItemDTO;
 import com.chelvc.cloud.vehicle.api.dto.MerchantCartItemDTO;
 import com.chelvc.cloud.vehicle.api.dto.OmsCartItemDTO;
 import com.chelvc.cloud.vehicle.api.param.OmsCartItemModifyParam;
@@ -18,7 +17,6 @@ import org.apache.commons.collections4.CollectionUtils;
 import org.apache.dubbo.config.annotation.DubboService;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -77,8 +75,7 @@ public class OmsCartItemServiceImpl extends ServiceImpl<OmsCartItemMapper, OmsCa
         omsCartItem.setUserId(userId);
         List<OmsCartItem> cartItemList = this.lambdaQuery()
                 .eq(OmsCartItem::getUserId, userId).list();
-        List<OmsCartItemDTO> omsCartItemList = CartItemCopier.INSTANCE.copying(cartItemList);
-        return omsCartItemList;
+        return CartItemCopier.INSTANCE.copying(cartItemList);
     }
 
     public List<OmsCartItemDTO> listCartItem(List<Long> cartIds) {
@@ -89,8 +86,7 @@ public class OmsCartItemServiceImpl extends ServiceImpl<OmsCartItemMapper, OmsCa
                 .eq(OmsCartItem::getUserId, userId)
                 .eq(OmsCartItem::getDeleteStatus,0)
                 .in(OmsCartItem::getGoodsId,cartIds).list();
-        List<OmsCartItemDTO> omsCartItemList = CartItemCopier.INSTANCE.copying(cartItemList);
-        return omsCartItemList;
+        return CartItemCopier.INSTANCE.copying(cartItemList);
     }
 
     @Override
@@ -98,13 +94,13 @@ public class OmsCartItemServiceImpl extends ServiceImpl<OmsCartItemMapper, OmsCa
         if (CollectionUtils.isEmpty(cartIds)) {
             return null;
         }
-        List<OmsCartItemDTO> cartItemList = listCartItem(cartIds);
-        List<CartPromotionItemDTO> cartPromotionItemList = new ArrayList<>();
-        if (!CollectionUtils.isEmpty(cartItemList)) {
+        return listCartItem(cartIds);
+//        List<CartPromotionItemDTO> cartPromotionItemList = new ArrayList<>();
+//        if (!CollectionUtils.isEmpty(cartItemList)) {
 //            cartPromotionItemList.add(cartItemList);
 //            cartPromotionItemList = promotionService.calcCartPromotion(cartItemList);
-        }
-        return cartItemList;
+//        }
+//        return cartItemList;
     }
 
     @Override
@@ -122,16 +118,7 @@ public class OmsCartItemServiceImpl extends ServiceImpl<OmsCartItemMapper, OmsCa
     @Override
     public void delete(List<Long> ids) {
         Long userId = SessionContextHolder.getId();
-        for (Long id : ids) {
-            OmsCartItem cartItem = this.lambdaQuery()
-                    .eq(OmsCartItem::getUserId, userId).eq(
-                            OmsCartItem::getId, id
-                    ).one();
-            if (cartItem != null){
-                cartItem.setDeleteStatus(1);
-                this.baseMapper.updateById(cartItem);
-            }
-        }
+        delete(ids, userId);
     }
 
     @Override

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/OmsOrderServiceImpl.java

@@ -618,7 +618,7 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper, OmsOrder> i
         BigDecimal totalAmount = calcTotalAmount(orderItemList);
         for (OmsOrderItem orderItem : orderItemList) {
             //(商品价格/可用商品总价)*优惠券面额
-            BigDecimal couponAmount = orderItem.getGoodsPrice().divide(totalAmount, 3, RoundingMode.HALF_EVEN).multiply(new BigDecimal(coupon.getAmount()));
+            BigDecimal couponAmount = orderItem.getGoodsPrice().divide(totalAmount, 3, RoundingMode.HALF_EVEN).multiply(BigDecimal.valueOf(coupon.getAmount()));
             orderItem.setCouponAmount(couponAmount);
         }
     }

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/PayServiceImpl.java

@@ -36,7 +36,7 @@ public class PayServiceImpl implements PayService {
         if(omsOrder == null){
             return;
         }
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
         sb.append("merchantAcctId=").append("1001292117101").append("&");
         sb.append("version=").append("v2.0").append("&");
         sb.append("language=").append("1").append("&");
@@ -58,7 +58,7 @@ public class PayServiceImpl implements PayService {
 
     public static void main(String[] args) {
 
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
         sb.append("merchantAcctId=").append("1001292117101").append("&");
         sb.append("version=").append("v2.0").append("&");
         sb.append("language=").append("1").append("&");

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/UserCouponServiceImpl.java

@@ -182,7 +182,7 @@ public class UserCouponServiceImpl extends ServiceImpl<UserCouponMapper, UserCou
         Integer haveCoupons = this.lambdaQuery()
                 .eq(UserCoupon::getUserId, userId)
                 .eq(UserCoupon::getCouponId, coupon.getId()).count();
-        if (!PromotionStatus.START.name().equals(coupon.getPromotionStatus())) {
+        if (!PromotionStatus.START.equals(coupon.getPromotionStatus())) {
             throw new ResourceUnavailableException("当前优惠券已经被领取完了，下次要早点来哦");
         }
         if (coupon.getPublishNum() != 0 && coupon.getReceivedNum() >= coupon.getPublishNum()) {