abu/wzj-boot
3
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改订单字段备注

Browse Source
This commit is contained in:
fengxiaohang 2025-06-16 10:00:17 +08:00
parent c0484c2c71
commit 2f54aee220
57 changed files with 951 additions and 792 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/controller/AftersaleController.java
View File

@ -26,6 +26,7 @@ import com.wzj.soopin.order.service.impl.AftersaleServiceImpl;
import com.wzj.soopin.order.utils.SecurityUtils; import com.wzj.soopin.order.utils.SecurityUtils;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.dromara.common.core.domain.R; import org.dromara.common.core.domain.R;
import org.dromara.common.core.domain.model.LoginUser; import org.dromara.common.core.domain.model.LoginUser;
@ -46,7 +47,7 @@ import java.util.List;
* @author zcc * @author zcc
* @date 2022-12-29 * @date 2022-12-29
*/ */
@Api(description ="订单售后接口列表") @Tag(name ="订单售后接口列表")
@RestController @RestController
@RequestMapping("/oms/aftersale") @RequestMapping("/oms/aftersale")
@Slf4j @Slf4j
@ -61,7 +62,7 @@ public class AftersaleController extends BaseController {
private AftersaleService aftersaleService; private AftersaleService aftersaleService;
@ApiOperation("查询订单售后列表") @Tag(name ="查询订单售后列表")
@PostMapping("/list") @PostMapping("/list")
public R<Page<AftersaleVO>> list(@RequestBody AftersaleBo query, Page<Aftersale> page) { public R<Page<AftersaleVO>> list(@RequestBody AftersaleBo query, Page<Aftersale> page) {
Page<Aftersale> list = aftersaleService.page(page,query.toWrapper() ); Page<Aftersale> list = aftersaleService.page(page,query.toWrapper() );
@ -69,7 +70,7 @@ public class AftersaleController extends BaseController {
} }
@ApiOperation("导出订单售后列表") @Tag(name ="导出订单售后列表")
@Log(title = "订单售后", businessType = BusinessType.EXPORT) @Log(title = "订单售后", businessType = BusinessType.EXPORT)
@GetMapping("export") @GetMapping("export")
public ResponseEntity<String> export(AftersaleBo query) { public ResponseEntity<String> export(AftersaleBo query) {
@ -78,34 +79,34 @@ public class AftersaleController extends BaseController {
return ResponseEntity.ok(util.writeExcel(convert.toVO(list), "订单售后数据")); return ResponseEntity.ok(util.writeExcel(convert.toVO(list), "订单售后数据"));
} }
@ApiOperation("获取订单售后详细信息") @Tag(name ="获取订单售后详细信息")
@GetMapping(value = "/{id}") @GetMapping(value = "/{id}")
public ResponseEntity<ManagerRefundOrderDetailVO> getInfo(@PathVariable("id") Long orderId) { public ResponseEntity<ManagerRefundOrderDetailVO> getInfo(@PathVariable("id") Long orderId) {
return ResponseEntity.ok(service.selectById(orderId)); return ResponseEntity.ok(service.selectById(orderId));
} }
@ApiOperation("新增订单售后") @Tag(name ="新增订单售后")
@Log(title = "订单售后", businessType = BusinessType.INSERT) @Log(title = "订单售后", businessType = BusinessType.INSERT)
@PostMapping("/add") @PostMapping("/add")
public R add(@RequestBody AftersaleBo query) { public R add(@RequestBody AftersaleBo query) {
return R.ok(service.save(convert.toPo(query))); return R.ok(service.save(convert.toPo(query)));
} }
@ApiOperation("修改订单售后") @Tag(name ="修改订单售后")
@Log(title = "订单售后", businessType = BusinessType.UPDATE) @Log(title = "订单售后", businessType = BusinessType.UPDATE)
@PostMapping("/update") @PostMapping("/update")
public R edit(@RequestBody Aftersale aftersale) { public R edit(@RequestBody Aftersale aftersale) {
return R.ok(service.updateById(aftersale)); return R.ok(service.updateById(aftersale));
} }
@ApiOperation("删除订单售后") @Tag(name ="删除订单售后")
@Log(title = "订单售后", businessType = BusinessType.DELETE) @Log(title = "订单售后", businessType = BusinessType.DELETE)
@DeleteMapping("/{id}") @DeleteMapping("/{id}")
public ResponseEntity<Integer> remove(@PathVariable Long id) { public ResponseEntity<Integer> remove(@PathVariable Long id) {
return ResponseEntity.ok(service.deleteById(id)); return ResponseEntity.ok(service.deleteById(id));
} }
@ApiOperation("售后订单操作") @Tag(name ="售后订单操作")
@PostMapping("/dealWith") @PostMapping("/dealWith")
public ResponseEntity<Boolean> updateStatus(@RequestBody DealWithAftersaleForm request){ public ResponseEntity<Boolean> updateStatus(@RequestBody DealWithAftersaleForm request){
LoginUser user = SecurityUtils.getLoginUser(); LoginUser user = SecurityUtils.getLoginUser();
@ -127,7 +128,7 @@ public class AftersaleController extends BaseController {
} }
} }
@ApiOperation("查看日志") @Tag(name ="查看日志")
@GetMapping("/log/{orderId}") @GetMapping("/log/{orderId}")
public R log(@PathVariable Long orderId){ public R log(@PathVariable Long orderId){
return R.ok(service.log(orderId)); return R.ok(service.log(orderId));

15
ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/controller/AftersaleItemController.java
View File

@ -21,6 +21,7 @@ import com.wzj.soopin.order.service.AftersaleItemService;
import com.wzj.soopin.order.service.impl.AftersaleItemServiceImpl; import com.wzj.soopin.order.service.impl.AftersaleItemServiceImpl;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.dromara.common.core.domain.R; import org.dromara.common.core.domain.R;
import org.dromara.common.excel.utils.ExcelUtil; import org.dromara.common.excel.utils.ExcelUtil;
import org.dromara.common.log.annotation.Log; import org.dromara.common.log.annotation.Log;
@ -37,7 +38,7 @@ import java.util.List;
* @author zcc * @author zcc
* @date 2022-12-29 * @date 2022-12-29
*/ */
@Api(description ="订单售后接口列表") @Tag(name ="订单售后接口列表")
@RestController @RestController
@RequestMapping("/oms/aftersaleItem") @RequestMapping("/oms/aftersaleItem")
public class AftersaleItemController extends BaseController { public class AftersaleItemController extends BaseController {
@ -55,7 +56,7 @@ public class AftersaleItemController extends BaseController {
// return ResponseEntity.ok(new PageImpl<>(list, page, ((com.github.pagehelper.Page)list).getTotal())); // return ResponseEntity.ok(new PageImpl<>(list, page, ((com.github.pagehelper.Page)list).getTotal()));
// } // }
@ApiOperation("查询订单售后列表") @Tag(name ="查询订单售后列表")
@PostMapping("/list") @PostMapping("/list")
public R<Page<AftersaleItemVO>> list(@RequestBody AftersaleItemBo query, Page<AftersaleItem> page) { public R<Page<AftersaleItemVO>> list(@RequestBody AftersaleItemBo query, Page<AftersaleItem> page) {
Page<AftersaleItem> list = aftersaleItemService.page(page,query.toWrapper() ); Page<AftersaleItem> list = aftersaleItemService.page(page,query.toWrapper() );
@ -64,7 +65,7 @@ public class AftersaleItemController extends BaseController {
@ApiOperation("导出订单售后列表") @Tag(name ="导出订单售后列表")
@Log(title = "订单售后", businessType = BusinessType.EXPORT) @Log(title = "订单售后", businessType = BusinessType.EXPORT)
@GetMapping("export") @GetMapping("export")
public ResponseEntity<String> export(AftersaleItemBo query) { public ResponseEntity<String> export(AftersaleItemBo query) {
@ -73,13 +74,13 @@ public class AftersaleItemController extends BaseController {
return ResponseEntity.ok(util.writeExcel(convert.toVO(list), "订单售后数据")); return ResponseEntity.ok(util.writeExcel(convert.toVO(list), "订单售后数据"));
} }
@ApiOperation("获取订单售后详细信息") @Tag(name ="获取订单售后详细信息")
@GetMapping(value = "/{id}") @GetMapping(value = "/{id}")
public ResponseEntity<AftersaleItem> getInfo(@PathVariable("id") Long id) { public ResponseEntity<AftersaleItem> getInfo(@PathVariable("id") Long id) {
return ResponseEntity.ok(service.getById(id)); return ResponseEntity.ok(service.getById(id));
} }
@ApiOperation("新增订单售后") @Tag(name ="新增订单售后")
@Log(title = "订单售后", businessType = BusinessType.INSERT) @Log(title = "订单售后", businessType = BusinessType.INSERT)
@PostMapping("/add") @PostMapping("/add")
public R add(@RequestBody AftersaleItemBo aftersaleItem) { public R add(@RequestBody AftersaleItemBo aftersaleItem) {
@ -87,7 +88,7 @@ public class AftersaleItemController extends BaseController {
} }
@ApiOperation("修改订单售后") @Tag(name ="修改订单售后")
@Log(title = "订单售后", businessType = BusinessType.UPDATE) @Log(title = "订单售后", businessType = BusinessType.UPDATE)
@PostMapping("/update") @PostMapping("/update")
public R edit(@RequestBody AftersaleItem aftersaleItem) { public R edit(@RequestBody AftersaleItem aftersaleItem) {
@ -95,7 +96,7 @@ public class AftersaleItemController extends BaseController {
} }
@ApiOperation("删除订单售后") @Tag(name ="删除订单售后")
@Log(title = "订单售后", businessType = BusinessType.DELETE) @Log(title = "订单售后", businessType = BusinessType.DELETE)
@DeleteMapping("/{id}") @DeleteMapping("/{id}")
public R remove(@PathVariable Long id) { public R remove(@PathVariable Long id) {

32
ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/controller/OrderController.java
View File

@ -3,22 +3,16 @@ package com.wzj.soopin.order.controller;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.wzj.soopin.order.convert.OrderConvert; import com.wzj.soopin.order.convert.OrderConvert;
import com.wzj.soopin.order.domain.bo.AftersaleBo;
import com.wzj.soopin.order.domain.bo.AftersaleItemBo;
import com.wzj.soopin.order.domain.bo.OrderBo; import com.wzj.soopin.order.domain.bo.OrderBo;
import com.wzj.soopin.order.domain.entity.AftersaleItem;
import com.wzj.soopin.order.domain.entity.Order; import com.wzj.soopin.order.domain.entity.Order;
import com.wzj.soopin.order.domain.form.DeliverProductForm; import com.wzj.soopin.order.domain.form.DeliverProductForm;
import com.wzj.soopin.order.domain.form.ManagerAftersaleOrderForm;
import com.wzj.soopin.order.domain.form.ManagerOrderQueryForm;
import com.wzj.soopin.order.domain.query.AftersaleItemQuery;
import com.wzj.soopin.order.domain.query.OrderQuery;
import com.wzj.soopin.order.domain.vo.*; import com.wzj.soopin.order.domain.vo.*;
import com.wzj.soopin.order.service.OrderService; import com.wzj.soopin.order.service.OrderService;
import com.wzj.soopin.order.service.impl.OrderServiceImpl; import com.wzj.soopin.order.service.impl.OrderServiceImpl;
import com.wzj.soopin.order.utils.SecurityUtils; import com.wzj.soopin.order.utils.SecurityUtils;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.dromara.common.core.domain.R; import org.dromara.common.core.domain.R;
import org.dromara.common.excel.utils.ExcelUtil; import org.dromara.common.excel.utils.ExcelUtil;
@ -40,7 +34,7 @@ import java.util.List;
* @author zcc * @author zcc
* @date 2022-12-01 * @date 2022-12-01
*/ */
@Api(description ="订单表接口列表") @Tag(name ="订单表接口列表")
@RestController @RestController
@RequestMapping("/oms/order") @RequestMapping("/oms/order")
@Slf4j @Slf4j
@ -64,7 +58,7 @@ public class OrderController extends BaseController {
// return R.ok(convert.toVO(list)); // return R.ok(convert.toVO(list));
// } // }
@ApiOperation("查询订单列表") @Tag(name ="查询订单列表")
@PostMapping("/list") @PostMapping("/list")
public R<IPage<OrderVO>> list1(@RequestBody OrderBo query, Page<Order> page){ public R<IPage<OrderVO>> list1(@RequestBody OrderBo query, Page<Order> page){
return R.ok(orderService.getlist(page,query)); return R.ok(orderService.getlist(page,query));
@ -79,13 +73,13 @@ public class OrderController extends BaseController {
@ApiOperation("修改收件人信息") @Tag(name ="修改收件人信息")
@PostMapping("/receiver/update") @PostMapping("/receiver/update")
public R updateReceiver(@RequestBody Order order) { public R updateReceiver(@RequestBody Order order) {
return R.ok(service.updateById(order)); return R.ok(service.updateById(order));
} }
@ApiOperation("导出订单表列表") @Tag(name ="导出订单表列表")
@Log(title = "订单售后", businessType = BusinessType.EXPORT) @Log(title = "订单售后", businessType = BusinessType.EXPORT)
@PostMapping("export") @PostMapping("export")
public ResponseEntity<String> export(OrderBo query) { public ResponseEntity<String> export(OrderBo query) {
@ -95,41 +89,41 @@ public class OrderController extends BaseController {
} }
@ApiOperation("获取订单表详细信息") @Tag(name ="获取订单表详细信息")
@GetMapping(value = "/{id}") @GetMapping(value = "/{id}")
public R<ManagerOrderDetailVO> getInfo(@PathVariable("id") Long id) { public R<ManagerOrderDetailVO> getInfo(@PathVariable("id") Long id) {
return R.ok(service.selectById(id)); return R.ok(service.selectById(id));
} }
@ApiOperation("新增订单表") @Tag(name ="新增订单表")
@Log(title = "订单表", businessType = BusinessType.INSERT) @Log(title = "订单表", businessType = BusinessType.INSERT)
@PostMapping("/add") @PostMapping("/add")
public R add(@RequestBody Order order) { public R add(@RequestBody Order order) {
return R.ok(service.save(order)); return R.ok(service.save(order));
} }
@ApiOperation("修改订单表") @Tag(name ="修改订单表")
@Log(title = "订单表", businessType = BusinessType.UPDATE) @Log(title = "订单表", businessType = BusinessType.UPDATE)
@PostMapping("/update") @PostMapping("/update")
public R edit(@RequestBody Order order) { public R edit(@RequestBody Order order) {
return R.ok(service.updateById(order)); return R.ok(service.updateById(order));
} }
@ApiOperation("删除订单表") @Tag(name ="删除订单表")
@Log(title = "订单表", businessType = BusinessType.DELETE) @Log(title = "订单表", businessType = BusinessType.DELETE)
@DeleteMapping("/{id}") @DeleteMapping("/{id}")
public R remove(@PathVariable Long id) { public R remove(@PathVariable Long id) {
return R.ok(service.removeById(id)); return R.ok(service.removeById(id));
} }
@ApiOperation("添加备注") @Tag(name ="添加备注")
@Log(title = "订单表", businessType = BusinessType.UPDATE) @Log(title = "订单表", businessType = BusinessType.UPDATE)
@PostMapping("/merchantNote/add") @PostMapping("/merchantNote/add")
public R<Order> saveMerchantNote(@RequestBody Order order){ public R<Order> saveMerchantNote(@RequestBody Order order){
return service.saveMerchantNote(order); return service.saveMerchantNote(order);
} }
@ApiOperation("管理后台订单发货") @Tag(name ="管理后台订单发货")
@PostMapping("/deliverProduct") @PostMapping("/deliverProduct")
public ResponseEntity<String> delivery(@RequestBody DeliverProductForm request){ public ResponseEntity<String> delivery(@RequestBody DeliverProductForm request){
Long userId = SecurityUtils.getUserId(); Long userId = SecurityUtils.getUserId();
@ -150,13 +144,13 @@ public class OrderController extends BaseController {
} }
} }
@ApiOperation("订单日志") @Tag(name ="订单日志")
@GetMapping("/log/{orderId}") @GetMapping("/log/{orderId}")
public R log(@PathVariable Long orderId){ public R log(@PathVariable Long orderId){
return R.ok(service.log(orderId)); return R.ok(service.log(orderId));
} }
@ApiOperation("订单解密") @Tag(name ="订单解密")
@GetMapping("/decryptPhone/{orderId}") @GetMapping("/decryptPhone/{orderId}")
public R decryptPhone(@PathVariable Long orderId){ public R decryptPhone(@PathVariable Long orderId){
return service.decryptPhone(orderId); return service.decryptPhone(orderId);

15
ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/controller/OrderDeliveryHistoryController.java
View File

@ -18,6 +18,7 @@ import com.wzj.soopin.order.service.OrderDeliveryHistoryService;
import com.wzj.soopin.order.service.impl.OrderDeliveryHistoryServiceImpl; import com.wzj.soopin.order.service.impl.OrderDeliveryHistoryServiceImpl;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.dromara.common.core.domain.R; import org.dromara.common.core.domain.R;
import org.dromara.common.excel.utils.ExcelUtil; import org.dromara.common.excel.utils.ExcelUtil;
import org.dromara.common.log.annotation.Log; import org.dromara.common.log.annotation.Log;
@ -34,7 +35,7 @@ import java.util.List;
* @author zcc * @author zcc
* @date 2022-12-01 * @date 2022-12-01
*/ */
@Api(description ="订单发货记录接口列表") @Tag(name ="订单发货记录接口列表")
@RestController @RestController
@RequestMapping("/oms/orderDeliveryHistory") @RequestMapping("/oms/orderDeliveryHistory")
public class OrderDeliveryHistoryController extends BaseController { public class OrderDeliveryHistoryController extends BaseController {
@ -52,7 +53,7 @@ public class OrderDeliveryHistoryController extends BaseController {
// return ResponseEntity.ok(new PageImpl<>(list, page, ((com.github.pagehelper.Page)list).getTotal())); // return ResponseEntity.ok(new PageImpl<>(list, page, ((com.github.pagehelper.Page)list).getTotal()));
// } // }
@ApiOperation("查询订单发货列表") @Tag(name ="查询订单发货列表")
@PostMapping("/list") @PostMapping("/list")
public R<IPage<OrderDeliveryHistoryVO>> list(@RequestBody OrderDeliveryHistoryBo query, Page<OrderDeliveryHistory> page) { public R<IPage<OrderDeliveryHistoryVO>> list(@RequestBody OrderDeliveryHistoryBo query, Page<OrderDeliveryHistory> page) {
Page<OrderDeliveryHistory> list = historyService.page(page,query.toWrapper() ); Page<OrderDeliveryHistory> list = historyService.page(page,query.toWrapper() );
@ -60,7 +61,7 @@ public class OrderDeliveryHistoryController extends BaseController {
} }
@ApiOperation("导出订单发货记录列表") @Tag(name ="导出订单发货记录列表")
@Log(title = "订单发货记录", businessType = BusinessType.EXPORT) @Log(title = "订单发货记录", businessType = BusinessType.EXPORT)
@GetMapping("export") @GetMapping("export")
public ResponseEntity<String> export(OrderDeliveryHistoryBo query) { public ResponseEntity<String> export(OrderDeliveryHistoryBo query) {
@ -70,28 +71,28 @@ public class OrderDeliveryHistoryController extends BaseController {
} }
@ApiOperation("获取订单发货记录详细信息") @Tag(name ="获取订单发货记录详细信息")
@GetMapping(value = "/{id}") @GetMapping(value = "/{id}")
public R<OrderDeliveryHistory> getInfo(@PathVariable("id") Long id) { public R<OrderDeliveryHistory> getInfo(@PathVariable("id") Long id) {
return R.ok(service.getById(id)); return R.ok(service.getById(id));
} }
@ApiOperation("新增订单发货记录") @Tag(name ="新增订单发货记录")
@Log(title = "订单发货记录", businessType = BusinessType.INSERT) @Log(title = "订单发货记录", businessType = BusinessType.INSERT)
@PostMapping("/add") @PostMapping("/add")
public R add(@RequestBody OrderDeliveryHistory orderDeliveryHistory) { public R add(@RequestBody OrderDeliveryHistory orderDeliveryHistory) {
return R.ok(service.save(orderDeliveryHistory)); return R.ok(service.save(orderDeliveryHistory));
} }
@ApiOperation("修改订单发货记录") @Tag(name ="修改订单发货记录")
@Log(title = "订单发货记录", businessType = BusinessType.UPDATE) @Log(title = "订单发货记录", businessType = BusinessType.UPDATE)
@PostMapping("/update") @PostMapping("/update")
public R edit(@RequestBody OrderDeliveryHistory orderDeliveryHistory) { public R edit(@RequestBody OrderDeliveryHistory orderDeliveryHistory) {
return R.ok(service.updateById(orderDeliveryHistory)); return R.ok(service.updateById(orderDeliveryHistory));
} }
@ApiOperation("删除订单发货记录") @Tag(name ="删除订单发货记录")
@Log(title = "订单发货记录", businessType = BusinessType.DELETE) @Log(title = "订单发货记录", businessType = BusinessType.DELETE)
@DeleteMapping("/{id}") @DeleteMapping("/{id}")
public R remove(@PathVariable Long id) { public R remove(@PathVariable Long id) {

15
ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/controller/OrderItemController.java
View File

@ -24,6 +24,7 @@ import com.wzj.soopin.order.service.OrderItemService;
import com.wzj.soopin.order.service.impl.OrderItemServiceImpl; import com.wzj.soopin.order.service.impl.OrderItemServiceImpl;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.dromara.common.core.domain.R; import org.dromara.common.core.domain.R;
import org.dromara.common.excel.utils.ExcelUtil; import org.dromara.common.excel.utils.ExcelUtil;
import org.dromara.common.log.annotation.Log; import org.dromara.common.log.annotation.Log;
@ -40,7 +41,7 @@ import java.util.List;
* @author zcc * @author zcc
* @date 2022-12-01 * @date 2022-12-01
*/ */
@Api(description ="订单中所包含的商品接口列表") @Tag(name ="订单中所包含的商品接口列表")
@RestController @RestController
@RequestMapping("/oms/orderItem") @RequestMapping("/oms/orderItem")
public class OrderItemController extends BaseController { public class OrderItemController extends BaseController {
@ -58,7 +59,7 @@ public class OrderItemController extends BaseController {
// return ResponseEntity.ok(new PageImpl<>(list, page, ((com.github.pagehelper.Page)list).getTotal())); // return ResponseEntity.ok(new PageImpl<>(list, page, ((com.github.pagehelper.Page)list).getTotal()));
// } // }
@ApiOperation("查询订单中所包含的商品列表") @Tag(name = "查询订单中所包含的商品列表")
@PostMapping("/list") @PostMapping("/list")
public R<IPage<OrderItemVO>> list(@RequestBody OrderItemBo query, Page<OrderItem> page) { public R<IPage<OrderItemVO>> list(@RequestBody OrderItemBo query, Page<OrderItem> page) {
Page<OrderItem> list = orderItemService.page(page,query.toWrapper() ); Page<OrderItem> list = orderItemService.page(page,query.toWrapper() );
@ -66,7 +67,7 @@ public class OrderItemController extends BaseController {
} }
@ApiOperation("导出会员信息列表") @Tag(name = "导出会员信息列表")
@Log(title = "会员信息", businessType = BusinessType.EXPORT) @Log(title = "会员信息", businessType = BusinessType.EXPORT)
@GetMapping("export") @GetMapping("export")
public ResponseEntity<String> export(OrderItemBo query) { public ResponseEntity<String> export(OrderItemBo query) {
@ -75,27 +76,27 @@ public class OrderItemController extends BaseController {
return ResponseEntity.ok(util.writeExcel(convert.toVO(list), "订单中所包含的商品数据")); return ResponseEntity.ok(util.writeExcel(convert.toVO(list), "订单中所包含的商品数据"));
} }
@ApiOperation("获取订单中所包含的商品详细信息") @Tag(name = "获取订单中所包含的商品详细信息")
@GetMapping(value = "/{id}") @GetMapping(value = "/{id}")
public R getInfo(@PathVariable("id") Long id) { public R getInfo(@PathVariable("id") Long id) {
return R.ok(service.getById(id)); return R.ok(service.getById(id));
} }
@ApiOperation("新增订单中所包含的商品") @Tag(name = "新增订单中所包含的商品")
@Log(title = "订单中所包含的商品", businessType = BusinessType.INSERT) @Log(title = "订单中所包含的商品", businessType = BusinessType.INSERT)
@PostMapping("/add") @PostMapping("/add")
public R add(@RequestBody OrderItem orderItem) { public R add(@RequestBody OrderItem orderItem) {
return R.ok(service.save(orderItem)); return R.ok(service.save(orderItem));
} }
@ApiOperation("修改订单中所包含的商品") @Tag(name = "修改订单中所包含的商品")
@Log(title = "订单中所包含的商品", businessType = BusinessType.UPDATE) @Log(title = "订单中所包含的商品", businessType = BusinessType.UPDATE)
@PostMapping("/update") @PostMapping("/update")
public R edit(@RequestBody OrderItem orderItem) { public R edit(@RequestBody OrderItem orderItem) {
return R.ok(service.updateById(orderItem)); return R.ok(service.updateById(orderItem));
} }
@ApiOperation("删除订单中所包含的商品") @Tag(name = "删除订单中所包含的商品")
@Log(title = "订单中所包含的商品", businessType = BusinessType.DELETE) @Log(title = "订单中所包含的商品", businessType = BusinessType.DELETE)
@DeleteMapping("/{id}") @DeleteMapping("/{id}")
public R remove(@PathVariable Long id) { public R remove(@PathVariable Long id) {

15
ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/controller/OrderOperateHistoryController.java
View File

@ -17,6 +17,7 @@ import com.wzj.soopin.order.service.OrderOperateHistoryService;
import com.wzj.soopin.order.service.impl.OrderOperateHistoryServiceImpl; import com.wzj.soopin.order.service.impl.OrderOperateHistoryServiceImpl;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.dromara.common.core.domain.R; import org.dromara.common.core.domain.R;
import org.dromara.common.excel.utils.ExcelUtil; import org.dromara.common.excel.utils.ExcelUtil;
import org.dromara.common.log.annotation.Log; import org.dromara.common.log.annotation.Log;
@ -33,7 +34,7 @@ import java.util.List;
* @author zcc * @author zcc
* @date 2022-12-01 * @date 2022-12-01
*/ */
@Api(description ="订单操作历史记录接口列表") @Tag(name ="订单操作历史记录接口列表")
@RestController @RestController
@RequestMapping("/oms/orderOperateHistory") @RequestMapping("/oms/orderOperateHistory")
public class OrderOperateHistoryController extends BaseController { public class OrderOperateHistoryController extends BaseController {
@ -51,7 +52,7 @@ public class OrderOperateHistoryController extends BaseController {
// return ResponseEntity.ok(new PageImpl<>(list, page, ((com.github.pagehelper.Page)list).getTotal())); // return ResponseEntity.ok(new PageImpl<>(list, page, ((com.github.pagehelper.Page)list).getTotal()));
// } // }
@ApiOperation("查询订单操作历史记录列表") @Tag(name ="查询订单操作历史记录列表")
@PostMapping("/list") @PostMapping("/list")
public R<IPage<OrderOperateHistoryVO>> list(@RequestBody OrderOperateHistoryBo query, Page<OrderOperateHistory> page) { public R<IPage<OrderOperateHistoryVO>> list(@RequestBody OrderOperateHistoryBo query, Page<OrderOperateHistory> page) {
Page<OrderOperateHistory> list = service.page(page,query.toWrapper() ); Page<OrderOperateHistory> list = service.page(page,query.toWrapper() );
@ -59,7 +60,7 @@ public class OrderOperateHistoryController extends BaseController {
} }
@ApiOperation("导出订单操作历史记录列表") @Tag(name ="导出订单操作历史记录列表")
@Log(title = "订单操作历史记录", businessType = BusinessType.EXPORT) @Log(title = "订单操作历史记录", businessType = BusinessType.EXPORT)
@GetMapping("export") @GetMapping("export")
public ResponseEntity<String> export(OrderOperateHistoryBo query) { public ResponseEntity<String> export(OrderOperateHistoryBo query) {
@ -68,27 +69,27 @@ public class OrderOperateHistoryController extends BaseController {
return ResponseEntity.ok(util.writeExcel(convert.toVO(list), "订单操作历史记录数据")); return ResponseEntity.ok(util.writeExcel(convert.toVO(list), "订单操作历史记录数据"));
} }
@ApiOperation("获取订单操作历史记录详细信息") @Tag(name ="获取订单操作历史记录详细信息")
@GetMapping(value = "/{id}") @GetMapping(value = "/{id}")
public R getInfo(@PathVariable("id") Long id) { public R getInfo(@PathVariable("id") Long id) {
return R.ok(service.getById(id)); return R.ok(service.getById(id));
} }
@ApiOperation("新增订单操作历史记录") @Tag(name ="新增订单操作历史记录")
@Log(title = "订单操作历史记录", businessType = BusinessType.INSERT) @Log(title = "订单操作历史记录", businessType = BusinessType.INSERT)
@PostMapping("/add") @PostMapping("/add")
public R add(@RequestBody OrderOperateHistory orderOperateHistory) { public R add(@RequestBody OrderOperateHistory orderOperateHistory) {
return R.ok(service.save(orderOperateHistory)); return R.ok(service.save(orderOperateHistory));
} }
@ApiOperation("修改订单操作历史记录") @Tag(name ="修改订单操作历史记录")
@Log(title = "订单操作历史记录", businessType = BusinessType.UPDATE) @Log(title = "订单操作历史记录", businessType = BusinessType.UPDATE)
@PostMapping("/update") @PostMapping("/update")
public R edit(@RequestBody OrderOperateHistory orderOperateHistory) { public R edit(@RequestBody OrderOperateHistory orderOperateHistory) {
return R.ok(service.updateById(orderOperateHistory)); return R.ok(service.updateById(orderOperateHistory));
} }
@ApiOperation("删除订单操作历史记录") @Tag(name ="删除订单操作历史记录")
@Log(title = "订单操作历史记录", businessType = BusinessType.DELETE) @Log(title = "订单操作历史记录", businessType = BusinessType.DELETE)
@DeleteMapping("/{id}") @DeleteMapping("/{id}")
public R remove(@PathVariable Long id) { public R remove(@PathVariable Long id) {

7
ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/controller/VerificationCodeController.java
View File

@ -3,6 +3,7 @@ package com.wzj.soopin.order.controller;
import com.wzj.soopin.order.service.VerificationCodeService; import com.wzj.soopin.order.service.VerificationCodeService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.dromara.common.core.domain.R; import org.dromara.common.core.domain.R;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@ -10,7 +11,7 @@ import org.springframework.web.bind.annotation.*;
/** /**
* 核销码相关接口 * 核销码相关接口
*/ */
@Api(tags = "核销码接口") @Tag(name = "核销码接口")
@RestController @RestController
@RequestMapping("/oms/verification") @RequestMapping("/oms/verification")
public class VerificationCodeController { public class VerificationCodeController {
@ -23,7 +24,7 @@ public class VerificationCodeController {
* 生成核销码 * 生成核销码
*/ */
@GetMapping("/generate/{orderId}") @GetMapping("/generate/{orderId}")
@ApiOperation("生成核销码") @Tag(name = "生成核销码")
public R generateCode(@PathVariable Long orderId) { public R generateCode(@PathVariable Long orderId) {
return verificationCodeService.generateVerificationCode(orderId); return verificationCodeService.generateVerificationCode(orderId);
} }
@ -35,7 +36,7 @@ public class VerificationCodeController {
* @return 核销结果z * @return 核销结果z
*/ */
@PostMapping("/verify") @PostMapping("/verify")
@ApiOperation("扫码核销接口") @Tag(name = "扫码核销接口")
public R verifyCode(@RequestParam String codeValue, public R verifyCode(@RequestParam String codeValue,
@RequestParam Long usedMerchantId) { @RequestParam Long usedMerchantId) {
return verificationCodeService.verifyCode(codeValue, usedMerchantId); return verificationCodeService.verifyCode(codeValue, usedMerchantId);

15
ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/controller/WechatPaymentHistoryController.java
View File

@ -16,6 +16,7 @@ import com.wzj.soopin.order.service.WechatPaymentHistoryService;
import com.wzj.soopin.order.service.impl.WechatPaymentHistoryServiceImpl; import com.wzj.soopin.order.service.impl.WechatPaymentHistoryServiceImpl;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.dromara.common.core.domain.R; import org.dromara.common.core.domain.R;
import org.dromara.common.excel.utils.ExcelUtil; import org.dromara.common.excel.utils.ExcelUtil;
import org.dromara.common.log.annotation.Log; import org.dromara.common.log.annotation.Log;
@ -32,7 +33,7 @@ import java.util.List;
* @author zcc * @author zcc
* @date 2023-07-12 * @date 2023-07-12
*/ */
@Api(description ="微信订单表接口列表") @Tag(name ="微信订单表接口列表")
@RestController @RestController
@RequestMapping("/pms/omsWechatPaymentHistory") @RequestMapping("/pms/omsWechatPaymentHistory")
public class WechatPaymentHistoryController extends BaseController { public class WechatPaymentHistoryController extends BaseController {
@ -50,7 +51,7 @@ public class WechatPaymentHistoryController extends BaseController {
// return ResponseEntity.ok(new PageImpl<>(list, page, ((com.github.pagehelper.Page)list).getTotal())); // return ResponseEntity.ok(new PageImpl<>(list, page, ((com.github.pagehelper.Page)list).getTotal()));
// } // }
@ApiOperation("查询微信订单表列表") @Tag(name ="查询微信订单表列表")
@PostMapping("/list") @PostMapping("/list")
public R<IPage<WechatPaymentHistoryVO>> list(@RequestBody WechatPaymentHistoryBo query, Page<WechatPaymentHistory> page) { public R<IPage<WechatPaymentHistoryVO>> list(@RequestBody WechatPaymentHistoryBo query, Page<WechatPaymentHistory> page) {
Page<WechatPaymentHistory> list = wechatPaymentHistoryService.page(page,query.toWrapper() ); Page<WechatPaymentHistory> list = wechatPaymentHistoryService.page(page,query.toWrapper() );
@ -58,7 +59,7 @@ public class WechatPaymentHistoryController extends BaseController {
} }
@ApiOperation("导出微信订单表列表") @Tag(name ="导出微信订单表列表")
@Log(title = "微信订单表", businessType = BusinessType.EXPORT) @Log(title = "微信订单表", businessType = BusinessType.EXPORT)
@GetMapping("export") @GetMapping("export")
public ResponseEntity<String> export(WechatPaymentHistoryBo query) { public ResponseEntity<String> export(WechatPaymentHistoryBo query) {
@ -67,27 +68,27 @@ public class WechatPaymentHistoryController extends BaseController {
return ResponseEntity.ok(util.writeExcel(convert.toVO(list), "微信订单表数据")); return ResponseEntity.ok(util.writeExcel(convert.toVO(list), "微信订单表数据"));
} }
@ApiOperation("获取微信订单表详细信息") @Tag(name ="获取微信订单表详细信息")
@GetMapping(value = "/{id}") @GetMapping(value = "/{id}")
public R getInfo(@PathVariable("id") Long id) { public R getInfo(@PathVariable("id") Long id) {
return R.ok(service.getById(id)); return R.ok(service.getById(id));
} }
@ApiOperation("新增微信订单表") @Tag(name ="新增微信订单表")
@Log(title = "微信订单表", businessType = BusinessType.INSERT) @Log(title = "微信订单表", businessType = BusinessType.INSERT)
@PostMapping("/add") @PostMapping("/add")
public R add(@RequestBody WechatPaymentHistory wechatPaymentHistory) { public R add(@RequestBody WechatPaymentHistory wechatPaymentHistory) {
return R.ok(service.save(wechatPaymentHistory)); return R.ok(service.save(wechatPaymentHistory));
} }
@ApiOperation("修改微信订单表") @Tag(name ="修改微信订单表")
@Log(title = "微信订单表", businessType = BusinessType.UPDATE) @Log(title = "微信订单表", businessType = BusinessType.UPDATE)
@PostMapping("/update") @PostMapping("/update")
public R edit(@RequestBody WechatPaymentHistory wechatPaymentHistory) { public R edit(@RequestBody WechatPaymentHistory wechatPaymentHistory) {
return R.ok(service.updateById(wechatPaymentHistory)); return R.ok(service.updateById(wechatPaymentHistory));
} }
@ApiOperation("删除微信订单表") @Tag(name ="删除微信订单表")
@Log(title = "微信订单表", businessType = BusinessType.DELETE) @Log(title = "微信订单表", businessType = BusinessType.DELETE)
@DeleteMapping("/{id}") @DeleteMapping("/{id}")
public R remove(@PathVariable Long id) { public R remove(@PathVariable Long id) {

34
ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/bo/AftersaleBo.java
View File

@ -4,8 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.wzj.soopin.order.domain.entity.Aftersale; import com.wzj.soopin.order.domain.entity.Aftersale;
import io.swagger.annotations.ApiModel; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat;
@ -13,50 +12,51 @@ import java.math.BigDecimal;
import java.time.LocalDateTime; import java.time.LocalDateTime;
@Data @Data
@ApiModel(description="订单售后 查询 对象") @Schema(description = "订单售后 查询 对象")
public class AftersaleBo { public class AftersaleBo {
@ApiModelProperty("MEMBER_ID 精确匹配")
@Schema(description = "MEMBER_ID 精确匹配")
private Long memberId; private Long memberId;
@ApiModelProperty("订单id 精确匹配") @Schema(description = "订单id 精确匹配")
private Long orderId; private Long orderId;
@ApiModelProperty("退款金额 精确匹配") @Schema(description = "退款金额 精确匹配")
private BigDecimal returnAmount; private BigDecimal returnAmount;
@ApiModelProperty("售后类型：1：退款，2：退货退款 精确匹配") @Schema(description = "售后类型：1：退款，2：退货退款 精确匹配")
private Integer type; private Integer type;
@ApiModelProperty("申请状态：0->待处理；1->退货中；2->已完成；3->已拒绝 精确匹配") @Schema(description = "申请状态：0->待处理；1->退货中；2->已完成；3->已拒绝 精确匹配")
private Integer status; private Integer status;
@ApiModelProperty("处理时间 精确匹配") @Schema(description = "处理时间 精确匹配")
private LocalDateTime handleTime; private LocalDateTime handleTime;
@ApiModelProperty("退货数量 精确匹配") @Schema(description = "退货数量 精确匹配")
private Integer quantity; private Integer quantity;
@ApiModelProperty("原因 精确匹配") @Schema(description = "原因 精确匹配")
private String reason; private String reason;
@ApiModelProperty("描述 精确匹配") @Schema(description = "描述 精确匹配")
private String description; private String description;
@ApiModelProperty("凭证图片，以逗号隔开 精确匹配") @Schema(description = "凭证图片，以逗号隔开 精确匹配")
private String proofPics; private String proofPics;
@ApiModelProperty("处理备注 精确匹配") @Schema(description = "处理备注 精确匹配")
private String handleNote; private String handleNote;
@ApiModelProperty("处理人员 精确匹配") @Schema(description = "处理人员 精确匹配")
private String handleMan; private String handleMan;
@ApiModelProperty(name = "startTime", value = "开始时间", required = true, dataType = "Date") @Schema(name = "startTime", description = "开始时间", required = true, implementation = LocalDateTime.class)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime startTime; private LocalDateTime startTime;
@ApiModelProperty(name = "endTime", value = "结束时间", required = true, dataType = "Date") @Schema(name = "endTime", description = "结束时间", required = true, implementation = LocalDateTime.class)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime endTime; private LocalDateTime endTime;

13
ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/bo/AftersaleItemBo.java
View File

@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.wzj.soopin.order.domain.entity.AftersaleItem; import com.wzj.soopin.order.domain.entity.AftersaleItem;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import org.dromara.common.excel.annotation.Excel; import org.dromara.common.excel.annotation.Excel;
@ -14,22 +15,22 @@ import java.math.BigDecimal;
@ApiModel(description="订单中所包含的商品 查询 对象") @ApiModel(description="订单中所包含的商品 查询 对象")
public class AftersaleItemBo { public class AftersaleItemBo {
@ApiModelProperty("MEMBER_ID 精确匹配") @Schema(description = "MEMBER_ID 精确匹配")
private Long memberId; private Long memberId;
@ApiModelProperty("订单id 精确匹配") @Schema(description = "订单id 精确匹配")
private Long orderId; private Long orderId;
@ApiModelProperty("子订单id 精确匹配") @Schema(description = "子订单id 精确匹配")
private Long orderItemId; private Long orderItemId;
@ApiModelProperty("退款金额 精确匹配") @Schema(description = "退款金额 精确匹配")
private BigDecimal returnAmount; private BigDecimal returnAmount;
@ApiModelProperty("退货数量 精确匹配") @Schema(description = "退货数量 精确匹配")
private Integer quantity; private Integer quantity;
@ApiModelProperty("售后单id") @Schema(description = "售后单id")
private Long aftersaleId; private Long aftersaleId;
public Wrapper<AftersaleItem> toWrapper() { public Wrapper<AftersaleItem> toWrapper() {

2
ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/bo/OrderBo.java
View File

@ -17,7 +17,7 @@ import java.util.Date;
import java.util.Random; import java.util.Random;
@Data @Data
@ApiModel(description="订单表 查询 对象") @Schema(description="订单表 查询 对象")
public class OrderBo { public class OrderBo {
@Schema(description ="MEMBER_ID 精确匹配") @Schema(description ="MEMBER_ID 精确匹配")

8
ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/bo/OrderDeliveryHistoryBo.java
View File

@ -5,18 +5,20 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.wzj.soopin.order.domain.entity.OrderDeliveryHistory; import com.wzj.soopin.order.domain.entity.OrderDeliveryHistory;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
@Data @Data
@ApiModel(description="订单发货记录 查询 对象") @ApiModel(description="订单发货记录 查询 对象")
public class OrderDeliveryHistoryBo { public class OrderDeliveryHistoryBo {
@ApiModelProperty("订单id 精确匹配")
@Schema(description ="订单id 精确匹配")
private Long orderId; private Long orderId;
@ApiModelProperty("物流公司 精确匹配") @Schema(description ="物流公司 精确匹配")
private String deliveryCompany; private String deliveryCompany;
@ApiModelProperty("物流单号 精确匹配") @Schema(description ="物流单号 精确匹配")
private String deliverySn; private String deliverySn;
public Wrapper<OrderDeliveryHistory> toWrapper() { public Wrapper<OrderDeliveryHistory> toWrapper() {

33
ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/bo/OrderItemBo.java
View File

@ -3,55 +3,54 @@ package com.wzj.soopin.order.domain.bo;
import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.wzj.soopin.order.domain.entity.OrderItem; import com.wzj.soopin.order.domain.entity.OrderItem;
import io.swagger.annotations.ApiModel; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.math.BigDecimal; import java.math.BigDecimal;
@Data @Data
@ApiModel(description="订单中所包含的商品 查询 对象") @Schema(description = "订单中所包含的商品 查询 对象")
public class OrderItemBo { public class OrderItemBo {
@ApiModelProperty("订单id 精确匹配") @Schema(description = "订单id 精确匹配")
private Long orderId; private Long orderId;
@ApiModelProperty("PRODUCT_ID 精确匹配") @Schema(description = "PRODUCT_ID 精确匹配")
private Long productId; private Long productId;
@ApiModelProperty("商品编码 精确匹配") @Schema(description = "商品编码 精确匹配")
private String outProductId; private String outProductId;
@ApiModelProperty("商品sku id 精确匹配") @Schema(description = "商品sku id 精确匹配")
private Long skuId; private Long skuId;
@ApiModelProperty("sku编码 精确匹配") @Schema(description = "sku编码 精确匹配")
private String outSkuId; private String outSkuId;
@ApiModelProperty("商品快照id 精确匹配") @Schema(description = "商品快照id 精确匹配")
private Long productSnapshotId; private Long productSnapshotId;
@ApiModelProperty("sku快照id 精确匹配") @Schema(description = "sku快照id 精确匹配")
private Long skuSnapshotId; private Long skuSnapshotId;
@ApiModelProperty("展示图片 精确匹配") @Schema(description = "展示图片 精确匹配")
private String pic; private String pic;
@ApiModelProperty("PRODUCT_NAME 精确匹配") @Schema(description = "PRODUCT_NAME 精确匹配")
private String productNameLike; private String productNameLike;
@ApiModelProperty("销售价格 精确匹配") @Schema(description = "销售价格 精确匹配")
private BigDecimal salePrice; private BigDecimal salePrice;
@ApiModelProperty("采购价 精确匹配") @Schema(description = "采购价 精确匹配")
private BigDecimal purchasePrice; private BigDecimal purchasePrice;
@ApiModelProperty("购买数量 精确匹配") @Schema(description = "购买数量 精确匹配")
private Integer quantity; private Integer quantity;
@ApiModelProperty("商品分类id 精确匹配") @Schema(description = "商品分类id 精确匹配")
private Long productCategoryId; private Long productCategoryId;
@ApiModelProperty("商品sku属性:[{\"key\":\"颜色\",\"value\":\"颜色\"},{\"key\":\"容量\",\"value\":\"4G\"}] 精确匹配") @Schema(description = "商品sku属性:[{\"key\":\"颜色\",\"value\":\"颜色\"},{\"key\":\"容量\",\"value\":\"4G\"}] 精确匹配")
private String spData; private String spData;
public Wrapper<OrderItem> toWrapper() { public Wrapper<OrderItem> toWrapper() {

9
ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/bo/OrderOperateHistoryBo.java
View File

@ -5,22 +5,23 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.wzj.soopin.order.domain.entity.OrderOperateHistory; import com.wzj.soopin.order.domain.entity.OrderOperateHistory;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
@Data @Data
@ApiModel(description="订单操作历史记录 查询 对象") @ApiModel(description="订单操作历史记录 查询 对象")
public class OrderOperateHistoryBo { public class OrderOperateHistoryBo {
@ApiModelProperty("订单号 精确匹配") @Schema(description = "订单号 精确匹配")
private String orderSn; private String orderSn;
@ApiModelProperty("操作人：用户；系统；后台管理员 精确匹配") @Schema(description = "操作人：用户；系统；后台管理员 精确匹配")
private String operateMan; private String operateMan;
@ApiModelProperty("订单状态：0->待付款；1->待发货；2->已发货；3->已完成；4->已关闭；5->无效订单 精确匹配") @Schema(description = "订单状态：0->待付款；1->待发货；2->已发货；3->已完成；4->已关闭；5->无效订单 精确匹配")
private Integer orderStatus; private Integer orderStatus;
@ApiModelProperty("备注 精确匹配") @Schema(description = "备注 精确匹配")
private String note; private String note;
public Wrapper<OrderOperateHistory> toWrapper() { public Wrapper<OrderOperateHistory> toWrapper() {

27
ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/bo/WechatPaymentHistoryBo.java
View File

@ -3,46 +3,45 @@ package com.wzj.soopin.order.domain.bo;
import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.wzj.soopin.order.domain.entity.WechatPaymentHistory; import com.wzj.soopin.order.domain.entity.WechatPaymentHistory;
import io.swagger.annotations.ApiModel; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.math.BigDecimal; import java.math.BigDecimal;
@Data @Data
@ApiModel(description="微信订单表 查询 对象") @Schema(description = "微信订单表 查询 对象")
public class WechatPaymentHistoryBo { public class WechatPaymentHistoryBo {
@ApiModelProperty("payment_id 精确匹配") @Schema(description = "payment_id 精确匹配")
private String paymentId; private String paymentId;
@ApiModelProperty("用户 ID 精确匹配") @Schema(description = "用户 ID 精确匹配")
private Long memberId; private Long memberId;
@ApiModelProperty("OPENID 精确匹配") @Schema(description = "OPENID 精确匹配")
private String openid; private String openid;
@ApiModelProperty("真实姓名，提现需要 精确匹配") @Schema(description = "真实姓名，提现需要 精确匹配")
private String realNameLike; private String realNameLike;
@ApiModelProperty("标题|商品名称 精确匹配") @Schema(description = "标题|商品名称 精确匹配")
private String title; private String title;
@ApiModelProperty("订单号 支付时是payId 其他为orderId 精确匹配") @Schema(description = "订单号 支付时是payId 其他为orderId 精确匹配")
private Long orderId; private Long orderId;
@ApiModelProperty("金额，单位分 精确匹配") @Schema(description = "金额，单位分 精确匹配")
private BigDecimal money; private BigDecimal money;
@ApiModelProperty("交易类型（1为支付 2为提现 3为退款） 精确匹配") @Schema(description = "交易类型（1为支付 2为提现 3为退款） 精确匹配")
private Integer opType; private Integer opType;
@ApiModelProperty("状态（0：未完成交易 1：完成关键交易） 精确匹配") @Schema(description = "状态（0：未完成交易 1：完成关键交易） 精确匹配")
private Integer paymentStatus; private Integer paymentStatus;
@ApiModelProperty("附加数据 精确匹配") @Schema(description = "附加数据 精确匹配")
private String attach; private String attach;
@ApiModelProperty("响应内容 精确匹配") @Schema(description = "响应内容 精确匹配")
private String responseBody; private String responseBody;
public Wrapper<WechatPaymentHistory> toWrapper() { public Wrapper<WechatPaymentHistory> toWrapper() {

17
ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/dto/OrderProductListDTO.java
View File

@ -2,8 +2,7 @@
import com.wzj.soopin.goods.domain.entity.Product; import com.wzj.soopin.goods.domain.entity.Product;
import com.wzj.soopin.goods.domain.entity.Sku; import com.wzj.soopin.goods.domain.entity.Sku;
import io.swagger.annotations.ApiModel; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.annotations.ApiModelProperty;
import jakarta.validation.constraints.Min; import jakarta.validation.constraints.Min;
import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
import lombok.Data; import lombok.Data;
@ -17,26 +16,26 @@
* *
*/ */
@Data @Data
@ApiModel(value = "创建订单请求VO") @Schema(description = "创建订单请求VO")
public class OrderProductListDTO { public class OrderProductListDTO {
@ApiModelProperty(value = "商品skuId", required = true) @Schema(description = "商品skuId", required = true)
@NotNull(message = "商品skuId不能为空") @NotNull(message = "商品skuId不能为空")
private Long skuId; private Long skuId;
@ApiModelProperty(value = "数量", required = true) @Schema(description = "数量", required = true)
@NotNull(message = "数量不能为空") @NotNull(message = "数量不能为空")
@Min(value = 1, message = "数量不能小于1") @Min(value = 1, message = "数量不能小于1")
private Integer quantity; private Integer quantity;
@ApiModelProperty(value = "消费金", hidden = true) @Schema(description = "消费金", hidden = true)
private BigDecimal consumption; private BigDecimal consumption;
@ApiModelProperty(value = "运费", hidden = true) @Schema(description = "运费", hidden = true)
private BigDecimal freightAmount; private BigDecimal freightAmount;
@ApiModelProperty(value = "隐藏 业务过程中的数据", hidden = true) @Schema(description = "隐藏 业务过程中的数据", hidden = true)
private Sku sku; private Sku sku;
@ApiModelProperty(value = "隐藏 业务过程中的数据", hidden = true) @Schema(description = "隐藏 业务过程中的数据", hidden = true)
private Product product; private Product product;
} }

37
ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/entity/Aftersale.java
View File

@ -5,81 +5,80 @@ import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import org.dromara.common.core.domain.model.BaseAudit; import org.dromara.common.core.domain.model.BaseAudit;
import org.dromara.common.excel.annotation.Excel; import org.dromara.common.excel.annotation.Excel;
import io.swagger.annotations.ApiModel; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.time.LocalDateTime; import java.time.LocalDateTime;
/** /**
* 订单售后对象 oms_aftersale * 订单售后对象 oms_aftersale
* *
* @author zcc * @author zcc
*/ */
@ApiModel(description="订单售后对象") @Schema(description = "订单售后对象")
@Data @Data
@TableName("oms_aftersale") @TableName("oms_aftersale")
public class Aftersale extends BaseAudit { public class Aftersale extends BaseAudit {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ApiModelProperty("ID") @Schema(description = "ID")
@TableId(type = IdType.ASSIGN_ID) @TableId(type = IdType.ASSIGN_ID)
private Long id; private Long id;
@ApiModelProperty("MEMBER_ID") @Schema(description = "MEMBER_ID")
@Excel(name = "MEMBER_ID") @Excel(name = "MEMBER_ID")
private Long memberId; private Long memberId;
@ApiModelProperty("订单id") @Schema(description = "订单id")
@Excel(name = "订单id") @Excel(name = "订单id")
private Long orderId; private Long orderId;
@ApiModelProperty("退款金额") @Schema(description = "退款金额")
@Excel(name = "退款金额") @Excel(name = "退款金额")
private BigDecimal returnAmount; private BigDecimal returnAmount;
@ApiModelProperty("售后类型：1：退款，2：退货退款") @Schema(description = "售后类型：1：退款，2：退货退款")
@Excel(name = "售后类型：1：退款，2：退货退款") @Excel(name = "售后类型：1：退款，2：退货退款")
private Integer type; private Integer type;
@ApiModelProperty("申请状态：0->待处理；1->退货中；2->已完成；3->已拒绝") @Schema(description = "申请状态：0->待处理；1->退货中；2->已完成；3->已拒绝")
@Excel(name = "申请状态：0->待处理；1->退货中；2->已完成；3->已拒绝") @Excel(name = "申请状态：0->待处理；1->退货中；2->已完成；3->已拒绝")
private Integer status; private Integer status;
@ApiModelProperty("处理时间") @Schema(description = "处理时间")
@Excel(name = "处理时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "处理时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime handleTime; private LocalDateTime handleTime;
@ApiModelProperty("退货数量") @Schema(description = "退货数量")
@Excel(name = "退货数量") @Excel(name = "退货数量")
private Integer quantity; private Integer quantity;
@ApiModelProperty("原因") @Schema(description = "原因")
@Excel(name = "原因") @Excel(name = "原因")
private String reason; private String reason;
@ApiModelProperty("描述") @Schema(description = "描述")
@Excel(name = "描述") @Excel(name = "描述")
private String description; private String description;
@ApiModelProperty("凭证图片，以逗号隔开") @Schema(description = "凭证图片，以逗号隔开")
@Excel(name = "凭证图片，以逗号隔开") @Excel(name = "凭证图片，以逗号隔开")
private String proofPics; private String proofPics;
@ApiModelProperty("处理备注") @Schema(description = "处理备注")
@Excel(name = "处理备注") @Excel(name = "处理备注")
private String handleNote; private String handleNote;
@ApiModelProperty("处理人员") @Schema(description = "处理人员")
@Excel(name = "处理人员") @Excel(name = "处理人员")
private String handleMan; private String handleMan;
@ApiModelProperty("退款快递公司") @Schema(description = "退款快递公司")
@Excel(name = "退款快递公司") @Excel(name = "退款快递公司")
private String refundWpCode; private String refundWpCode;
@ApiModelProperty("退货快递号") @Schema(description = "退货快递号")
@Excel(name = "退货快递号") @Excel(name = "退货快递号")
private String refundWaybillCode; private String refundWaybillCode;
} }

21
ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/entity/AftersaleItem.java
View File

@ -1,49 +1,48 @@
package com.wzj.soopin.order.domain.entity; package com.wzj.soopin.order.domain.entity;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import org.dromara.common.core.domain.model.BaseAudit; import org.dromara.common.core.domain.model.BaseAudit;
import org.dromara.common.excel.annotation.Excel; import org.dromara.common.excel.annotation.Excel;
import java.math.BigDecimal; import java.math.BigDecimal;
/** /**
* 订单售后对象 oms_aftersale_item * 订单售后对象 oms_aftersale_item
* *
* @author zcc * @author zcc
*/ */
@ApiModel(description="订单售后对象") @Schema(description = "订单售后对象")
@Data @Data
@TableName("oms_aftersale_item") @TableName("oms_aftersale_item")
public class AftersaleItem extends BaseAudit { public class AftersaleItem extends BaseAudit {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ApiModelProperty("ID") @Schema(description = "ID")
private Long id; private Long id;
@ApiModelProperty("MEMBER_ID") @Schema(description = "MEMBER_ID")
@Excel(name = "MEMBER_ID") @Excel(name = "MEMBER_ID")
private Long memberId; private Long memberId;
@ApiModelProperty("售后单id") @Schema(description = "售后单id")
@Excel(name = "售后单id") @Excel(name = "售后单id")
private Long aftersaleId; private Long aftersaleId;
@ApiModelProperty("订单id") @Schema(description = "订单id")
@Excel(name = "订单id") @Excel(name = "订单id")
private Long orderId; private Long orderId;
@ApiModelProperty("子订单id") @Schema(description = "子订单id")
@Excel(name = "子订单id") @Excel(name = "子订单id")
private Long orderItemId; private Long orderItemId;
@ApiModelProperty("退款金额") @Schema(description = "退款金额")
@Excel(name = "退款金额") @Excel(name = "退款金额")
private BigDecimal returnAmount; private BigDecimal returnAmount;
@ApiModelProperty("退货数量") @Schema(description = "退货数量")
@Excel(name = "退货数量") @Excel(name = "退货数量")
private Integer quantity; private Integer quantity;
} }

83
ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/entity/Order.java
View File

@ -3,8 +3,7 @@ package com.wzj.soopin.order.domain.entity;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.annotations.ApiModelProperty;
import jakarta.persistence.PrePersist; import jakarta.persistence.PrePersist;
import lombok.Data; import lombok.Data;
import org.dromara.common.core.domain.model.BaseAudit; import org.dromara.common.core.domain.model.BaseAudit;
@ -21,157 +20,155 @@ import java.util.Random;
* *
* @author zcc * @author zcc
*/ */
@ApiModel(description="订单表对象") @Schema(description = "订单表对象")
@Data @Data
@TableName("oms_order") @TableName("oms_order")
public class Order extends BaseAudit { public class Order extends BaseAudit {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ApiModelProperty("订单id") @Schema(description = "订单id")
@TableId(type = IdType.ASSIGN_ID) @TableId(type = IdType.ASSIGN_ID)
private Long id; private Long id;
@ApiModelProperty("支付id") @Schema(description = "支付id")
private Long payId; private Long payId;
@ApiModelProperty("租户id") @Schema(description = "租户id")
private String tenantId; private String tenantId;
@ApiModelProperty("订单编号") @Schema(description = "订单编号")
@Excel(name = "订单编号") @Excel(name = "订单编号")
private String orderSn; private String orderSn;
@ApiModelProperty("MEMBER_ID") @Schema(description = "MEMBER_ID")
@Excel(name = "MEMBER_ID") @Excel(name = "MEMBER_ID")
private Long memberId; private Long memberId;
@ApiModelProperty("用户帐号") @Schema(description = "用户帐号")
@Excel(name = "用户帐号") @Excel(name = "用户帐号")
private String memberUsername; private String memberUsername;
@ApiModelProperty("商家备注") @Schema(description = "商家备注")
@Excel(name = "商家备注") @Excel(name = "商家备注")
private String merchantNote; private String merchantNote;
@ApiModelProperty("订单总金额") @Schema(description = "订单总金额")
@Excel(name = "订单总金额") @Excel(name = "订单总金额")
private BigDecimal totalAmount; private BigDecimal totalAmount;
@ApiModelProperty("采购价") @Schema(description = "采购价")
@Excel(name = "采购价") @Excel(name = "采购价")
private BigDecimal purchasePrice; private BigDecimal purchasePrice;
@ApiModelProperty("应付金额（实际支付金额）") @Schema(description = "应付金额（实际支付金额）")
@Excel(name = "应付金额", readConverterExp = "实=际支付金额") @Excel(name = "应付金额", readConverterExp = "实=际支付金额")
private BigDecimal payAmount; private BigDecimal payAmount;
@ApiModelProperty("运费金额") @Schema(description = "运费金额")
@Excel(name = "运费金额") @Excel(name = "运费金额")
private BigDecimal freightAmount; private BigDecimal freightAmount;
@ApiModelProperty("支付方式：0->未支付；1->支付宝；2->微信") @Schema(description = "支付方式：0->未支付；1->支付宝；2->微信")
@Excel(name = "支付方式：0->未支付；1->支付宝；2->微信") @Excel(name = "支付方式：0->未支付；1->支付宝；2->微信")
private Integer payType; private Integer payType;
@ApiModelProperty("订单状态：0->待付款；1->待发货；2->已发货；3->已完成；4->已关闭；5->无效订单") @Schema(description = "订单状态：0->待付款；1->待发货；2->已发货；3->已完成；4->已关闭；5->无效订单")
@Excel(name = "订单状态：0->待付款；1->待发货；2->已发货；3->已完成；4->已关闭；5->无效订单") @Excel(name = "订单状态：0->待付款；1->待发货；2->已发货；3->已完成；4->已关闭；5->无效订单")
private Integer status; private Integer status;
@ApiModelProperty("退款状态，枚举值：1：无售后或售后关闭，2：售后处理中，3：退款中，4： 退款成功") @Schema(description = "退款状态，枚举值：1：无售后或售后关闭，2：售后处理中，3：退款中，4： 退款成功")
@Excel(name = "退款状态，枚举值：1：无售后或售后关闭，2：售后处理中，3：退款中，4： 退款成功") @Excel(name = "退款状态，枚举值：1：无售后或售后关闭，2：售后处理中，3：退款中，4： 退款成功")
private Integer aftersaleStatus; private Integer aftersaleStatus;
@ApiModelProperty("物流公司(配送方式)") @Schema(description = "物流公司(配送方式)")
@Excel(name = "物流公司(配送方式)") @Excel(name = "物流公司(配送方式)")
private String deliveryCompany; private String deliveryCompany;
@ApiModelProperty("物流单号") @Schema(description = "物流单号")
@Excel(name = "物流单号") @Excel(name = "物流单号")
private String deliverySn; private String deliverySn;
@ApiModelProperty("自动确认时间（天）") @Schema(description = "自动确认时间（天）")
@Excel(name = "自动确认时间", readConverterExp = "天=") @Excel(name = "自动确认时间", readConverterExp = "天=")
private Integer autoConfirmDay; private Integer autoConfirmDay;
@ApiModelProperty("收货人姓名") @Schema(description = "收货人姓名")
@Excel(name = "收货人姓名") @Excel(name = "收货人姓名")
private String receiverName; private String receiverName;
@ApiModelProperty("收货人电话") @Schema(description = "收货人电话")
@Excel(name = "收货人电话") @Excel(name = "收货人电话")
private String receiverPhone; private String receiverPhone;
@ApiModelProperty("加密的手机号") @Schema(description = "加密的手机号")
@Excel(name = "加密的手机号") @Excel(name = "加密的手机号")
private String receiverPhoneEncrypted; private String receiverPhoneEncrypted;
@ApiModelProperty("收货人邮编") @Schema(description = "收货人邮编")
@Excel(name = "收货人邮编") @Excel(name = "收货人邮编")
private String receiverPostCode; private String receiverPostCode;
@ApiModelProperty("省份/直辖市") @Schema(description = "省份/直辖市")
@Excel(name = "省份/直辖市") @Excel(name = "省份/直辖市")
private String receiverProvince; private String receiverProvince;
@ApiModelProperty("城市") @Schema(description = "城市")
@Excel(name = "城市") @Excel(name = "城市")
private String receiverCity; private String receiverCity;
@ApiModelProperty("区") @Schema(description = "区")
@Excel(name = "区") @Excel(name = "区")
private String receiverDistrict; private String receiverDistrict;
@ApiModelProperty("省份/直辖市id") @Schema(description = "省份/直辖市id")
@Excel(name = "省份/直辖市id") @Excel(name = "省份/直辖市id")
private Long receiverProvinceId; private Long receiverProvinceId;
@ApiModelProperty("城市id") @Schema(description = "城市id")
@Excel(name = "城市id") @Excel(name = "城市id")
private Long receiverCityId; private Long receiverCityId;
@ApiModelProperty("区id") @Schema(description = "区id")
@Excel(name = "区id") @Excel(name = "区id")
private Long receiverDistrictId; private Long receiverDistrictId;
@ApiModelProperty("详细地址") @Schema(description = "详细地址")
@Excel(name = "详细地址") @Excel(name = "详细地址")
private String receiverDetailAddress; private String receiverDetailAddress;
@ApiModelProperty("订单备注") @Schema(description = "订单备注")
@Excel(name = "订单备注") @Excel(name = "订单备注")
private String note; private String note;
@ApiModelProperty("确认收货状态：0->未确认；1->已确认") @Schema(description = "确认收货状态：0->未确认；1->已确认")
@Excel(name = "确认收货状态：0->未确认；1->已确认") @Excel(name = "确认收货状态：0->未确认；1->已确认")
private Integer confirmStatus; private Integer confirmStatus;
@ApiModelProperty("删除状态：0->未删除；1->已删除") @Schema(description = "删除状态：0->未删除；1->已删除")
@Excel(name = "删除状态：0->未删除；1->已删除") @Excel(name = "删除状态：0->未删除；1->已删除")
private Integer deleteStatus; private Integer deleteStatus;
@ApiModelProperty("支付时间") @Schema(description = "支付时间")
@Excel(name = "支付时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "支付时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime paymentTime; private LocalDateTime paymentTime;
@ApiModelProperty("发货时间") @Schema(description = "发货时间")
@Excel(name = "发货时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "发货时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime deliveryTime; private LocalDateTime deliveryTime;
@ApiModelProperty("确认收货时间") @Schema(description = "确认收货时间")
@Excel(name = "确认收货时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "确认收货时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime receiveTime; private LocalDateTime receiveTime;
@ApiModelProperty("优惠券ID") @Schema(description = "优惠券ID")
private Long memberCouponId; private Long memberCouponId;
@ApiModelProperty("优惠券金额") @Schema(description = "优惠券金额")
private BigDecimal couponAmount; private BigDecimal couponAmount;
@ApiModelProperty("核销时间") @Schema(description = "核销时间")
private LocalDateTime usedTime; private LocalDateTime usedTime;
@ApiModelProperty("核销码url") @Schema(description = "核销码url")
private String codeUrl; private String codeUrl;
} }

14
ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/entity/OrderDeliveryHistory.java
View File

@ -1,8 +1,7 @@
package com.wzj.soopin.order.domain.entity; package com.wzj.soopin.order.domain.entity;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import org.dromara.common.core.domain.model.BaseAudit; import org.dromara.common.core.domain.model.BaseAudit;
import org.dromara.common.excel.annotation.Excel; import org.dromara.common.excel.annotation.Excel;
@ -12,25 +11,24 @@ import org.dromara.common.excel.annotation.Excel;
* *
* @author zcc * @author zcc
*/ */
@ApiModel(description="订单发货记录对象") @Schema(description = "订单发货记录对象")
@Data @Data
@TableName("oms_order_delivery_history") @TableName("oms_order_delivery_history")
public class OrderDeliveryHistory extends BaseAudit { public class OrderDeliveryHistory extends BaseAudit {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ApiModelProperty("ID") @Schema(description = "ID")
private Long id; private Long id;
@ApiModelProperty("订单id") @Schema(description = "订单id")
@Excel(name = "订单id") @Excel(name = "订单id")
private Long orderId; private Long orderId;
@ApiModelProperty("物流公司(配送方式)") @Schema(description = "物流公司(配送方式)")
@Excel(name = "物流公司(配送方式)") @Excel(name = "物流公司(配送方式)")
private String deliveryCompany; private String deliveryCompany;
@ApiModelProperty("物流单号") @Schema(description = "物流单号")
@Excel(name = "物流单号") @Excel(name = "物流单号")
private String deliverySn; private String deliverySn;
} }

37
ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/entity/OrderItem.java
View File

@ -3,82 +3,81 @@ package com.wzj.soopin.order.domain.entity;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import org.dromara.common.core.domain.model.BaseAudit; import org.dromara.common.core.domain.model.BaseAudit;
import org.dromara.common.excel.annotation.Excel; import org.dromara.common.excel.annotation.Excel;
import java.math.BigDecimal; import java.math.BigDecimal;
/** /**
* 订单中所包含的商品对象 oms_order_item * 订单中所包含的商品对象 oms_order_item
* *
* @author zcc * @author zcc
*/ */
@ApiModel(description="订单中所包含的商品对象") @Schema(description = "订单中所包含的商品对象")
@Data @Data
@TableName("oms_order_item") @TableName("oms_order_item")
public class OrderItem extends BaseAudit { public class OrderItem extends BaseAudit {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ApiModelProperty("ID") @Schema(description = "ID")
@TableId(type = IdType.ASSIGN_ID) @TableId(type = IdType.ASSIGN_ID)
private Long id; private Long id;
@ApiModelProperty("订单id") @Schema(description = "订单id")
@Excel(name = "订单id") @Excel(name = "订单id")
private Long orderId; private Long orderId;
@ApiModelProperty("PRODUCT_ID") @Schema(description = "PRODUCT_ID")
@Excel(name = "PRODUCT_ID") @Excel(name = "PRODUCT_ID")
private Long productId; private Long productId;
@ApiModelProperty("商品编码") @Schema(description = "商品编码")
@Excel(name = "商品编码") @Excel(name = "商品编码")
private String outProductId; private String outProductId;
@ApiModelProperty("商品sku id") @Schema(description = "商品sku id")
@Excel(name = "商品sku id") @Excel(name = "商品sku id")
private Long skuId; private Long skuId;
@ApiModelProperty("sku编码") @Schema(description = "sku编码")
@Excel(name = "sku编码") @Excel(name = "sku编码")
private String outSkuId; private String outSkuId;
@ApiModelProperty("商品快照id") @Schema(description = "商品快照id")
@Excel(name = "商品快照id") @Excel(name = "商品快照id")
private Long productSnapshotId; private Long productSnapshotId;
@ApiModelProperty("sku快照id") @Schema(description = "sku快照id")
@Excel(name = "sku快照id") @Excel(name = "sku快照id")
private Long skuSnapshotId; private Long skuSnapshotId;
@ApiModelProperty("展示图片") @Schema(description = "展示图片")
@Excel(name = "展示图片") @Excel(name = "展示图片")
private String pic; private String pic;
@ApiModelProperty("PRODUCT_NAME") @Schema(description = "PRODUCT_NAME")
@Excel(name = "PRODUCT_NAME") @Excel(name = "PRODUCT_NAME")
private String productName; private String productName;
@ApiModelProperty("销售价格") @Schema(description = "销售价格")
@Excel(name = "销售价格") @Excel(name = "销售价格")
private BigDecimal salePrice; private BigDecimal salePrice;
@ApiModelProperty("采购价") @Schema(description = "采购价")
@Excel(name = "采购价") @Excel(name = "采购价")
private BigDecimal purchasePrice; private BigDecimal purchasePrice;
@ApiModelProperty("购买数量") @Schema(description = "购买数量")
@Excel(name = "购买数量") @Excel(name = "购买数量")
private Integer quantity; private Integer quantity;
@ApiModelProperty("商品分类id") @Schema(description = "商品分类id")
@Excel(name = "商品分类id") @Excel(name = "商品分类id")
private Long productCategoryId; private Long productCategoryId;
@ApiModelProperty("商品sku属性:[{\"key\":\"颜色\",\"value\":\"颜色\"},{\"key\":\"容量\",\"value\":\"4G\"}]") @Schema(description = "商品sku属性:[{\"key\":\"颜色\",\"value\":\"颜色\"},{\"key\":\"容量\",\"value\":\"4G\"}]")
@Excel(name = "商品sku属性:[{\"key\":\"颜色\",\"value\":\"颜色\"},{\"key\":\"容量\",\"value\":\"4G\"}]") @Excel(name = "商品sku属性:[{\"key\":\"颜色\",\"value\":\"颜色\"},{\"key\":\"容量\",\"value\":\"4G\"}]")
private String spData; private String spData;
} }

18
ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/entity/OrderOperateHistory.java
View File

@ -1,10 +1,9 @@
package com.wzj.soopin.order.domain.entity; package com.wzj.soopin.order.domain.entity;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import org.dromara.common.core.domain.model.BaseAudit; import org.dromara.common.core.domain.model.BaseAudit;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import org.dromara.common.excel.annotation.Excel; import org.dromara.common.excel.annotation.Excel;
/** /**
@ -12,33 +11,32 @@ import org.dromara.common.excel.annotation.Excel;
* *
* @author zcc * @author zcc
*/ */
@ApiModel(description="订单操作历史记录对象") @Schema(description = "订单操作历史记录对象")
@Data @Data
@TableName("oms_order_operate_history") @TableName("oms_order_operate_history")
public class OrderOperateHistory extends BaseAudit { public class OrderOperateHistory extends BaseAudit {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ApiModelProperty("ID") @Schema(description = "ID")
private Long id; private Long id;
@ApiModelProperty("订单id") @Schema(description = "订单id")
@Excel(name = "订单id") @Excel(name = "订单id")
private Long orderId; private Long orderId;
@ApiModelProperty("订单号") @Schema(description = "订单号")
@Excel(name = "订单号") @Excel(name = "订单号")
private String orderSn; private String orderSn;
@ApiModelProperty("操作人：用户；系统；后台管理员") @Schema(description = "操作人：用户；系统；后台管理员")
@Excel(name = "操作人：用户；系统；后台管理员") @Excel(name = "操作人：用户；系统；后台管理员")
private String operateMan; private String operateMan;
@ApiModelProperty("订单状态：0->待付款；1->待发货；2->已发货；3->已完成；4->已关闭；5->无效订单") @Schema(description = "订单状态：0->待付款；1->待发货；2->已发货；3->已完成；4->已关闭；5->无效订单")
@Excel(name = "订单状态：0->待付款；1->待发货；2->已发货；3->已完成；4->已关闭；5->无效订单") @Excel(name = "订单状态：0->待付款；1->待发货；2->已发货；3->已完成；4->已关闭；5->无效订单")
private Integer orderStatus; private Integer orderStatus;
@ApiModelProperty("备注") @Schema(description = "备注")
@Excel(name = "备注") @Excel(name = "备注")
private String note; private String note;
} }

30
ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/entity/SystemStatistics.java
View File

@ -1,8 +1,7 @@
package com.wzj.soopin.order.domain.entity; package com.wzj.soopin.order.domain.entity;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import org.dromara.common.excel.annotation.Excel; import org.dromara.common.excel.annotation.Excel;
@ -14,57 +13,56 @@ import java.time.LocalDateTime;
* *
* @author zcc * @author zcc
*/ */
@ApiModel(description="系统数据统计对象") @Schema(description = "系统数据统计对象")
@Data @Data
@TableName("aws_system_statistics") @TableName("aws_system_statistics")
public class SystemStatistics { public class SystemStatistics {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ApiModelProperty("ID") @Schema(description = "ID")
private Long id; private Long id;
@ApiModelProperty("统计日期") @Schema(description = "统计日期")
@Excel(name = "统计日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "统计日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime date; private LocalDateTime date;
@ApiModelProperty("登录用户数") @Schema(description = "登录用户数")
@Excel(name = "登录用户数") @Excel(name = "登录用户数")
private Integer loginMemberCount; private Integer loginMemberCount;
@ApiModelProperty("注册用户数") @Schema(description = "注册用户数")
@Excel(name = "注册用户数") @Excel(name = "注册用户数")
private Integer registerMemberCount; private Integer registerMemberCount;
@ApiModelProperty("加购用户数") @Schema(description = "加购用户数")
@Excel(name = "加购用户数") @Excel(name = "加购用户数")
private Integer addCartMemberCount; private Integer addCartMemberCount;
@ApiModelProperty("下单用户数") @Schema(description = "下单用户数")
@Excel(name = "下单用户数") @Excel(name = "下单用户数")
private Integer createOrderMemberCount; private Integer createOrderMemberCount;
@ApiModelProperty("成交用户数") @Schema(description = "成交用户数")
@Excel(name = "成交用户数") @Excel(name = "成交用户数")
private Integer dealMemberCount; private Integer dealMemberCount;
@ApiModelProperty("下单数") @Schema(description = "下单数")
@Excel(name = "下单数") @Excel(name = "下单数")
private Integer orderCount; private Integer orderCount;
@ApiModelProperty("成交数") @Schema(description = "成交数")
@Excel(name = "成交数") @Excel(name = "成交数")
private Integer dealCount; private Integer dealCount;
@ApiModelProperty("成交金额") @Schema(description = "成交金额")
@Excel(name = "成交金额") @Excel(name = "成交金额")
private BigDecimal dealAmount; private BigDecimal dealAmount;
@ApiModelProperty("售后数") @Schema(description = "售后数")
@Excel(name = "售后数") @Excel(name = "售后数")
private Integer aftersaleCount; private Integer aftersaleCount;
@ApiModelProperty("售后金额") @Schema(description = "售后金额")
@Excel(name = "售后金额") @Excel(name = "售后金额")
private BigDecimal aftersaleAmount; private BigDecimal aftersaleAmount;
} }

26
ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/entity/VerificationCodes.java
View File

@ -3,46 +3,42 @@ package com.wzj.soopin.order.domain.entity;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import org.dromara.common.core.domain.model.BaseAudit; import org.dromara.common.core.domain.model.BaseAudit;
import java.time.LocalDateTime; import java.time.LocalDateTime;
@ApiModel(description="核销码表对象") @Schema(description = "核销码表对象")
@Data @Data
@TableName("oms_verification_codes") @TableName("oms_verification_codes")
public class VerificationCodes extends BaseAudit { public class VerificationCodes extends BaseAudit {
@ApiModelProperty("ID") @Schema(description = "ID")
@TableId(type = IdType.ASSIGN_ID) @TableId(type = IdType.ASSIGN_ID)
private Long id; private Long id;
@ApiModelProperty("核销码") @Schema(description = "核销码")
private String code; private String code;
@ApiModelProperty("关联订单id") @Schema(description = "关联订单id")
private Long orderId; private Long orderId;
@ApiModelProperty("是否使用") @Schema(description = "是否使用")
private Integer status; private Integer status;
@ApiModelProperty("用户id") @Schema(description = "用户id")
private Long memberId; private Long memberId;
@ApiModelProperty("用户昵称") @Schema(description = "用户昵称")
private String memberName; private String memberName;
@ApiModelProperty("使用时间") @Schema(description = "使用时间")
private LocalDateTime usedTime; private LocalDateTime usedTime;
@ApiModelProperty("使用商家id") @Schema(description = "使用商家id")
private Long usedMerchantId; private Long usedMerchantId;
@ApiModelProperty("过期时间") @Schema(description = "过期时间")
private LocalDateTime expireTime; private LocalDateTime expireTime;
} }

20
ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/entity/VerificationLogs.java
View File

@ -1,40 +1,38 @@
package com.wzj.soopin.order.domain.entity; package com.wzj.soopin.order.domain.entity;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import org.dromara.common.core.domain.model.BaseAudit; import org.dromara.common.core.domain.model.BaseAudit;
import java.time.LocalDateTime; import java.time.LocalDateTime;
@ApiModel(description="核销日志表对象") @Schema(description = "核销日志表对象")
@Data @Data
@TableName("oms_verification_logs") @TableName("oms_verification_logs")
public class VerificationLogs extends BaseAudit { public class VerificationLogs extends BaseAudit {
@ApiModelProperty("ID") @Schema(description = "ID")
@TableId(type = IdType.ASSIGN_ID) @TableId(type = IdType.ASSIGN_ID)
private Long id; private Long id;
@ApiModelProperty("核销码id") @Schema(description = "核销码id")
private Long codeId; private Long codeId;
@ApiModelProperty("订单id") @Schema(description = "订单id")
private Long orderId; private Long orderId;
@ApiModelProperty("商家ID") @Schema(description = "商家ID")
private Long merchantId; private Long merchantId;
@ApiModelProperty("核销时间") @Schema(description = "核销时间")
private LocalDateTime verificationTime; private LocalDateTime verificationTime;
@ApiModelProperty("核销结果") @Schema(description = "核销结果")
private Integer result; private Integer result;
@ApiModelProperty("失败原因") @Schema(description = "失败原因")
private String reason; private String reason;
} }

33
ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/entity/WechatPaymentHistory.java
View File

@ -1,73 +1,72 @@
package com.wzj.soopin.order.domain.entity; package com.wzj.soopin.order.domain.entity;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import org.dromara.common.core.domain.model.BaseAudit; import org.dromara.common.core.domain.model.BaseAudit;
import org.dromara.common.excel.annotation.Excel; import org.dromara.common.excel.annotation.Excel;
import java.math.BigDecimal; import java.math.BigDecimal;
/** /**
* 微信订单表对象 oms_wechat_payment_history * 微信订单表对象 oms_wechat_payment_history
* *
* @author zcc * @author zcc
*/ */
@ApiModel(description="微信订单表对象") @Schema(description = "微信订单表对象")
@Data @Data
@TableName("oms_wechat_payment_history") @TableName("oms_wechat_payment_history")
public class WechatPaymentHistory extends BaseAudit { public class WechatPaymentHistory extends BaseAudit {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ApiModelProperty("ID") @Schema(description = "ID")
private Long id; private Long id;
@ApiModelProperty("payment_id") @Schema(description = "payment_id")
@Excel(name = "payment_id") @Excel(name = "payment_id")
private String paymentId; private String paymentId;
@ApiModelProperty("用户 ID") @Schema(description = "用户 ID")
@Excel(name = "用户 ID") @Excel(name = "用户 ID")
private Long memberId; private Long memberId;
@ApiModelProperty("OPENID") @Schema(description = "OPENID")
@Excel(name = "OPENID") @Excel(name = "OPENID")
private String openid; private String openid;
@ApiModelProperty("真实姓名，提现需要") @Schema(description = "真实姓名，提现需要")
@Excel(name = "真实姓名，提现需要") @Excel(name = "真实姓名，提现需要")
private String realName; private String realName;
@ApiModelProperty("标题|商品名称") @Schema(description = "标题|商品名称")
@Excel(name = "标题|商品名称") @Excel(name = "标题|商品名称")
private String title; private String title;
@ApiModelProperty("订单号 支付时是payId 其他为orderId") @Schema(description = "订单号 支付时是payId 其他为orderId")
@Excel(name = "订单号 支付时是payId 其他为orderId") @Excel(name = "订单号 支付时是payId 其他为orderId")
private Long orderId; private Long orderId;
@ApiModelProperty("金额，单位分") @Schema(description = "金额，单位分")
@Excel(name = "金额，单位分") @Excel(name = "金额，单位分")
private BigDecimal money; private BigDecimal money;
@ApiModelProperty("交易类型（1为支付 2为提现 3为退款）") @Schema(description = "交易类型（1为支付 2为提现 3为退款）")
@Excel(name = "交易类型", readConverterExp = "1=为支付,2=为提现,3=为退款") @Excel(name = "交易类型", readConverterExp = "1=为支付,2=为提现,3=为退款")
private Integer opType; private Integer opType;
@ApiModelProperty("状态（0：未完成交易 1：完成关键交易）") @Schema(description = "状态（0：未完成交易 1：完成关键交易）")
@Excel(name = "状态", readConverterExp = "0=：未完成交易,1=：完成关键交易") @Excel(name = "状态", readConverterExp = "0=：未完成交易,1=：完成关键交易")
private Integer paymentStatus; private Integer paymentStatus;
@ApiModelProperty("备注") @Schema(description = "备注")
@Excel(name = "备注") @Excel(name = "备注")
private String remark; private String remark;
@ApiModelProperty("附加数据") @Schema(description = "附加数据")
@Excel(name = "附加数据") @Excel(name = "附加数据")
private String attach; private String attach;
@ApiModelProperty("响应内容") @Schema(description = "响应内容")
@Excel(name = "响应内容") @Excel(name = "响应内容")
private String responseBody; private String responseBody;
} }

14
ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/form/DealWithAftersaleForm.java
View File

@ -1,23 +1,21 @@
package com.wzj.soopin.order.domain.form; package com.wzj.soopin.order.domain.form;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
import lombok.Data; import lombok.Data;
@Data @Data
@ApiModel(value = "商城售后订单处理操作请求体") @Schema(description = "商城售后订单处理操作请求体")
public class DealWithAftersaleForm { public class DealWithAftersaleForm {
@ApiModelProperty(name = "orderId",value = "订单id",required = true,dataType = "Long") @Schema(name = "orderId", description = "订单id", required = true, implementation = Long.class)
@NotBlank(message = "订单id不能为空") @NotBlank(message = "订单id不能为空")
private Long orderId; private Long orderId;
@ApiModelProperty(name = "optType",value = "操作类型 1同意 2拒绝 3确认收货",required = true,dataType = "String") @Schema(name = "optType", description = "操作类型 1同意 2拒绝 3确认收货", required = true, implementation = Integer.class)
@NotNull(message = "操作类型不能为空") @NotNull(message = "操作类型不能为空")
private Integer optType; private Integer optType;
@ApiModelProperty(name = "remark",value = "拒绝理由 操作类型为2时必填",required = true,dataType = "String") @Schema(name = "remark", description = "拒绝理由 操作类型为2时必填", required = true, implementation = String.class)
private String remark; private String remark;
} }

9
ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/form/DeliverProductForm.java
View File

@ -1,7 +1,8 @@
package com.wzj.soopin.order.domain.form; package com.wzj.soopin.order.domain.form;
import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.wzj.soopin.order.domain.entity.OrderDeliveryHistory; import com.wzj.soopin.order.domain.entity.OrderDeliveryHistory;
import io.swagger.annotations.ApiModelProperty; import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotBlank;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
@ -11,17 +12,17 @@ import org.dromara.common.excel.annotation.Excel;
@Getter @Getter
@Setter @Setter
public class DeliverProductForm { public class DeliverProductForm {
@ApiModelProperty("订单id") @Schema(description = "订单id")
@NotBlank(message = "订单id不能为空") @NotBlank(message = "订单id不能为空")
@Excel(name = "订单号") @Excel(name = "订单号")
private Long orderId; private Long orderId;
@ApiModelProperty("快递名称") @Schema(description = "快递名称")
@NotBlank(message = "快递名称不能为空") @NotBlank(message = "快递名称不能为空")
@Excel(name = "快递公司") @Excel(name = "快递公司")
private String expressName; private String expressName;
@ApiModelProperty("快递单号") @Schema(description = "快递单号")
@NotBlank(message = "快递单号不能为空") @NotBlank(message = "快递单号不能为空")
@Excel(name = "运单号") @Excel(name = "运单号")
private String expressSn; private String expressSn;

19
ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/form/ManagerAftersaleOrderForm.java
View File

@ -4,8 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.wzj.soopin.member.domain.po.MemberAddress; import com.wzj.soopin.member.domain.po.MemberAddress;
import com.wzj.soopin.order.domain.entity.Aftersale; import com.wzj.soopin.order.domain.entity.Aftersale;
import io.swagger.annotations.ApiModel; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat;
@ -13,30 +12,30 @@ import java.time.LocalDateTime;
@Data @Data
@ApiModel(value = "商城订单请求体") @Schema(description = "商城订单请求体")
public class ManagerAftersaleOrderForm { public class ManagerAftersaleOrderForm {
@ApiModelProperty(name = "id", value = "售后单号", required = true, dataType = "Long") @Schema(name = "id", description = "售后单号", required = true, implementation = Long.class)
private Long id; private Long id;
@ApiModelProperty(name = "orderSn", value = "订单号", required = true, dataType = "String") @Schema(name = "orderSn", description = "订单号", required = true, implementation = String.class)
private String orderSn; private String orderSn;
@ApiModelProperty(name = "userPhone", value = "用户名称（手机号）", required = true, dataType = "String") @Schema(name = "userPhone", description = "用户名称（手机号）", required = true, implementation = String.class)
private String userPhone; private String userPhone;
@ApiModelProperty(name = "status", value = "售后申请状态：0->待处理；1->退货中；2->已完成；3->已拒绝；4->用户取消", required = true, dataType = "String") @Schema(name = "status", description = "售后申请状态：0->待处理；1->退货中；2->已完成；3->已拒绝；4->用户取消", required = true, implementation = Integer.class)
private Integer status; private Integer status;
@ApiModelProperty(name = "type", value = "售后类型：1->退款；2->退货退款", required = true, dataType = "String") @Schema(name = "type", description = "售后类型：1->退款；2->退货退款", required = true, implementation = Integer.class)
private Integer type; private Integer type;
@ApiModelProperty(name = "startTime", value = "开始时间", required = true, dataType = "Date") @Schema(name = "startTime", description = "开始时间", required = true, implementation = LocalDateTime.class)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime startTime; private LocalDateTime startTime;
@ApiModelProperty(name = "endTime", value = "结束时间", required = true, dataType = "Date") @Schema(name = "endTime", description = "结束时间", required = true, implementation = LocalDateTime.class)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime endTime; private LocalDateTime endTime;

31
ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/form/ManagerOrderQueryForm.java
View File

@ -3,53 +3,51 @@ package com.wzj.soopin.order.domain.form;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.wzj.soopin.order.domain.vo.ManagerOrderVO; import com.wzj.soopin.order.domain.vo.ManagerOrderVO;
import io.swagger.annotations.ApiModel; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime; import java.time.LocalDateTime;
@Data @Data
@ApiModel("后台订单查询请求体") @Schema(description = "后台订单查询请求体")
public class ManagerOrderQueryForm { public class ManagerOrderQueryForm {
@ApiModelProperty(name = "orderId", value = "订单id", required = true, dataType = "Long") @Schema(name = "orderId", description = "订单id", required = true, implementation = Long.class)
private Long orderId; private Long orderId;
@ApiModelProperty(name = "orderSn", value = "订单编号", required = true, dataType = "String") @Schema(name = "orderSn", description = "订单编号", required = true, implementation = String.class)
private String orderSn; private String orderSn;
@Schema(name = "productId", description = "商品id", required = true, implementation = Long.class)
@ApiModelProperty(name = "productId", value = "商品id", required = true, dataType = "Long")
private Long productId; private Long productId;
@ApiModelProperty(name = "productName", value = "商品名称", required = true, dataType = "String") @Schema(name = "productName", description = "商品名称", required = true, implementation = String.class)
private String productName; private String productName;
@ApiModelProperty(name = "userPhone", value = "用户名称（手机号）", required = true, dataType = "String") @Schema(name = "userPhone", description = "用户名称（手机号）", required = true, implementation = String.class)
private String userPhone; private String userPhone;
@ApiModelProperty(name = "payType", value = "支付方式 0->未支付；1->支付宝；2->微信", required = true, dataType = "Integer") @Schema(name = "payType", description = "支付方式 0->未支付；1->支付宝；2->微信", required = true, implementation = Integer.class)
private Integer payType; private Integer payType;
@ApiModelProperty(name = "status", value = "订单状态：0->待付款；1->待发货；2->已发货；3->已完成；4->已关闭；5->无效订单", required = true, dataType = "String") @Schema(name = "status", description = "订单状态：0->待付款；1->待发货；2->已发货；3->已完成；4->已关闭；5->无效订单", required = true, implementation = Integer.class)
private Integer status; private Integer status;
@ApiModelProperty("省份/直辖市 精确匹配") @Schema(description = "省份/直辖市 精确匹配")
private String receiverProvince; private String receiverProvince;
@ApiModelProperty("城市 精确匹配") @Schema(description = "城市 精确匹配")
private String receiverCity; private String receiverCity;
@ApiModelProperty("区 精确匹配") @Schema(description = "区 精确匹配")
private String receiverDistrict; private String receiverDistrict;
@ApiModelProperty(name = "startTime", value = "开始时间", required = true, dataType = "Date") @Schema(name = "startTime", description = "开始时间", required = true, implementation = LocalDateTime.class)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime startTime; private LocalDateTime startTime;
@ApiModelProperty(name = "endTime", value = "结束时间", required = true, dataType = "Date") @Schema(name = "endTime", description = "结束时间", required = true, implementation = LocalDateTime.class)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime endTime; private LocalDateTime endTime;
@ -85,7 +83,6 @@ public class ManagerOrderQueryForm {
queryWrapper.eq(ManagerOrderVO::getReceiverDistrict, receiverDistrict); queryWrapper.eq(ManagerOrderVO::getReceiverDistrict, receiverDistrict);
} }
if (startTime != null && endTime != null) { if (startTime != null && endTime != null) {
// 假设使用createTime作为时间查询字段，可根据实际情况修改
queryWrapper.between(ManagerOrderVO::getCreateTime, startTime, endTime); queryWrapper.between(ManagerOrderVO::getCreateTime, startTime, endTime);
} else if (startTime != null) { } else if (startTime != null) {
queryWrapper.ge(ManagerOrderVO::getCreateTime, startTime); queryWrapper.ge(ManagerOrderVO::getCreateTime, startTime);

15
ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/query/AftersaleItemQuery.java
View File

@ -3,8 +3,7 @@ package com.wzj.soopin.order.domain.query;
import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.wzj.soopin.order.domain.entity.AftersaleItem; import com.wzj.soopin.order.domain.entity.AftersaleItem;
import io.swagger.annotations.ApiModel; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.math.BigDecimal; import java.math.BigDecimal;
@ -14,22 +13,22 @@ import java.math.BigDecimal;
* *
* @author zcc * @author zcc
*/ */
@ApiModel(description="订单售后 查询 对象") @Schema(description = "订单售后 查询 对象")
@Data @Data
public class AftersaleItemQuery { public class AftersaleItemQuery {
@ApiModelProperty("MEMBER_ID 精确匹配") @Schema(description = "MEMBER_ID 精确匹配")
private Long memberId; private Long memberId;
@ApiModelProperty("订单id 精确匹配") @Schema(description = "订单id 精确匹配")
private Long orderId; private Long orderId;
@ApiModelProperty("子订单id 精确匹配") @Schema(description = "子订单id 精确匹配")
private Long orderItemId; private Long orderItemId;
@ApiModelProperty("退款金额 精确匹配") @Schema(description = "退款金额 精确匹配")
private BigDecimal returnAmount; private BigDecimal returnAmount;
@ApiModelProperty("退货数量 精确匹配") @Schema(description = "退货数量 精确匹配")
private Integer quantity; private Integer quantity;
public Wrapper<AftersaleItem> toWrapper() { public Wrapper<AftersaleItem> toWrapper() {

30
ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/query/AftersaleQuery.java
View File

@ -1,7 +1,6 @@
package com.wzj.soopin.order.domain.query; package com.wzj.soopin.order.domain.query;
import io.swagger.annotations.ApiModel; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import org.dromara.common.core.domain.BaseBO; import org.dromara.common.core.domain.BaseBO;
@ -13,43 +12,42 @@ import java.time.LocalDateTime;
* *
* @author zcc * @author zcc
*/ */
@ApiModel(description="订单售后 查询 对象") @Schema(description = "订单售后 查询 对象")
@Data @Data
public class AftersaleQuery extends BaseBO { public class AftersaleQuery extends BaseBO {
@ApiModelProperty("MEMBER_ID 精确匹配") @Schema(description = "MEMBER_ID 精确匹配")
private Long memberId; private Long memberId;
@ApiModelProperty("订单id 精确匹配") @Schema(description = "订单id 精确匹配")
private Long orderId; private Long orderId;
@ApiModelProperty("退款金额 精确匹配") @Schema(description = "退款金额 精确匹配")
private BigDecimal returnAmount; private BigDecimal returnAmount;
@ApiModelProperty("售后类型：1：退款，2：退货退款 精确匹配") @Schema(description = "售后类型：1：退款，2：退货退款 精确匹配")
private Integer type; private Integer type;
@ApiModelProperty("申请状态：0->待处理；1->退货中；2->已完成；3->已拒绝 精确匹配") @Schema(description = "申请状态：0->待处理；1->退货中；2->已完成；3->已拒绝 精确匹配")
private Integer status; private Integer status;
@ApiModelProperty("处理时间 精确匹配") @Schema(description = "处理时间 精确匹配")
private LocalDateTime handleTime; private LocalDateTime handleTime;
@ApiModelProperty("退货数量 精确匹配") @Schema(description = "退货数量 精确匹配")
private Integer quantity; private Integer quantity;
@ApiModelProperty("原因 精确匹配") @Schema(description = "原因 精确匹配")
private String reason; private String reason;
@ApiModelProperty("描述 精确匹配") @Schema(description = "描述 精确匹配")
private String description; private String description;
@ApiModelProperty("凭证图片，以逗号隔开 精确匹配") @Schema(description = "凭证图片，以逗号隔开 精确匹配")
private String proofPics; private String proofPics;
@ApiModelProperty("处理备注 精确匹配") @Schema(description = "处理备注 精确匹配")
private String handleNote; private String handleNote;
@ApiModelProperty("处理人员 精确匹配") @Schema(description = "处理人员 精确匹配")
private String handleMan; private String handleMan;
} }

11
ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/query/OrderDeliveryHistoryQuery.java
View File

@ -3,8 +3,7 @@ package com.wzj.soopin.order.domain.query;
import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.wzj.soopin.order.domain.entity.OrderDeliveryHistory; import com.wzj.soopin.order.domain.entity.OrderDeliveryHistory;
import io.swagger.annotations.ApiModel; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
/** /**
@ -12,16 +11,16 @@ import lombok.Data;
* *
* @author zcc * @author zcc
*/ */
@ApiModel(description="订单发货记录 查询 对象") @Schema(description = "订单发货记录 查询 对象")
@Data @Data
public class OrderDeliveryHistoryQuery { public class OrderDeliveryHistoryQuery {
@ApiModelProperty("订单id 精确匹配") @Schema(description = "订单id 精确匹配")
private Long orderId; private Long orderId;
@ApiModelProperty("物流公司 精确匹配") @Schema(description = "物流公司 精确匹配")
private String deliveryCompany; private String deliveryCompany;
@ApiModelProperty("物流单号 精确匹配") @Schema(description = "物流单号 精确匹配")
private String deliverySn; private String deliverySn;
public Wrapper<OrderDeliveryHistory> toWrapper() { public Wrapper<OrderDeliveryHistory> toWrapper() {

2
ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/query/OrderH5Query.java
View File

@ -1,8 +1,10 @@
package com.wzj.soopin.order.domain.query; package com.wzj.soopin.order.domain.query;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
@Data @Data
public class OrderH5Query { public class OrderH5Query {
@Schema(description = "tab")
private Integer tab; private Integer tab;
} }

33
ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/query/OrderItemQuery.java
View File

@ -3,8 +3,7 @@ package com.wzj.soopin.order.domain.query;
import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.wzj.soopin.order.domain.entity.OrderItem; import com.wzj.soopin.order.domain.entity.OrderItem;
import io.swagger.annotations.ApiModel; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.math.BigDecimal; import java.math.BigDecimal;
@ -14,49 +13,49 @@ import java.math.BigDecimal;
* *
* @author zcc * @author zcc
*/ */
@ApiModel(description="订单中所包含的商品 查询 对象") @Schema(description = "订单中所包含的商品 查询 对象")
@Data @Data
public class OrderItemQuery { public class OrderItemQuery {
@ApiModelProperty("订单id 精确匹配") @Schema(description = "订单id 精确匹配")
private Long orderId; private Long orderId;
@ApiModelProperty("PRODUCT_ID 精确匹配") @Schema(description = "PRODUCT_ID 精确匹配")
private Long productId; private Long productId;
@ApiModelProperty("商品编码 精确匹配") @Schema(description = "商品编码 精确匹配")
private String outProductId; private String outProductId;
@ApiModelProperty("商品sku id 精确匹配") @Schema(description = "商品sku id 精确匹配")
private Long skuId; private Long skuId;
@ApiModelProperty("sku编码 精确匹配") @Schema(description = "sku编码 精确匹配")
private String outSkuId; private String outSkuId;
@ApiModelProperty("商品快照id 精确匹配") @Schema(description = "商品快照id 精确匹配")
private Long productSnapshotId; private Long productSnapshotId;
@ApiModelProperty("sku快照id 精确匹配") @Schema(description = "sku快照id 精确匹配")
private Long skuSnapshotId; private Long skuSnapshotId;
@ApiModelProperty("展示图片 精确匹配") @Schema(description = "展示图片 精确匹配")
private String pic; private String pic;
@ApiModelProperty("PRODUCT_NAME 精确匹配") @Schema(description = "PRODUCT_NAME 精确匹配")
private String productNameLike; private String productNameLike;
@ApiModelProperty("销售价格 精确匹配") @Schema(description = "销售价格 精确匹配")
private BigDecimal salePrice; private BigDecimal salePrice;
@ApiModelProperty("采购价 精确匹配") @Schema(description = "采购价 精确匹配")
private BigDecimal purchasePrice; private BigDecimal purchasePrice;
@ApiModelProperty("购买数量 精确匹配") @Schema(description = "购买数量 精确匹配")
private Integer quantity; private Integer quantity;
@ApiModelProperty("商品分类id 精确匹配") @Schema(description = "商品分类id 精确匹配")
private Long productCategoryId; private Long productCategoryId;
@ApiModelProperty("商品sku属性:[{\"key\":\"颜色\",\"value\":\"颜色\"},{\"key\":\"容量\",\"value\":\"4G\"}] 精确匹配") @Schema(description = "商品sku属性:[{\"key\":\"颜色\",\"value\":\"颜色\"},{\"key\":\"容量\",\"value\":\"4G\"}] 精确匹配")
private String spData; private String spData;
public Wrapper<OrderItem> toWrapper() { public Wrapper<OrderItem> toWrapper() {

13
ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/query/OrderOperateHistoryQuery.java
View File

@ -3,8 +3,7 @@ package com.wzj.soopin.order.domain.query;
import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.wzj.soopin.order.domain.entity.OrderOperateHistory; import com.wzj.soopin.order.domain.entity.OrderOperateHistory;
import io.swagger.annotations.ApiModel; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
/** /**
@ -12,19 +11,19 @@ import lombok.Data;
* *
* @author zcc * @author zcc
*/ */
@ApiModel(description="订单操作历史记录 查询 对象") @Schema(description = "订单操作历史记录 查询 对象")
@Data @Data
public class OrderOperateHistoryQuery { public class OrderOperateHistoryQuery {
@ApiModelProperty("订单号 精确匹配") @Schema(description = "订单号 精确匹配")
private String orderSn; private String orderSn;
@ApiModelProperty("操作人：用户；系统；后台管理员 精确匹配") @Schema(description = "操作人：用户；系统；后台管理员 精确匹配")
private String operateMan; private String operateMan;
@ApiModelProperty("订单状态：0->待付款；1->待发货；2->已发货；3->已完成；4->已关闭；5->无效订单 精确匹配") @Schema(description = "订单状态：0->待付款；1->待发货；2->已发货；3->已完成；4->已关闭；5->无效订单 精确匹配")
private Integer orderStatus; private Integer orderStatus;
@ApiModelProperty("备注 精确匹配") @Schema(description = "备注 精确匹配")
private String note; private String note;
public Wrapper<OrderOperateHistory> toWrapper() { public Wrapper<OrderOperateHistory> toWrapper() {

65
ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/query/OrderQuery.java
View File

@ -1,7 +1,6 @@
package com.wzj.soopin.order.domain.query; package com.wzj.soopin.order.domain.query;
import io.swagger.annotations.ApiModel; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.math.BigDecimal; import java.math.BigDecimal;
@ -12,97 +11,97 @@ import java.time.LocalDateTime;
* *
* @author zcc * @author zcc
*/ */
@ApiModel(description="订单表 查询 对象") @Schema(description = "订单表 查询 对象")
@Data @Data
public class OrderQuery { public class OrderQuery {
@ApiModelProperty("MEMBER_ID 精确匹配") @Schema(description = "MEMBER_ID 精确匹配")
private Long memberId; private Long memberId;
@ApiModelProperty("用户帐号 精确匹配") @Schema(description = "用户帐号 精确匹配")
private String memberUsernameLike; private String memberUsernameLike;
@ApiModelProperty("订单总金额 精确匹配") @Schema(description = "订单总金额 精确匹配")
private BigDecimal totalAmount; private BigDecimal totalAmount;
@ApiModelProperty("采购价 精确匹配") @Schema(description = "采购价 精确匹配")
private BigDecimal purchasePrice; private BigDecimal purchasePrice;
@ApiModelProperty("应付金额（实际支付金额） 精确匹配") @Schema(description = "应付金额（实际支付金额） 精确匹配")
private BigDecimal payAmount; private BigDecimal payAmount;
@ApiModelProperty("运费金额 精确匹配") @Schema(description = "运费金额 精确匹配")
private BigDecimal freightAmount; private BigDecimal freightAmount;
@ApiModelProperty("支付方式：0->未支付；1->支付宝；2->微信 精确匹配") @Schema(description = "支付方式：0->未支付；1->支付宝；2->微信 精确匹配")
private Integer payType; private Integer payType;
@ApiModelProperty("订单状态：0->待付款；1->待发货；2->已发货；3->已完成；4->已关闭；5->无效订单 精确匹配") @Schema(description = "订单状态：0->待付款；1->待发货；2->已发货；3->已完成；4->已关闭；5->无效订单 精确匹配")
private Integer status; private Integer status;
@ApiModelProperty("退款状态，枚举值：1：无售后或售后关闭，2：售后处理中，3：退款中，4： 退款成功 精确匹配") @Schema(description = "退款状态，枚举值：1：无售后或售后关闭，2：售后处理中，3：退款中，4： 退款成功 精确匹配")
private Integer aftersaleStatus; private Integer aftersaleStatus;
@ApiModelProperty("物流公司 精确匹配") @Schema(description = "物流公司 精确匹配")
private String deliveryCompany; private String deliveryCompany;
@ApiModelProperty("物流单号 精确匹配") @Schema(description = "物流单号 精确匹配")
private String deliverySn; private String deliverySn;
@ApiModelProperty("自动确认时间（天） 精确匹配") @Schema(description = "自动确认时间（天） 精确匹配")
private Integer autoConfirmDay; private Integer autoConfirmDay;
@ApiModelProperty("收货人姓名 精确匹配") @Schema(description = "收货人姓名 精确匹配")
private String receiverNameLike; private String receiverNameLike;
@ApiModelProperty("收货人电话 精确匹配") @Schema(description = "收货人电话 精确匹配")
private String receiverPhone; private String receiverPhone;
@ApiModelProperty("收货人邮编 精确匹配") @Schema(description = "收货人邮编 精确匹配")
private String receiverPostCode; private String receiverPostCode;
@ApiModelProperty("省份/直辖市 精确匹配") @Schema(description = "省份/直辖市 精确匹配")
private String receiverProvince; private String receiverProvince;
@ApiModelProperty("城市 精确匹配") @Schema(description = "城市 精确匹配")
private String receiverCity; private String receiverCity;
@ApiModelProperty("区 精确匹配") @Schema(description = "区 精确匹配")
private String receiverDistrict; private String receiverDistrict;
@ApiModelProperty("省份/直辖市id 精确匹配") @Schema(description = "省份/直辖市id 精确匹配")
private Long receiverProvinceId; private Long receiverProvinceId;
@ApiModelProperty("城市id 精确匹配") @Schema(description = "城市id 精确匹配")
private Long receiverCityId; private Long receiverCityId;
@ApiModelProperty("区id 精确匹配") @Schema(description = "区id 精确匹配")
private Long receiverDistrictId; private Long receiverDistrictId;
@ApiModelProperty("详细地址 精确匹配") @Schema(description = "详细地址 精确匹配")
private String receiverDetailAddress; private String receiverDetailAddress;
@ApiModelProperty("订单备注 精确匹配") @Schema(description = "订单备注 精确匹配")
private String note; private String note;
@ApiModelProperty("确认收货状态：0->未确认；1->已确认 精确匹配") @Schema(description = "确认收货状态：0->未确认；1->已确认 精确匹配")
private Integer confirmStatus; private Integer confirmStatus;
@ApiModelProperty("删除状态：0->未删除；1->已删除 精确匹配") @Schema(description = "删除状态：0->未删除；1->已删除 精确匹配")
private Integer deleteStatus; private Integer deleteStatus;
@ApiModelProperty("支付时间 精确匹配") @Schema(description = "支付时间 精确匹配")
private LocalDateTime paymentTime; private LocalDateTime paymentTime;
@ApiModelProperty("发货时间 精确匹配") @Schema(description = "发货时间 精确匹配")
private LocalDateTime deliveryTime; private LocalDateTime deliveryTime;
@ApiModelProperty("确认收货时间 精确匹配") @Schema(description = "确认收货时间 精确匹配")
private LocalDateTime receiveTime; private LocalDateTime receiveTime;
@ApiModelProperty("创建订单开始时间") @Schema(description = "创建订单开始时间")
private LocalDateTime startTime; private LocalDateTime startTime;
@ApiModelProperty("创建订单结束时间") @Schema(description = "创建订单结束时间")
private LocalDateTime endTime; private LocalDateTime endTime;
public Object toWrapper() { public Object toWrapper() {

28
ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/query/WechatPaymentHistoryQuery.java
View File

@ -3,8 +3,7 @@ package com.wzj.soopin.order.domain.query;
import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.wzj.soopin.order.domain.entity.WechatPaymentHistory; import com.wzj.soopin.order.domain.entity.WechatPaymentHistory;
import io.swagger.annotations.ApiModel; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.math.BigDecimal; import java.math.BigDecimal;
@ -14,40 +13,40 @@ import java.math.BigDecimal;
* *
* @author zcc * @author zcc
*/ */
@ApiModel(description="微信订单表 查询 对象") @Schema(description = "微信订单表 查询 对象")
@Data @Data
public class WechatPaymentHistoryQuery { public class WechatPaymentHistoryQuery {
@ApiModelProperty("payment_id 精确匹配") @Schema(description = "payment_id 精确匹配")
private String paymentId; private String paymentId;
@ApiModelProperty("用户 ID 精确匹配") @Schema(description = "用户 ID 精确匹配")
private Long memberId; private Long memberId;
@ApiModelProperty("OPENID 精确匹配") @Schema(description = "OPENID 精确匹配")
private String openid; private String openid;
@ApiModelProperty("真实姓名，提现需要 精确匹配") @Schema(description = "真实姓名，提现需要 精确匹配")
private String realNameLike; private String realNameLike;
@ApiModelProperty("标题|商品名称 精确匹配") @Schema(description = "标题|商品名称 精确匹配")
private String title; private String title;
@ApiModelProperty("订单号 支付时是payId 其他为orderId 精确匹配") @Schema(description = "订单号 支付时是payId 其他为orderId 精确匹配")
private Long orderId; private Long orderId;
@ApiModelProperty("金额，单位分 精确匹配") @Schema(description = "金额，单位分 精确匹配")
private BigDecimal money; private BigDecimal money;
@ApiModelProperty("交易类型（1为支付 2为提现 3为退款） 精确匹配") @Schema(description = "交易类型（1为支付 2为提现 3为退款） 精确匹配")
private Integer opType; private Integer opType;
@ApiModelProperty("状态（0：未完成交易 1：完成关键交易） 精确匹配") @Schema(description = "状态（0：未完成交易 1：完成关键交易） 精确匹配")
private Integer paymentStatus; private Integer paymentStatus;
@ApiModelProperty("附加数据 精确匹配") @Schema(description = "附加数据 精确匹配")
private String attach; private String attach;
@ApiModelProperty("响应内容 精确匹配") @Schema(description = "响应内容 精确匹配")
private String responseBody; private String responseBody;
public Wrapper<WechatPaymentHistory> toWrapper() { public Wrapper<WechatPaymentHistory> toWrapper() {
@ -66,7 +65,6 @@ public class WechatPaymentHistoryQuery {
} }
if (realNameLike != null && !realNameLike.isEmpty()) { if (realNameLike != null && !realNameLike.isEmpty()) {
// 注意：字段名若为 real_name 需对应实体类属性
queryWrapper.like(WechatPaymentHistory::getRealName, realNameLike); queryWrapper.like(WechatPaymentHistory::getRealName, realNameLike);
} }

16
ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/vo/AftersaleItemVO.java
View File

@ -1,35 +1,51 @@
package com.wzj.soopin.order.domain.vo; package com.wzj.soopin.order.domain.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import org.dromara.common.core.domain.model.BaseAudit; import org.dromara.common.core.domain.model.BaseAudit;
import org.dromara.common.excel.annotation.Excel; import org.dromara.common.excel.annotation.Excel;
import java.math.BigDecimal; import java.math.BigDecimal;
/** /**
* 订单售后 数据视图对象 * 订单售后 数据视图对象
* *
* @author zcc * @author zcc
*/ */
@Schema(description = "订单售后数据视图对象")
@Data @Data
public class AftersaleItemVO extends BaseAudit { public class AftersaleItemVO extends BaseAudit {
/** ID */ /** ID */
@Schema(description = "ID")
private Long id; private Long id;
/** MEMBER_ID */ /** MEMBER_ID */
@Schema(description = "MEMBER_ID")
@Excel(name = "MEMBER_ID") @Excel(name = "MEMBER_ID")
private Long memberId; private Long memberId;
/** 售后单id */ /** 售后单id */
@Schema(description = "售后单id")
@Excel(name = "售后单id") @Excel(name = "售后单id")
private Long aftersaleId; private Long aftersaleId;
/** 订单id */ /** 订单id */
@Schema(description = "订单id")
@Excel(name = "订单id") @Excel(name = "订单id")
private Long orderId; private Long orderId;
/** 子订单id */ /** 子订单id */
@Schema(description = "子订单id")
@Excel(name = "子订单id") @Excel(name = "子订单id")
private Long orderItemId; private Long orderItemId;
/** 退款金额 */ /** 退款金额 */
@Schema(description = "退款金额")
@Excel(name = "退款金额") @Excel(name = "退款金额")
private BigDecimal returnAmount; private BigDecimal returnAmount;
/** 退货数量 */ /** 退货数量 */
@Schema(description = "退货数量")
@Excel(name = "退货数量") @Excel(name = "退货数量")
private Integer quantity; private Integer quantity;
} }

30
ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/vo/AftersaleVO.java
View File

@ -1,56 +1,84 @@
package com.wzj.soopin.order.domain.vo; package com.wzj.soopin.order.domain.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.dromara.common.core.domain.model.BaseAudit; import org.dromara.common.core.domain.model.BaseAudit;
import org.dromara.common.excel.annotation.Excel; import org.dromara.common.excel.annotation.Excel;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.time.LocalDateTime; import java.time.LocalDateTime;
/** /**
* 订单售后 数据视图对象 * 订单售后 数据视图对象
* *
* @author zcc * @author zcc
*/ */
@Schema(description = "订单售后数据视图对象")
@Data @Data
public class AftersaleVO extends BaseAudit { public class AftersaleVO extends BaseAudit {
/** ID */ /** ID */
@Schema(description = "ID")
private Long id; private Long id;
/** MEMBER_ID */ /** MEMBER_ID */
@Schema(description = "MEMBER_ID")
@Excel(name = "MEMBER_ID") @Excel(name = "MEMBER_ID")
private Long memberId; private Long memberId;
/** 订单id */ /** 订单id */
@Schema(description = "订单id")
@Excel(name = "订单id") @Excel(name = "订单id")
private Long orderId; private Long orderId;
/** 退款金额 */ /** 退款金额 */
@Schema(description = "退款金额")
@Excel(name = "退款金额") @Excel(name = "退款金额")
private BigDecimal returnAmount; private BigDecimal returnAmount;
/** 售后类型：1：退款，2：退货退款 */ /** 售后类型：1：退款，2：退货退款 */
@Schema(description = "售后类型：1：退款，2：退货退款")
@Excel(name = "售后类型：1：退款，2：退货退款") @Excel(name = "售后类型：1：退款，2：退货退款")
private Integer type; private Integer type;
/** 申请状态：0->待处理；1->退货中；2->已完成；3->已拒绝 */ /** 申请状态：0->待处理；1->退货中；2->已完成；3->已拒绝 */
@Schema(description = "申请状态：0->待处理；1->退货中；2->已完成；3->已拒绝")
@Excel(name = "申请状态：0->待处理；1->退货中；2->已完成；3->已拒绝") @Excel(name = "申请状态：0->待处理；1->退货中；2->已完成；3->已拒绝")
private Integer status; private Integer status;
/** 处理时间 */ /** 处理时间 */
@Schema(description = "处理时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "处理时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "处理时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime handleTime; private LocalDateTime handleTime;
/** 退货数量 */ /** 退货数量 */
@Schema(description = "退货数量")
@Excel(name = "退货数量") @Excel(name = "退货数量")
private Integer quantity; private Integer quantity;
/** 原因 */ /** 原因 */
@Schema(description = "原因")
@Excel(name = "原因") @Excel(name = "原因")
private String reason; private String reason;
/** 描述 */ /** 描述 */
@Schema(description = "描述")
@Excel(name = "描述") @Excel(name = "描述")
private String description; private String description;
/** 凭证图片，以逗号隔开 */ /** 凭证图片，以逗号隔开 */
@Schema(description = "凭证图片，以逗号隔开")
@Excel(name = "凭证图片，以逗号隔开") @Excel(name = "凭证图片，以逗号隔开")
private String proofPics; private String proofPics;
/** 处理备注 */ /** 处理备注 */
@Schema(description = "处理备注")
@Excel(name = "处理备注") @Excel(name = "处理备注")
private String handleNote; private String handleNote;
/** 处理人员 */ /** 处理人员 */
@Schema(description = "处理人员")
@Excel(name = "处理人员") @Excel(name = "处理人员")
private String handleMan; private String handleMan;
} }

13
ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/vo/CountOrderVO.java
View File

@ -1,22 +1,21 @@
package com.wzj.soopin.order.domain.vo; package com.wzj.soopin.order.domain.vo;
import io.swagger.annotations.ApiModel; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
@Data @Data
@ApiModel("统计订单数量VO") @Schema(description = "统计订单数量VO")
public class CountOrderVO { public class CountOrderVO {
@ApiModelProperty(value = "待付款订单数量", dataType = "Integer") @Schema(description = "待付款订单数量", implementation = Integer.class)
private Integer unpaid; private Integer unpaid;
@ApiModelProperty(value = "待发货订单数量", dataType = "Integer") @Schema(description = "待发货订单数量", implementation = Integer.class)
private Integer nosend; private Integer nosend;
@ApiModelProperty(value = "待收货订单数量", dataType = "Integer") @Schema(description = "待收货订单数量", implementation = Integer.class)
private Integer noget; private Integer noget;
@ApiModelProperty(value = "售后订单数量", dataType = "Integer") @Schema(description = "售后订单数量", implementation = Integer.class)
private Integer aftersale; private Integer aftersale;
} }

42
ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/vo/H5OrderVO.java
View File

@ -2,7 +2,7 @@ package com.wzj.soopin.order.domain.vo;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.wzj.soopin.order.domain.entity.OrderItem; import com.wzj.soopin.order.domain.entity.OrderItem;
import io.swagger.annotations.ApiModelProperty; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import java.math.BigDecimal; import java.math.BigDecimal;
@ -12,67 +12,67 @@ import java.util.List;
@Data @Data
public class H5OrderVO { public class H5OrderVO {
@ApiModelProperty("订单id") @Schema(description = "订单id")
private Long orderId; private Long orderId;
@ApiModelProperty("支付id") @Schema(description = "支付id")
private Long payId; private Long payId;
@ApiModelProperty("订单编号") @Schema(description = "订单编号")
private String orderSn; private String orderSn;
@ApiModelProperty("会员id") @Schema(description = "会员id")
private Long memberId; private Long memberId;
@ApiModelProperty("订单总金额") @Schema(description = "订单总金额")
private BigDecimal totalAmount; private BigDecimal totalAmount;
@ApiModelProperty("应付金额") @Schema(description = "应付金额")
private BigDecimal payAmount; private BigDecimal payAmount;
private BigDecimal couponAmount; private BigDecimal couponAmount;
@ApiModelProperty("订单状态 0->待付款；1->待发货；2->已发货；3->已完成；4->已关闭") @Schema(description = "订单状态 0->待付款；1->待发货；2->已发货；3->已完成；4->已关闭")
private Integer status; private Integer status;
@ApiModelProperty("售后状态") @Schema(description = "售后状态")
private Integer aftersaleStatus; private Integer aftersaleStatus;
@ApiModelProperty("订单Item") @Schema(description = "订单Item")
private List<OrderItem> orderItemList; private List<OrderItem> orderItemList;
@ApiModelProperty("订单备注") @Schema(description = "订单备注")
private String note; private String note;
@ApiModelProperty("物流单号") @Schema(description = "物流单号")
private String deliverySn; private String deliverySn;
@ApiModelProperty("下单时间") @Schema(description = "下单时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime; private LocalDateTime createTime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty("支付时间") @Schema(description = "支付时间")
private LocalDateTime paymentTime; private LocalDateTime paymentTime;
@ApiModelProperty("收货人姓名") @Schema(description = "收货人姓名")
private String receiverName; private String receiverName;
@ApiModelProperty("收货人手机号") @Schema(description = "收货人手机号")
private String receiverPhone; private String receiverPhone;
@ApiModelProperty("省份/直辖市") @Schema(description = "省份/直辖市")
private String receiverProvince; private String receiverProvince;
@ApiModelProperty("城市") @Schema(description = "城市")
private String receiverCity; private String receiverCity;
@ApiModelProperty("区") @Schema(description = "区")
private String receiverDistrict; private String receiverDistrict;
@ApiModelProperty("详细地址") @Schema(description = "详细地址")
private String receiverDetailAddress; private String receiverDetailAddress;
@ApiModelProperty("支付倒计时") @Schema(description = "支付倒计时")
private Long timeToPay; private Long timeToPay;
} }

14
ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/vo/ManagerOrderAddressVo.java
View File

@ -1,7 +1,6 @@
package com.wzj.soopin.order.domain.vo; package com.wzj.soopin.order.domain.vo;
import io.swagger.annotations.ApiModel; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
@ -12,15 +11,14 @@ import lombok.Setter;
*/ */
@Getter @Getter
@Setter @Setter
@ApiModel("订单收获地址") @Schema(description = "订单收获地址")
public class ManagerOrderAddressVo { public class ManagerOrderAddressVo {
@ApiModelProperty("收货人姓名") @Schema(description = "收货人姓名")
private String name; private String name;
@ApiModelProperty("收货人手机号") @Schema(description = "收货人手机号")
private String userPhone; private String userPhone;
@ApiModelProperty("收获区域") @Schema(description = "收获区域")
private String area; private String area;
@ApiModelProperty("详细地址") @Schema(description = "详细地址")
private String address; private String address;
} }

54
ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/vo/ManagerOrderDetailVO.java
View File

@ -1,7 +1,6 @@
package com.wzj.soopin.order.domain.vo; package com.wzj.soopin.order.domain.vo;
import io.swagger.annotations.ApiModel; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.math.BigDecimal; import java.math.BigDecimal;
@ -9,39 +8,56 @@ import java.time.LocalDateTime;
import java.util.List; import java.util.List;
@Data @Data
@ApiModel("后台订单详情对象") @Schema(description = "后台订单详情对象")
public class ManagerOrderDetailVO { public class ManagerOrderDetailVO {
@ApiModelProperty("订单id") @Schema(description = "订单id")
private Long orderId; private Long orderId;
@ApiModelProperty("订单编号")
@Schema(description = "订单编号")
private String orderSn; private String orderSn;
@ApiModelProperty("用户昵称")
@Schema(description = "用户昵称")
private String userName; private String userName;
@ApiModelProperty("用户手机号")
@Schema(description = "用户手机号")
private String userPhone; private String userPhone;
@ApiModelProperty("下单时间")
@Schema(description = "下单时间")
private LocalDateTime createTime; private LocalDateTime createTime;
@ApiModelProperty("支付方式：0->未支付；1->支付宝；2->微信")
@Schema(description = "支付方式：0->未支付；1->支付宝；2->微信")
private Integer payType; private Integer payType;
@ApiModelProperty("支付时间")
@Schema(description = "支付时间")
private LocalDateTime payTime; private LocalDateTime payTime;
@ApiModelProperty("订单状态：0->待付款；1->待发货；2->已发货；3->已完成；4->已关闭；5->无效订单")
@Schema(description = "订单状态：0->待付款；1->待发货；2->已发货；3->已完成；4->已关闭；5->无效订单")
private Integer orderStatus; private Integer orderStatus;
@ApiModelProperty("订单收获地址信息")
@Schema(description = "订单收获地址信息")
private ManagerOrderAddressVo addressInfo; private ManagerOrderAddressVo addressInfo;
@ApiModelProperty("订单商品信息")
@Schema(description = "订单商品信息")
private List<ManagerOrderProductVO> productInfo; private List<ManagerOrderProductVO> productInfo;
@ApiModelProperty("发货时间")
@Schema(description = "发货时间")
private LocalDateTime deliveryTime; private LocalDateTime deliveryTime;
@ApiModelProperty("收货时间")
@Schema(description = "收货时间")
private LocalDateTime receiveTime; private LocalDateTime receiveTime;
@ApiModelProperty("物流单号")
@Schema(description = "物流单号")
private String expressNo; private String expressNo;
@ApiModelProperty("物流名称")
@Schema(description = "物流名称")
private String expressName; private String expressName;
@ApiModelProperty("支付金额")
@Schema(description = "支付金额")
private BigDecimal payAmount; private BigDecimal payAmount;
@ApiModelProperty("订单金额")
@Schema(description = "订单金额")
private BigDecimal totalAmount; private BigDecimal totalAmount;
@Schema(description = "优惠卷金额")
private BigDecimal couponAmount; private BigDecimal couponAmount;
} }

31
ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/vo/ManagerOrderProductVO.java
View File

@ -1,27 +1,30 @@
package com.wzj.soopin.order.domain.vo; package com.wzj.soopin.order.domain.vo;
import com.baomidou.mybatisplus.annotation.InterceptorIgnore; import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
import io.swagger.annotations.ApiModel; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.math.BigDecimal; import java.math.BigDecimal;
@Data @Data
@ApiModel("订单") @Schema(description = "订单")
@InterceptorIgnore(tenantLine = "true") @InterceptorIgnore(tenantLine = "true")
public class ManagerOrderProductVO { public class ManagerOrderProductVO {
@ApiModelProperty("商品id") @Schema(description = "商品id")
private Long productId; private Long productId;
@ApiModelProperty("商品名称")
private String productName;
@ApiModelProperty("商品规格")
private String spData;
@ApiModelProperty("商品图片")
private String pic;
@ApiModelProperty("购买数量")
private Integer buyNum;
@ApiModelProperty("销售价格")
private BigDecimal salePrice;
@Schema(description = "商品名称")
private String productName;
@Schema(description = "商品规格")
private String spData;
@Schema(description = "商品图片")
private String pic;
@Schema(description = "购买数量")
private Integer buyNum;
@Schema(description = "销售价格")
private BigDecimal salePrice;
} }

55
ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/vo/ManagerOrderVO.java
View File

@ -4,8 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.wzj.soopin.order.domain.entity.Order; import com.wzj.soopin.order.domain.entity.Order;
import io.swagger.annotations.ApiModel; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.math.BigDecimal; import java.math.BigDecimal;
@ -13,80 +12,82 @@ import java.time.LocalDateTime;
import java.util.List; import java.util.List;
@Data @Data
@ApiModel(value = "管理后台订单VO") @Schema(description = "管理后台订单VO")
public class ManagerOrderVO { public class ManagerOrderVO {
@ApiModelProperty(name = "id",value = "订单id",required = true,dataType = "Long") @Schema(name = "id", description = "订单id", required = true, implementation = Long.class)
private Long id; private Long id;
@ApiModelProperty(name = "orderSn",value = "订单编号",required = true,dataType = "String")
@Schema(name = "orderSn", description = "订单编号", required = true, implementation = String.class)
private String orderSn; private String orderSn;
@ApiModelProperty(name = "productId",value = "商品id",required = true,dataType = "Long")
@Schema(name = "productId", description = "商品id", required = true, implementation = Long.class)
private Long productId; private Long productId;
@ApiModelProperty(name = "productName",value = "商品名称",required = true,dataType = "String") @Schema(name = "productName", description = "商品名称", required = true, implementation = String.class)
private String productName; private String productName;
@ApiModelProperty(name = "userPhone",value = "用户账号",required = true,dataType = "String") @Schema(name = "userPhone", description = "用户账号", required = true, implementation = String.class)
private String userPhone; private String userPhone;
@ApiModelProperty(name = "nickName",value = "用户昵称",required = true,dataType = "String") @Schema(name = "nickName", description = "用户昵称", required = true, implementation = String.class)
private String nickName; private String nickName;
@ApiModelProperty(name = "avatar",value = "用户头像",required = true,dataType = "String") @Schema(name = "avatar", description = "用户头像", required = true, implementation = String.class)
private String avatar; private String avatar;
@ApiModelProperty(name = "status",value = "订单状态：0->待付款；1->待发货；2->已发货；3->已完成；4->已关闭；5->无效订单",required = true,dataType = "Integer") @Schema(name = "status", description = "订单状态：0->待付款；1->待发货；2->已发货；3->已完成；4->已关闭；5->无效订单", required = true, implementation = Integer.class)
private Integer status; private Integer status;
@ApiModelProperty("退款状态，枚举值：1：无售后或售后关闭，2：售后处理中，3：退款中，4： 退款成功") @Schema(description = "退款状态，枚举值：1：无售后或售后关闭，2：售后处理中，3：退款中，4： 退款成功")
private Integer aftersaleStatus; private Integer aftersaleStatus;
@ApiModelProperty(name = "pic",value = "商品图片",required = true,dataType = "String") @Schema(name = "pic", description = "商品图片", required = true, implementation = String.class)
private String pic; private String pic;
@ApiModelProperty(name = "userName",value = "用户名称",required = true,dataType = "String") @Schema(name = "userName", description = "用户名称", required = true, implementation = String.class)
private String userName; private String userName;
@ApiModelProperty(name = "buyNum",value = "购买数量",required = true,dataType = "Integer") @Schema(name = "buyNum", description = "购买数量", required = true, implementation = Integer.class)
private Integer buyNum; private Integer buyNum;
@ApiModelProperty(name = "totalAmount",value = "订单总金额",required = true,dataType = "BigDecimal") @Schema(name = "totalAmount", description = "订单总金额", required = true, implementation = BigDecimal.class)
private BigDecimal totalAmount; private BigDecimal totalAmount;
@ApiModelProperty(name = "payAmount",value = "应付金额",required = true,dataType = "BigDecimal") @Schema(name = "payAmount", description = "应付金额", required = true, implementation = BigDecimal.class)
private BigDecimal payAmount; private BigDecimal payAmount;
@ApiModelProperty(name = "createTime",value = "下单时间",required = true,dataType = "Date") @Schema(name = "createTime", description = "下单时间", required = true, implementation = LocalDateTime.class)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime; private LocalDateTime createTime;
@ApiModelProperty(name = "payTime",value = "支付时间",required = true,dataType = "Date") @Schema(name = "payTime", description = "支付时间", required = true, implementation = LocalDateTime.class)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime payTime; private LocalDateTime payTime;
@ApiModelProperty(name = "payType",value = "支付方式 支付方式：0->未支付；1->支付宝；2->微信",required = true,dataType = "Integer") @Schema(name = "payType", description = "支付方式 支付方式：0->未支付；1->支付宝；2->微信", required = true, implementation = Integer.class)
private Integer payType; private Integer payType;
@ApiModelProperty(name = "receiveTime",value = "确认收货时间",required = true,dataType = "Date") @Schema(name = "receiveTime", description = "确认收货时间", required = true, implementation = LocalDateTime.class)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime receiveTime; private LocalDateTime receiveTime;
@ApiModelProperty(name = "note",value = "备注",required = true,dataType = "String") @Schema(name = "note", description = "备注", required = true, implementation = String.class)
private String note; private String note;
@ApiModelProperty("商家备注") @Schema(description = "商家备注")
private String merchantNote; private String merchantNote;
@ApiModelProperty(name = "spData",value = "商品sku属性",required = true,dataType = "String") @Schema(name = "spData", description = "商品sku属性", required = true, implementation = String.class)
private String spData; private String spData;
@ApiModelProperty(name = "productInfo", value = "订单商品数据") @Schema(name = "productInfo", description = "订单商品数据")
private List<ManagerOrderProductVO> productList; private List<ManagerOrderProductVO> productList;
@ApiModelProperty(name = "deliveryTime",value = "发货时间",required = true,dataType = "LocalDataTime") @Schema(name = "deliveryTime", description = "发货时间", required = true, implementation = LocalDateTime.class)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime deliveryTime; private LocalDateTime deliveryTime;
@ApiModelProperty(name = "deliverySn",value = "物流单号",required = true,dataType = "String") @Schema(name = "deliverySn", description = "物流单号", required = true, implementation = String.class)
private String deliverySn; private String deliverySn;
private String receiverName; private String receiverName;

81
ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/vo/ManagerRefundOrderDetailVO.java
View File

@ -1,7 +1,6 @@
package com.wzj.soopin.order.domain.vo; package com.wzj.soopin.order.domain.vo;
import io.swagger.annotations.ApiModel; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.math.BigDecimal; import java.math.BigDecimal;
@ -14,39 +13,53 @@ import java.util.List;
* @Description: * @Description:
*/ */
@Data @Data
@ApiModel("售后订单详情") @Schema(description = "售后订单详情")
public class ManagerRefundOrderDetailVO { public class ManagerRefundOrderDetailVO {
@ApiModelProperty("订单id") @Schema(description = "订单id")
private Long orderId; private Long orderId;
@ApiModelProperty("订单号")
private String orderSn;
@ApiModelProperty("用户昵称")
private String nickName;
@ApiModelProperty("用户手机号")
private String phone;
@ApiModelProperty("下单时间")
private LocalDateTime createTime;
@ApiModelProperty("支付方式：0->未支付；1->支付宝；2->微信")
private Integer payType;
@ApiModelProperty("支付时间")
private LocalDateTime payTime;
@ApiModelProperty("订单状态：0->待付款；1->待发货；2->已发货；3->已完成；4->已关闭；5->无效订单")
private Integer status;
@ApiModelProperty("订单收获地址信息")
private OrderAddressVO addressInfo;
@ApiModelProperty("订单商品信息")
private List<ManagerOrderProductVO> productList;
@ApiModelProperty("售后信息")
private List<RefundInfoVO> refundInfoList;
@ApiModelProperty("退货时间")
private LocalDateTime deliveryTime;
@ApiModelProperty("物流单号")
private String expressNo;
@ApiModelProperty("物流名称")
private String expressName;
@ApiModelProperty("订单总金额")
private BigDecimal totalAmount;
@ApiModelProperty("应付金额（实际支付金额）")
private BigDecimal payAmount;
@Schema(description = "订单号")
private String orderSn;
@Schema(description = "用户昵称")
private String nickName;
@Schema(description = "用户手机号")
private String phone;
@Schema(description = "下单时间")
private LocalDateTime createTime;
@Schema(description = "支付方式：0->未支付；1->支付宝；2->微信")
private Integer payType;
@Schema(description = "支付时间")
private LocalDateTime payTime;
@Schema(description = "订单状态：0->待付款；1->待发货；2->已发货；3->已完成；4->已关闭；5->无效订单")
private Integer status;
@Schema(description = "订单收获地址信息")
private OrderAddressVO addressInfo;
@Schema(description = "订单商品信息")
private List<ManagerOrderProductVO> productList;
@Schema(description = "售后信息")
private List<RefundInfoVO> refundInfoList;
@Schema(description = "退货时间")
private LocalDateTime deliveryTime;
@Schema(description = "物流单号")
private String expressNo;
@Schema(description = "物流名称")
private String expressName;
@Schema(description = "订单总金额")
private BigDecimal totalAmount;
@Schema(description = "应付金额（实际支付金额）")
private BigDecimal payAmount;
} }

57
ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/vo/ManagerRefundOrderVO.java
View File

@ -1,7 +1,6 @@
package com.wzj.soopin.order.domain.vo; package com.wzj.soopin.order.domain.vo;
import io.swagger.annotations.ApiModel; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.math.BigDecimal; import java.math.BigDecimal;
@ -10,77 +9,81 @@
@Data @Data
@ApiModel(value = "售后订单vo") @Schema(description = "售后订单vo")
public class ManagerRefundOrderVO { public class ManagerRefundOrderVO {
@ApiModelProperty(name = "id",value = "售后单id",required = true,dataType = "Long") @Schema(name = "id", description = "售后单id", required = true, implementation = Long.class)
private Long id; private Long id;
@ApiModelProperty(name = "orderId",value = "订单id",required = true,dataType = "Long") @Schema(name = "orderId", description = "订单id", required = true, implementation = Long.class)
private Long orderId; private Long orderId;
@ApiModelProperty(name = "orderSn",value = "订单号",required = true,dataType = "String") @Schema(name = "orderSn", description = "订单号", required = true, implementation = String.class)
private String orderSn; private String orderSn;
@ApiModelProperty(name = "payId",value = "支付ID",required = true,dataType = "Long") @Schema(name = "payId", description = "支付ID", required = true, implementation = Long.class)
private Long payId; private Long payId;
@ApiModelProperty(name = "phone",value = "用户手机号",required = true,dataType = "String") @Schema(name = "phone", description = "用户手机号", required = true, implementation = String.class)
private String phone; private String phone;
@ApiModelProperty(name = "nickName",value = "用户昵称",required = true,dataType = "String") @Schema(name = "nickName", description = "用户昵称", required = true, implementation = String.class)
private String nickName; private String nickName;
@ApiModelProperty(name = "status",value = "订单状态 0->待付款；1->待发货；2->已发货；3->已完成；4->已关闭；5->无效订单",required = true,dataType = "Integer") @Schema(name = "status", description = "订单状态 0->待付款；1->待发货；2->已发货；3->已完成；4->已关闭；5->无效订单", required = true, implementation = Integer.class)
private Integer status; private Integer status;
@ApiModelProperty(name = "userName",value = "用户名称",required = true,dataType = "String") @Schema(name = "userName", description = "用户名称", required = true, implementation = String.class)
private String userName; private String userName;
@ApiModelProperty(name = "payTime",value = "支付时间",required = true,dataType = "String") @Schema(name = "payTime", description = "支付时间", required = true, implementation = String.class)
private String payTime; private String payTime;
@ApiModelProperty(name = "payType",value = "支付方式 支付方式：0->未支付；1->支付宝；2->微信",required = true,dataType = "Integer") @Schema(name = "payType", description = "支付方式 支付方式：0->未支付；1->支付宝；2->微信", required = true, implementation = Integer.class)
private Integer payType; private Integer payType;
@ApiModelProperty(name = "applyRefundTime",value = "申请售后的时间",required = true,dataType = "String") @Schema(name = "applyRefundTime", description = "申请售后的时间", required = true, implementation = String.class)
private String applyRefundTime; private String applyRefundTime;
@ApiModelProperty(name = "refundFinishTime",value = "售后完成的时间",required = true,dataType = "String") @Schema(name = "refundFinishTime", description = "售后完成的时间", required = true, implementation = String.class)
private String refundFinishTime; private String refundFinishTime;
@ApiModelProperty(name = "aftersaleStatus",value = "0->待处理；1->退货中；2->已完成；3->已拒绝； 4->用户取消",required = true,dataType = "String") @Schema(name = "aftersaleStatus", description = "0->待处理；1->退货中；2->已完成；3->已拒绝； 4->用户取消", required = true, implementation = Integer.class)
private Integer aftersaleStatus; private Integer aftersaleStatus;
@ApiModelProperty(name = "note",value = "备注",required = true,dataType = "String")
@Schema(name = "note", description = "备注", required = true, implementation = String.class)
private String note; private String note;
@ApiModelProperty(name = "applyRefundAmount",value = "退款金额",required = true,dataType = "BigDecimal")
@Schema(name = "applyRefundAmount", description = "退款金额", required = true, implementation = BigDecimal.class)
private BigDecimal applyReturnAmount; private BigDecimal applyReturnAmount;
@ApiModelProperty(name = "refundNum",value = "退款数量",required = true,dataType = "Integer")
@Schema(name = "refundNum", description = "退款数量", required = true, implementation = Integer.class)
private Integer refundNum; private Integer refundNum;
@ApiModelProperty(name = "applyRefundType",value = "申请退货方式：1-仅退款，2-退货退款",required = true,dataType = "String") @Schema(name = "applyRefundType", description = "申请退货方式：1-仅退款，2-退货退款", required = true, implementation = Integer.class)
private Integer applyRefundType; private Integer applyRefundType;
@ApiModelProperty(name = "handleTime",value = "处理时间",required = true,dataType = "LocalDateTime")
@Schema(name = "handleTime", description = "处理时间", required = true, implementation = LocalDateTime.class)
private LocalDateTime handleTime; private LocalDateTime handleTime;
@ApiModelProperty(name = "reason",value = "原因",required = true,dataType = "String") @Schema(name = "reason", description = "原因", required = true, implementation = String.class)
private String reason; private String reason;
@ApiModelProperty(name = "description",value = "描述",required = true,dataType = "String") @Schema(name = "description", description = "描述", required = true, implementation = String.class)
private String description; private String description;
@ApiModelProperty(name = "proofPics",value = "凭证图片",required = true,dataType = "String") @Schema(name = "proofPics", description = "凭证图片", required = true, implementation = String.class)
private String proofPics; private String proofPics;
@ApiModelProperty(name = "productInfo", value = "售后单商品数据") @Schema(name = "productInfo", description = "售后单商品数据")
private List<ManagerOrderProductVO> productList; private List<ManagerOrderProductVO> productList;
@ApiModelProperty(name = "handleMan", value = "处理人员") @Schema(name = "handleMan", description = "处理人员")
private String handleMan; private String handleMan;
private String mark; private String mark;
private String refundWpCode; private String refundWpCode;
@ApiModelProperty("退货快递号") @Schema(description = "退货快递号")
private String refundWaybillCode; private String refundWaybillCode;
} }

16
ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/vo/MemberDataStatisticsVO.java
View File

@ -1,22 +1,24 @@
package com.wzj.soopin.order.domain.vo; package com.wzj.soopin.order.domain.vo;
import io.swagger.annotations.ApiModel; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import org.apache.ibatis.type.Alias; import org.apache.ibatis.type.Alias;
import java.math.BigDecimal; import java.math.BigDecimal;
@Data @Data
@ApiModel("会员下单数据统计对象") @Schema(description = "会员下单数据统计对象")
@Alias("OrderMemberDataStatisticsVO") @Alias("OrderMemberDataStatisticsVO")
public class MemberDataStatisticsVO { public class MemberDataStatisticsVO {
@ApiModelProperty("购物车数") @Schema(description = "购物车数")
private Integer cartCount; private Integer cartCount;
@ApiModelProperty("订单数")
@Schema(description = "订单数")
private Integer orderCount; private Integer orderCount;
@ApiModelProperty("下单金额")
@Schema(description = "下单金额")
private BigDecimal orderAmount; private BigDecimal orderAmount;
@ApiModelProperty("售后数")
@Schema(description = "售后数")
private Integer aftersaleCount; private Integer aftersaleCount;
} }

21
ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/vo/OrderAddressVO.java
View File

@ -1,7 +1,6 @@
package com.wzj.soopin.order.domain.vo; package com.wzj.soopin.order.domain.vo;
import io.swagger.annotations.ApiModel; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
@ -12,15 +11,17 @@ import lombok.Setter;
*/ */
@Getter @Getter
@Setter @Setter
@ApiModel("订单收获地址") @Schema(description = "订单收获地址")
public class OrderAddressVO { public class OrderAddressVO {
@ApiModelProperty("收货人姓名") @Schema(description = "收货人姓名")
private String name; private String name;
@ApiModelProperty("收货人手机号")
private String userPhone;
@ApiModelProperty("收获区域")
private String area;
@ApiModelProperty("详细地址")
private String address;
@Schema(description = "收货人手机号")
private String userPhone;
@Schema(description = "收获区域")
private String area;
@Schema(description = "详细地址")
private String address;
} }

13
ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/vo/OrderAndAftersaleStatisticsVO.java
View File

@ -1,21 +1,34 @@
package com.wzj.soopin.order.domain.vo; package com.wzj.soopin.order.domain.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import java.math.BigDecimal; import java.math.BigDecimal;
@Data @Data
@Schema(description = "订单与售后统计VO")
public class OrderAndAftersaleStatisticsVO { public class OrderAndAftersaleStatisticsVO {
/** 待处理售后 */ /** 待处理售后 */
@Schema(description = "待处理售后数量")
private Integer pendingAftersaleCount; private Integer pendingAftersaleCount;
/** 处理中售后 */ /** 处理中售后 */
@Schema(description = "处理中售后数量")
private Integer processingAftersaleCount; private Integer processingAftersaleCount;
/** 待发货 */ /** 待发货 */
@Schema(description = "待发货订单数量")
private Integer waitDeliveredCount; private Integer waitDeliveredCount;
/** 已发货 */ /** 已发货 */
@Schema(description = "今日已发货订单数量")
private Integer todayHasDeliveredCount; private Integer todayHasDeliveredCount;
/** 订单数 */ /** 订单数 */
@Schema(description = "今日订单数量")
private Integer todayOrderCount; private Integer todayOrderCount;
/** 成交额 */ /** 成交额 */
@Schema(description = "今日成交金额")
private BigDecimal todayTransactionAmount; private BigDecimal todayTransactionAmount;
} }

9
ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/vo/OrderDeliveryHistoryVO.java
View File

@ -1,5 +1,6 @@
package com.wzj.soopin.order.domain.vo; package com.wzj.soopin.order.domain.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import org.dromara.common.core.domain.model.BaseAudit; import org.dromara.common.core.domain.model.BaseAudit;
import org.dromara.common.excel.annotation.Excel; import org.dromara.common.excel.annotation.Excel;
@ -9,17 +10,25 @@ import org.dromara.common.excel.annotation.Excel;
* *
* @author zcc * @author zcc
*/ */
@Schema(description = "订单发货记录数据视图对象")
@Data @Data
public class OrderDeliveryHistoryVO extends BaseAudit { public class OrderDeliveryHistoryVO extends BaseAudit {
/** ID */ /** ID */
@Schema(description = "ID")
private Long id; private Long id;
/** 订单id */ /** 订单id */
@Schema(description = "订单id")
@Excel(name = "订单id") @Excel(name = "订单id")
private Long orderId; private Long orderId;
/** 物流公司(配送方式) */ /** 物流公司(配送方式) */
@Schema(description = "物流公司(配送方式)")
@Excel(name = "物流公司(配送方式)") @Excel(name = "物流公司(配送方式)")
private String deliveryCompany; private String deliveryCompany;
/** 物流单号 */ /** 物流单号 */
@Schema(description = "物流单号")
@Excel(name = "物流单号") @Excel(name = "物流单号")
private String deliverySn; private String deliverySn;
} }

32
ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/vo/OrderItemVO.java
View File

@ -1,59 +1,91 @@
package com.wzj.soopin.order.domain.vo; package com.wzj.soopin.order.domain.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import org.dromara.common.core.domain.model.BaseAudit; import org.dromara.common.core.domain.model.BaseAudit;
import org.dromara.common.excel.annotation.Excel; import org.dromara.common.excel.annotation.Excel;
import java.math.BigDecimal; import java.math.BigDecimal;
/** /**
* 订单中所包含的商品 数据视图对象 * 订单中所包含的商品 数据视图对象
* *
* @author zcc * @author zcc
*/ */
@Schema(description = "订单中所包含的商品数据视图对象")
@Data @Data
public class OrderItemVO extends BaseAudit { public class OrderItemVO extends BaseAudit {
/** ID */ /** ID */
@Schema(description = "ID")
private Long id; private Long id;
/** 订单id */ /** 订单id */
@Schema(description = "订单id")
@Excel(name = "订单id") @Excel(name = "订单id")
private Long orderId; private Long orderId;
/** PRODUCT_ID */ /** PRODUCT_ID */
@Schema(description = "PRODUCT_ID")
@Excel(name = "PRODUCT_ID") @Excel(name = "PRODUCT_ID")
private Long productId; private Long productId;
/** 商品编码 */ /** 商品编码 */
@Schema(description = "商品编码")
@Excel(name = "商品编码") @Excel(name = "商品编码")
private String outProductId; private String outProductId;
/** 商品sku id */ /** 商品sku id */
@Schema(description = "商品sku id")
@Excel(name = "商品sku id") @Excel(name = "商品sku id")
private Long skuId; private Long skuId;
/** sku编码 */ /** sku编码 */
@Schema(description = "sku编码")
@Excel(name = "sku编码") @Excel(name = "sku编码")
private String outSkuId; private String outSkuId;
/** 商品快照id */ /** 商品快照id */
@Schema(description = "商品快照id")
@Excel(name = "商品快照id") @Excel(name = "商品快照id")
private Long productSnapshotId; private Long productSnapshotId;
/** sku快照id */ /** sku快照id */
@Schema(description = "sku快照id")
@Excel(name = "sku快照id") @Excel(name = "sku快照id")
private Long skuSnapshotId; private Long skuSnapshotId;
/** 展示图片 */ /** 展示图片 */
@Schema(description = "展示图片")
@Excel(name = "展示图片") @Excel(name = "展示图片")
private String pic; private String pic;
/** PRODUCT_NAME */ /** PRODUCT_NAME */
@Schema(description = "PRODUCT_NAME")
@Excel(name = "PRODUCT_NAME") @Excel(name = "PRODUCT_NAME")
private String productName; private String productName;
/** 销售价格 */ /** 销售价格 */
@Schema(description = "销售价格")
@Excel(name = "销售价格") @Excel(name = "销售价格")
private BigDecimal salePrice; private BigDecimal salePrice;
/** 采购价 */ /** 采购价 */
@Schema(description = "采购价")
@Excel(name = "采购价") @Excel(name = "采购价")
private BigDecimal purchasePrice; private BigDecimal purchasePrice;
/** 购买数量 */ /** 购买数量 */
@Schema(description = "购买数量")
@Excel(name = "购买数量") @Excel(name = "购买数量")
private Integer quantity; private Integer quantity;
/** 商品分类id */ /** 商品分类id */
@Schema(description = "商品分类id")
@Excel(name = "商品分类id") @Excel(name = "商品分类id")
private Long productCategoryId; private Long productCategoryId;
/** 商品sku属性:[{\"key\":\"颜色\",\"value\":\"颜色\"},{\"key\":\"容量\",\"value\":\"4G\"}] */ /** 商品sku属性:[{\"key\":\"颜色\",\"value\":\"颜色\"},{\"key\":\"容量\",\"value\":\"4G\"}] */
@Schema(description = "商品sku属性:[{\"key\":\"颜色\",\"value\":\"颜色\"},{\"key\":\"容量\",\"value\":\"4G\"}]")
@Excel(name = "商品sku属性:[{\"key\":\"颜色\",\"value\":\"颜色\"},{\"key\":\"容量\",\"value\":\"4G\"}]") @Excel(name = "商品sku属性:[{\"key\":\"颜色\",\"value\":\"颜色\"},{\"key\":\"容量\",\"value\":\"4G\"}]")
private String spData; private String spData;
} }

13
ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/vo/OrderOperateHistoryVO.java
View File

@ -1,5 +1,6 @@
package com.wzj.soopin.order.domain.vo; package com.wzj.soopin.order.domain.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import org.dromara.common.core.domain.model.BaseAudit; import org.dromara.common.core.domain.model.BaseAudit;
import org.dromara.common.excel.annotation.Excel; import org.dromara.common.excel.annotation.Excel;
@ -9,23 +10,35 @@ import org.dromara.common.excel.annotation.Excel;
* *
* @author zcc * @author zcc
*/ */
@Schema(description = "订单操作历史记录数据视图对象")
@Data @Data
public class OrderOperateHistoryVO extends BaseAudit { public class OrderOperateHistoryVO extends BaseAudit {
/** ID */ /** ID */
@Schema(description = "ID")
private Long id; private Long id;
/** 订单id */ /** 订单id */
@Schema(description = "订单id")
@Excel(name = "订单id") @Excel(name = "订单id")
private Long orderId; private Long orderId;
/** 订单号 */ /** 订单号 */
@Schema(description = "订单号")
@Excel(name = "订单号") @Excel(name = "订单号")
private String orderSn; private String orderSn;
/** 操作人：用户；系统；后台管理员 */ /** 操作人：用户；系统；后台管理员 */
@Schema(description = "操作人：用户；系统；后台管理员")
@Excel(name = "操作人：用户；系统；后台管理员") @Excel(name = "操作人：用户；系统；后台管理员")
private String operateMan; private String operateMan;
/** 订单状态：0->待付款；1->待发货；2->已发货；3->已完成；4->已关闭；5->无效订单 */ /** 订单状态：0->待付款；1->待发货；2->已发货；3->已完成；4->已关闭；5->无效订单 */
@Schema(description = "订单状态：0->待付款；1->待发货；2->已发货；3->已完成；4->已关闭；5->无效订单")
@Excel(name = "订单状态：0->待付款；1->待发货；2->已发货；3->已完成；4->已关闭；5->无效订单") @Excel(name = "订单状态：0->待付款；1->待发货；2->已发货；3->已完成；4->已关闭；5->无效订单")
private Integer orderStatus; private Integer orderStatus;
/** 备注 */ /** 备注 */
@Schema(description = "备注")
@Excel(name = "备注") @Excel(name = "备注")
private String note; private String note;
} }

46
ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/vo/RefundInfoVO.java
View File

@ -1,7 +1,6 @@
package com.wzj.soopin.order.domain.vo; package com.wzj.soopin.order.domain.vo;
import io.swagger.annotations.ApiModel; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
@ -15,36 +14,49 @@ import java.time.LocalDateTime;
*/ */
@Getter @Getter
@Setter @Setter
@ApiModel("售后信息") @Schema(description = "售后信息")
public class RefundInfoVO { public class RefundInfoVO {
@ApiModelProperty("退款单号") @Schema(description = "退款单号")
private Long id; private Long id;
@ApiModelProperty("申请退货方式：1-仅退款，2-退货退款")
@Schema(description = "申请退货方式：1-仅退款，2-退货退款")
private Integer applyRefundType; private Integer applyRefundType;
@ApiModelProperty("申请售后时间")
@Schema(description = "申请售后时间")
private LocalDateTime applyRefundTime; private LocalDateTime applyRefundTime;
@ApiModelProperty("售后金额")
@Schema(description = "售后金额")
private BigDecimal refundAmount; private BigDecimal refundAmount;
@ApiModelProperty("申请原因")
@Schema(description = "申请原因")
private String reason; private String reason;
@ApiModelProperty("描述")
@Schema(description = "描述")
private String description; private String description;
@ApiModelProperty("凭证")
@Schema(description = "凭证")
private String proofPics; private String proofPics;
@ApiModelProperty("申请状态：0->待处理；1->退货中；2->已完成；3->已拒绝； 4->用户取消")
@Schema(description = "申请状态：0->待处理；1->退货中；2->已完成；3->已拒绝；4->用户取消")
private Integer refundStatus; private Integer refundStatus;
@ApiModelProperty("平台拒绝理由")
@Schema(description = "平台拒绝理由")
private String remark; private String remark;
@ApiModelProperty("物流单号")
@Schema(description = "物流单号")
private String expressNo; private String expressNo;
@ApiModelProperty("物流名称")
@Schema(description = "物流名称")
private String expressName; private String expressName;
@ApiModelProperty("最新物流数据")
@Schema(description = "最新物流数据")
private String logistics; private String logistics;
@ApiModelProperty("所有物流信息 JSON格式")
@Schema(description = "所有物流信息 JSON格式")
private String allLogistics; private String allLogistics;
private String refundWpCode; private String refundWpCode;
@ApiModelProperty("退货快递号") @Schema(description = "退货快递号")
private String refundWaybillCode; private String refundWaybillCode;
} }

5
ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/vo/SearchVO.java
View File

@ -3,6 +3,7 @@ package com.wzj.soopin.order.domain.vo;
import com.wzj.soopin.order.utils.DateUtil; import com.wzj.soopin.order.utils.DateUtil;
import com.wzj.soopin.order.utils.StringUtils; import com.wzj.soopin.order.utils.StringUtils;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
@ -21,10 +22,10 @@ import java.util.Date;
@NoArgsConstructor @NoArgsConstructor
public class SearchVO implements Serializable { public class SearchVO implements Serializable {
@ApiModelProperty(value = "起始日期") @Schema(description = "起始日期")
private String startDate; private String startDate;
@ApiModelProperty(value = "结束日期") @Schema(description = "结束日期")
private String endDate; private String endDate;
public Date getConvertStartDate() { public Date getConvertStartDate() {

28
ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/vo/WechatPaymentHistoryVO.java
View File

@ -1,53 +1,81 @@
package com.wzj.soopin.order.domain.vo; package com.wzj.soopin.order.domain.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import org.dromara.common.core.domain.model.BaseAudit; import org.dromara.common.core.domain.model.BaseAudit;
import org.dromara.common.excel.annotation.Excel; import org.dromara.common.excel.annotation.Excel;
import java.math.BigDecimal; import java.math.BigDecimal;
/** /**
* 微信订单表 数据视图对象 * 微信订单表 数据视图对象
* *
* @author zcc * @author zcc
*/ */
@Schema(description = "微信订单表数据视图对象")
@Data @Data
public class WechatPaymentHistoryVO extends BaseAudit { public class WechatPaymentHistoryVO extends BaseAudit {
/** ID */ /** ID */
@Schema(description = "ID")
private Long id; private Long id;
/** payment_id */ /** payment_id */
@Schema(description = "payment_id")
@Excel(name = "payment_id") @Excel(name = "payment_id")
private String paymentId; private String paymentId;
/** 用户 ID */ /** 用户 ID */
@Schema(description = "用户 ID")
@Excel(name = "用户 ID") @Excel(name = "用户 ID")
private Long memberId; private Long memberId;
/** OPENID */ /** OPENID */
@Schema(description = "OPENID")
@Excel(name = "OPENID") @Excel(name = "OPENID")
private String openid; private String openid;
/** 真实姓名，提现需要 */ /** 真实姓名，提现需要 */
@Schema(description = "真实姓名，提现需要")
@Excel(name = "真实姓名，提现需要") @Excel(name = "真实姓名，提现需要")
private String realName; private String realName;
/** 标题|商品名称 */ /** 标题|商品名称 */
@Schema(description = "标题|商品名称")
@Excel(name = "标题|商品名称") @Excel(name = "标题|商品名称")
private String title; private String title;
/** 订单号 支付时是payId 其他为orderId */ /** 订单号 支付时是payId 其他为orderId */
@Schema(description = "订单号 支付时是payId 其他为orderId")
@Excel(name = "订单号 支付时是payId 其他为orderId") @Excel(name = "订单号 支付时是payId 其他为orderId")
private Long orderId; private Long orderId;
/** 金额，单位分 */ /** 金额，单位分 */
@Schema(description = "金额，单位分")
@Excel(name = "金额，单位分") @Excel(name = "金额，单位分")
private BigDecimal money; private BigDecimal money;
/** 交易类型（1为支付 2为提现 3为退款） */ /** 交易类型（1为支付 2为提现 3为退款） */
@Schema(description = "交易类型（1为支付 2为提现 3为退款）")
@Excel(name = "交易类型", readConverterExp = "1=为支付,2=为提现,3=为退款") @Excel(name = "交易类型", readConverterExp = "1=为支付,2=为提现,3=为退款")
private Integer opType; private Integer opType;
/** 状态（0：未完成交易 1：完成关键交易） */ /** 状态（0：未完成交易 1：完成关键交易） */
@Schema(description = "状态（0：未完成交易 1：完成关键交易）")
@Excel(name = "状态", readConverterExp = "0=：未完成交易,1=：完成关键交易") @Excel(name = "状态", readConverterExp = "0=：未完成交易,1=：完成关键交易")
private Integer paymentStatus; private Integer paymentStatus;
/** 备注 */ /** 备注 */
@Schema(description = "备注")
@Excel(name = "备注") @Excel(name = "备注")
private String remark; private String remark;
/** 附加数据 */ /** 附加数据 */
@Schema(description = "附加数据")
@Excel(name = "附加数据") @Excel(name = "附加数据")
private String attach; private String attach;
/** 响应内容 */ /** 响应内容 */
@Schema(description = "响应内容")
@Excel(name = "响应内容") @Excel(name = "响应内容")
private String responseBody; private String responseBody;
} }