feat(order): app用户查询订单详情信息扩展核销码信息
This commit is contained in:
parent
606ffbefdf
commit
a6a7af49c8
@ -1,5 +1,6 @@
|
|||||||
package com.wzj.soopin.order.business.impl;
|
package com.wzj.soopin.order.business.impl;
|
||||||
|
|
||||||
|
import cn.hutool.core.bean.BeanUtil;
|
||||||
import com.wzj.soopin.member.domain.po.Member;
|
import com.wzj.soopin.member.domain.po.Member;
|
||||||
import com.wzj.soopin.member.service.IMemberService;
|
import com.wzj.soopin.member.service.IMemberService;
|
||||||
import com.wzj.soopin.order.business.IOrderBusiness;
|
import com.wzj.soopin.order.business.IOrderBusiness;
|
||||||
@ -23,6 +24,7 @@ import org.springframework.stereotype.Service;
|
|||||||
|
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
import java.util.Optional;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
@Service
|
@Service
|
||||||
@ -44,13 +46,18 @@ public class OrderBusinessImpl extends BusinessImpl<OrderService, OrderConvert,
|
|||||||
|
|
||||||
//设置明细
|
//设置明细
|
||||||
List<OrderItem> orderItemList = orderItemService.findByOrderId(vo.getId());
|
List<OrderItem> orderItemList = orderItemService.findByOrderId(vo.getId());
|
||||||
|
|
||||||
List<OrderItemVO> itemVOList = orderItemList.stream().map(item -> {
|
List<OrderItemVO> itemVOList = orderItemList.stream().map(item -> {
|
||||||
OrderItemVO itemVO=orderItemConvert.toVO(item);
|
OrderItemVO itemVO=orderItemConvert.toVO(item);
|
||||||
if (itemVO.getTenantId() != null) {
|
if (itemVO.getTenantId() != null) {
|
||||||
SysTenantVo tenant = tenantService.queryByTenantId(item.getTenantId());
|
SysTenantVo tenant = tenantService.queryByTenantId(item.getTenantId());
|
||||||
itemVO.setTenantName(tenant.getStoreName());
|
itemVO.setTenantName(tenant.getStoreName());
|
||||||
}
|
}
|
||||||
//赋值
|
Optional.ofNullable(verificationCodeService.getByOrderItemId(item.getId()))
|
||||||
|
.ifPresent(v -> {
|
||||||
|
itemVO.setVerificationId(v.getId());
|
||||||
|
BeanUtil.copyProperties(v, itemVO,"id");
|
||||||
|
});
|
||||||
return itemVO;
|
return itemVO;
|
||||||
}).collect(Collectors.toList());
|
}).collect(Collectors.toList());
|
||||||
|
|
||||||
|
@ -18,4 +18,6 @@ public interface VerificationCodeService extends IService<VerificationCodes> {
|
|||||||
List<VerificationCodes> getByOrderId(Long orderId);
|
List<VerificationCodes> getByOrderId(Long orderId);
|
||||||
|
|
||||||
void Invalid(Long orderId, List<Long> orderItemIdList);
|
void Invalid(Long orderId, List<Long> orderItemIdList);
|
||||||
|
|
||||||
|
VerificationCodes getByOrderItemId(Long orderItemId);
|
||||||
}
|
}
|
||||||
|
@ -135,4 +135,10 @@ public class VerificationCodeServiceImpl extends ServiceImpl<VerificationCodesM
|
|||||||
.in(VerificationCodes::getOrderItemId, orderItemIdList)
|
.in(VerificationCodes::getOrderItemId, orderItemIdList)
|
||||||
.set(VerificationCodes::getStatus, VerificationCodeStatus.CANCELLED.getCode()));
|
.set(VerificationCodes::getStatus, VerificationCodeStatus.CANCELLED.getCode()));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public VerificationCodes getByOrderItemId(Long orderItemId) {
|
||||||
|
return codeMapper.selectOne(Wrappers.lambdaQuery(VerificationCodes.class)
|
||||||
|
.eq(VerificationCodes::getOrderItemId, orderItemId));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user