From d1cfef3e27f29460ca497c9b8071c456b2890420 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=88=86=E7=B1=B3=E8=8A=B1?= <417727563@qq.com> Date: Fri, 3 Feb 2023 09:09:54 +0800 Subject: [PATCH 1/3] 2023-02-03 --- ant-design-vue-jeecg/src/main.js | 4 +- .../src/views/system/Depart3List.vue | 4 +- .../src/views/system/modules/DepartModal.vue | 6 +- .../zyWorkorderManagement/ZyWorkOrderList.vue | 6 +- .../controller/WorkOrderController.java | 2 +- .../service/impl/WorkOrderServiceImpl.java | 73 +++++++++++++++---- 6 files changed, 70 insertions(+), 25 deletions(-) diff --git a/ant-design-vue-jeecg/src/main.js b/ant-design-vue-jeecg/src/main.js index d539d2a6..be83b4ac 100644 --- a/ant-design-vue-jeecg/src/main.js +++ b/ant-design-vue-jeecg/src/main.js @@ -12,8 +12,8 @@ import ElementUI from 'element-ui'; import 'element-ui/lib/theme-chalk/index.css'; import './views/shopping/assets/iconfont/iconfont.css'//引入商城所需图标 // YU-优化 - require('@jeecg/antd-online-mini') - require('@jeecg/antd-online-mini/dist/OnlineForm.css') +// require('@jeecg/antd-online-mini') +// require('@jeecg/antd-online-mini/dist/OnlineForm.css') // 引入 按需组件的统一引入文件 //import './components/use' import Antd, { version } from 'ant-design-vue' diff --git a/ant-design-vue-jeecg/src/views/system/Depart3List.vue b/ant-design-vue-jeecg/src/views/system/Depart3List.vue index 1a7bb904..2eea3942 100644 --- a/ant-design-vue-jeecg/src/views/system/Depart3List.vue +++ b/ant-design-vue-jeecg/src/views/system/Depart3List.vue @@ -158,7 +158,7 @@ - + - + { if (res.success) { this.$message.success("撤销成功！"); diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workorder/controller/WorkOrderController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workorder/controller/WorkOrderController.java index 607155e0..49a12936 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workorder/controller/WorkOrderController.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workorder/controller/WorkOrderController.java @@ -278,7 +278,7 @@ public class WorkOrderController extends JeecgController queryWrapper = QueryGenerator.initQueryWrapper(sysDepart, req.getParameterMap()); Page page = new Page(pageNo, pageSize); - queryWrapper.eq("org_type",1); + // queryWrapper.eq("org_type",1); queryWrapper.eq("org_category",2); IPage pageList = sysDepartService.page(page, queryWrapper); return Result.OK(pageList); diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workorder/service/impl/WorkOrderServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workorder/service/impl/WorkOrderServiceImpl.java index 6d71b47c..bb181316 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workorder/service/impl/WorkOrderServiceImpl.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workorder/service/impl/WorkOrderServiceImpl.java @@ -2,6 +2,7 @@ package org.jeecg.modules.workorder.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.jeecg.common.api.vo.Result; @@ -173,6 +174,8 @@ public class WorkOrderServiceImpl extends ServiceImpl0) {//start if 02 // 保存工单 + + //获取订单商品 OrderGoods ogModel=ogList.get(0); //服装款式 @@ -199,6 +202,7 @@ public class WorkOrderServiceImpl extends ServiceImpl0) + if(goodNum>0) { //量体数据 CustomerMeasure mesureModel=customerMeasureMapper.selectById(ogModel.getMeasureId()); @@ -219,7 +224,7 @@ public class WorkOrderServiceImpl extends ServiceImpl cancellationWorkOrder(WorkOrder woModel) { + //根据工单获取产品列表，然后循环删除产品列表中的工序，以及工序对应的设备、工具，再删除产品中对应模块、面料、辅料 - //ZyProduct //工单 - //-产品 - //-工序 + //-产品 + QueryWrapper productWrapper = new QueryWrapper(); + productWrapper.eq("work_order_id", woModel.getId()); + List productList = productMapper.selectList(productWrapper); + + for (ZyProduct model:productList) + { + //-工序 + QueryWrapper productProcessWrapper = new QueryWrapper(); + productProcessWrapper.eq("product_id",model.getId()); + productProcessMapper.delete(productProcessWrapper); + //-工具 + QueryWrapper productOperationtoolWrapper = new QueryWrapper(); + productOperationtoolWrapper.eq("product_id",model.getId()); + productOperationtoolMapper.delete(productOperationtoolWrapper); + //-设备 + QueryWrapper productMachineWrapper = new QueryWrapper(); + productMachineWrapper.eq("product_id",model.getId()); + productMachineMapper.delete(productMachineWrapper); + + //产品模块 + QueryWrapper productModuleWrapper = new QueryWrapper(); + productModuleWrapper.eq("product_id",model.getId()); + productModuleMapper.delete(productModuleWrapper); + + //产品面料 + QueryWrapper productFabricWrapper = new QueryWrapper(); + productFabricWrapper.eq("product_id",model.getId()); + productFabricMapper.delete(productFabricWrapper); + + //产品面料 + QueryWrapper productAccessoriesWrapper = new QueryWrapper(); + productAccessoriesWrapper.eq("product_id",model.getId()); + productAccessoriesMapper.delete(productAccessoriesWrapper); + } - return null; + + //修改订单 + UpdateWrapper updateWrapper = new UpdateWrapper(); + updateWrapper.eq("id", woModel.getOrdersId()); + updateWrapper.set("delivery_status", 2); + int update = zyOrdersMapper.update(null, updateWrapper); + + //产品 + productMapper.delete(productWrapper); + //工单 + baseMapper.deleteById(woModel.getId()); + return Result.OK("成功"); } From 58f1e7e858dd5df58411b95a66254664ebcffad2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=88=86=E7=B1=B3=E8=8A=B1?= <417727563@qq.com> Date: Tue, 14 Feb 2023 10:59:44 +0800 Subject: [PATCH 2/3] 2023-02-14 --- .../org/jeecg/config/shiro/ShiroConfig.java | 2 + .../pom.xml | 2 +- .../service/impl/ZyOrderServiceImpl.java | 1 + .../zyorders/service/IZyOrdersService.java | 6 ++ .../service/impl/ZyOrdersServiceImpl.java | 56 ++++++++++++++++ .../largeScreen/LargeScreenController.java | 64 +++++++++++++++++++ 6 files changed, 130 insertions(+), 1 deletion(-) create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/largeScreen/LargeScreenController.java diff --git a/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java b/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java index 1b3bbfb6..09b7afea 100644 --- a/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java +++ b/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java @@ -126,6 +126,8 @@ public class ShiroConfig { //店铺管理 filterChainDefinitionMap.put("/zyShop/shopInfo/**","anon"); filterChainDefinitionMap.put("/zyShopOrder/shopOrder/**","anon"); + //大屏数据 + filterChainDefinitionMap.put("/largeScreen/**","anon"); //人员管理 filterChainDefinitionMap.put("/zyPerson/**","anon"); diff --git a/jeecg-boot/jeecg-boot-module-orderbymakeclothplan/pom.xml b/jeecg-boot/jeecg-boot-module-orderbymakeclothplan/pom.xml index bb18ccc7..315d8c9e 100644 --- a/jeecg-boot/jeecg-boot-module-orderbymakeclothplan/pom.xml +++ b/jeecg-boot/jeecg-boot-module-orderbymakeclothplan/pom.xml @@ -54,4 +54,4 @@ jeecg-boot-starter-job --> - + \ No newline at end of file diff --git a/jeecg-boot/jeecg-boot-module-orderbymakeclothplan/src/main/java/org/jeecg/modules/orderbymakeclothplan/service/impl/ZyOrderServiceImpl.java b/jeecg-boot/jeecg-boot-module-orderbymakeclothplan/src/main/java/org/jeecg/modules/orderbymakeclothplan/service/impl/ZyOrderServiceImpl.java index eaf6caf7..262002ae 100644 --- a/jeecg-boot/jeecg-boot-module-orderbymakeclothplan/src/main/java/org/jeecg/modules/orderbymakeclothplan/service/impl/ZyOrderServiceImpl.java +++ b/jeecg-boot/jeecg-boot-module-orderbymakeclothplan/src/main/java/org/jeecg/modules/orderbymakeclothplan/service/impl/ZyOrderServiceImpl.java @@ -25,6 +25,7 @@ import java.util.*; @Service public class ZyOrderServiceImpl implements ZyOrderService { + //虚假订单 @Autowired private ZyOrderMapper zyOrderMapper; diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zyorders/service/IZyOrdersService.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zyorders/service/IZyOrdersService.java index 1ddb16c5..8c48a272 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zyorders/service/IZyOrdersService.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zyorders/service/IZyOrdersService.java @@ -4,6 +4,8 @@ import org.jeecg.common.api.vo.Result; import org.jeecg.modules.demo.zyorders.entity.ZyOrders; import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + /** * @Description: 订单基本信息管理 * @Author: jeecg-boot @@ -12,4 +14,8 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface IZyOrdersService extends IService { + //大屏数据-获取订单的状态 + List getOrderStatus(); + //大屏数据-获取历史订单 + List getOldOrder(); } diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zyorders/service/impl/ZyOrdersServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zyorders/service/impl/ZyOrdersServiceImpl.java index 626e1ff7..00f20319 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zyorders/service/impl/ZyOrdersServiceImpl.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zyorders/service/impl/ZyOrdersServiceImpl.java @@ -1,5 +1,6 @@ package org.jeecg.modules.demo.zyorders.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import org.jeecg.modules.demo.zyorders.entity.ZyOrders; import org.jeecg.modules.demo.zyorders.mapper.ZyOrdersMapper; import org.jeecg.modules.demo.zyorders.service.IZyOrdersService; @@ -7,6 +8,11 @@ import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; +import java.util.List; + /** * @Description: 订单基本信息管理 * @Author: jeecg-boot @@ -16,4 +22,54 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @Service public class ZyOrdersServiceImpl extends ServiceImpl implements IZyOrdersService { + /** + * 大屏数据-获取订单的状态 + * @return + */ + @Override + public List getOrderStatus() { + String starTime; + String endTime; + Date date = new Date(); + SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd"); + + String todayStr = formatter.format(date);//今天 + //System.out.println(todayStr); + + + Calendar calendar = Calendar.getInstance(); + calendar.setTime(date); + //把日期往后增加一天.整数往后推,负数往前移动(1:表示明天、-1：表示昨天，0：表示今天) + calendar.add(Calendar.DATE, 1); + //这个时间就是日期往后推一天的结果，明天 + date = calendar.getTime(); + String tomorrowStr = formatter.format(date); + + //System.out.println(tomorrowStr); + + + starTime = todayStr + " 00:00:00"; + endTime = tomorrowStr + " 00:00:00"; + +// System.out.println(starTime); +// System.out.println(endTime); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.ge("create_time", starTime).le("create_time", endTime).eq("pay_status", 1); + + List zyOrderList = baseMapper.selectList(wrapper); + return zyOrderList; + } + + /** + * 大屏数据-获取历史订单 + * @return + */ + @Override + public List getOldOrder() { + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("is_delete", 0).orderByDesc("create_time"); + List orderList = baseMapper.selectList(wrapper); + return orderList; + } } diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/largeScreen/LargeScreenController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/largeScreen/LargeScreenController.java new file mode 100644 index 00000000..dc654f25 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/largeScreen/LargeScreenController.java @@ -0,0 +1,64 @@ +package org.jeecg.modules.largeScreen; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.aspect.annotation.AutoLog; +import org.jeecg.modules.demo.zyorders.entity.ZyOrders; +import org.jeecg.modules.demo.zyorders.service.IZyOrdersService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * @author Lee + *下单的时候，直接生成生产订单（zy_make_order)====> 审核生产订单 ==========>通过的话，就生成对应的zy_make_cloth_plan + */ +@Api(tags = "大屏数据") +@RequestMapping("/largeScreen") +@RestController +@Slf4j +public class LargeScreenController { + + + @Autowired + private IZyOrdersService zyOrdersService; + + + /** + * 查询订单的状态 + * + * @return + */ + @AutoLog (value = "获取订单的状态") + @ApiOperation(value = "获取订单的状态", notes = "获取订单的状态") + @GetMapping("/getOrderStatus") + public Result getOrderStatus() { + List zyOrderList = zyOrdersService.getOrderStatus(); + if (!zyOrderList.isEmpty()) + { + return Result.OK("查询成功！", zyOrderList); + } + else + { + return Result.error("今天没有生成订单！"); + } + + } + + @AutoLog(value = "获取历史订单") + @ApiOperation(value = "获取历史订单", notes = "获取历史订单") + @GetMapping("/getOldOrder") + public Result getOldOrder() { + List orderList = zyOrdersService.getOldOrder(); + if (!orderList.isEmpty()){ + return Result.OK("查询成功！", orderList); + }else { + return Result.error("获取订单失败！"); + } + } + + +} From c46abc86aa856354cf8bb8a04cb9738c0b414392 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=88=86=E7=B1=B3=E8=8A=B1?= <417727563@qq.com> Date: Wed, 22 Feb 2023 16:04:30 +0800 Subject: [PATCH 3/3] =?UTF-8?q?2023-02-22-01=20=E5=A4=A7=E5=B1=8F=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ZyOrderServiceImpl.java | 1 + .../modules/shop/Service/ZyShopService.java | 4 +-- .../shop/Service/impl/ZyShopServiceImpl.java | 14 +++++----- .../shop/controller/ZyShopController.java | 19 ++++++------- .../modules/shop/mapper/ZyShopMapper.java | 4 +-- .../modules/shop/mapper/xml/ZyShopMapper.xml | 26 +++++++++--------- .../demo/zyorders/mapper/ZyOrdersMapper.java | 6 +++++ .../zyorders/mapper/xml/ZyOrdersMapper.xml | 16 +++++++++++ .../zyorders/service/IZyOrdersService.java | 3 +++ .../service/impl/ZyOrdersServiceImpl.java | 22 +++++++++++++-- .../largeScreen/LargeScreenController.java | 27 +++++++++++++++++++ 11 files changed, 106 insertions(+), 36 deletions(-) diff --git a/jeecg-boot/jeecg-boot-module-orderbymakeclothplan/src/main/java/org/jeecg/modules/orderbymakeclothplan/service/impl/ZyOrderServiceImpl.java b/jeecg-boot/jeecg-boot-module-orderbymakeclothplan/src/main/java/org/jeecg/modules/orderbymakeclothplan/service/impl/ZyOrderServiceImpl.java index 262002ae..8efc678d 100644 --- a/jeecg-boot/jeecg-boot-module-orderbymakeclothplan/src/main/java/org/jeecg/modules/orderbymakeclothplan/service/impl/ZyOrderServiceImpl.java +++ b/jeecg-boot/jeecg-boot-module-orderbymakeclothplan/src/main/java/org/jeecg/modules/orderbymakeclothplan/service/impl/ZyOrderServiceImpl.java @@ -370,6 +370,7 @@ public class ZyOrderServiceImpl implements ZyOrderService { queryWrapper.isNotNull("id"); Double all = Double.valueOf(zyOrderMapper.selectCount(queryWrapper)); + //获得不同订单状态数据 List statusNums = zyOrderMapper.percentStatu(); List statusNumList = JSON.parseArray(ZyMakeClothPlanMessage.STATUS, StatusNum.class); diff --git a/jeecg-boot/jeecg-boot-module-shop/src/main/java/org/jeecg/modules/shop/Service/ZyShopService.java b/jeecg-boot/jeecg-boot-module-shop/src/main/java/org/jeecg/modules/shop/Service/ZyShopService.java index f98d06e6..af23af87 100644 --- a/jeecg-boot/jeecg-boot-module-shop/src/main/java/org/jeecg/modules/shop/Service/ZyShopService.java +++ b/jeecg-boot/jeecg-boot-module-shop/src/main/java/org/jeecg/modules/shop/Service/ZyShopService.java @@ -28,7 +28,7 @@ public interface ZyShopService { //查询近七日订单数 String selectOrderBetweenThisW(); //查询近七日销售额 - List selectSalesVolumeBetweenThisW(); + Double selectSalesVolumeBetweenThisW(); List selectAllShopSalesVolumeByLastM(); //查询无人店铺下单人数 @@ -36,7 +36,7 @@ public interface ZyShopService { List queryByList(); - Integer selectAllShopSalesThisD(); + Double selectAllShopSalesThisD(); Integer selectSalesVolumeByThisTime(String id); diff --git a/jeecg-boot/jeecg-boot-module-shop/src/main/java/org/jeecg/modules/shop/Service/impl/ZyShopServiceImpl.java b/jeecg-boot/jeecg-boot-module-shop/src/main/java/org/jeecg/modules/shop/Service/impl/ZyShopServiceImpl.java index ccce7c49..b375e94a 100644 --- a/jeecg-boot/jeecg-boot-module-shop/src/main/java/org/jeecg/modules/shop/Service/impl/ZyShopServiceImpl.java +++ b/jeecg-boot/jeecg-boot-module-shop/src/main/java/org/jeecg/modules/shop/Service/impl/ZyShopServiceImpl.java @@ -101,7 +101,7 @@ public class ZyShopServiceImpl implements ZyShopService { * @return */ @Override - public List selectSalesVolumeBetweenThisW() { + public Double selectSalesVolumeBetweenThisW() { String start_time = GetTime.getLastSevenDay(7); String end_time = String.format("%tF", date); return zyShopMapper.selectSalesVolumeBetweenThisW(start_time, end_time); @@ -247,13 +247,15 @@ public class ZyShopServiceImpl implements ZyShopService { * @return */ @Override - public Integer selectAllShopSalesThisD() { - int ShopSales = 0; + public Double selectAllShopSalesThisD() { + Double ShopSales = 0.00d; String format = String.format("%tF", date); - List list = zyShopMapper.selectAllShopSalesThisD(format); - for (int i = list.size() - 1; i >= 0; i--) { - ShopSales = ShopSales + list.get(i); + Double sales = zyShopMapper.selectAllShopSalesThisD(format); + if(sales!=null && sales>ShopSales) + { + ShopSales=sales; } + return ShopSales; } diff --git a/jeecg-boot/jeecg-boot-module-shop/src/main/java/org/jeecg/modules/shop/controller/ZyShopController.java b/jeecg-boot/jeecg-boot-module-shop/src/main/java/org/jeecg/modules/shop/controller/ZyShopController.java index b4bc3e46..56d52af0 100644 --- a/jeecg-boot/jeecg-boot-module-shop/src/main/java/org/jeecg/modules/shop/controller/ZyShopController.java +++ b/jeecg-boot/jeecg-boot-module-shop/src/main/java/org/jeecg/modules/shop/controller/ZyShopController.java @@ -143,7 +143,7 @@ public class ZyShopController { @ApiOperation(value = "查询今天的营业额", notes = "查询今天的营业额") @GetMapping("/selectAllShopSalesThisD") public Result selectAllShopSalesThisD() { - Integer shopSales = zyShopService.selectAllShopSalesThisD(); + Double shopSales = zyShopService.selectAllShopSalesThisD(); return Result.OK(shopSales); } @@ -160,17 +160,14 @@ public class ZyShopController { @AutoLog(value = "查询近七日销售额") @ApiOperation(value = "查询近七日销售额", notes = "查询近七日销售额") @GetMapping("/selectSalesVolumeBetweenThisW") - public Result selectSalesVolumeBetweenThisW(){ - List list = zyShopService.selectSalesVolumeBetweenThisW(); - int salesVolem = 0; - if (list.isEmpty()) { - return Result.OK(0); - } else { - for (Integer sales : list) { - salesVolem += sales; - } - return Result.OK(salesVolem); + public Result selectSalesVolumeBetweenThisW(){ + Double sales = zyShopService.selectSalesVolumeBetweenThisW(); + Double salesVolem = 0.00d; + if(sales!=null && sales>salesVolem) + { + salesVolem=sales; } + return Result.OK(salesVolem); } } diff --git a/jeecg-boot/jeecg-boot-module-shop/src/main/java/org/jeecg/modules/shop/mapper/ZyShopMapper.java b/jeecg-boot/jeecg-boot-module-shop/src/main/java/org/jeecg/modules/shop/mapper/ZyShopMapper.java index f99fd16b..01b3df21 100644 --- a/jeecg-boot/jeecg-boot-module-shop/src/main/java/org/jeecg/modules/shop/mapper/ZyShopMapper.java +++ b/jeecg-boot/jeecg-boot-module-shop/src/main/java/org/jeecg/modules/shop/mapper/ZyShopMapper.java @@ -26,7 +26,7 @@ public interface ZyShopMapper extends BaseMapper { //查询近七日订单数 String selectOrderBetweenThisW(String start_time,String end_time); //查询近七日销售额 - List selectSalesVolumeBetweenThisW(String start_time,String end_time); + Double selectSalesVolumeBetweenThisW(String start_time,String end_time); //查询所有店铺上月销售额 List selectAllShopSalesVolumeByLastM(String start_time,String end_time); //查询无人店铺下单人数 @@ -36,7 +36,7 @@ public interface ZyShopMapper extends BaseMapper { //查询当前店铺月销售额 List queryByList(String name, String start_time, String end_time); //查询今天的营业额 - List selectAllShopSalesThisD(String time); + Double selectAllShopSalesThisD(String time); // List selectSalesVolumeByThisTime(String id,String time); diff --git a/jeecg-boot/jeecg-boot-module-shop/src/main/java/org/jeecg/modules/shop/mapper/xml/ZyShopMapper.xml b/jeecg-boot/jeecg-boot-module-shop/src/main/java/org/jeecg/modules/shop/mapper/xml/ZyShopMapper.xml index c0ab0646..312b418a 100644 --- a/jeecg-boot/jeecg-boot-module-shop/src/main/java/org/jeecg/modules/shop/mapper/xml/ZyShopMapper.xml +++ b/jeecg-boot/jeecg-boot-module-shop/src/main/java/org/jeecg/modules/shop/mapper/xml/ZyShopMapper.xml @@ -25,15 +25,15 @@ @@ -87,16 +87,16 @@ - + SELECT sum(money) as total_money + FROM zy_orders + WHERE payment_time LIKE #{time}"%" AND ischild=0 AND payment_status=1 - + SELECT sum(money) as total_money + FROM zy_orders WHERE shop_id = #{id} - AND pay_time LIKE #{time}"%" + AND payment_time LIKE #{time}"%" diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zyorders/mapper/ZyOrdersMapper.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zyorders/mapper/ZyOrdersMapper.java index 0613582e..3e6f5aac 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zyorders/mapper/ZyOrdersMapper.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zyorders/mapper/ZyOrdersMapper.java @@ -5,6 +5,7 @@ import java.util.List; import org.apache.ibatis.annotations.Param; import org.jeecg.modules.demo.zyorders.entity.ZyOrders; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.jeecg.modules.orderbymakeclothplan.vo.TodayOrderAndQIriVo; /** * @Description: 订单基本信息管理 @@ -14,4 +15,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface ZyOrdersMapper extends BaseMapper { + /** + * 获取今日订单及七日订单 + * @return + */ + TodayOrderAndQIriVo getTotalOrderAndWeek(); } diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zyorders/mapper/xml/ZyOrdersMapper.xml b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zyorders/mapper/xml/ZyOrdersMapper.xml index 519d0cd0..6c40fc2e 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zyorders/mapper/xml/ZyOrdersMapper.xml +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zyorders/mapper/xml/ZyOrdersMapper.xml @@ -2,4 +2,20 @@ + + diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zyorders/service/IZyOrdersService.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zyorders/service/IZyOrdersService.java index 8c48a272..eda4b3bb 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zyorders/service/IZyOrdersService.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zyorders/service/IZyOrdersService.java @@ -3,6 +3,7 @@ package org.jeecg.modules.demo.zyorders.service; import org.jeecg.common.api.vo.Result; import org.jeecg.modules.demo.zyorders.entity.ZyOrders; import com.baomidou.mybatisplus.extension.service.IService; +import org.jeecg.modules.orderbymakeclothplan.vo.TodayOrderAndQIriVo; import java.util.List; @@ -18,4 +19,6 @@ public interface IZyOrdersService extends IService { List getOrderStatus(); //大屏数据-获取历史订单 List getOldOrder(); + //大屏数据-获取今日订单及七日订单 + TodayOrderAndQIriVo getOrder(); } diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zyorders/service/impl/ZyOrdersServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zyorders/service/impl/ZyOrdersServiceImpl.java index 00f20319..351ed7e4 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zyorders/service/impl/ZyOrdersServiceImpl.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zyorders/service/impl/ZyOrdersServiceImpl.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import org.jeecg.modules.demo.zyorders.entity.ZyOrders; import org.jeecg.modules.demo.zyorders.mapper.ZyOrdersMapper; import org.jeecg.modules.demo.zyorders.service.IZyOrdersService; +import org.jeecg.modules.orderbymakeclothplan.vo.TodayOrderAndQIriVo; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -55,7 +56,7 @@ public class ZyOrdersServiceImpl extends ServiceImpl i // System.out.println(endTime); QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.ge("create_time", starTime).le("create_time", endTime).eq("pay_status", 1); + wrapper.ge("create_time", starTime).le("create_time", endTime).eq("payment_status", 1); List zyOrderList = baseMapper.selectList(wrapper); return zyOrderList; @@ -68,8 +69,25 @@ public class ZyOrdersServiceImpl extends ServiceImpl i @Override public List getOldOrder() { QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq("is_delete", 0).orderByDesc("create_time"); + wrapper +// .eq("is_delete", 0) + .orderByDesc("create_time"); List orderList = baseMapper.selectList(wrapper); return orderList; } + + /** + * 获取今日订单及七日订单 + * @return + */ + @Override + public TodayOrderAndQIriVo getOrder() { + TodayOrderAndQIriVo todayOrderAndQIriVo = baseMapper.getTotalOrderAndWeek(); + if (todayOrderAndQIriVo != null) { + return todayOrderAndQIriVo; + } else { + return null; + } + } + } diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/largeScreen/LargeScreenController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/largeScreen/LargeScreenController.java index dc654f25..bd9277d1 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/largeScreen/LargeScreenController.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/largeScreen/LargeScreenController.java @@ -7,6 +7,8 @@ import org.jeecg.common.api.vo.Result; import org.jeecg.common.aspect.annotation.AutoLog; import org.jeecg.modules.demo.zyorders.entity.ZyOrders; import org.jeecg.modules.demo.zyorders.service.IZyOrdersService; +import org.jeecg.modules.orderbymakeclothplan.vo.TodayOrderAndQIriVo; +import org.jeecg.modules.shop.vo.OrderSales; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -27,6 +29,10 @@ public class LargeScreenController { private IZyOrdersService zyOrdersService; + /********************************************订单大数据监控系统********************************************/ + + /************************************实时订单展示************************************/ + /** * 查询订单的状态 * @@ -61,4 +67,25 @@ public class LargeScreenController { } +// @AutoLog(value = "订单销售分析") +// @ApiOperation(value = "订单销售分析", notes = "订单销售分析") +// @GetMapping("/selectOrderSale") +// public Result selectOrderSale(){ +// List list = zyOrdersService.selectOrderSale(); +// return Result.OK(list); +// } + /************************************销售订单数据************************************/ + + @AutoLog(value = "获取今日订单及七日订单") + @ApiOperation(value = "获取今日订单及七日订单", notes = "获取今日订单及七日订单") + @GetMapping("/getOrder") + public Result getOrder() { + TodayOrderAndQIriVo todayOrderAndQIriVo = zyOrdersService.getOrder(); + if (todayOrderAndQIriVo != null) { + return Result.OK(todayOrderAndQIriVo); + }else { + return Result.OK("没有工作安排"); + } + } + }