|
@@ -77,7 +77,7 @@ public class CmsOrderController {
|
|
|
public Result<SearchResult<OrderDonView>> get() {
|
|
public Result<SearchResult<OrderDonView>> get() {
|
|
|
SearchResult<OrderDonView> search = beanSearcher.search(OrderDonView.class, MapUtils.flatBuilder(request.getParameterMap()).build());
|
|
SearchResult<OrderDonView> search = beanSearcher.search(OrderDonView.class, MapUtils.flatBuilder(request.getParameterMap()).build());
|
|
|
search.getDataList().forEach(data -> {
|
|
search.getDataList().forEach(data -> {
|
|
|
- if (data.getGoodsDonType() != null && data.getGoodsDonType() == 2) {
|
|
|
|
|
|
|
+ if (data.getGoodsDonType() != null && Constant.realGoodsType.contains(data.getGoodsDonType())) {
|
|
|
RealGoodsOrderHandle realGoodsOrderHandle = realGoodsOrderHandleMapper.selectOne(Wrappers.lambdaQuery(RealGoodsOrderHandle.class).eq(RealGoodsOrderHandle::getOrderId, data.getId()).last("limit 1"));
|
|
RealGoodsOrderHandle realGoodsOrderHandle = realGoodsOrderHandleMapper.selectOne(Wrappers.lambdaQuery(RealGoodsOrderHandle.class).eq(RealGoodsOrderHandle::getOrderId, data.getId()).last("limit 1"));
|
|
|
if (realGoodsOrderHandle != null) {
|
|
if (realGoodsOrderHandle != null) {
|
|
|
data.setBeforeServiceName(realGoodsOrderHandle.getBeforeServiceName());
|
|
data.setBeforeServiceName(realGoodsOrderHandle.getBeforeServiceName());
|
|
@@ -107,7 +107,7 @@ public class CmsOrderController {
|
|
|
if (data.getChannelId() == null) {
|
|
if (data.getChannelId() == null) {
|
|
|
data.setChannel("自然流量渠道");
|
|
data.setChannel("自然流量渠道");
|
|
|
}
|
|
}
|
|
|
- if (data.getGoodsDonType() != null && data.getGoodsDonType() == 2) {
|
|
|
|
|
|
|
+ if (data.getGoodsDonType() != null && Constant.realGoodsType.contains(data.getGoodsDonType())) {
|
|
|
OrderDonTransportView transportView = beanSearcher.searchFirst(OrderDonTransportView.class, MapUtils.builder().field(OrderDonTransportView::getOrderId, data.getId()).build());
|
|
OrderDonTransportView transportView = beanSearcher.searchFirst(OrderDonTransportView.class, MapUtils.builder().field(OrderDonTransportView::getOrderId, data.getId()).build());
|
|
|
if (transportView != null) {
|
|
if (transportView != null) {
|
|
|
data.setTransportStr(String.format("%s%s%s%s", transportView.getProvince(), transportView.getCity(), transportView.getDistrict(), transportView.getAddress()));
|
|
data.setTransportStr(String.format("%s%s%s%s", transportView.getProvince(), transportView.getCity(), transportView.getDistrict(), transportView.getAddress()));
|