|
@@ -22,13 +22,14 @@ import org.dromara.common.redis.utils.SequenceUtils;
|
|
|
import org.dromara.customer.api.RemoteCustomerSalesService;
|
|
import org.dromara.customer.api.RemoteCustomerSalesService;
|
|
|
import org.dromara.customer.api.RemoteCustomerService;
|
|
import org.dromara.customer.api.RemoteCustomerService;
|
|
|
import org.dromara.customer.api.domain.vo.RemoteCustomerSalesVo;
|
|
import org.dromara.customer.api.domain.vo.RemoteCustomerSalesVo;
|
|
|
-import org.dromara.order.domain.OrderMain;
|
|
|
|
|
-import org.dromara.order.domain.OrderProduct;
|
|
|
|
|
import org.dromara.external.api.zhongche.RemoteZhongChePullService;
|
|
import org.dromara.external.api.zhongche.RemoteZhongChePullService;
|
|
|
import org.dromara.external.api.zhongche.domain.bo.OrderConfirmBo;
|
|
import org.dromara.external.api.zhongche.domain.bo.OrderConfirmBo;
|
|
|
import org.dromara.external.api.zhongche.domain.bo.OrderRejectBo;
|
|
import org.dromara.external.api.zhongche.domain.bo.OrderRejectBo;
|
|
|
import org.dromara.external.api.zhongche.domain.vo.GoodsUpdateVo;
|
|
import org.dromara.external.api.zhongche.domain.vo.GoodsUpdateVo;
|
|
|
-import org.dromara.order.domain.*;
|
|
|
|
|
|
|
+import org.dromara.order.domain.OrderDeliver;
|
|
|
|
|
+import org.dromara.order.domain.OrderMain;
|
|
|
|
|
+import org.dromara.order.domain.OrderMainCrrcExt;
|
|
|
|
|
+import org.dromara.order.domain.OrderProduct;
|
|
|
import org.dromara.order.domain.bo.OrderMainBo;
|
|
import org.dromara.order.domain.bo.OrderMainBo;
|
|
|
import org.dromara.order.domain.bo.OrderProductBo;
|
|
import org.dromara.order.domain.bo.OrderProductBo;
|
|
|
import org.dromara.order.domain.dto.AssignmentStatsDto;
|
|
import org.dromara.order.domain.dto.AssignmentStatsDto;
|
|
@@ -169,6 +170,11 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
|
|
|
return TableDataInfo.build(result);
|
|
return TableDataInfo.build(result);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ @Override
|
|
|
|
|
+ public OrderCountVo countOrderNum(Long customerId) {
|
|
|
|
|
+ return baseMapper.countOrderNum(customerId);
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
@Override
|
|
@Override
|
|
|
public TableDataInfo<OrderProductVo> getCustomerOrderProductList(Set<Long> orderIdList) {
|
|
public TableDataInfo<OrderProductVo> getCustomerOrderProductList(Set<Long> orderIdList) {
|
|
|
// 1. 空值与空集合校验
|
|
// 1. 空值与空集合校验
|
|
@@ -677,7 +683,7 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
|
|
|
@Override
|
|
@Override
|
|
|
public TableDataInfo<OrderMainVo> queryZhongChePageList(OrderMainBo bo, PageQuery pageQuery) {
|
|
public TableDataInfo<OrderMainVo> queryZhongChePageList(OrderMainBo bo, PageQuery pageQuery) {
|
|
|
LambdaQueryWrapper<OrderMain> lqw = buildQueryWrapper(bo);
|
|
LambdaQueryWrapper<OrderMain> lqw = buildQueryWrapper(bo);
|
|
|
- lqw.eq(OrderMain::getDataSource,"zhongche");
|
|
|
|
|
|
|
+ lqw.eq(OrderMain::getDataSource, "zhongche");
|
|
|
Page<OrderMainVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
|
|
Page<OrderMainVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
|
|
|
List<OrderMainVo> records = result.getRecords();
|
|
List<OrderMainVo> records = result.getRecords();
|
|
|
|
|
|
|
@@ -745,7 +751,7 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
|
|
|
throw new ZhongcheException("中车订单扩展信息不存在");
|
|
throw new ZhongcheException("中车订单扩展信息不存在");
|
|
|
}
|
|
}
|
|
|
String crrcOrderNo = ext.getCrrcOrderNo();
|
|
String crrcOrderNo = ext.getCrrcOrderNo();
|
|
|
- OrderConfirmBo bo = new OrderConfirmBo(crrcOrderNo,orderNo);
|
|
|
|
|
|
|
+ OrderConfirmBo bo = new OrderConfirmBo(crrcOrderNo, orderNo);
|
|
|
GoodsUpdateVo goodsUpdateVo = zhongChePullService.mallOrderConfirm(bo);
|
|
GoodsUpdateVo goodsUpdateVo = zhongChePullService.mallOrderConfirm(bo);
|
|
|
if (goodsUpdateVo.getResult() != 1) {
|
|
if (goodsUpdateVo.getResult() != 1) {
|
|
|
throw new ZhongcheException("中车订单扩展信息不存在");
|
|
throw new ZhongcheException("中车订单扩展信息不存在");
|
|
@@ -774,7 +780,7 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
|
|
|
throw new ZhongcheException("中车订单扩展信息不存在");
|
|
throw new ZhongcheException("中车订单扩展信息不存在");
|
|
|
}
|
|
}
|
|
|
String crrcOrderNo = ext.getCrrcOrderNo();
|
|
String crrcOrderNo = ext.getCrrcOrderNo();
|
|
|
- OrderRejectBo bo = new OrderRejectBo(crrcOrderNo,orderNo,reason);
|
|
|
|
|
|
|
+ OrderRejectBo bo = new OrderRejectBo(crrcOrderNo, orderNo, reason);
|
|
|
GoodsUpdateVo goodsUpdateVo = zhongChePullService.mallOrderReject(bo);
|
|
GoodsUpdateVo goodsUpdateVo = zhongChePullService.mallOrderReject(bo);
|
|
|
if (goodsUpdateVo.getResult() != 1) {
|
|
if (goodsUpdateVo.getResult() != 1) {
|
|
|
throw new ZhongcheException("拒绝失败");
|
|
throw new ZhongcheException("拒绝失败");
|