From e140c73ae10f2891ad4de12a31da604306ffdc2f Mon Sep 17 00:00:00 2001 From: haotianmingyue <2421912570@qq.com> Date: Thu, 19 Dec 2024 11:26:39 +0800 Subject: [PATCH] =?UTF-8?q?=E8=90=A5=E9=94=80=E5=AE=98--=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8--=E5=AE=8C=E6=88=90?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../backstage/SysAppUserController.java | 39 ++-- .../backstage/SysMarketController.java | 71 ++++++- .../backstage/SysSourceController.java | 81 +++++--- .../controller/OrderInfoController.java | 104 +++++++++++ .../com/ruoyi/system/domain/OrderInfo.java | 102 ++++++++++ .../com/ruoyi/system/domain/SysOrder.java | 24 +++ .../system/domain/dto/GetOrderDetailDto.java | 23 +++ .../ruoyi/system/domain/dto/OrderInfoDto.java | 175 ++++++++++++++++++ .../ruoyi/system/domain/dto/OrderListDto.java | 148 +++++++++++++++ .../system/domain/dto/SourceListDto.java | 11 ++ .../ruoyi/system/mapper/OrderInfoMapper.java | 68 +++++++ .../ruoyi/system/mapper/SysOrderMapper.java | 3 + .../ruoyi/system/mapper/SysSourceMapper.java | 2 + .../system/service/IOrderInfoService.java | 68 +++++++ .../system/service/ISysOrderService.java | 7 + .../system/service/ISysSourceService.java | 2 + .../service/impl/OrderInfoServiceImpl.java | 105 +++++++++++ .../service/impl/SysOrderServiceImpl.java | 6 + .../service/impl/SysSourceServiceImpl.java | 5 + .../mapper/system/OrderInfoMapper.xml | 111 +++++++++++ .../mapper/system/SysOrderMapper.xml | 42 +++++ .../mapper/system/SysSourceMapper.xml | 3 + 22 files changed, 1151 insertions(+), 49 deletions(-) create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/controller/OrderInfoController.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/domain/OrderInfo.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/GetOrderDetailDto.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/OrderInfoDto.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/OrderListDto.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/mapper/OrderInfoMapper.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/service/IOrderInfoService.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OrderInfoServiceImpl.java create mode 100644 ruoyi-system/src/main/resources/mapper/system/OrderInfoMapper.xml diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/backstage/SysAppUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/backstage/SysAppUserController.java index 247d511d..a1206960 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/backstage/SysAppUserController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/backstage/SysAppUserController.java @@ -123,24 +123,31 @@ public class SysAppUserController { @GetMapping("/getUserCount") public AjaxResult getUserCount(){ - LocalDate now = LocalDate.now(); - LocalDate startDate = now.minusDays(2); - LocalDate endDate = now.minusDays(1); - List seUserCount = sysUserStService.getUserCountByTime(startDate, endDate); +// // --------------------------------真实数据-------------------------------------- +// +// LocalDate now = LocalDate.now(); +// LocalDate startDate = now.minusDays(2); +// LocalDate endDate = now.minusDays(1); +// List seUserCount = sysUserStService.getUserCountByTime(startDate, endDate); +// +// SeUserCountDto seUserCountDto1 = seUserCount.get(0); +// SeUserCountDto seUserCountDto2 = seUserCount.get(1); +// +// // 当前用户总数 +// Long userCount2 = seUserCountDto2.gettUser(); +// +// // 前一天用户总数 +// Long userCount1 = seUserCountDto1.gettUser(); +// +// Long change = userCount2 - userCount1; +// AjaxResult ajax = new AjaxResult(); +// ajax.put("userCount", userCount2); +// ajax.put("change", change); +// //---------------------------------真实数据end------------------------------------------ - SeUserCountDto seUserCountDto1 = seUserCount.get(0); - SeUserCountDto seUserCountDto2 = seUserCount.get(1); - - // 当前用户总数 - Long userCount2 = seUserCountDto2.gettUser(); - - // 前一天用户总数 - Long userCount1 = seUserCountDto1.gettUser(); - - Long change = userCount2 - userCount1; AjaxResult ajax = new AjaxResult(); - ajax.put("userCount", userCount2); - ajax.put("change", change); + ajax.put("userCount", 1234L); + ajax.put("change", 233L); return ajax; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/backstage/SysMarketController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/backstage/SysMarketController.java index c2662fbb..b4d08e5b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/backstage/SysMarketController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/backstage/SysMarketController.java @@ -1,17 +1,20 @@ package com.ruoyi.web.controller.backstage; +import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.enums.BusinessType; import com.ruoyi.framework.web.domain.server.Sys; -import com.ruoyi.system.domain.dto.OrderIncomeDto; -import com.ruoyi.system.domain.dto.SysIncomeDto; +import com.ruoyi.system.domain.OrderInfo; +import com.ruoyi.system.domain.SysOrder; +import com.ruoyi.system.domain.dto.*; import com.ruoyi.system.service.IDailySysService; +import com.ruoyi.system.service.IOrderInfoService; +import com.ruoyi.system.service.ISysOrderService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.time.LocalDate; import java.util.ArrayList; @@ -25,6 +28,12 @@ public class SysMarketController extends BaseController { @Autowired private IDailySysService dailySysService; + @Autowired + private ISysOrderService sysOrderService; + + @Autowired + private IOrderInfoService orderInfoService; + @GetMapping("/getStIncome") public AjaxResult getStIncome() { @@ -102,6 +111,56 @@ public class SysMarketController extends BaseController { } // 获取订单列表 + @GetMapping("/getOrderList") + public TableDataInfo getOrderList(SysOrder sysOrder) { + +// //------------------------------------真实接口---------------------------------------------- +// LocalDate now = LocalDate.now(); +// LocalDate startDate = now.minusDays(7); +// LocalDate endDate = now.minusDays(1); +// List orderIncomeDtoList = dailySysService.getOrderIncome(startDate, endDate); +// return success(orderIncomeDtoList); +// //-----------------------------------真实接口end---------- + + List orderListDtoList = sysOrderService.getOrderListDto(sysOrder); + + // 根据 order_info_id 查看订单所有的资源位 + for(OrderListDto orderListDto: orderListDtoList){ + + Long orderInfoId = orderListDto.getOrderInfoId(); + + List orderInfoList = orderInfoService.getOrderInfoDtoList(orderInfoId); + + for (OrderInfoDto orderInfoDto: orderInfoList){ + orderInfoDto.setNickName(orderListDto.getNickName()); + orderInfoDto.setPhoneNumber(orderListDto.getPhonenumber()); + orderInfoDto.setSource(orderInfoDto.getCity()+orderInfoDto.getScenic()+orderInfoDto.getPart()+orderInfoDto.getCoordinate()); + } + + orderListDto.setOrderInfoList(orderInfoList); + + + } + + return getDataTable(orderListDtoList); + } + + //获取订单详情 + @Log(title = "营销管理--查看订单详情", businessType = BusinessType.GET) + @PostMapping("/getOrderDetail/") + public AjaxResult getOrderDetail(@RequestBody GetOrderDetailDto getOrderDetailDto){ + + // sys_order 中的 order_id + Long orderId = getOrderDetailDto.getOrderId(); + + // order_info 中的 id + Long id = getOrderDetailDto.getId(); + +// OrderInfoDto orderInfoDto = orderInfoService.getOrderInfoDto(id); + + return success(); + + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/backstage/SysSourceController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/backstage/SysSourceController.java index 40c51b74..b5700fe0 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/backstage/SysSourceController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/backstage/SysSourceController.java @@ -98,10 +98,16 @@ public class SysSourceController extends BaseController { - // 价格 - Map price = GsonUtils.fromJson(sourceListDto.getPrice(), HashedMap.class); +// // 价格 +// Map price = GsonUtils.fromJson(sourceListDto.getPrice(), HashedMap.class); +// +// sourceListDto.setPriceJson(price); + + + // 新版价格 + sourceListDto.setPriceList(GsonUtils.fromJson(sourceListDto.getPrice(), List.class)); + - sourceListDto.setPriceJson(price); // 这里根据天数判断价格?? 还是直接返回每天的价格算了 @@ -417,32 +423,34 @@ public class SysSourceController extends BaseController { } - //---------------------------------------------------修改默认背景---------------------------------------------------- - - List imageList = setSourceDto.getImageList(); - - for(SetSourceImageDto image : imageList){ - System.out.println("图片前端数据: " + image.getCity()+image.getScenic()+image.getPart()+image.getWorkAddress()); - - SysScenicDefault sysScenicDefault = sysScenicDefaultService.getScenicDefaultByScenicAndPart(image.getScenic(), image.getPart()); - - System.out.println("默认设置id: " + sysScenicDefault.getId()); - - sysScenicDefault.setWorkAddress(image.getWorkAddress()); - - // 更新默认作品地址 - sysScenicDefaultService.updateSysScenicDefault(sysScenicDefault); - // -------------------------修改没有出售的资源位的默认作品--还没写-------------------- - - // function - //--------------------------修改默认作品-----end--------------------------------- - - } - - - //---------------------------------------------------修改默认背景end---------------------------------------------------- +// //---------------------------------------------------修改默认背景---因另写了修改图片接口而停用--------------------------------------------------- +// +// List imageList = setSourceDto.getImageList(); +// +// for(SetSourceImageDto image : imageList){ +// System.out.println("图片前端数据: " + image.getCity()+image.getScenic()+image.getPart()+image.getWorkAddress()); +// +// SysScenicDefault sysScenicDefault = sysScenicDefaultService.getScenicDefaultByScenicAndPart(image.getScenic(), image.getPart()); +// +// System.out.println("默认设置id: " + sysScenicDefault.getId()); +// +// sysScenicDefault.setWorkAddress(image.getWorkAddress()); +// +// // 更新默认作品地址 +// sysScenicDefaultService.updateSysScenicDefault(sysScenicDefault); +// +// +// // -------------------------修改没有出售的资源位的默认作品--还没写-------------------- +// +// // function +// //--------------------------修改默认作品-----end--------------------------------- +// +// } +// +// +// //---------------------------------------------------修改默认背景end---------------------------------------------------- return success("修改成功"); @@ -471,6 +479,7 @@ public class SysSourceController extends BaseController { } // 上传默认资源位图片--并更新sys_scenic_default默认的图片 + // 修改默认被购买的资源位的默认图片---未完成 @Transactional @Log(title = "产品管理--修改资源位默认图片", businessType = BusinessType.UPDATE) @PostMapping("/changeSourceImage") @@ -513,6 +522,24 @@ public class SysSourceController extends BaseController { // 更新数据库--图片地址 sysScenicDefaultService.updateSysScenicDefault(sysScenicDefault); + //-----------------------------修改默认被购买的资源位的默认图片---------------------------------------------- + + // 更新资源位默认图片---source_status=0 + SysSource sysSource = new SysSource(); + sysSource.setCity(city); + sysSource.setScenic(scenic); + sysSource.setPart(part); + sysSource.setWorkAddress(uploadFilePath); + + // 根据city,scenic,part修改默认图片. + sysSourceService.updateSysSourceByCP(sysSource); + + + + //------------------------修改没有被购买的资源位的默认图片end--------------------------------------------------------- + + + // System.out.println("默认设置id: " + sysScenicDefault.getId()); // AjaxResult ajax = success(); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/controller/OrderInfoController.java b/ruoyi-system/src/main/java/com/ruoyi/system/controller/OrderInfoController.java new file mode 100644 index 00000000..a58ec412 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/controller/OrderInfoController.java @@ -0,0 +1,104 @@ +package com.ruoyi.system.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.system.domain.OrderInfo; +import com.ruoyi.system.service.IOrderInfoService; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 订单信息，若一个订单存在购买多个资源位，则添加多条数据Controller + * + * @author haotian + * @date 2024-12-17 + */ +@RestController +@RequestMapping("/system/info") +public class OrderInfoController extends BaseController +{ + @Autowired + private IOrderInfoService orderInfoService; + + /** + * 查询订单信息，若一个订单存在购买多个资源位，则添加多条数据列表 + */ + @PreAuthorize("@ss.hasPermi('system:info:list')") + @GetMapping("/list") + public TableDataInfo list(OrderInfo orderInfo) + { + startPage(); + List list = orderInfoService.selectOrderInfoList(orderInfo); + return getDataTable(list); + } + + /** + * 导出订单信息，若一个订单存在购买多个资源位，则添加多条数据列表 + */ + @PreAuthorize("@ss.hasPermi('system:info:export')") + @Log(title = "订单信息，若一个订单存在购买多个资源位，则添加多条数据", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, OrderInfo orderInfo) + { + List list = orderInfoService.selectOrderInfoList(orderInfo); + ExcelUtil util = new ExcelUtil(OrderInfo.class); + util.exportExcel(response, list, "订单信息，若一个订单存在购买多个资源位，则添加多条数据数据"); + } + + /** + * 获取订单信息，若一个订单存在购买多个资源位，则添加多条数据详细信息 + */ + @PreAuthorize("@ss.hasPermi('system:info:query')") + @GetMapping(value = "/{orderInfoId}") + public AjaxResult getInfo(@PathVariable("orderInfoId") Long orderInfoId) + { + return success(orderInfoService.selectOrderInfoByOrderInfoId(orderInfoId)); + } + + /** + * 新增订单信息，若一个订单存在购买多个资源位，则添加多条数据 + */ + @PreAuthorize("@ss.hasPermi('system:info:add')") + @Log(title = "订单信息，若一个订单存在购买多个资源位，则添加多条数据", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody OrderInfo orderInfo) + { + return toAjax(orderInfoService.insertOrderInfo(orderInfo)); + } + + /** + * 修改订单信息，若一个订单存在购买多个资源位，则添加多条数据 + */ + @PreAuthorize("@ss.hasPermi('system:info:edit')") + @Log(title = "订单信息，若一个订单存在购买多个资源位，则添加多条数据", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody OrderInfo orderInfo) + { + return toAjax(orderInfoService.updateOrderInfo(orderInfo)); + } + + /** + * 删除订单信息，若一个订单存在购买多个资源位，则添加多条数据 + */ + @PreAuthorize("@ss.hasPermi('system:info:remove')") + @Log(title = "订单信息，若一个订单存在购买多个资源位，则添加多条数据", businessType = BusinessType.DELETE) + @DeleteMapping("/{orderInfoIds}") + public AjaxResult remove(@PathVariable Long[] orderInfoIds) + { + return toAjax(orderInfoService.deleteOrderInfoByOrderInfoIds(orderInfoIds)); + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/OrderInfo.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/OrderInfo.java new file mode 100644 index 00000000..9b6fa84d --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/OrderInfo.java @@ -0,0 +1,102 @@ +package com.ruoyi.system.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +import java.util.Date; + +/** + * 订单信息，若一个订单存在购买多个资源位，则添加多条数据对象 order_info + * + * @author haotian + * @date 2024-12-17 + */ +public class OrderInfo extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 订单编号，主键，关联 */ + private Long id; + + + private Long orderInfoId; + + /** 资源位id */ + @Excel(name = "资源位id") + private Long sourceId; + + /** 作品id */ + @Excel(name = "作品id") + private Long workId; + + private String status; + + private Date refundTime; + + public void setId(Long id){ + this.id = id; + } + + public Long getId(){ + return id; + } + + public void setOrderInfoId(Long orderInfoId) + { + this.orderInfoId = orderInfoId; + } + + public Long getOrderInfoId() + { + return orderInfoId; + } + public void setSourceId(Long sourceId) + { + this.sourceId = sourceId; + } + + public Long getSourceId() + { + return sourceId; + } + public void setWorkId(Long workId) + { + this.workId = workId; + } + + public Long getWorkId() + { + return workId; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public Date getRefundTime() { + return refundTime; + } + + public void setRefundTime(Date refundTime) { + this.refundTime = refundTime; + } + + + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("orderInfoId", getOrderInfoId()) + .append("remark", getRemark()) + .append("sourceId", getSourceId()) + .append("workId", getWorkId()) + .append("status", getStatus()) + .toString(); + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOrder.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOrder.java index 4b6093ee..688f1313 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOrder.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOrder.java @@ -54,6 +54,12 @@ public class SysOrder extends BaseEntity // 订单详情 private String detail; + // 订单状态 + private String status; + + // 退款金额 + private Long refund; + public void setOrderId(Long orderId) { this.orderId = orderId; @@ -141,6 +147,22 @@ public class SysOrder extends BaseEntity this.detail = detail; } + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public Long getRefund() { + return refund; + } + + public void setRefund(Long refund) { + this.refund = refund; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) @@ -155,6 +177,8 @@ public class SysOrder extends BaseEntity .append("money", getMoney()) .append("way", getWay()) .append("detail", getDetail()) + .append("status", getStatus()) + .append("detail", getDetail()) .toString(); } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/GetOrderDetailDto.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/GetOrderDetailDto.java new file mode 100644 index 00000000..02f65421 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/GetOrderDetailDto.java @@ -0,0 +1,23 @@ +package com.ruoyi.system.domain.dto; + +public class GetOrderDetailDto { + + private Long orderId; + private Long id; + + public Long getOrderId() { + return orderId; + } + + public void setOrderId(Long orderId) { + this.orderId = orderId; + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/OrderInfoDto.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/OrderInfoDto.java new file mode 100644 index 00000000..072d5369 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/OrderInfoDto.java @@ -0,0 +1,175 @@ +package com.ruoyi.system.domain.dto; + +import java.util.Date; + +public class OrderInfoDto { + + private Long id; + + private Long orderInfoId; + + private Long userId; + private String nickName; + + private String phoneNumber; + + private Long sourceId; + + private String workId; + + private String workName; + + private String workAddress; + + private String workDetail; + + private String city; + private String scenic; + private String part; + + private String source; + + private String status; + + private String coordinate; + + private Date refundTime; + + public String getPart() { + return part; + } + + public void setPart(String part) { + this.part = part; + } + + public String getScenic() { + return scenic; + } + + public void setScenic(String scenic) { + this.scenic = scenic; + } + + public String getCity() { + return city; + } + + public void setCity(String city) { + this.city = city; + } + + public String getWorkDetail() { + return workDetail; + } + + public void setWorkDetail(String workDetail) { + this.workDetail = workDetail; + } + + public String getWorkAddress() { + return workAddress; + } + + public void setWorkAddress(String workAddress) { + this.workAddress = workAddress; + } + + public String getWorkName() { + return workName; + } + + public void setWorkName(String workName) { + this.workName = workName; + } + + public String getWorkId() { + return workId; + } + + public void setWorkId(String workId) { + this.workId = workId; + } + + public Long getSourceId() { + return sourceId; + } + + public void setSourceId(Long sourceId) { + this.sourceId = sourceId; + } + + public String getPhoneNumber() { + return phoneNumber; + } + + public void setPhoneNumber(String phoneNumber) { + this.phoneNumber = phoneNumber; + } + + public String getNickName() { + return nickName; + } + + public void setNickName(String nickName) { + this.nickName = nickName; + } + + public Long getUserId() { + return userId; + } + + public void setUserId(Long userId) { + this.userId = userId; + } + + public Long getOrderInfoId() { + return orderInfoId; + } + + public void setOrderInfoId(Long orderInfoId) { + this.orderInfoId = orderInfoId; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public String getSource() { + return source; + } + + public void setSource(String source) { + this.source = source; + } + + public String getCoordinate() { + return coordinate; + } + + public void setCoordinate(String coordinate) { + this.coordinate = coordinate; + } + + public Date getRefundTime() { + return refundTime; + } + + public void setRefundTime(Date refundTime) { + this.refundTime = refundTime; + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/OrderListDto.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/OrderListDto.java new file mode 100644 index 00000000..eb5bd4c5 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/OrderListDto.java @@ -0,0 +1,148 @@ +package com.ruoyi.system.domain.dto; + +import java.util.Date; +import java.util.List; + +public class OrderListDto { + private Long orderId; + + private Long userId; + + private String nickName; + private String phonenumber; + + + + private Date createTime; + + private Date startTime; + private Date endTime; + + private Long orderInfoId; + + private Long money; + + private Long refund; + private String way; + private String orderDetail; + + private String status; + + private List orderInfoList; + + public Long getOrderId() { + return orderId; + } + + public void setOrderId(Long orderId) { + this.orderId = orderId; + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + public Date getStartTime() { + return startTime; + } + + public void setStartTime(Date startTime) { + this.startTime = startTime; + } + + public Date getEndTime() { + return endTime; + } + + + public void setEndTime(Date endTime) { + this.endTime = endTime; + } + + public Long getOrderInfoId() { + return orderInfoId; + } + + public void setOrderInfoId(Long orderInfoId) { + this.orderInfoId = orderInfoId; + } + + public Long getMoney() { + return money; + } + + public void setMoney(Long money) { + this.money = money; + } + + public Long getRefund() { + return refund; + } + + public void setRefund(Long refund) { + this.refund = refund; + } + + public String getWay() { + return way; + } + + public void setWay(String way) { + this.way = way; + } + + public String getOrderDetail() { + return orderDetail; + } + + public void setOrderDetail(String orderDetail) { + this.orderDetail = orderDetail; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public List getOrderInfoList() { + return orderInfoList; + } + + public void setOrderInfoList(List orderInfoList) { + this.orderInfoList = orderInfoList; + } + + public Long getUserId() { + return userId; + } + + public void setUserId(Long userId) { + this.userId = userId; + } + + public String getNickName() { + return nickName; + } + + public void setNickName(String nickName) { + this.nickName = nickName; + } + + public String getPhonenumber() { + return phonenumber; + } + + public void setPhonenumber(String phonenumber) { + this.phonenumber = phonenumber; + } + + + +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/SourceListDto.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/SourceListDto.java index 3dd3014b..8b3276ec 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/SourceListDto.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/SourceListDto.java @@ -1,6 +1,7 @@ package com.ruoyi.system.domain.dto; import java.time.LocalDate; +import java.util.List; import java.util.Map; public class SourceListDto { @@ -16,6 +17,8 @@ public class SourceListDto { // json 话的价格 private Map priceJson; + private List> priceList; + private Long bBought; private String sourceStatus; @@ -175,6 +178,14 @@ public class SourceListDto { this.number = number; } + public List> getPriceList() { + return priceList; + } + + public void setPriceList(List> priceList) { + this.priceList = priceList; + } + diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/OrderInfoMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/OrderInfoMapper.java new file mode 100644 index 00000000..e041fa28 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/OrderInfoMapper.java @@ -0,0 +1,68 @@ +package com.ruoyi.system.mapper; + +import java.util.List; +import com.ruoyi.system.domain.OrderInfo; +import com.ruoyi.system.domain.dto.OrderInfoDto; + +/** + * 订单信息，若一个订单存在购买多个资源位，则添加多条数据Mapper接口 + * + * @author haotian + * @date 2024-12-17 + */ +public interface OrderInfoMapper +{ + /** + * 查询订单信息，若一个订单存在购买多个资源位，则添加多条数据 + * + * @param orderInfoId 订单信息，若一个订单存在购买多个资源位，则添加多条数据主键 + * @return 订单信息，若一个订单存在购买多个资源位，则添加多条数据 + */ + public OrderInfo selectOrderInfoByOrderInfoId(Long orderInfoId); + + /** + * 查询订单信息，若一个订单存在购买多个资源位，则添加多条数据列表 + * + * @param orderInfo 订单信息，若一个订单存在购买多个资源位，则添加多条数据 + * @return 订单信息，若一个订单存在购买多个资源位，则添加多条数据集合 + */ + public List selectOrderInfoList(OrderInfo orderInfo); + + /** + * 新增订单信息，若一个订单存在购买多个资源位，则添加多条数据 + * + * @param orderInfo 订单信息，若一个订单存在购买多个资源位，则添加多条数据 + * @return 结果 + */ + public int insertOrderInfo(OrderInfo orderInfo); + + /** + * 修改订单信息，若一个订单存在购买多个资源位，则添加多条数据 + * + * @param orderInfo 订单信息，若一个订单存在购买多个资源位，则添加多条数据 + * @return 结果 + */ + public int updateOrderInfo(OrderInfo orderInfo); + + /** + * 删除订单信息，若一个订单存在购买多个资源位，则添加多条数据 + * + * @param orderInfoId 订单信息，若一个订单存在购买多个资源位，则添加多条数据主键 + * @return 结果 + */ + public int deleteOrderInfoByOrderInfoId(Long orderInfoId); + + /** + * 批量删除订单信息，若一个订单存在购买多个资源位，则添加多条数据 + * + * @param orderInfoIds 需要删除的数据主键集合 + * @return 结果 + */ + + public int deleteOrderInfoByOrderInfoIds(Long[] orderInfoIds); + + + public List getOrderInfoDtoList(Long orderInfoId); + + public OrderInfoDto getOrderInfoDto(Long id); +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOrderMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOrderMapper.java index 2a0024f3..49131fbe 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOrderMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOrderMapper.java @@ -3,6 +3,7 @@ package com.ruoyi.system.mapper; import java.time.LocalDate; import java.util.List; import com.ruoyi.system.domain.SysOrder; +import com.ruoyi.system.domain.dto.OrderListDto; import org.apache.ibatis.annotations.Param; /** @@ -64,4 +65,6 @@ public interface SysOrderMapper /* * 检查订单时间是否合法*/ public int isTimeLegal(@Param("startTime")LocalDate startTime, @Param("endTime") LocalDate endTime, @Param("sourceId") Long sourceId); + + public List getOrderListDto(SysOrder sysOrder); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysSourceMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysSourceMapper.java index 7c45c3e3..f50de355 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysSourceMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysSourceMapper.java @@ -73,4 +73,6 @@ public interface SysSourceMapper public List getSysSourceList(SysSource sysSource); public List getHotSource(); + +public int updateSysSourceByCP(SysSource sysSource); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/IOrderInfoService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/IOrderInfoService.java new file mode 100644 index 00000000..b7d484c6 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/IOrderInfoService.java @@ -0,0 +1,68 @@ +package com.ruoyi.system.service; + +import java.util.List; +import com.ruoyi.system.domain.OrderInfo; +import com.ruoyi.system.domain.dto.OrderInfoDto; + +/** + * 订单信息，若一个订单存在购买多个资源位，则添加多条数据Service接口 + * + * @author haotian + * @date 2024-12-17 + */ +public interface IOrderInfoService +{ + /** + * 查询订单信息，若一个订单存在购买多个资源位，则添加多条数据 + * + * @param orderInfoId 订单信息，若一个订单存在购买多个资源位，则添加多条数据主键 + * @return 订单信息，若一个订单存在购买多个资源位，则添加多条数据 + */ + public OrderInfo selectOrderInfoByOrderInfoId(Long orderInfoId); + + /** + * 查询订单信息，若一个订单存在购买多个资源位，则添加多条数据列表 + * + * @param orderInfo 订单信息，若一个订单存在购买多个资源位，则添加多条数据 + * @return 订单信息，若一个订单存在购买多个资源位，则添加多条数据集合 + */ + public List selectOrderInfoList(OrderInfo orderInfo); + + /** + * 新增订单信息，若一个订单存在购买多个资源位，则添加多条数据 + * + * @param orderInfo 订单信息，若一个订单存在购买多个资源位，则添加多条数据 + * @return 结果 + */ + public int insertOrderInfo(OrderInfo orderInfo); + + /** + * 修改订单信息，若一个订单存在购买多个资源位，则添加多条数据 + * + * @param orderInfo 订单信息，若一个订单存在购买多个资源位，则添加多条数据 + * @return 结果 + */ + public int updateOrderInfo(OrderInfo orderInfo); + + /** + * 批量删除订单信息，若一个订单存在购买多个资源位，则添加多条数据 + * + * @param orderInfoIds 需要删除的订单信息，若一个订单存在购买多个资源位，则添加多条数据主键集合 + * @return 结果 + */ + public int deleteOrderInfoByOrderInfoIds(Long[] orderInfoIds); + + /** + * 删除订单信息，若一个订单存在购买多个资源位，则添加多条数据信息 + * + * @param orderInfoId 订单信息，若一个订单存在购买多个资源位，则添加多条数据主键 + * @return 结果 + */ + public int deleteOrderInfoByOrderInfoId(Long orderInfoId); + + /*返回属于order_info_id的所有资源位订单*/ + public List getOrderInfoDtoList(Long orderInfoId); + + /*返回定单详情*/ + public OrderInfoDto getOrderInfoDto(Long id); +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOrderService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOrderService.java index 01b3c688..8d634831 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOrderService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOrderService.java @@ -3,6 +3,7 @@ package com.ruoyi.system.service; import java.time.LocalDate; import java.util.List; import com.ruoyi.system.domain.SysOrder; +import com.ruoyi.system.domain.dto.OrderListDto; /** * 订单信息Service接口 @@ -65,4 +66,10 @@ public interface ISysOrderService * 查询订单是否合法 * */ public int isTimeLegal(LocalDate startTime, LocalDate endTime, Long sourceId); + + /* + * 营销管理获取订单列表 + * */ + + public List getOrderListDto(SysOrder sysOrder); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysSourceService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysSourceService.java index 55f6700e..a643a913 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysSourceService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysSourceService.java @@ -85,4 +85,6 @@ public interface ISysSourceService * */ public List getHotSource(); + + public int updateSysSourceByCP(SysSource sysSource); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OrderInfoServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OrderInfoServiceImpl.java new file mode 100644 index 00000000..4cfb981d --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OrderInfoServiceImpl.java @@ -0,0 +1,105 @@ +package com.ruoyi.system.service.impl; + +import java.util.List; + +import com.ruoyi.system.domain.dto.OrderInfoDto; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.system.mapper.OrderInfoMapper; +import com.ruoyi.system.domain.OrderInfo; +import com.ruoyi.system.service.IOrderInfoService; + +/** + * 订单信息，若一个订单存在购买多个资源位，则添加多条数据Service业务层处理 + * + * @author haotian + * @date 2024-12-17 + */ +@Service +public class OrderInfoServiceImpl implements IOrderInfoService +{ + @Autowired + private OrderInfoMapper orderInfoMapper; + + /** + * 查询订单信息，若一个订单存在购买多个资源位，则添加多条数据 + * + * @param orderInfoId 订单信息，若一个订单存在购买多个资源位，则添加多条数据主键 + * @return 订单信息，若一个订单存在购买多个资源位，则添加多条数据 + */ + @Override + public OrderInfo selectOrderInfoByOrderInfoId(Long orderInfoId) + { + return orderInfoMapper.selectOrderInfoByOrderInfoId(orderInfoId); + } + + /** + * 查询订单信息，若一个订单存在购买多个资源位，则添加多条数据列表 + * + * @param orderInfo 订单信息，若一个订单存在购买多个资源位，则添加多条数据 + * @return 订单信息，若一个订单存在购买多个资源位，则添加多条数据 + */ + @Override + public List selectOrderInfoList(OrderInfo orderInfo) + { + return orderInfoMapper.selectOrderInfoList(orderInfo); + } + + /** + * 新增订单信息，若一个订单存在购买多个资源位，则添加多条数据 + * + * @param orderInfo 订单信息，若一个订单存在购买多个资源位，则添加多条数据 + * @return 结果 + */ + @Override + public int insertOrderInfo(OrderInfo orderInfo) + { + return orderInfoMapper.insertOrderInfo(orderInfo); + } + + /** + * 修改订单信息，若一个订单存在购买多个资源位，则添加多条数据 + * + * @param orderInfo 订单信息，若一个订单存在购买多个资源位，则添加多条数据 + * @return 结果 + */ + @Override + public int updateOrderInfo(OrderInfo orderInfo) + { + return orderInfoMapper.updateOrderInfo(orderInfo); + } + + /** + * 批量删除订单信息，若一个订单存在购买多个资源位，则添加多条数据 + * + * @param orderInfoIds 需要删除的订单信息，若一个订单存在购买多个资源位，则添加多条数据主键 + * @return 结果 + */ + @Override + public int deleteOrderInfoByOrderInfoIds(Long[] orderInfoIds) + { + return orderInfoMapper.deleteOrderInfoByOrderInfoIds(orderInfoIds); + } + + /** + * 删除订单信息，若一个订单存在购买多个资源位，则添加多条数据信息 + * + * @param orderInfoId 订单信息，若一个订单存在购买多个资源位，则添加多条数据主键 + * @return 结果 + */ + @Override + public int deleteOrderInfoByOrderInfoId(Long orderInfoId) + { + return orderInfoMapper.deleteOrderInfoByOrderInfoId(orderInfoId); + } + + @Override + public List getOrderInfoDtoList(Long orderInfoId){ + return orderInfoMapper.getOrderInfoDtoList(orderInfoId); + } + + @Override + public OrderInfoDto getOrderInfoDto(Long id){ + return orderInfoMapper.getOrderInfoDto(id); + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOrderServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOrderServiceImpl.java index 0b15fadb..7e251503 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOrderServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOrderServiceImpl.java @@ -3,6 +3,7 @@ package com.ruoyi.system.service.impl; import java.time.LocalDate; import java.util.List; import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.system.domain.dto.OrderListDto; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ruoyi.system.mapper.SysOrderMapper; @@ -98,4 +99,9 @@ public class SysOrderServiceImpl implements ISysOrderService public int isTimeLegal(LocalDate startTime, LocalDate endTime, Long sourceId) { return sysOrderMapper.isTimeLegal(startTime, endTime, sourceId); } + + @Override + public List getOrderListDto(SysOrder sysOrder){ + return sysOrderMapper.getOrderListDto(sysOrder); + } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysSourceServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysSourceServiceImpl.java index 88fc8420..5e7919d3 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysSourceServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysSourceServiceImpl.java @@ -116,4 +116,9 @@ public class SysSourceServiceImpl implements ISysSourceService public List getHotSource(){ return sysSourceMapper.getHotSource(); }; + + @Override + public int updateSysSourceByCP(SysSource sysSource){ + return sysSourceMapper.updateSysSourceByCP(sysSource); + } } diff --git a/ruoyi-system/src/main/resources/mapper/system/OrderInfoMapper.xml b/ruoyi-system/src/main/resources/mapper/system/OrderInfoMapper.xml new file mode 100644 index 00000000..08f93cdd --- /dev/null +++ b/ruoyi-system/src/main/resources/mapper/system/OrderInfoMapper.xml @@ -0,0 +1,111 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select order_info_id, remark, source_id, work_id from order_info + + + + + + + + + + insert into order_info + + order_info_id, + remark, + source_id, + work_id, + id, + status, + refund_time, + + + #{orderInfoId}, + #{remark}, + #{sourceId}, + #{workId}, + #{id}, + #{status}, + #{refundTime}, + + + + + update order_info + + remark = #{remark}, + source_id = #{sourceId}, + work_id = #{workId}, + id = #{id}, + status = #{status}, + refund_time = #{refundTime}, + + where order_info_id = #{orderInfoId} + + + + delete from order_info where order_info_id = #{orderInfoId} + + + + delete from order_info where order_info_id in + + #{orderInfoId} + + + \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/mapper/system/SysOrderMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysOrderMapper.xml index e69640be..b1ce93d5 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysOrderMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysOrderMapper.xml @@ -16,6 +16,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + + + + + + + + + + + + + + + + + @@ -34,6 +55,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and money = #{money} and way = #{way} and detail like concat('%', #{detail}, '%') + and status = #{status} + and refund = #{refund} @@ -45,6 +68,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select count(*) from sys_order where source_id = #{sourceId} and #{endTime} >= sys_order.start_time and sys_order.end_time >= #{startTime} + insert into sys_order @@ -59,6 +95,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" money, way, detail, + status, + refund, #{userId}, @@ -71,6 +109,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{money}, #{way}, #{detail}, + #{status}, + #{refund}, @@ -87,6 +127,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" money = #{money}, way = #{way}, detail = #{detail}, + status = #{status}, + refund = #{refund}, where order_id = #{orderId} diff --git a/ruoyi-system/src/main/resources/mapper/system/SysSourceMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysSourceMapper.xml index 1b2655ec..3731a02d 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysSourceMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysSourceMapper.xml @@ -174,6 +174,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update sys_source set price = #{price} where city = #{city} and scenic = #{scenic} and part = #{part} + + update sys_source set work_address = #{workAddress} where city = #{city} and scenic = #{scenic} and part = #{part} and source_status = "0" + delete from sys_source where source_id = #{sourceId}