From c8966780eeb79274af961db1b69a90805bbcd26b Mon Sep 17 00:00:00 2001 From: zhaochencheng Date: Thu, 29 Dec 2022 12:27:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E6=8E=89refund?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cyl/oms/controller/RefundController.java | 93 ------------ .../oms/controller/RefundItemController.java | 93 ------------ .../com/cyl/oms/convert/RefundConvert.java | 16 --- .../cyl/oms/convert/RefundItemConvert.java | 16 --- .../main/java/com/cyl/oms/domain/Refund.java | 73 ---------- .../java/com/cyl/oms/domain/RefundItem.java | 44 ------ .../com/cyl/oms/mapper/RefundItemMapper.java | 21 --- .../java/com/cyl/oms/mapper/RefundMapper.java | 21 --- .../cyl/oms/pojo/query/RefundItemQuery.java | 31 ---- .../com/cyl/oms/pojo/query/RefundQuery.java | 53 ------- .../com/cyl/oms/pojo/vo/RefundItemVO.java | 32 ----- .../java/com/cyl/oms/pojo/vo/RefundVO.java | 55 -------- .../cyl/oms/service/RefundItemService.java | 103 -------------- .../com/cyl/oms/service/RefundService.java | 132 ------------------ .../resources/mapper/oms/RefundItemMapper.xml | 38 ----- .../resources/mapper/oms/RefundMapper.xml | 52 ------- sql/oms/refund.sql | 22 --- sql/oms/refundItem.sql | 22 --- 18 files changed, 917 deletions(-) delete mode 100644 ruoyi-mall/src/main/java/com/cyl/oms/controller/RefundController.java delete mode 100644 ruoyi-mall/src/main/java/com/cyl/oms/controller/RefundItemController.java delete mode 100644 ruoyi-mall/src/main/java/com/cyl/oms/convert/RefundConvert.java delete mode 100644 ruoyi-mall/src/main/java/com/cyl/oms/convert/RefundItemConvert.java delete mode 100644 ruoyi-mall/src/main/java/com/cyl/oms/domain/Refund.java delete mode 100644 ruoyi-mall/src/main/java/com/cyl/oms/domain/RefundItem.java delete mode 100644 ruoyi-mall/src/main/java/com/cyl/oms/mapper/RefundItemMapper.java delete mode 100644 ruoyi-mall/src/main/java/com/cyl/oms/mapper/RefundMapper.java delete mode 100644 ruoyi-mall/src/main/java/com/cyl/oms/pojo/query/RefundItemQuery.java delete mode 100644 ruoyi-mall/src/main/java/com/cyl/oms/pojo/query/RefundQuery.java delete mode 100644 ruoyi-mall/src/main/java/com/cyl/oms/pojo/vo/RefundItemVO.java delete mode 100644 ruoyi-mall/src/main/java/com/cyl/oms/pojo/vo/RefundVO.java delete mode 100644 ruoyi-mall/src/main/java/com/cyl/oms/service/RefundItemService.java delete mode 100644 ruoyi-mall/src/main/java/com/cyl/oms/service/RefundService.java delete mode 100644 ruoyi-mall/src/main/resources/mapper/oms/RefundItemMapper.xml delete mode 100644 ruoyi-mall/src/main/resources/mapper/oms/RefundMapper.xml delete mode 100644 sql/oms/refund.sql delete mode 100644 sql/oms/refundItem.sql diff --git a/ruoyi-mall/src/main/java/com/cyl/oms/controller/RefundController.java b/ruoyi-mall/src/main/java/com/cyl/oms/controller/RefundController.java deleted file mode 100644 index ecfb64f..0000000 --- a/ruoyi-mall/src/main/java/com/cyl/oms/controller/RefundController.java +++ /dev/null @@ -1,93 +0,0 @@ -package com.cyl.oms.controller; - -import java.util.List; - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.data.domain.PageImpl; -import org.springframework.data.domain.Pageable; -import org.springframework.data.domain.Page; -import org.springframework.http.ResponseEntity; -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.enums.BusinessType; -import com.cyl.oms.convert.RefundConvert; -import com.cyl.oms.domain.Refund; -import com.cyl.oms.pojo.query.RefundQuery; -import com.cyl.oms.service.RefundService; -import com.cyl.oms.pojo.vo.RefundVO; -import com.ruoyi.common.utils.poi.ExcelUtil; -/** - * 订单售后Controller - * - * @author zcc - * @date 2022-12-01 - */ -@Api(description ="订单售后接口列表") -@RestController -@RequestMapping("/oms/refund") -public class RefundController extends BaseController { - @Autowired - private RefundService service; - @Autowired - private RefundConvert convert; - - @ApiOperation("查询订单售后列表") - @PreAuthorize("@ss.hasPermi('oms:refund:list')") - @PostMapping("/list") - public ResponseEntity> list(@RequestBody RefundQuery query, Pageable page) { - List list = service.selectList(query, page); - return ResponseEntity.ok(new PageImpl<>(list, page, ((com.github.pagehelper.Page)list).getTotal())); - } - - @ApiOperation("导出订单售后列表") - @PreAuthorize("@ss.hasPermi('oms:refund:export')") - @Log(title = "订单售后", businessType = BusinessType.EXPORT) - @GetMapping("/export") - public ResponseEntity export(RefundQuery query) { - List list = service.selectList(query, null); - ExcelUtil util = new ExcelUtil<>(RefundVO.class); - return ResponseEntity.ok(util.writeExcel(convert.dos2vos(list), "订单售后数据")); - } - - @ApiOperation("获取订单售后详细信息") - @PreAuthorize("@ss.hasPermi('oms:refund:query')") - @GetMapping(value = "/{id}") - public ResponseEntity getInfo(@PathVariable("id") Long id) { - return ResponseEntity.ok(service.selectById(id)); - } - - @ApiOperation("新增订单售后") - @PreAuthorize("@ss.hasPermi('oms:refund:add')") - @Log(title = "订单售后", businessType = BusinessType.INSERT) - @PostMapping - public ResponseEntity add(@RequestBody Refund refund) { - return ResponseEntity.ok(service.insert(refund)); - } - - @ApiOperation("修改订单售后") - @PreAuthorize("@ss.hasPermi('oms:refund:edit')") - @Log(title = "订单售后", businessType = BusinessType.UPDATE) - @PutMapping - public ResponseEntity edit(@RequestBody Refund refund) { - return ResponseEntity.ok(service.update(refund)); - } - - @ApiOperation("删除订单售后") - @PreAuthorize("@ss.hasPermi('oms:refund:remove')") - @Log(title = "订单售后", businessType = BusinessType.DELETE) - @DeleteMapping("/{id}") - public ResponseEntity remove(@PathVariable Long id) { - return ResponseEntity.ok(service.deleteById(id)); - } -} diff --git a/ruoyi-mall/src/main/java/com/cyl/oms/controller/RefundItemController.java b/ruoyi-mall/src/main/java/com/cyl/oms/controller/RefundItemController.java deleted file mode 100644 index d9ceb7f..0000000 --- a/ruoyi-mall/src/main/java/com/cyl/oms/controller/RefundItemController.java +++ /dev/null @@ -1,93 +0,0 @@ -package com.cyl.oms.controller; - -import java.util.List; - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.data.domain.PageImpl; -import org.springframework.data.domain.Pageable; -import org.springframework.data.domain.Page; -import org.springframework.http.ResponseEntity; -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.enums.BusinessType; -import com.cyl.oms.convert.RefundItemConvert; -import com.cyl.oms.domain.RefundItem; -import com.cyl.oms.pojo.query.RefundItemQuery; -import com.cyl.oms.service.RefundItemService; -import com.cyl.oms.pojo.vo.RefundItemVO; -import com.ruoyi.common.utils.poi.ExcelUtil; -/** - * 订单售后Controller - * - * @author zcc - * @date 2022-12-01 - */ -@Api(description ="订单售后接口列表") -@RestController -@RequestMapping("/oms/refundItem") -public class RefundItemController extends BaseController { - @Autowired - private RefundItemService service; - @Autowired - private RefundItemConvert convert; - - @ApiOperation("查询订单售后列表") - @PreAuthorize("@ss.hasPermi('oms:refundItem:list')") - @PostMapping("/list") - public ResponseEntity> list(@RequestBody RefundItemQuery query, Pageable page) { - List list = service.selectList(query, page); - return ResponseEntity.ok(new PageImpl<>(list, page, ((com.github.pagehelper.Page)list).getTotal())); - } - - @ApiOperation("导出订单售后列表") - @PreAuthorize("@ss.hasPermi('oms:refundItem:export')") - @Log(title = "订单售后", businessType = BusinessType.EXPORT) - @GetMapping("/export") - public ResponseEntity export(RefundItemQuery query) { - List list = service.selectList(query, null); - ExcelUtil util = new ExcelUtil<>(RefundItemVO.class); - return ResponseEntity.ok(util.writeExcel(convert.dos2vos(list), "订单售后数据")); - } - - @ApiOperation("获取订单售后详细信息") - @PreAuthorize("@ss.hasPermi('oms:refundItem:query')") - @GetMapping(value = "/{id}") - public ResponseEntity getInfo(@PathVariable("id") Long id) { - return ResponseEntity.ok(service.selectById(id)); - } - - @ApiOperation("新增订单售后") - @PreAuthorize("@ss.hasPermi('oms:refundItem:add')") - @Log(title = "订单售后", businessType = BusinessType.INSERT) - @PostMapping - public ResponseEntity add(@RequestBody RefundItem refundItem) { - return ResponseEntity.ok(service.insert(refundItem)); - } - - @ApiOperation("修改订单售后") - @PreAuthorize("@ss.hasPermi('oms:refundItem:edit')") - @Log(title = "订单售后", businessType = BusinessType.UPDATE) - @PutMapping - public ResponseEntity edit(@RequestBody RefundItem refundItem) { - return ResponseEntity.ok(service.update(refundItem)); - } - - @ApiOperation("删除订单售后") - @PreAuthorize("@ss.hasPermi('oms:refundItem:remove')") - @Log(title = "订单售后", businessType = BusinessType.DELETE) - @DeleteMapping("/{id}") - public ResponseEntity remove(@PathVariable Long id) { - return ResponseEntity.ok(service.deleteById(id)); - } -} diff --git a/ruoyi-mall/src/main/java/com/cyl/oms/convert/RefundConvert.java b/ruoyi-mall/src/main/java/com/cyl/oms/convert/RefundConvert.java deleted file mode 100644 index 74a520c..0000000 --- a/ruoyi-mall/src/main/java/com/cyl/oms/convert/RefundConvert.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.cyl.oms.convert; - -import org.mapstruct.Mapper; -import com.cyl.oms.domain.Refund; -import com.cyl.oms.pojo.vo.RefundVO; -import java.util.List; -/** - * 订单售后 DO <=> DTO <=> VO / BO / Query - * - * @author zcc - */ -@Mapper(componentModel = "spring") -public interface RefundConvert { - - List dos2vos(List list); -} diff --git a/ruoyi-mall/src/main/java/com/cyl/oms/convert/RefundItemConvert.java b/ruoyi-mall/src/main/java/com/cyl/oms/convert/RefundItemConvert.java deleted file mode 100644 index 9232aee..0000000 --- a/ruoyi-mall/src/main/java/com/cyl/oms/convert/RefundItemConvert.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.cyl.oms.convert; - -import org.mapstruct.Mapper; -import com.cyl.oms.domain.RefundItem; -import com.cyl.oms.pojo.vo.RefundItemVO; -import java.util.List; -/** - * 订单售后 DO <=> DTO <=> VO / BO / Query - * - * @author zcc - */ -@Mapper(componentModel = "spring") -public interface RefundItemConvert { - - List dos2vos(List list); -} diff --git a/ruoyi-mall/src/main/java/com/cyl/oms/domain/Refund.java b/ruoyi-mall/src/main/java/com/cyl/oms/domain/Refund.java deleted file mode 100644 index 88967ca..0000000 --- a/ruoyi-mall/src/main/java/com/cyl/oms/domain/Refund.java +++ /dev/null @@ -1,73 +0,0 @@ -package com.cyl.oms.domain; - -import java.math.BigDecimal; -import java.time.LocalDateTime; -import com.ruoyi.common.annotation.Excel; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import com.ruoyi.common.core.domain.BaseAudit; -import lombok.Data; -import com.baomidou.mybatisplus.annotation.TableName; -/** - * 订单售后对象 oms_refund - * - * @author zcc - */ -@ApiModel(description="订单售后对象") -@Data -@TableName("oms_refund") -public class Refund extends BaseAudit { - private static final long serialVersionUID = 1L; - - @ApiModelProperty("ID") - private Long id; - - @ApiModelProperty("MEMBER_ID") - @Excel(name = "MEMBER_ID") - private Long memberId; - - @ApiModelProperty("订单id") - @Excel(name = "订单id") - private Long orderId; - - @ApiModelProperty("退款金额") - @Excel(name = "退款金额") - private BigDecimal returnAmount; - - @ApiModelProperty("售后类型：1：退款，2：退货退款") - @Excel(name = "售后类型：1：退款，2：退货退款") - private Integer type; - - @ApiModelProperty("申请状态：0->待处理；1->退货中；2->已完成；3->已拒绝") - @Excel(name = "申请状态：0->待处理；1->退货中；2->已完成；3->已拒绝") - private Integer status; - - @ApiModelProperty("处理时间") - @Excel(name = "处理时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") - private LocalDateTime handleTime; - - @ApiModelProperty("退货数量") - @Excel(name = "退货数量") - private Integer quantity; - - @ApiModelProperty("原因") - @Excel(name = "原因") - private String reason; - - @ApiModelProperty("描述") - @Excel(name = "描述") - private String description; - - @ApiModelProperty("凭证图片，以逗号隔开") - @Excel(name = "凭证图片，以逗号隔开") - private String proofPics; - - @ApiModelProperty("处理备注") - @Excel(name = "处理备注") - private String handleNote; - - @ApiModelProperty("处理人员") - @Excel(name = "处理人员") - private String handleMan; - -} diff --git a/ruoyi-mall/src/main/java/com/cyl/oms/domain/RefundItem.java b/ruoyi-mall/src/main/java/com/cyl/oms/domain/RefundItem.java deleted file mode 100644 index 65c6e17..0000000 --- a/ruoyi-mall/src/main/java/com/cyl/oms/domain/RefundItem.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.cyl.oms.domain; - -import java.math.BigDecimal; -import com.ruoyi.common.annotation.Excel; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import com.ruoyi.common.core.domain.BaseAudit; -import lombok.Data; -import com.baomidou.mybatisplus.annotation.TableName; -/** - * 订单售后对象 oms_refund_item - * - * @author zcc - */ -@ApiModel(description="订单售后对象") -@Data -@TableName("oms_refund_item") -public class RefundItem extends BaseAudit { - private static final long serialVersionUID = 1L; - - @ApiModelProperty("ID") - private Long id; - - @ApiModelProperty("MEMBER_ID") - @Excel(name = "MEMBER_ID") - private Long memberId; - - @ApiModelProperty("订单id") - @Excel(name = "订单id") - private Long orderId; - - @ApiModelProperty("子订单id") - @Excel(name = "子订单id") - private Long orderItemId; - - @ApiModelProperty("退款金额") - @Excel(name = "退款金额") - private BigDecimal returnAmount; - - @ApiModelProperty("退货数量") - @Excel(name = "退货数量") - private Integer quantity; - -} diff --git a/ruoyi-mall/src/main/java/com/cyl/oms/mapper/RefundItemMapper.java b/ruoyi-mall/src/main/java/com/cyl/oms/mapper/RefundItemMapper.java deleted file mode 100644 index 4571b09..0000000 --- a/ruoyi-mall/src/main/java/com/cyl/oms/mapper/RefundItemMapper.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.cyl.oms.mapper; - -import java.util.List; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Param; -import com.cyl.oms.domain.RefundItem; - -/** - * 订单售后Mapper接口 - * - * @author zcc - */ -public interface RefundItemMapper extends BaseMapper { - /** - * 查询订单售后列表 - * - * @param refundItem 订单售后 - * @return 订单售后集合 - */ - List selectByEntity(RefundItem refundItem); -} diff --git a/ruoyi-mall/src/main/java/com/cyl/oms/mapper/RefundMapper.java b/ruoyi-mall/src/main/java/com/cyl/oms/mapper/RefundMapper.java deleted file mode 100644 index 968b6a7..0000000 --- a/ruoyi-mall/src/main/java/com/cyl/oms/mapper/RefundMapper.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.cyl.oms.mapper; - -import java.util.List; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Param; -import com.cyl.oms.domain.Refund; - -/** - * 订单售后Mapper接口 - * - * @author zcc - */ -public interface RefundMapper extends BaseMapper { - /** - * 查询订单售后列表 - * - * @param refund 订单售后 - * @return 订单售后集合 - */ - List selectByEntity(Refund refund); -} diff --git a/ruoyi-mall/src/main/java/com/cyl/oms/pojo/query/RefundItemQuery.java b/ruoyi-mall/src/main/java/com/cyl/oms/pojo/query/RefundItemQuery.java deleted file mode 100644 index 7680a0f..0000000 --- a/ruoyi-mall/src/main/java/com/cyl/oms/pojo/query/RefundItemQuery.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.cyl.oms.pojo.query; - -import java.math.BigDecimal; -import lombok.Data; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; - -/** - * 订单售后 查询 对象 - * - * @author zcc - */ -@ApiModel(description="订单售后 查询 对象") -@Data -public class RefundItemQuery { - @ApiModelProperty("MEMBER_ID 精确匹配") - private Long memberId; - - @ApiModelProperty("订单id 精确匹配") - private Long orderId; - - @ApiModelProperty("子订单id 精确匹配") - private Long orderItemId; - - @ApiModelProperty("退款金额 精确匹配") - private BigDecimal returnAmount; - - @ApiModelProperty("退货数量 精确匹配") - private Integer quantity; - -} diff --git a/ruoyi-mall/src/main/java/com/cyl/oms/pojo/query/RefundQuery.java b/ruoyi-mall/src/main/java/com/cyl/oms/pojo/query/RefundQuery.java deleted file mode 100644 index 17356b3..0000000 --- a/ruoyi-mall/src/main/java/com/cyl/oms/pojo/query/RefundQuery.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.cyl.oms.pojo.query; - -import java.math.BigDecimal; -import java.time.LocalDateTime; -import lombok.Data; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; - -/** - * 订单售后 查询 对象 - * - * @author zcc - */ -@ApiModel(description="订单售后 查询 对象") -@Data -public class RefundQuery { - @ApiModelProperty("MEMBER_ID 精确匹配") - private Long memberId; - - @ApiModelProperty("订单id 精确匹配") - private Long orderId; - - @ApiModelProperty("退款金额 精确匹配") - private BigDecimal returnAmount; - - @ApiModelProperty("售后类型：1：退款，2：退货退款 精确匹配") - private Integer type; - - @ApiModelProperty("申请状态：0->待处理；1->退货中；2->已完成；3->已拒绝 精确匹配") - private Integer status; - - @ApiModelProperty("处理时间 精确匹配") - private LocalDateTime handleTime; - - @ApiModelProperty("退货数量 精确匹配") - private Integer quantity; - - @ApiModelProperty("原因 精确匹配") - private String reason; - - @ApiModelProperty("描述 精确匹配") - private String description; - - @ApiModelProperty("凭证图片，以逗号隔开 精确匹配") - private String proofPics; - - @ApiModelProperty("处理备注 精确匹配") - private String handleNote; - - @ApiModelProperty("处理人员 精确匹配") - private String handleMan; - -} diff --git a/ruoyi-mall/src/main/java/com/cyl/oms/pojo/vo/RefundItemVO.java b/ruoyi-mall/src/main/java/com/cyl/oms/pojo/vo/RefundItemVO.java deleted file mode 100644 index 29f8ad0..0000000 --- a/ruoyi-mall/src/main/java/com/cyl/oms/pojo/vo/RefundItemVO.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.cyl.oms.pojo.vo; - -import java.math.BigDecimal; -import com.ruoyi.common.annotation.Excel; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.core.domain.BaseAudit; -import lombok.Data; -/** - * 订单售后 数据视图对象 - * - * @author zcc - */ -@Data -public class RefundItemVO extends BaseAudit { - /** ID */ - private Long id; - /** MEMBER_ID */ - @Excel(name = "MEMBER_ID") - private Long memberId; - /** 订单id */ - @Excel(name = "订单id") - private Long orderId; - /** 子订单id */ - @Excel(name = "子订单id") - private Long orderItemId; - /** 退款金额 */ - @Excel(name = "退款金额") - private BigDecimal returnAmount; - /** 退货数量 */ - @Excel(name = "退货数量") - private Integer quantity; -} diff --git a/ruoyi-mall/src/main/java/com/cyl/oms/pojo/vo/RefundVO.java b/ruoyi-mall/src/main/java/com/cyl/oms/pojo/vo/RefundVO.java deleted file mode 100644 index 9dffce7..0000000 --- a/ruoyi-mall/src/main/java/com/cyl/oms/pojo/vo/RefundVO.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.cyl.oms.pojo.vo; - -import java.math.BigDecimal; -import java.time.LocalDateTime; -import com.ruoyi.common.annotation.Excel; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.core.domain.BaseAudit; -import lombok.Data; -/** - * 订单售后 数据视图对象 - * - * @author zcc - */ -@Data -public class RefundVO extends BaseAudit { - /** ID */ - private Long id; - /** MEMBER_ID */ - @Excel(name = "MEMBER_ID") - private Long memberId; - /** 订单id */ - @Excel(name = "订单id") - private Long orderId; - /** 退款金额 */ - @Excel(name = "退款金额") - private BigDecimal returnAmount; - /** 售后类型：1：退款，2：退货退款 */ - @Excel(name = "售后类型：1：退款，2：退货退款") - private Integer type; - /** 申请状态：0->待处理；1->退货中；2->已完成；3->已拒绝 */ - @Excel(name = "申请状态：0->待处理；1->退货中；2->已完成；3->已拒绝") - private Integer status; - /** 处理时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @Excel(name = "处理时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") - private LocalDateTime handleTime; - /** 退货数量 */ - @Excel(name = "退货数量") - private Integer quantity; - /** 原因 */ - @Excel(name = "原因") - private String reason; - /** 描述 */ - @Excel(name = "描述") - private String description; - /** 凭证图片，以逗号隔开 */ - @Excel(name = "凭证图片，以逗号隔开") - private String proofPics; - /** 处理备注 */ - @Excel(name = "处理备注") - private String handleNote; - /** 处理人员 */ - @Excel(name = "处理人员") - private String handleMan; -} diff --git a/ruoyi-mall/src/main/java/com/cyl/oms/service/RefundItemService.java b/ruoyi-mall/src/main/java/com/cyl/oms/service/RefundItemService.java deleted file mode 100644 index 3510e5e..0000000 --- a/ruoyi-mall/src/main/java/com/cyl/oms/service/RefundItemService.java +++ /dev/null @@ -1,103 +0,0 @@ -package com.cyl.oms.service; - -import java.math.BigDecimal; -import java.util.Arrays; -import java.util.List; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.github.pagehelper.PageHelper; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.domain.Pageable; -import org.apache.commons.lang3.StringUtils; -import org.springframework.stereotype.Service; -import com.cyl.oms.mapper.RefundItemMapper; -import com.cyl.oms.domain.RefundItem; -import com.cyl.oms.pojo.query.RefundItemQuery; - -/** - * 订单售后Service业务层处理 - * - * - * @author zcc - */ -@Service -public class RefundItemService { - @Autowired - private RefundItemMapper refundItemMapper; - - /** - * 查询订单售后 - * - * @param id 订单售后主键 - * @return 订单售后 - */ - public RefundItem selectById(Long id) { - return refundItemMapper.selectById(id); - } - - /** - * 查询订单售后列表 - * - * @param query 查询条件 - * @param page 分页条件 - * @return 订单售后 - */ - public List selectList(RefundItemQuery query, Pageable page) { - if (page != null) { - PageHelper.startPage(page.getPageNumber() + 1, page.getPageSize()); - } - QueryWrapper qw = new QueryWrapper<>(); - Long memberId = query.getMemberId(); - if (memberId != null) { - qw.eq("member_id", memberId); - } - Long orderId = query.getOrderId(); - if (orderId != null) { - qw.eq("order_id", orderId); - } - Long orderItemId = query.getOrderItemId(); - if (orderItemId != null) { - qw.eq("order_item_id", orderItemId); - } - BigDecimal returnAmount = query.getReturnAmount(); - if (returnAmount != null) { - qw.eq("return_amount", returnAmount); - } - Integer quantity = query.getQuantity(); - if (quantity != null) { - qw.eq("quantity", quantity); - } - return refundItemMapper.selectList(qw); - } - - /** - * 新增订单售后 - * - * @param refundItem 订单售后 - * @return 结果 - */ - public int insert(RefundItem refundItem) { - refundItem.setCreateTime(LocalDateTime.now()); - return refundItemMapper.insert(refundItem); - } - - /** - * 修改订单售后 - * - * @param refundItem 订单售后 - * @return 结果 - */ - public int update(RefundItem refundItem) { - return refundItemMapper.updateById(refundItem); - } - - /** - * 删除订单售后信息 - * - * @param id 订单售后主键 - * @return 结果 - */ - public int deleteById(Long id) { - return refundItemMapper.deleteById(id); - } -} diff --git a/ruoyi-mall/src/main/java/com/cyl/oms/service/RefundService.java b/ruoyi-mall/src/main/java/com/cyl/oms/service/RefundService.java deleted file mode 100644 index ab9c8ee..0000000 --- a/ruoyi-mall/src/main/java/com/cyl/oms/service/RefundService.java +++ /dev/null @@ -1,132 +0,0 @@ -package com.cyl.oms.service; - -import java.math.BigDecimal; -import java.time.LocalDateTime; -import java.util.Arrays; -import java.util.List; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.github.pagehelper.PageHelper; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.domain.Pageable; -import org.apache.commons.lang3.StringUtils; -import org.springframework.stereotype.Service; -import com.cyl.oms.mapper.RefundMapper; -import com.cyl.oms.domain.Refund; -import com.cyl.oms.pojo.query.RefundQuery; - -/** - * 订单售后Service业务层处理 - * - * - * @author zcc - */ -@Service -public class RefundService { - @Autowired - private RefundMapper refundMapper; - - /** - * 查询订单售后 - * - * @param id 订单售后主键 - * @return 订单售后 - */ - public Refund selectById(Long id) { - return refundMapper.selectById(id); - } - - /** - * 查询订单售后列表 - * - * @param query 查询条件 - * @param page 分页条件 - * @return 订单售后 - */ - public List selectList(RefundQuery query, Pageable page) { - if (page != null) { - PageHelper.startPage(page.getPageNumber() + 1, page.getPageSize()); - } - QueryWrapper qw = new QueryWrapper<>(); - Long memberId = query.getMemberId(); - if (memberId != null) { - qw.eq("member_id", memberId); - } - Long orderId = query.getOrderId(); - if (orderId != null) { - qw.eq("order_id", orderId); - } - BigDecimal returnAmount = query.getReturnAmount(); - if (returnAmount != null) { - qw.eq("return_amount", returnAmount); - } - Integer type = query.getType(); - if (type != null) { - qw.eq("type", type); - } - Integer status = query.getStatus(); - if (status != null) { - qw.eq("status", status); - } - LocalDateTime handleTime = query.getHandleTime(); - if (handleTime != null) { - qw.eq("handle_time", handleTime); - } - Integer quantity = query.getQuantity(); - if (quantity != null) { - qw.eq("quantity", quantity); - } - String reason = query.getReason(); - if (!StringUtils.isEmpty(reason)) { - qw.eq("reason", reason); - } - String description = query.getDescription(); - if (!StringUtils.isEmpty(description)) { - qw.eq("description", description); - } - String proofPics = query.getProofPics(); - if (!StringUtils.isEmpty(proofPics)) { - qw.eq("proof_pics", proofPics); - } - String handleNote = query.getHandleNote(); - if (!StringUtils.isEmpty(handleNote)) { - qw.eq("handle_note", handleNote); - } - String handleMan = query.getHandleMan(); - if (!StringUtils.isEmpty(handleMan)) { - qw.eq("handle_man", handleMan); - } - return refundMapper.selectList(qw); - } - - /** - * 新增订单售后 - * - * @param refund 订单售后 - * @return 结果 - */ - public int insert(Refund refund) { - refund.setCreateTime(LocalDateTime.now()); - return refundMapper.insert(refund); - } - - /** - * 修改订单售后 - * - * @param refund 订单售后 - * @return 结果 - */ - public int update(Refund refund) { - return refundMapper.updateById(refund); - } - - /** - * 删除订单售后信息 - * - * @param id 订单售后主键 - * @return 结果 - */ - public int deleteById(Long id) { - return refundMapper.deleteById(id); - } -} diff --git a/ruoyi-mall/src/main/resources/mapper/oms/RefundItemMapper.xml b/ruoyi-mall/src/main/resources/mapper/oms/RefundItemMapper.xml deleted file mode 100644 index e483da9..0000000 --- a/ruoyi-mall/src/main/resources/mapper/oms/RefundItemMapper.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - select id, member_id, order_id, order_item_id, return_amount, quantity, create_by, create_time, update_by, update_time from oms_refund_item - - - - diff --git a/ruoyi-mall/src/main/resources/mapper/oms/RefundMapper.xml b/ruoyi-mall/src/main/resources/mapper/oms/RefundMapper.xml deleted file mode 100644 index d5c6b31..0000000 --- a/ruoyi-mall/src/main/resources/mapper/oms/RefundMapper.xml +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - select id, member_id, order_id, return_amount, type, status, handle_time, quantity, reason, description, proof_pics, handle_note, handle_man, create_by, create_time, update_by, update_time from oms_refund - - - - diff --git a/sql/oms/refund.sql b/sql/oms/refund.sql deleted file mode 100644 index 1399607..0000000 --- a/sql/oms/refund.sql +++ /dev/null @@ -1,22 +0,0 @@ --- 菜单 SQL -insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark) -values('订单售后', '3', '1', 'refund', 'oms/refund/index', 1, 0, 'C', '0', '0', 'oms:refund:list', '#', 1, sysdate(), '', null, '订单售后菜单'); - --- 按钮父菜单ID -SELECT @parentId := LAST_INSERT_ID(); - --- 按钮 SQL -insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark) -values('订单售后查询', @parentId, '1', '#', '', 1, 0, 'F', '0', '0', 'oms:refund:query', '#', 1, sysdate(), '', null, ''); - -insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark) -values('订单售后新增', @parentId, '2', '#', '', 1, 0, 'F', '0', '0', 'oms:refund:add', '#', 1, sysdate(), '', null, ''); - -insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark) -values('订单售后修改', @parentId, '3', '#', '', 1, 0, 'F', '0', '0', 'oms:refund:edit', '#', 1, sysdate(), '', null, ''); - -insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark) -values('订单售后删除', @parentId, '4', '#', '', 1, 0, 'F', '0', '0', 'oms:refund:remove', '#', 1, sysdate(), '', null, ''); - -insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark) -values('订单售后导出', @parentId, '5', '#', '', 1, 0, 'F', '0', '0', 'oms:refund:export', '#', 1, sysdate(), '', null, ''); diff --git a/sql/oms/refundItem.sql b/sql/oms/refundItem.sql deleted file mode 100644 index 0bf4858..0000000 --- a/sql/oms/refundItem.sql +++ /dev/null @@ -1,22 +0,0 @@ --- 菜单 SQL -insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark) -values('订单售后', '3', '1', 'refundItem', 'oms/refundItem/index', 1, 0, 'C', '0', '0', 'oms:refundItem:list', '#', 1, sysdate(), '', null, '订单售后菜单'); - --- 按钮父菜单ID -SELECT @parentId := LAST_INSERT_ID(); - --- 按钮 SQL -insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark) -values('订单售后查询', @parentId, '1', '#', '', 1, 0, 'F', '0', '0', 'oms:refundItem:query', '#', 1, sysdate(), '', null, ''); - -insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark) -values('订单售后新增', @parentId, '2', '#', '', 1, 0, 'F', '0', '0', 'oms:refundItem:add', '#', 1, sysdate(), '', null, ''); - -insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark) -values('订单售后修改', @parentId, '3', '#', '', 1, 0, 'F', '0', '0', 'oms:refundItem:edit', '#', 1, sysdate(), '', null, ''); - -insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark) -values('订单售后删除', @parentId, '4', '#', '', 1, 0, 'F', '0', '0', 'oms:refundItem:remove', '#', 1, sysdate(), '', null, ''); - -insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark) -values('订单售后导出', @parentId, '5', '#', '', 1, 0, 'F', '0', '0', 'oms:refundItem:export', '#', 1, sysdate(), '', null, '');