From 726f97c55b0937bf0d048313271bdd7a80cdd1f6 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期二, 20 四月 2021 12:38:30 +0800
Subject: [PATCH] add:添加订单相关联字段
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopOrderServiceImpl.java | 144 ++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 126 insertions(+), 18 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopOrderServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopOrderServiceImpl.java
index 24cd5c2..be8fa71 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopOrderServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopOrderServiceImpl.java
@@ -1,19 +1,15 @@
package com.panzhihua.service_community.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.dtos.PageDTO;
-import com.panzhihua.common.model.dtos.shop.PageComShopOrderSearchDTO;
+import com.panzhihua.common.model.dtos.shop.*;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.dao.ComShopOrderDAO;
import com.panzhihua.service_community.model.dos.ComShopOrderDO;
-import com.panzhihua.common.model.dtos.shop.ComShopOrderCreateDTO;
-import com.panzhihua.common.model.dtos.shop.ComShopOrderCreateGoodsDTO;
-import com.panzhihua.common.model.dtos.shop.ComShopOrderPreviewDTO;
-import com.panzhihua.common.model.dtos.shop.PageComOrderListDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.shop.*;
import com.panzhihua.common.utlis.OrderNoUtils;
@@ -55,11 +51,14 @@
private ComShopOrderOperateDAO comShopOrderOperateDAO;
@Resource
private ComShopOrderGoodsDAO comShopOrderGoodsDAO;
+ @Resource
+ private ComShopOrderDAO comShopOrderDAO;
/**
* 订单预览
- * @param orderPreviewDTO 请求参数
- * @return 订单预览数据
+ *
+ * @param orderPreviewDTO 请求参数
+ * @return 订单预览数据
*/
@Override
public R orderPreview(ComShopOrderPreviewDTO orderPreviewDTO){
@@ -511,22 +510,131 @@
}
@Override
- public R pageShopOrder(PageComShopOrderSearchDTO pageComShopOrderSearchDTO) {
+ public R shipOrder(ComShopOrderShipDTO orderShipDTO) {
+ ComShopOrderDO comShopOrderDO = comShopOrderDAO.selectById(orderShipDTO.getOrderId());
+ if(comShopOrderDO==null){
+ return R.fail("订单不存在");
+ }
+ if(!(comShopOrderDO.getStatus()==2)
+ || !(comShopOrderDO.getDeleteStatus()==1)){
+ return R.fail("订单发货失败,订单状态不允许发货");
+ }
+ comShopOrderDO.setDeliveryStatus(2);
+ comShopOrderDO.setDeliveryType(2);
+ comShopOrderDO.setStatus(3);
+ comShopOrderDO.setLogisticsCompany(orderShipDTO.getLogisticsCompany());
+ comShopOrderDO.setLogisticsNo(orderShipDTO.getLogisticsNo());
+ int updated = comShopOrderDAO.updateById(comShopOrderDO);
+ if(updated==1){
+ return R.ok("发货成功");
+ }
+ return R.fail("发货失败!");
+ }
+ @Override
+ public R deliverOrder(Long orderId) {
+ ComShopOrderDO comShopOrderDO = comShopOrderDAO.selectById(orderId);
+ if(comShopOrderDO==null){
+ return R.fail("订单不存在");
+ }
+ if(!(comShopOrderDO.getStatus()==2)){
+ return R.fail("当前订单不能配送");
+ }
+ comShopOrderDO.setDeliveryStatus(4);
+ comShopOrderDO.setDeliveryType(1);
+ int updated = comShopOrderDAO.updateById(comShopOrderDO);
+ if(updated==1){
+ return R.ok("开始配送");
+ }
+ return R.fail("操作失败!");
+ }
+
+ @Override
+ public R finishDeliverOrder(Long orderId) {
+ ComShopOrderDO comShopOrderDO = comShopOrderDAO.selectById(orderId);
+ if(comShopOrderDO==null){
+ return R.fail("订单不存在");
+ }
+ if(!(comShopOrderDO.getDeliveryStatus() == 4)){
+ return R.fail("订单还未开始配送");
+ }
+ comShopOrderDO.setDeliveryStatus(5);
+ int updated = comShopOrderDAO.updateById(comShopOrderDO);
+ if(updated==1){
+ return R.ok("配送完成");
+ }
+ return R.fail("操作失败!");
+ }
+
+ @Override
+ public R shopOrderExportData(ComShopOrderExportDTO comShopOrderExportDTO) {
+ Page page = new Page();
+ page.setSize(1000);
+ page.setCurrent(1);
+ IPage<ExcelShopOrderDTO> excelShopOrderDTO = comShopOrderDAO.selectOrderExport(page, comShopOrderExportDTO);
+ return R.ok(excelShopOrderDTO.getRecords());
+ }
+
+ @Override
+ public R shopOrderFundsExportData(ComShopFundsExportDTO comShopFundsExportDTO) {
+ Page page = new Page();
+ page.setSize(1000);
+ page.setCurrent(1);
+ IPage<ExcelShopFundsDTO> excelShopFundsDTO = comShopOrderDAO.selectFundsExport(page, comShopFundsExportDTO);
+ return R.ok(excelShopFundsDTO.getRecords());
+ }
+
+ @Override
+ public R getFundsStat(Long userId) {
+ ComShopFundsVO comShopFundsVO = comShopOrderDAO.queryStatis(userId);
+ return R.ok(comShopFundsVO);
+ }
+
+ @Override
+ public R pageShopFunds(PageComShopFundsSearchDTO pageComShopFundsSearchDTO) {
+ Long pageNum = pageComShopFundsSearchDTO.getPageNum();
+ Long pageSize = pageComShopFundsSearchDTO.getPageSize();
+ Page page = new Page();
+ if(pageNum==null||0==pageNum.longValue()){
+ pageNum = 1l;
+ }
+ if(pageSize==null||0==pageSize.longValue()){
+ pageSize = 10l;
+ }
+ page.setCurrent(pageNum);
+ page.setSize(pageSize);
+ IPage<ComShopFundsOrderVO> comShopFundsOrderVOIPage = comShopOrderDAO.pageShopFunds(page, pageComShopFundsSearchDTO);
+ return R.ok(comShopFundsOrderVOIPage);
+ }
+
+ @Override
+ public R pageShopOrder(PageComShopOrderSearchDTO pageComShopOrderSearchDTO) {
Long pageNum = pageComShopOrderSearchDTO.getPageNum();
Long pageSize = pageComShopOrderSearchDTO.getPageSize();
- PageDTO page = new PageDTO();
+ Page page = new Page();
- page.setPageNum(pageNum);
- page.setPageSize(pageSize);
- if(pageNum==null||new Long(0).equals(pageNum.longValue())){
- page.setPageNum(1l);
+ page.setCurrent(pageNum);
+ page.setSize(pageSize);
+ if(pageNum==null||0==pageNum.longValue()){
+ page.setCurrent(1l);
}
- if(pageSize==null||new Long(0).equals(pageSize.longValue())){
- page.setPageSize(10l);
+ if(pageSize==null||0==pageSize.longValue()){
+ page.setSize(10l);
}
- this.baseMapper.pageOrderBy(page, pageComShopOrderSearchDTO);
- return null;
+ IPage<ComShopOrderSearchVO> ipage = this.baseMapper.pageOrderBy(page, pageComShopOrderSearchDTO);
+ return R.ok(ipage);
+ }
+
+
+
+
+ @Override
+ public R capitalDetailByStore(Long id) {
+ if(id==null){
+ R.fail("订单号不能为空！");
+ }
+ CapitalDetailVO vo = this.baseMapper.capitalDetailByStore(id);
+ return R.ok(vo);
}
}
--
Gitblit v1.7.1