|
@@ -1,4 +1,5 @@
|
|
|
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;
|
|
@@ -16,6 +17,7 @@ import lombok.RequiredArgsConstructor;
|
|
|
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;
|
|
@@ -32,6 +34,7 @@ public class OmsCartItemServiceImpl extends ServiceImpl<OmsCartItemMapper, OmsCa
|
|
|
com.chelvc.cloud.vehicle.api.service.OmsCartItemService {
|
|
|
|
|
|
private final MerchantService merchantService;
|
|
|
+
|
|
|
@Override
|
|
|
public int add(OmsCartItemModifyParam cartItem) {
|
|
|
int count;
|
|
@@ -185,7 +188,7 @@ public class OmsCartItemServiceImpl extends ServiceImpl<OmsCartItemMapper, OmsCa
|
|
|
.eq(OmsCartItem :: getMerchantId,merchantId)
|
|
|
.eq(OmsCartItem::getDeleteStatus,"0").list();
|
|
|
List<OmsCartItemDTO> omsCartItemList = CartItemCopier.INSTANCE.copying(cartItemList);
|
|
|
- Merchant merchant = this.merchantService.getById(merchantId);
|
|
|
+ Merchant merchant = merchantService.getById(merchantId);
|
|
|
MerchantCartItemDTO merchantCartItemDTO = new MerchantCartItemDTO();
|
|
|
merchantCartItemDTO.setCartItems(omsCartItemList);
|
|
|
merchantCartItemDTO.setMerchantDTO(MerchantCopier.INSTANCE.copying(merchant));
|