diff --git a/zlpt-modules/pom.xml b/zlpt-modules/pom.xml index bea098b..87e6059 100644 --- a/zlpt-modules/pom.xml +++ b/zlpt-modules/pom.xml @@ -15,6 +15,7 @@ zlpt-file zlpt-home zlpt-bigScreen + zlpt-order zlpt-modules diff --git a/zlpt-modules/zlpt-order/pom.xml b/zlpt-modules/zlpt-order/pom.xml new file mode 100644 index 0000000..fb4a06e --- /dev/null +++ b/zlpt-modules/zlpt-order/pom.xml @@ -0,0 +1,105 @@ + + + + com.bonus.zlpt + zlpt-modules + 3.6.3 + + 4.0.0 + + zlpt-modules-order + + + zlpt-modules-order订单模块 + + + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-sentinel + + + + + org.springframework.boot + spring-boot-starter-actuator + + + + + io.springfox + springfox-swagger-ui + ${swagger.fox.version} + + + + + com.mysql + mysql-connector-j + + + + + com.bonus.zlpt + zlpt-common-datasource + + + + + com.bonus.zlpt + zlpt-common-datascope + + + + + com.bonus.zlpt + zlpt-common-log + + + com.bonus.zlpt + zlpt-common-log + + + com.bonus.zlpt + zlpt-common-swagger + + + + + + + + + ${project.artifactId} + + + org.springframework.boot + spring-boot-maven-plugin + + + + repackage + + + + + + + + \ No newline at end of file diff --git a/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/ZlptOrderApplication.java b/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/ZlptOrderApplication.java new file mode 100644 index 0000000..da9c24a --- /dev/null +++ b/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/ZlptOrderApplication.java @@ -0,0 +1,35 @@ +package com.bonus.zlpt.order; + +import com.bonus.zlpt.common.security.annotation.EnableCustomConfig; +import com.bonus.zlpt.common.security.annotation.EnableRyFeignClients; +import com.bonus.zlpt.common.swagger.annotation.EnableCustomSwagger2; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +/** + * 订单模块 + * + * @author xsheng + * @date 2023-12-01 + */ +@EnableCustomConfig +@EnableCustomSwagger2 +@EnableRyFeignClients +@SpringBootApplication +public class ZlptOrderApplication +{ + public static void main(String[] args) + { + SpringApplication.run(ZlptOrderApplication.class, args); + System.out.println("(♥◠‿◠)ﾉﾞ 订单模块启动成功 ლ(´ڡ`ლ)ﾞ \n" + + " .-------. ____ __ \n" + + " | _ _ \\ \\ \\ / / \n" + + " | ( ' ) | \\ _. / ' \n" + + " |(_ o _) / _( )_ .' \n" + + " | (_,_).' __ ___(_ o _)' \n" + + " | |\\ \\ | || |(_,_)' \n" + + " | | \\ `' /| `-' / \n" + + " | | \\ / \\ / \n" + + " ''-' `'-' `-..-' "); + } +} diff --git a/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/controller/OrderDetailsController.java b/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/controller/OrderDetailsController.java new file mode 100644 index 0000000..702d768 --- /dev/null +++ b/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/controller/OrderDetailsController.java @@ -0,0 +1,104 @@ +package com.bonus.zlpt.order.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; +import com.bonus.zlpt.common.core.utils.poi.ExcelUtil; +import com.bonus.zlpt.common.core.web.controller.BaseController; +import com.bonus.zlpt.common.core.web.domain.AjaxResult; +import com.bonus.zlpt.common.core.web.page.TableDataInfo; +import com.bonus.zlpt.common.log.annotation.Log; +import com.bonus.zlpt.common.log.enums.BusinessType; +import com.bonus.zlpt.common.security.annotation.RequiresPermissions; +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.bonus.zlpt.order.domain.OrderDetails; +import com.bonus.zlpt.order.service.IOrderDetailsService; + +/** + * 订单详细Controller + * + * @author xsheng + * @date 2023-12-01 + */ +@RestController +@RequestMapping("/details") +public class OrderDetailsController extends BaseController +{ + @Autowired + private IOrderDetailsService orderDetailsService; + + /** + * 查询订单详细列表 + */ + @RequiresPermissions("order:details:list") + @GetMapping("/list") + public TableDataInfo list(OrderDetails orderDetails) + { + startPage(); + List list = orderDetailsService.selectOrderDetailsList(orderDetails); + return getDataTable(list); + } + + /** + * 导出订单详细列表 + */ + @RequiresPermissions("order:details:export") + @Log(title = "订单详细", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, OrderDetails orderDetails) + { + List list = orderDetailsService.selectOrderDetailsList(orderDetails); + ExcelUtil util = new ExcelUtil(OrderDetails.class); + util.exportExcel(response, list, "订单详细数据"); + } + + /** + * 获取订单详细详细信息 + */ + @RequiresPermissions("order:details:query") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return success(orderDetailsService.selectOrderDetailsById(id)); + } + + /** + * 新增订单详细 + */ + @RequiresPermissions("order:details:add") + @Log(title = "订单详细", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody OrderDetails orderDetails) + { + return toAjax(orderDetailsService.insertOrderDetails(orderDetails)); + } + + /** + * 修改订单详细 + */ + @RequiresPermissions("order:details:edit") + @Log(title = "订单详细", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody OrderDetails orderDetails) + { + return toAjax(orderDetailsService.updateOrderDetails(orderDetails)); + } + + /** + * 删除订单详细 + */ + @RequiresPermissions("order:details:remove") + @Log(title = "订单详细", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(orderDetailsService.deleteOrderDetailsByIds(ids)); + } +} diff --git a/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/controller/OrderInfoController.java b/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/controller/OrderInfoController.java new file mode 100644 index 0000000..ee2bb64 --- /dev/null +++ b/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/controller/OrderInfoController.java @@ -0,0 +1,104 @@ +package com.bonus.zlpt.order.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; + +import com.bonus.zlpt.common.core.utils.poi.ExcelUtil; +import com.bonus.zlpt.common.core.web.controller.BaseController; +import com.bonus.zlpt.common.core.web.domain.AjaxResult; +import com.bonus.zlpt.common.core.web.page.TableDataInfo; +import com.bonus.zlpt.common.log.annotation.Log; +import com.bonus.zlpt.common.log.enums.BusinessType; +import com.bonus.zlpt.common.security.annotation.RequiresPermissions; +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.bonus.zlpt.order.domain.OrderInfo; +import com.bonus.zlpt.order.service.IOrderInfoService; +/** + * 订单信息Controller + * + * @author xsheng + * @date 2023-12-01 + */ +@RestController +@RequestMapping("/info") +public class OrderInfoController extends BaseController +{ + @Autowired + private IOrderInfoService orderInfoService; + + /** + * 查询订单信息列表 + */ + @RequiresPermissions("order:info:list") + @GetMapping("/list") + public TableDataInfo list(OrderInfo orderInfo) + { + startPage(); + List list = orderInfoService.selectOrderInfoList(orderInfo); + return getDataTable(list); + } + + /** + * 导出订单信息列表 + */ + @RequiresPermissions("order: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, "订单信息数据"); + } + + /** + * 获取订单信息详细信息 + */ + @RequiresPermissions("order:info:query") + @GetMapping(value = "/{orderId}") + public AjaxResult getInfo(@PathVariable("orderId") Long orderId) + { + return success(orderInfoService.selectOrderInfoByOrderId(orderId)); + } + + /** + * 新增订单信息 + */ + @RequiresPermissions("order:info:add") + @Log(title = "订单信息", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody OrderInfo orderInfo) + { + return toAjax(orderInfoService.insertOrderInfo(orderInfo)); + } + + /** + * 修改订单信息 + */ + @RequiresPermissions("order:info:edit") + @Log(title = "订单信息", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody OrderInfo orderInfo) + { + return toAjax(orderInfoService.updateOrderInfo(orderInfo)); + } + + /** + * 删除订单信息 + */ + @RequiresPermissions("order:info:remove") + @Log(title = "订单信息", businessType = BusinessType.DELETE) + @DeleteMapping("/{orderIds}") + public AjaxResult remove(@PathVariable Long[] orderIds) + { + return toAjax(orderInfoService.deleteOrderInfoByOrderIds(orderIds)); + } +} diff --git a/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/domain/OrderDetails.java b/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/domain/OrderDetails.java new file mode 100644 index 0000000..bd45133 --- /dev/null +++ b/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/domain/OrderDetails.java @@ -0,0 +1,102 @@ +package com.bonus.zlpt.order.domain; + +import com.bonus.zlpt.common.core.annotation.Excel; +import com.bonus.zlpt.common.core.web.domain.BaseEntity; +import lombok.Data; +import lombok.ToString; + +/** + * 订单详细对象 ma_order_details + * + * @author xsheng + * @date 2023-12-01 + */ +@Data +@ToString +public class OrderDetails extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** $column.columnComment */ + private Long id; + + /** 订单id */ + @Excel(name = "订单id") + private Long orderId; + + /** 需求单位 */ + @Excel(name = "需求单位") + private String needCompany; + + /** 设备计划进场时间 */ + @Excel(name = "设备计划进场时间") + private String planStartTime; + + /** 是否需要机手 */ + @Excel(name = "是否需要机手") + private String isMachinist; + + /** 详细地址 */ + @Excel(name = "详细地址") + private String address; + + /** 工期时长 */ + @Excel(name = "工期时长") + private String duration; + + /** 发票类型 */ + @Excel(name = "发票类型") + private String invoiceType; + + /** 项目说明 */ + @Excel(name = "项目说明") + private String description; + + /** 设备id */ + @Excel(name = "设备id") + private Long maId; + + /** 租赁类型 */ + @Excel(name = "租赁类型") + private Long leaseType; + + /** 租赁单价 */ + @Excel(name = "租赁单价") + private String leasePrice; + + /** 机手单价 */ + @Excel(name = "机手单价") + private String machinistPrice; + + /** 订单合同 */ + @Excel(name = "订单合同") + private String orderContract; + + /** 机手姓名 */ + @Excel(name = "机手姓名") + private String machinistName; + + /** 联系电话 */ + @Excel(name = "联系电话") + private String phone; + + /** 物流司机电话 */ + @Excel(name = "物流司机电话") + private String logisticsPhone; + + /** 设备实际进场时间 */ + @Excel(name = "设备实际进场时间") + private String realStartTime; + + /** 租方进场确认人 */ + @Excel(name = "租方进场确认人") + private String rentalName; + + /** 出租方进场确认人 */ + @Excel(name = "出租方进场确认人") + private String tenantName; + + /** 进场附件 */ + @Excel(name = "进场附件") + private String entryAttachment; +} diff --git a/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/domain/OrderInfo.java b/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/domain/OrderInfo.java new file mode 100644 index 0000000..84214a7 --- /dev/null +++ b/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/domain/OrderInfo.java @@ -0,0 +1,65 @@ +package com.bonus.zlpt.order.domain; + +import java.math.BigDecimal; + +import com.bonus.zlpt.common.core.annotation.Excel; +import com.bonus.zlpt.common.core.web.domain.BaseEntity; +import lombok.Data; +import lombok.ToString; + +/** + * 订单信息对象 ma_order_info + * + * @author xsheng + * @date 2023-12-01 + */ +@Data +@ToString +public class OrderInfo extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long orderId; + + /** 父id（续租原订单） */ + @Excel(name = "父id", readConverterExp = "续=租原订单") + private Long pId; + + /** 订单编号 */ + @Excel(name = "订单编号") + private String code; + + /** 订单日期 */ + @Excel(name = "订单日期") + private String time; + + /** 订金 */ + @Excel(name = "订金") + private BigDecimal deposit; + + /** 订单金额 */ + @Excel(name = "订单金额") + private BigDecimal cost; + + /** 结算周期 */ + @Excel(name = "结算周期") + private String payType; + + /** 供应商id */ + @Excel(name = "供应商id") + private String supplier; + + /** 订单状态（待确认，待上传合同，待发货，已退货，待收货，进行中，临期，超期，驳回，退租申请，续租申请，完结） */ + @Excel(name = "订单状态", readConverterExp = "待=确认，待上传合同，待发货，已退货，待收货，进行中，临期，超期，驳回，退租申请，续租申请，完结") + private String orderStatus; + + /** 下单用户id */ + @Excel(name = "下单用户id") + private Long orderUser; + + /** 下单企业 */ + @Excel(name = "下单企业") + private String orderCompany; +} diff --git a/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/mapper/OrderDetailsMapper.java b/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/mapper/OrderDetailsMapper.java new file mode 100644 index 0000000..481c274 --- /dev/null +++ b/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/mapper/OrderDetailsMapper.java @@ -0,0 +1,61 @@ +package com.bonus.zlpt.order.mapper; + +import java.util.List; +import com.bonus.zlpt.order.domain.OrderDetails; + +/** + * 订单详细Mapper接口 + * + * @author xsheng + * @date 2023-12-01 + */ +public interface OrderDetailsMapper +{ + /** + * 查询订单详细 + * + * @param id 订单详细主键 + * @return 订单详细 + */ + public OrderDetails selectOrderDetailsById(Long id); + + /** + * 查询订单详细列表 + * + * @param orderDetails 订单详细 + * @return 订单详细集合 + */ + public List selectOrderDetailsList(OrderDetails orderDetails); + + /** + * 新增订单详细 + * + * @param orderDetails 订单详细 + * @return 结果 + */ + public int insertOrderDetails(OrderDetails orderDetails); + + /** + * 修改订单详细 + * + * @param orderDetails 订单详细 + * @return 结果 + */ + public int updateOrderDetails(OrderDetails orderDetails); + + /** + * 删除订单详细 + * + * @param id 订单详细主键 + * @return 结果 + */ + public int deleteOrderDetailsById(Long id); + + /** + * 批量删除订单详细 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteOrderDetailsByIds(Long[] ids); +} diff --git a/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/mapper/OrderInfoMapper.java b/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/mapper/OrderInfoMapper.java new file mode 100644 index 0000000..3d9c5cb --- /dev/null +++ b/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/mapper/OrderInfoMapper.java @@ -0,0 +1,61 @@ +package com.bonus.zlpt.order.mapper; + +import java.util.List; +import com.bonus.zlpt.order.domain.OrderInfo; + +/** + * 订单信息Mapper接口 + * + * @author xsheng + * @date 2023-12-01 + */ +public interface OrderInfoMapper +{ + /** + * 查询订单信息 + * + * @param orderId 订单信息主键 + * @return 订单信息 + */ + public OrderInfo selectOrderInfoByOrderId(Long orderId); + + /** + * 查询订单信息列表 + * + * @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 orderId 订单信息主键 + * @return 结果 + */ + public int deleteOrderInfoByOrderId(Long orderId); + + /** + * 批量删除订单信息 + * + * @param orderIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteOrderInfoByOrderIds(Long[] orderIds); +} diff --git a/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/service/IOrderDetailsService.java b/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/service/IOrderDetailsService.java new file mode 100644 index 0000000..28ffd5e --- /dev/null +++ b/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/service/IOrderDetailsService.java @@ -0,0 +1,61 @@ +package com.bonus.zlpt.order.service; + +import java.util.List; +import com.bonus.zlpt.order.domain.OrderDetails; + +/** + * 订单详细Service接口 + * + * @author xsheng + * @date 2023-12-01 + */ +public interface IOrderDetailsService +{ + /** + * 查询订单详细 + * + * @param id 订单详细主键 + * @return 订单详细 + */ + public OrderDetails selectOrderDetailsById(Long id); + + /** + * 查询订单详细列表 + * + * @param orderDetails 订单详细 + * @return 订单详细集合 + */ + public List selectOrderDetailsList(OrderDetails orderDetails); + + /** + * 新增订单详细 + * + * @param orderDetails 订单详细 + * @return 结果 + */ + public int insertOrderDetails(OrderDetails orderDetails); + + /** + * 修改订单详细 + * + * @param orderDetails 订单详细 + * @return 结果 + */ + public int updateOrderDetails(OrderDetails orderDetails); + + /** + * 批量删除订单详细 + * + * @param ids 需要删除的订单详细主键集合 + * @return 结果 + */ + public int deleteOrderDetailsByIds(Long[] ids); + + /** + * 删除订单详细信息 + * + * @param id 订单详细主键 + * @return 结果 + */ + public int deleteOrderDetailsById(Long id); +} diff --git a/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/service/IOrderInfoService.java b/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/service/IOrderInfoService.java new file mode 100644 index 0000000..13db8a9 --- /dev/null +++ b/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/service/IOrderInfoService.java @@ -0,0 +1,61 @@ +package com.bonus.zlpt.order.service; + +import java.util.List; +import com.bonus.zlpt.order.domain.OrderInfo; + +/** + * 订单信息Service接口 + * + * @author xsheng + * @date 2023-12-01 + */ +public interface IOrderInfoService +{ + /** + * 查询订单信息 + * + * @param orderId 订单信息主键 + * @return 订单信息 + */ + public OrderInfo selectOrderInfoByOrderId(Long orderId); + + /** + * 查询订单信息列表 + * + * @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 orderIds 需要删除的订单信息主键集合 + * @return 结果 + */ + public int deleteOrderInfoByOrderIds(Long[] orderIds); + + /** + * 删除订单信息信息 + * + * @param orderId 订单信息主键 + * @return 结果 + */ + public int deleteOrderInfoByOrderId(Long orderId); +} diff --git a/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/service/impl/OrderDetailsServiceImpl.java b/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/service/impl/OrderDetailsServiceImpl.java new file mode 100644 index 0000000..e3753d2 --- /dev/null +++ b/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/service/impl/OrderDetailsServiceImpl.java @@ -0,0 +1,93 @@ +package com.bonus.zlpt.order.service.impl; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.bonus.zlpt.order.mapper.OrderDetailsMapper; +import com.bonus.zlpt.order.domain.OrderDetails; +import com.bonus.zlpt.order.service.IOrderDetailsService; + +/** + * 订单详细Service业务层处理 + * + * @author xsheng + * @date 2023-12-01 + */ +@Service +public class OrderDetailsServiceImpl implements IOrderDetailsService +{ + @Autowired + private OrderDetailsMapper orderDetailsMapper; + + /** + * 查询订单详细 + * + * @param id 订单详细主键 + * @return 订单详细 + */ + @Override + public OrderDetails selectOrderDetailsById(Long id) + { + return orderDetailsMapper.selectOrderDetailsById(id); + } + + /** + * 查询订单详细列表 + * + * @param orderDetails 订单详细 + * @return 订单详细 + */ + @Override + public List selectOrderDetailsList(OrderDetails orderDetails) + { + return orderDetailsMapper.selectOrderDetailsList(orderDetails); + } + + /** + * 新增订单详细 + * + * @param orderDetails 订单详细 + * @return 结果 + */ + @Override + public int insertOrderDetails(OrderDetails orderDetails) + { + return orderDetailsMapper.insertOrderDetails(orderDetails); + } + + /** + * 修改订单详细 + * + * @param orderDetails 订单详细 + * @return 结果 + */ + @Override + public int updateOrderDetails(OrderDetails orderDetails) + { + return orderDetailsMapper.updateOrderDetails(orderDetails); + } + + /** + * 批量删除订单详细 + * + * @param ids 需要删除的订单详细主键 + * @return 结果 + */ + @Override + public int deleteOrderDetailsByIds(Long[] ids) + { + return orderDetailsMapper.deleteOrderDetailsByIds(ids); + } + + /** + * 删除订单详细信息 + * + * @param id 订单详细主键 + * @return 结果 + */ + @Override + public int deleteOrderDetailsById(Long id) + { + return orderDetailsMapper.deleteOrderDetailsById(id); + } +} diff --git a/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/service/impl/OrderInfoServiceImpl.java b/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/service/impl/OrderInfoServiceImpl.java new file mode 100644 index 0000000..dbc71dc --- /dev/null +++ b/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/service/impl/OrderInfoServiceImpl.java @@ -0,0 +1,93 @@ +package com.bonus.zlpt.order.service.impl; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.bonus.zlpt.order.mapper.OrderInfoMapper; +import com.bonus.zlpt.order.domain.OrderInfo; +import com.bonus.zlpt.order.service.IOrderInfoService; + +/** + * 订单信息Service业务层处理 + * + * @author xsheng + * @date 2023-12-01 + */ +@Service +public class OrderInfoServiceImpl implements IOrderInfoService +{ + @Autowired + private OrderInfoMapper orderInfoMapper; + + /** + * 查询订单信息 + * + * @param orderId 订单信息主键 + * @return 订单信息 + */ + @Override + public OrderInfo selectOrderInfoByOrderId(Long orderId) + { + return orderInfoMapper.selectOrderInfoByOrderId(orderId); + } + + /** + * 查询订单信息列表 + * + * @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 orderIds 需要删除的订单信息主键 + * @return 结果 + */ + @Override + public int deleteOrderInfoByOrderIds(Long[] orderIds) + { + return orderInfoMapper.deleteOrderInfoByOrderIds(orderIds); + } + + /** + * 删除订单信息信息 + * + * @param orderId 订单信息主键 + * @return 结果 + */ + @Override + public int deleteOrderInfoByOrderId(Long orderId) + { + return orderInfoMapper.deleteOrderInfoByOrderId(orderId); + } +} diff --git a/zlpt-modules/zlpt-order/src/main/resources/banner.txt b/zlpt-modules/zlpt-order/src/main/resources/banner.txt new file mode 100644 index 0000000..0b9cd42 --- /dev/null +++ b/zlpt-modules/zlpt-order/src/main/resources/banner.txt @@ -0,0 +1,10 @@ +Spring Boot Version: ${spring-boot.version} +Spring Application Name: ${spring.application.name} + _ _ _ + (_) (_) | | + _ __ _ _ ___ _ _ _ ______ _ ___ | |__ +| '__|| | | | / _ \ | | | || ||______| | | / _ \ | '_ \ +| | | |_| || (_) || |_| || | | || (_) || |_) | +|_| \__,_| \___/ \__, ||_| | | \___/ |_.__/ + __/ | _/ | + |___/ |__/ \ No newline at end of file diff --git a/zlpt-modules/zlpt-order/src/main/resources/bootstrap.yml b/zlpt-modules/zlpt-order/src/main/resources/bootstrap.yml new file mode 100644 index 0000000..e25132a --- /dev/null +++ b/zlpt-modules/zlpt-order/src/main/resources/bootstrap.yml @@ -0,0 +1,27 @@ +# Tomcat +server: + port: 9205 + +# Spring +spring: + application: + # 应用名称 + name: zlpt-order + profiles: + # 环境配置 + active: zlpt_cloud_dev + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: 127.0.0.1:8848 + namespace: zlpt_cloud_dev + config: + # 配置中心地址 + server-addr: 127.0.0.1:8848 + namespace: zlpt_cloud_dev + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} diff --git a/zlpt-modules/zlpt-order/src/main/resources/logback.xml b/zlpt-modules/zlpt-order/src/main/resources/logback.xml new file mode 100644 index 0000000..1769de5 --- /dev/null +++ b/zlpt-modules/zlpt-order/src/main/resources/logback.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + ${log.pattern} + + + + + + ${log.path}/info.log + + + + ${log.path}/info.%d{yyyy-MM-dd}.log + + 60 + + + ${log.pattern} + + + + INFO + + ACCEPT + + DENY + + + + + ${log.path}/error.log + + + + ${log.path}/error.%d{yyyy-MM-dd}.log + + 60 + + + ${log.pattern} + + + + ERROR + + ACCEPT + + DENY + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/zlpt-modules/zlpt-order/src/main/resources/mapper.order/OrderDetailsMapper.xml b/zlpt-modules/zlpt-order/src/main/resources/mapper.order/OrderDetailsMapper.xml new file mode 100644 index 0000000..59ce13d --- /dev/null +++ b/zlpt-modules/zlpt-order/src/main/resources/mapper.order/OrderDetailsMapper.xml @@ -0,0 +1,153 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select id, order_id, need_company, plan_start_time, is_machinist, address, duration, invoice_type, description, ma_id, lease_type, lease_price, machinist_price, order_contract, machinist_name, phone, logistics_phone, real_start_time, rental_name, tenant_name, entry_attachment from ma_order_details + + + + + + + + insert into ma_order_details + + id, + order_id, + need_company, + plan_start_time, + is_machinist, + address, + duration, + invoice_type, + description, + ma_id, + lease_type, + lease_price, + machinist_price, + order_contract, + machinist_name, + phone, + logistics_phone, + real_start_time, + rental_name, + tenant_name, + entry_attachment, + + + #{id}, + #{orderId}, + #{needCompany}, + #{planStartTime}, + #{isMachinist}, + #{address}, + #{duration}, + #{invoiceType}, + #{description}, + #{maId}, + #{leaseType}, + #{leasePrice}, + #{machinistPrice}, + #{orderContract}, + #{machinistName}, + #{phone}, + #{logisticsPhone}, + #{realStartTime}, + #{rentalName}, + #{tenantName}, + #{entryAttachment}, + + + + + update ma_order_details + + order_id = #{orderId}, + need_company = #{needCompany}, + plan_start_time = #{planStartTime}, + is_machinist = #{isMachinist}, + address = #{address}, + duration = #{duration}, + invoice_type = #{invoiceType}, + description = #{description}, + ma_id = #{maId}, + lease_type = #{leaseType}, + lease_price = #{leasePrice}, + machinist_price = #{machinistPrice}, + order_contract = #{orderContract}, + machinist_name = #{machinistName}, + phone = #{phone}, + logistics_phone = #{logisticsPhone}, + real_start_time = #{realStartTime}, + rental_name = #{rentalName}, + tenant_name = #{tenantName}, + entry_attachment = #{entryAttachment}, + + where id = #{id} + + + + delete from ma_order_details where id = #{id} + + + + delete from ma_order_details where id in + + #{id} + + + \ No newline at end of file diff --git a/zlpt-modules/zlpt-order/src/main/resources/mapper.order/OrderInfoMapper.xml b/zlpt-modules/zlpt-order/src/main/resources/mapper.order/OrderInfoMapper.xml new file mode 100644 index 0000000..832c707 --- /dev/null +++ b/zlpt-modules/zlpt-order/src/main/resources/mapper.order/OrderInfoMapper.xml @@ -0,0 +1,104 @@ + + + + + + + + + + + + + + + + + + + + select order_id, p_id, code, time, deposit, cost, pay_type, supplier, order_status, order_user, order_company from ma_order_info + + + + + + + + insert into ma_order_info + + order_id, + p_id, + code, + time, + deposit, + cost, + pay_type, + supplier, + order_status, + order_user, + order_company, + + + #{orderId}, + #{pId}, + #{code}, + #{time}, + #{deposit}, + #{cost}, + #{payType}, + #{supplier}, + #{orderStatus}, + #{orderUser}, + #{orderCompany}, + + + + + update ma_order_info + + p_id = #{pId}, + code = #{code}, + time = #{time}, + deposit = #{deposit}, + cost = #{cost}, + pay_type = #{payType}, + supplier = #{supplier}, + order_status = #{orderStatus}, + order_user = #{orderUser}, + order_company = #{orderCompany}, + + where order_id = #{orderId} + + + + delete from ma_order_info where order_id = #{orderId} + + + + delete from ma_order_info where order_id in + + #{orderId} + + + \ No newline at end of file