From 4557e673f9f2d8dcc694d9b4ecc10b0600b0d2bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E5=AE=87=E5=A5=87?= Date: Wed, 2 Apr 2025 13:13:02 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E8=AE=A2=E5=8D=95=E3=80=81=E6=94=AF?= =?UTF-8?q?=E4=BB=98=E4=BB=93=E5=82=A8=E5=B1=82=E5=88=9D=E5=A7=8B=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/xkt/StoreOrderController.java | 91 ------- .../xkt/StoreOrderDetailController.java | 91 ------- .../xkt/StoreOrderExpressController.java | 91 ------- .../xkt/StoreOrderReceiveController.java | 91 ------- .../common/core/domain/SimpleEntity.java | 48 ++++ .../com/ruoyi/xkt/domain/AlipayCallback.java | 144 +++++++++++ .../java/com/ruoyi/xkt/domain/Express.java | 48 ++++ .../com/ruoyi/xkt/domain/ExternalAccount.java | 54 +++++ .../domain/ExternalAccountTransDetail.java | 57 +++++ .../com/ruoyi/xkt/domain/InternalAccount.java | 52 ++++ .../domain/InternalAccountTransDetail.java | 61 +++++ .../com/ruoyi/xkt/domain/PaymentBill.java | 82 +++++++ .../ruoyi/xkt/domain/PaymentBillDetail.java | 44 ++++ .../java/com/ruoyi/xkt/domain/StoreOrder.java | 226 +++++++++--------- .../ruoyi/xkt/domain/StoreOrderDetail.java | 146 ++++++----- .../ruoyi/xkt/domain/StoreOrderExpress.java | 99 -------- .../xkt/domain/StoreOrderExpressTrack.java | 42 ++++ .../xkt/domain/StoreOrderOperationRecord.java | 44 ++++ .../ruoyi/xkt/domain/StoreOrderReceive.java | 97 -------- .../com/ruoyi/xkt/dto/express/ExpressDTO.java | 63 +++++ .../ruoyi/xkt/dto/order/StoreOrderDTO.java | 172 +++++++++++++ .../xkt/dto/order/StoreOrderDetailDTO.java | 120 ++++++++++ .../dto/order/StoreOrderExpressTrackDTO.java | 63 +++++ .../order/StoreOrderOperationRecordDTO.java | 63 +++++ .../xkt/dto/payment/AlipayCallbackDTO.java | 164 +++++++++++++ .../xkt/dto/payment/ExternalAccountDTO.java | 75 ++++++ .../ExternalAccountTransDetailDTO.java | 76 ++++++ .../xkt/dto/payment/InternalAccountDTO.java | 72 ++++++ .../InternalAccountTransDetailDTO.java | 80 +++++++ .../ruoyi/xkt/dto/payment/PaymentBillDTO.java | 96 ++++++++ .../xkt/dto/payment/PaymentBillDetailDTO.java | 64 +++++ .../xkt/mapper/AlipayCallbackMapper.java | 13 + .../com/ruoyi/xkt/mapper/ExpressMapper.java | 13 + .../xkt/mapper/ExternalAccountMapper.java | 13 + .../ExternalAccountTransDetailMapper.java | 13 + .../xkt/mapper/InternalAccountMapper.java | 13 + .../InternalAccountTransDetailMapper.java | 13 + .../xkt/mapper/PaymentBillDetailMapper.java | 13 + .../ruoyi/xkt/mapper/PaymentBillMapper.java | 13 + .../xkt/mapper/StoreOrderDetailMapper.java | 57 +---- .../xkt/mapper/StoreOrderExpressMapper.java | 62 ----- .../mapper/StoreOrderExpressTrackMapper.java | 14 ++ .../ruoyi/xkt/mapper/StoreOrderMapper.java | 57 +---- .../StoreOrderOperationRecordMapper.java | 13 + .../xkt/mapper/StoreOrderReceiveMapper.java | 62 ----- .../xkt/service/IStoreOrderDetailService.java | 61 ----- .../service/IStoreOrderExpressService.java | 61 ----- .../service/IStoreOrderReceiveService.java | 61 ----- .../ruoyi/xkt/service/IStoreOrderService.java | 61 ----- .../impl/StoreOrderDetailServiceImpl.java | 97 -------- .../impl/StoreOrderExpressServiceImpl.java | 93 ------- .../impl/StoreOrderReceiveServiceImpl.java | 92 ------- .../service/impl/StoreOrderServiceImpl.java | 93 ------- .../resources/mapper/AlipayCallbackMapper.xml | 5 + .../main/resources/mapper/ExpressMapper.xml | 5 + .../mapper/ExternalAccountMapper.xml | 5 + .../ExternalAccountTransDetailMapper.xml | 5 + .../mapper/InternalAccountMapper.xml | 5 + .../InternalAccountTransDetailMapper.xml | 5 + .../mapper/PaymentBillDetailMapper.xml | 5 + .../resources/mapper/PaymentBillMapper.xml | 5 + .../mapper/StoreOrderDetailMapper.xml | 118 +-------- .../mapper/StoreOrderExpressMapper.xml | 116 --------- .../mapper/StoreOrderExpressTrackMapper.xml | 5 + .../resources/mapper/StoreOrderMapper.xml | 148 +----------- .../StoreOrderOperationRecordMapper.xml | 5 + .../mapper/StoreOrderReceiveMapper.xml | 120 ---------- 67 files changed, 2161 insertions(+), 2095 deletions(-) delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreOrderController.java delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreOrderDetailController.java delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreOrderExpressController.java delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreOrderReceiveController.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/core/domain/SimpleEntity.java create mode 100644 xkt/src/main/java/com/ruoyi/xkt/domain/AlipayCallback.java create mode 100644 xkt/src/main/java/com/ruoyi/xkt/domain/Express.java create mode 100644 xkt/src/main/java/com/ruoyi/xkt/domain/ExternalAccount.java create mode 100644 xkt/src/main/java/com/ruoyi/xkt/domain/ExternalAccountTransDetail.java create mode 100644 xkt/src/main/java/com/ruoyi/xkt/domain/InternalAccount.java create mode 100644 xkt/src/main/java/com/ruoyi/xkt/domain/InternalAccountTransDetail.java create mode 100644 xkt/src/main/java/com/ruoyi/xkt/domain/PaymentBill.java create mode 100644 xkt/src/main/java/com/ruoyi/xkt/domain/PaymentBillDetail.java delete mode 100644 xkt/src/main/java/com/ruoyi/xkt/domain/StoreOrderExpress.java create mode 100644 xkt/src/main/java/com/ruoyi/xkt/domain/StoreOrderExpressTrack.java create mode 100644 xkt/src/main/java/com/ruoyi/xkt/domain/StoreOrderOperationRecord.java delete mode 100644 xkt/src/main/java/com/ruoyi/xkt/domain/StoreOrderReceive.java create mode 100644 xkt/src/main/java/com/ruoyi/xkt/dto/express/ExpressDTO.java create mode 100644 xkt/src/main/java/com/ruoyi/xkt/dto/order/StoreOrderDTO.java create mode 100644 xkt/src/main/java/com/ruoyi/xkt/dto/order/StoreOrderDetailDTO.java create mode 100644 xkt/src/main/java/com/ruoyi/xkt/dto/order/StoreOrderExpressTrackDTO.java create mode 100644 xkt/src/main/java/com/ruoyi/xkt/dto/order/StoreOrderOperationRecordDTO.java create mode 100644 xkt/src/main/java/com/ruoyi/xkt/dto/payment/AlipayCallbackDTO.java create mode 100644 xkt/src/main/java/com/ruoyi/xkt/dto/payment/ExternalAccountDTO.java create mode 100644 xkt/src/main/java/com/ruoyi/xkt/dto/payment/ExternalAccountTransDetailDTO.java create mode 100644 xkt/src/main/java/com/ruoyi/xkt/dto/payment/InternalAccountDTO.java create mode 100644 xkt/src/main/java/com/ruoyi/xkt/dto/payment/InternalAccountTransDetailDTO.java create mode 100644 xkt/src/main/java/com/ruoyi/xkt/dto/payment/PaymentBillDTO.java create mode 100644 xkt/src/main/java/com/ruoyi/xkt/dto/payment/PaymentBillDetailDTO.java create mode 100644 xkt/src/main/java/com/ruoyi/xkt/mapper/AlipayCallbackMapper.java create mode 100644 xkt/src/main/java/com/ruoyi/xkt/mapper/ExpressMapper.java create mode 100644 xkt/src/main/java/com/ruoyi/xkt/mapper/ExternalAccountMapper.java create mode 100644 xkt/src/main/java/com/ruoyi/xkt/mapper/ExternalAccountTransDetailMapper.java create mode 100644 xkt/src/main/java/com/ruoyi/xkt/mapper/InternalAccountMapper.java create mode 100644 xkt/src/main/java/com/ruoyi/xkt/mapper/InternalAccountTransDetailMapper.java create mode 100644 xkt/src/main/java/com/ruoyi/xkt/mapper/PaymentBillDetailMapper.java create mode 100644 xkt/src/main/java/com/ruoyi/xkt/mapper/PaymentBillMapper.java delete mode 100644 xkt/src/main/java/com/ruoyi/xkt/mapper/StoreOrderExpressMapper.java create mode 100644 xkt/src/main/java/com/ruoyi/xkt/mapper/StoreOrderExpressTrackMapper.java create mode 100644 xkt/src/main/java/com/ruoyi/xkt/mapper/StoreOrderOperationRecordMapper.java delete mode 100644 xkt/src/main/java/com/ruoyi/xkt/mapper/StoreOrderReceiveMapper.java delete mode 100644 xkt/src/main/java/com/ruoyi/xkt/service/IStoreOrderDetailService.java delete mode 100644 xkt/src/main/java/com/ruoyi/xkt/service/IStoreOrderExpressService.java delete mode 100644 xkt/src/main/java/com/ruoyi/xkt/service/IStoreOrderReceiveService.java delete mode 100644 xkt/src/main/java/com/ruoyi/xkt/service/IStoreOrderService.java delete mode 100644 xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreOrderDetailServiceImpl.java delete mode 100644 xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreOrderExpressServiceImpl.java delete mode 100644 xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreOrderReceiveServiceImpl.java delete mode 100644 xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreOrderServiceImpl.java create mode 100644 xkt/src/main/resources/mapper/AlipayCallbackMapper.xml create mode 100644 xkt/src/main/resources/mapper/ExpressMapper.xml create mode 100644 xkt/src/main/resources/mapper/ExternalAccountMapper.xml create mode 100644 xkt/src/main/resources/mapper/ExternalAccountTransDetailMapper.xml create mode 100644 xkt/src/main/resources/mapper/InternalAccountMapper.xml create mode 100644 xkt/src/main/resources/mapper/InternalAccountTransDetailMapper.xml create mode 100644 xkt/src/main/resources/mapper/PaymentBillDetailMapper.xml create mode 100644 xkt/src/main/resources/mapper/PaymentBillMapper.xml delete mode 100644 xkt/src/main/resources/mapper/StoreOrderExpressMapper.xml create mode 100644 xkt/src/main/resources/mapper/StoreOrderExpressTrackMapper.xml create mode 100644 xkt/src/main/resources/mapper/StoreOrderOperationRecordMapper.xml delete mode 100644 xkt/src/main/resources/mapper/StoreOrderReceiveMapper.xml diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreOrderController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreOrderController.java deleted file mode 100644 index d55d50f59..000000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreOrderController.java +++ /dev/null @@ -1,91 +0,0 @@ -package com.ruoyi.web.controller.xkt; - -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.XktBaseController; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.xkt.domain.StoreOrder; -import com.ruoyi.xkt.service.IStoreOrderService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletResponse; -import java.util.List; - -/** - * 档口代发订单Controller - * - * @author ruoyi - * @date 2025-03-26 - */ -@RestController -@RequestMapping("/rest/v1/store-orders") -public class StoreOrderController extends XktBaseController { - @Autowired - private IStoreOrderService storeOrderService; - - /** - * 查询档口代发订单列表 - */ - @PreAuthorize("@ss.hasPermi('system:order:list')") - @GetMapping("/list") - public TableDataInfo list(StoreOrder storeOrder) { - startPage(); - List list = storeOrderService.selectStoreOrderList(storeOrder); - return getDataTable(list); - } - - /** - * 导出档口代发订单列表 - */ - @PreAuthorize("@ss.hasPermi('system:order:export')") - @Log(title = "档口代发订单", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response, StoreOrder storeOrder) { - List list = storeOrderService.selectStoreOrderList(storeOrder); - ExcelUtil util = new ExcelUtil(StoreOrder.class); - util.exportExcel(response, list, "档口代发订单数据"); - } - - /** - * 获取档口代发订单详细信息 - */ - @PreAuthorize("@ss.hasPermi('system:order:query')") - @GetMapping(value = "/{storeOrderId}") - public R getInfo(@PathVariable("storeOrderId") Long storeOrderId) { - return success(storeOrderService.selectStoreOrderByStoreOrderId(storeOrderId)); - } - - /** - * 新增档口代发订单 - */ - @PreAuthorize("@ss.hasPermi('system:order:add')") - @Log(title = "档口代发订单", businessType = BusinessType.INSERT) - @PostMapping - public R add(@RequestBody StoreOrder storeOrder) { - return success(storeOrderService.insertStoreOrder(storeOrder)); - } - - /** - * 修改档口代发订单 - */ - @PreAuthorize("@ss.hasPermi('system:order:edit')") - @Log(title = "档口代发订单", businessType = BusinessType.UPDATE) - @PutMapping - public R edit(@RequestBody StoreOrder storeOrder) { - return success(storeOrderService.updateStoreOrder(storeOrder)); - } - - /** - * 删除档口代发订单 - */ - @PreAuthorize("@ss.hasPermi('system:order:remove')") - @Log(title = "档口代发订单", businessType = BusinessType.DELETE) - @DeleteMapping("/{storeOrderIds}") - public R remove(@PathVariable Long[] storeOrderIds) { - return success(storeOrderService.deleteStoreOrderByStoreOrderIds(storeOrderIds)); - } -} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreOrderDetailController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreOrderDetailController.java deleted file mode 100644 index 93749908d..000000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreOrderDetailController.java +++ /dev/null @@ -1,91 +0,0 @@ -package com.ruoyi.web.controller.xkt; - -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.XktBaseController; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.xkt.domain.StoreOrderDetail; -import com.ruoyi.xkt.service.IStoreOrderDetailService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletResponse; -import java.util.List; - -/** - * 档口代发订单明细Controller - * - * @author ruoyi - * @date 2025-03-26 - */ -@RestController -@RequestMapping("/rest/v1/store-order-details") -public class StoreOrderDetailController extends XktBaseController { - @Autowired - private IStoreOrderDetailService storeOrderDetailService; - - /** - * 查询档口代发订单明细列表 - */ - @PreAuthorize("@ss.hasPermi('system:detail:list')") - @GetMapping("/list") - public TableDataInfo list(StoreOrderDetail storeOrderDetail) { - startPage(); - List list = storeOrderDetailService.selectStoreOrderDetailList(storeOrderDetail); - return getDataTable(list); - } - - /** - * 导出档口代发订单明细列表 - */ - @PreAuthorize("@ss.hasPermi('system:detail:export')") - @Log(title = "档口代发订单明细", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response, StoreOrderDetail storeOrderDetail) { - List list = storeOrderDetailService.selectStoreOrderDetailList(storeOrderDetail); - ExcelUtil util = new ExcelUtil(StoreOrderDetail.class); - util.exportExcel(response, list, "档口代发订单明细数据"); - } - - /** - * 获取档口代发订单明细详细信息 - */ - @PreAuthorize("@ss.hasPermi('system:detail:query')") - @GetMapping(value = "/{storeOrderDetailId}") - public R getInfo(@PathVariable("storeOrderDetailId") Long storeOrderDetailId) { - return success(storeOrderDetailService.selectStoreOrderDetailByStoreOrderDetailId(storeOrderDetailId)); - } - - /** - * 新增档口代发订单明细 - */ - @PreAuthorize("@ss.hasPermi('system:detail:add')") - @Log(title = "档口代发订单明细", businessType = BusinessType.INSERT) - @PostMapping - public R add(@RequestBody StoreOrderDetail storeOrderDetail) { - return success(storeOrderDetailService.insertStoreOrderDetail(storeOrderDetail)); - } - - /** - * 修改档口代发订单明细 - */ - @PreAuthorize("@ss.hasPermi('system:detail:edit')") - @Log(title = "档口代发订单明细", businessType = BusinessType.UPDATE) - @PutMapping - public R edit(@RequestBody StoreOrderDetail storeOrderDetail) { - return success(storeOrderDetailService.updateStoreOrderDetail(storeOrderDetail)); - } - - /** - * 删除档口代发订单明细 - */ - @PreAuthorize("@ss.hasPermi('system:detail:remove')") - @Log(title = "档口代发订单明细", businessType = BusinessType.DELETE) - @DeleteMapping("/{storeOrderDetailIds}") - public R remove(@PathVariable Long[] storeOrderDetailIds) { - return success(storeOrderDetailService.deleteStoreOrderDetailByStoreOrderDetailIds(storeOrderDetailIds)); - } -} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreOrderExpressController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreOrderExpressController.java deleted file mode 100644 index 5e09e7943..000000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreOrderExpressController.java +++ /dev/null @@ -1,91 +0,0 @@ -package com.ruoyi.web.controller.xkt; - -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.XktBaseController; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.xkt.domain.StoreOrderExpress; -import com.ruoyi.xkt.service.IStoreOrderExpressService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletResponse; -import java.util.List; - -/** - * 档口代发订单快递Controller - * - * @author ruoyi - * @date 2025-03-26 - */ -@RestController -@RequestMapping("/rest/v1/store-order-expresses") -public class StoreOrderExpressController extends XktBaseController { - @Autowired - private IStoreOrderExpressService storeOrderExpressService; - - /** - * 查询档口代发订单快递列表 - */ - @PreAuthorize("@ss.hasPermi('system:express:list')") - @GetMapping("/list") - public TableDataInfo list(StoreOrderExpress storeOrderExpress) { - startPage(); - List list = storeOrderExpressService.selectStoreOrderExpressList(storeOrderExpress); - return getDataTable(list); - } - - /** - * 导出档口代发订单快递列表 - */ - @PreAuthorize("@ss.hasPermi('system:express:export')") - @Log(title = "档口代发订单快递", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response, StoreOrderExpress storeOrderExpress) { - List list = storeOrderExpressService.selectStoreOrderExpressList(storeOrderExpress); - ExcelUtil util = new ExcelUtil(StoreOrderExpress.class); - util.exportExcel(response, list, "档口代发订单快递数据"); - } - - /** - * 获取档口代发订单快递详细信息 - */ - @PreAuthorize("@ss.hasPermi('system:express:query')") - @GetMapping(value = "/{storeOrderExprId}") - public R getInfo(@PathVariable("storeOrderExprId") Long storeOrderExprId) { - return success(storeOrderExpressService.selectStoreOrderExpressByStoreOrderExprId(storeOrderExprId)); - } - - /** - * 新增档口代发订单快递 - */ - @PreAuthorize("@ss.hasPermi('system:express:add')") - @Log(title = "档口代发订单快递", businessType = BusinessType.INSERT) - @PostMapping - public R add(@RequestBody StoreOrderExpress storeOrderExpress) { - return success(storeOrderExpressService.insertStoreOrderExpress(storeOrderExpress)); - } - - /** - * 修改档口代发订单快递 - */ - @PreAuthorize("@ss.hasPermi('system:express:edit')") - @Log(title = "档口代发订单快递", businessType = BusinessType.UPDATE) - @PutMapping - public R edit(@RequestBody StoreOrderExpress storeOrderExpress) { - return success(storeOrderExpressService.updateStoreOrderExpress(storeOrderExpress)); - } - - /** - * 删除档口代发订单快递 - */ - @PreAuthorize("@ss.hasPermi('system:express:remove')") - @Log(title = "档口代发订单快递", businessType = BusinessType.DELETE) - @DeleteMapping("/{storeOrderExprIds}") - public R remove(@PathVariable Long[] storeOrderExprIds) { - return success(storeOrderExpressService.deleteStoreOrderExpressByStoreOrderExprIds(storeOrderExprIds)); - } -} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreOrderReceiveController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreOrderReceiveController.java deleted file mode 100644 index 75cab793a..000000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreOrderReceiveController.java +++ /dev/null @@ -1,91 +0,0 @@ -package com.ruoyi.web.controller.xkt; - -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.XktBaseController; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.xkt.domain.StoreOrderReceive; -import com.ruoyi.xkt.service.IStoreOrderReceiveService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletResponse; -import java.util.List; - -/** - * 档口代发订单收件人Controller - * - * @author ruoyi - * @date 2025-03-26 - */ -@RestController -@RequestMapping("/rest/v1/store-order-receives") -public class StoreOrderReceiveController extends XktBaseController { - @Autowired - private IStoreOrderReceiveService storeOrderReceiveService; - - /** - * 查询档口代发订单收件人列表 - */ - @PreAuthorize("@ss.hasPermi('system:receive:list')") - @GetMapping("/list") - public TableDataInfo list(StoreOrderReceive storeOrderReceive) { - startPage(); - List list = storeOrderReceiveService.selectStoreOrderReceiveList(storeOrderReceive); - return getDataTable(list); - } - - /** - * 导出档口代发订单收件人列表 - */ - @PreAuthorize("@ss.hasPermi('system:receive:export')") - @Log(title = "档口代发订单收件人", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response, StoreOrderReceive storeOrderReceive) { - List list = storeOrderReceiveService.selectStoreOrderReceiveList(storeOrderReceive); - ExcelUtil util = new ExcelUtil(StoreOrderReceive.class); - util.exportExcel(response, list, "档口代发订单收件人数据"); - } - - /** - * 获取档口代发订单收件人详细信息 - */ - @PreAuthorize("@ss.hasPermi('system:receive:query')") - @GetMapping(value = "/{storeOrderRcvId}") - public R getInfo(@PathVariable("storeOrderRcvId") Long storeOrderRcvId) { - return success(storeOrderReceiveService.selectStoreOrderReceiveByStoreOrderRcvId(storeOrderRcvId)); - } - - /** - * 新增档口代发订单收件人 - */ - @PreAuthorize("@ss.hasPermi('system:receive:add')") - @Log(title = "档口代发订单收件人", businessType = BusinessType.INSERT) - @PostMapping - public R add(@RequestBody StoreOrderReceive storeOrderReceive) { - return success(storeOrderReceiveService.insertStoreOrderReceive(storeOrderReceive)); - } - - /** - * 修改档口代发订单收件人 - */ - @PreAuthorize("@ss.hasPermi('system:receive:edit')") - @Log(title = "档口代发订单收件人", businessType = BusinessType.UPDATE) - @PutMapping - public R edit(@RequestBody StoreOrderReceive storeOrderReceive) { - return success(storeOrderReceiveService.updateStoreOrderReceive(storeOrderReceive)); - } - - /** - * 删除档口代发订单收件人 - */ - @PreAuthorize("@ss.hasPermi('system:receive:remove')") - @Log(title = "档口代发订单收件人", businessType = BusinessType.DELETE) - @DeleteMapping("/{storeOrderRcvIds}") - public R remove(@PathVariable Long[] storeOrderRcvIds) { - return success(storeOrderReceiveService.deleteStoreOrderReceiveByStoreOrderRcvIds(storeOrderRcvIds)); - } -} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/SimpleEntity.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/SimpleEntity.java new file mode 100644 index 000000000..1480d8562 --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/SimpleEntity.java @@ -0,0 +1,48 @@ +package com.ruoyi.common.core.domain; + +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; + +import java.util.Date; + +/** + * Entity基类 + * + * @author ruoyi + */ +@Getter +@Setter +@ToString +public class SimpleEntity { + /** + * ID + */ + @TableId + private Long id; + /** + * 创建者 + */ + private String createBy; + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT) + private Date createTime; + /** + * 更新者 + */ + private String updateBy; + /** + * 更新时间 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private Date updateTime; + /** + * 删除标志（0代表存在 2代表删除） + */ + private String delFlag; +} diff --git a/xkt/src/main/java/com/ruoyi/xkt/domain/AlipayCallback.java b/xkt/src/main/java/com/ruoyi/xkt/domain/AlipayCallback.java new file mode 100644 index 000000000..6330b9b50 --- /dev/null +++ b/xkt/src/main/java/com/ruoyi/xkt/domain/AlipayCallback.java @@ -0,0 +1,144 @@ +package com.ruoyi.xkt.domain; + +import com.ruoyi.common.core.domain.SimpleEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + +import java.math.BigDecimal; + +/** + * 阿里支付回调信息 + * + * @author liangyq + * @date 2025-04-01 11:57:52.300 + **/ +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class AlipayCallback extends SimpleEntity { + /** + * 通知的类型 + */ + private String notifyType; + /** + * 通知校验 ID + */ + private String notifyId; + /** + * 支付宝分配给开发者的应用 ID + */ + private String appId; + /** + * 编码格式，如 utf-8、gbk、gb2312 等 + */ + private String charset; + /** + * 调用的接口版本，固定为：1.0 + */ + private String version; + /** + * 商家生成签名字符串所使用的签名算法类型，目前支持 RSA2 和 RSA，推荐使用 RSA2 + */ + private String signType; + /** + * 详情可查看 异步返回结果的验签 + */ + private String sign; + /** + * 支付宝交易凭证号 + */ + private String tradeNo; + /** + * 原支付请求的商户订单号 + */ + private String outTradeNo; + /** + * 商户业务 ID + */ + private String outBizNo; + /** + * 买家支付宝用户号 + */ + private String buyerId; + /** + * 买家支付宝账号 + */ + private String buyerLogonId; + /** + * 卖家支付宝用户号 + */ + private String sellerId; + /** + * 卖家支付宝账号 + */ + private String sellerEmail; + /** + * 交易目前所处的状态[WAIT_BUYER_PAY 交易创建，等待买家付款 TRADE_CLOSED 未付款交易超时关闭，或支付完成后全额退款 TRADE_SUCCESS 交易支付成功 TRADE_FINISHED 交易结束，不可退款] + */ + private String tradeStatus; + /** + * 本次交易支付的订单金额，单位为人民币（元） + */ + private BigDecimal totalAmount; + /** + * 商家在收益中实际收到的款项，单位人民币（元） + */ + private BigDecimal receiptAmount; + /** + * 用户在交易中支付的可开发票的金额 + */ + private BigDecimal invoiceAmount; + /** + * 用户在交易中支付的金额 + */ + private BigDecimal buyerPayAmount; + /** + * 使用集分宝支付的金额 + */ + private BigDecimal pointAmount; + /** + * 退款通知中，返回总退款金额，单位为人民币（元），支持两位小数 + */ + private BigDecimal refundFee; + /** + * 商品的标题/交易标题/订单标题/订单关键字等，是请求时对应的参数，原样通知回来 + */ + private String subject; + /** + * 订单的备注、描述、明细等。对应请求时的 body 参数，原样通知回来 + */ + private String body; + /** + * 该笔交易创建的时间 + */ + private String gmtCreate; + /** + * 该笔交易 的买家付款时间 + */ + private String gmtPayment; + /** + * 该笔交易的退款时间 + */ + private String gmtRefund; + /** + * 该笔交易结束时间 + */ + private String gmtClose; + /** + * 支付成功的各个渠道金额信息 + */ + private String fundBillList; + /** + * 公共回传参数，如果请求时传递了该参数，则返回给商家时会在异步通知时将该参数原样返回 + */ + private String passbackParams; + /** + * 本交易支付时所有优惠券信息 + */ + private String voucherDetailList; + /** + * 回调处理状态[1:初始 2:处理中 3:处理成功 4:处理失败] + */ + private Integer processStatus; +} diff --git a/xkt/src/main/java/com/ruoyi/xkt/domain/Express.java b/xkt/src/main/java/com/ruoyi/xkt/domain/Express.java new file mode 100644 index 000000000..7dac51c28 --- /dev/null +++ b/xkt/src/main/java/com/ruoyi/xkt/domain/Express.java @@ -0,0 +1,48 @@ +package com.ruoyi.xkt.domain; + +import com.baomidou.mybatisplus.annotation.Version; +import com.ruoyi.common.core.domain.SimpleEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + +/** + * 物流信息 + * + * @author liangyq + * @date 2025-04-01 11:57:52.434 + **/ +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class Express extends SimpleEntity { + /** + * 物流编码 + */ + private String expressCode; + /** + * 物流名称 + */ + private String expressName; + /** + * 系统发货可选 + */ + private Boolean systemDeliverAccess; + /** + * 档口发货可选 + */ + private Boolean storeDeliverAccess; + /** + * 用户退货可选 + */ + private Boolean userRefundAccess; + /** + * 系统配置 + */ + private String systemConfig; + /** + * 版本号 + */ + @Version + private Long version; +} diff --git a/xkt/src/main/java/com/ruoyi/xkt/domain/ExternalAccount.java b/xkt/src/main/java/com/ruoyi/xkt/domain/ExternalAccount.java new file mode 100644 index 000000000..e25553ec5 --- /dev/null +++ b/xkt/src/main/java/com/ruoyi/xkt/domain/ExternalAccount.java @@ -0,0 +1,54 @@ +package com.ruoyi.xkt.domain; + +import com.ruoyi.common.core.domain.SimpleEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + +/** + * 外部账户 + * + * @author liangyq + * @date 2025-04-01 11:57:52.450 + **/ +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class ExternalAccount extends SimpleEntity { + /** + * 归属[1:平台 2:档口 3:用户] + */ + private Integer ownerType; + /** + * 归属ID（平台=-1，档口=store_id，用户=user_id） + */ + private Long ownerId; + /** + * 账户状态[1:正常 2:冻结] + */ + private Integer accountStatus; + /** + * 账户类型[1:支付宝账户] + */ + private Integer accountType; + /** + * 归属人实际账户 + */ + private String accountOwnerNumber; + /** + * 归属人真实姓名 + */ + private String accountOwnerName; + /** + * 归属人手机号 + */ + private String accountOwnerPhoneNumber; + /** + * 归属人认证通过 + */ + private Boolean accountAuthAccess; + /** + * 备注 + */ + private String remark; +} diff --git a/xkt/src/main/java/com/ruoyi/xkt/domain/ExternalAccountTransDetail.java b/xkt/src/main/java/com/ruoyi/xkt/domain/ExternalAccountTransDetail.java new file mode 100644 index 000000000..54860219e --- /dev/null +++ b/xkt/src/main/java/com/ruoyi/xkt/domain/ExternalAccountTransDetail.java @@ -0,0 +1,57 @@ +package com.ruoyi.xkt.domain; + +import com.ruoyi.common.core.domain.SimpleEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * 外部账户交易明细 + * + * @author liangyq + * @date 2025-04-01 11:57:52.470 + **/ +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class ExternalAccountTransDetail extends SimpleEntity { + /** + * 外部账户ID + */ + private Long externalAccountId; + /** + * 来源单据ID + */ + private Long srcBillId; + /** + * 来源单据类型[2:付款] + */ + private Integer srcBillType; + /** + * 借贷方向[1:借(D) 2:贷(C)] + */ + private Integer loanDirection; + /** + * 交易金额 + */ + private BigDecimal transAmount; + /** + * 交易时间 + */ + private Date transTime; + /** + * 经办人ID + */ + private Long handlerId; + /** + * 入账状态 [1:已入账 2:未入账] + */ + private Integer entryStatus; + /** + * 备注 + */ + private String remark; +} diff --git a/xkt/src/main/java/com/ruoyi/xkt/domain/InternalAccount.java b/xkt/src/main/java/com/ruoyi/xkt/domain/InternalAccount.java new file mode 100644 index 000000000..d4da5e6cc --- /dev/null +++ b/xkt/src/main/java/com/ruoyi/xkt/domain/InternalAccount.java @@ -0,0 +1,52 @@ +package com.ruoyi.xkt.domain; + +import com.ruoyi.common.core.domain.SimpleEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + +import java.math.BigDecimal; + +/** + * 内部账户 + * + * @author liangyq + * @date 2025-04-01 11:57:52.493 + **/ +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class InternalAccount extends SimpleEntity { + /** + * 归属[1:平台 2:档口 3:用户] + */ + private Integer ownerType; + /** + * 归属ID（平台=-1，档口=store_id） + */ + private Long ownerId; + /** + * 账户状态[1:正常 2:冻结] + */ + private Integer accountStatus; + /** + * 交易密码 + */ + private String transactionPassword; + /** + * 余额 + */ + private BigDecimal balance; + /** + * 可用余额 + */ + private BigDecimal usableBalance; + /** + * 支付中金额 + */ + private BigDecimal paymentAmount; + /** + * 备注 + */ + private String remark; +} diff --git a/xkt/src/main/java/com/ruoyi/xkt/domain/InternalAccountTransDetail.java b/xkt/src/main/java/com/ruoyi/xkt/domain/InternalAccountTransDetail.java new file mode 100644 index 000000000..f27aae267 --- /dev/null +++ b/xkt/src/main/java/com/ruoyi/xkt/domain/InternalAccountTransDetail.java @@ -0,0 +1,61 @@ +package com.ruoyi.xkt.domain; + +import com.ruoyi.common.core.domain.SimpleEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * 内部账户交易明细 + * + * @author liangyq + * @date 2025-04-01 11:57:52.516 + **/ +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class InternalAccountTransDetail extends SimpleEntity { + /** + * 内部账户ID + */ + private Long internalAccountId; + /** + * 来源单据ID + */ + private Long srcBillId; + /** + * 来源单据类型[1:收款 2:付款 3:转移] + */ + private Integer srcBillType; + /** + * 借贷方向[1:借(D) 2:贷(C)] + */ + private Integer loanDirection; + /** + * 交易金额 + */ + private BigDecimal transAmount; + /** + * 交易时间 + */ + private Date transTime; + /** + * 经办人ID + */ + private Long handlerId; + /** + * 入账状态 [1:已入账 2:未入账] + */ + private Integer entryStatus; + /** + * 入账执行标识[1:已执行 2:未执行] + */ + private Integer entryExecuted; + /** + * 备注 + */ + private String remark; +} diff --git a/xkt/src/main/java/com/ruoyi/xkt/domain/PaymentBill.java b/xkt/src/main/java/com/ruoyi/xkt/domain/PaymentBill.java new file mode 100644 index 000000000..bad44fc31 --- /dev/null +++ b/xkt/src/main/java/com/ruoyi/xkt/domain/PaymentBill.java @@ -0,0 +1,82 @@ +package com.ruoyi.xkt.domain; + +import com.baomidou.mybatisplus.annotation.Version; +import com.ruoyi.common.core.domain.SimpleEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + +import java.math.BigDecimal; + +/** + * 支付单据 + * + * @author liangyq + * @date 2025-04-01 11:57:52.533 + **/ +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class PaymentBill extends SimpleEntity { + /** + * 单号 + */ + private String billNo; + /** + * 单据类型[1:收款 2:付款 3:转移] + */ + private Integer billType; + /** + * 单据状态[1:初始 2:执行中 3:执行成功 4:执行失败] + */ + private Integer billStatus; + /** + * 来源类型[1:代发订单支付 2:代发订单完成 3:提现] + */ + private Integer srcType; + /** + * 来源ID + */ + private Long srcId; + /** + * 关联类型[1:代发订单] + */ + private Integer relType; + /** + * 关联ID + */ + private Long relId; + /** + * 收入内部账户ID + */ + private Long inputInternalAccountId; + /** + * 支出内部账户ID + */ + private Long outputInternalAccountId; + /** + * 收入外部账户ID + */ + private Long inputExternalAccountId; + /** + * 支出外部账户ID + */ + private Long outputExternalAccountId; + /** + * 业务金额 + */ + private BigDecimal businessAmount; + /** + * 交易金额 + */ + private BigDecimal transAmount; + /** + * 备注 + */ + private String remark; + /** + * 版本号 + */ + @Version + private Long version; +} diff --git a/xkt/src/main/java/com/ruoyi/xkt/domain/PaymentBillDetail.java b/xkt/src/main/java/com/ruoyi/xkt/domain/PaymentBillDetail.java new file mode 100644 index 000000000..c77405088 --- /dev/null +++ b/xkt/src/main/java/com/ruoyi/xkt/domain/PaymentBillDetail.java @@ -0,0 +1,44 @@ +package com.ruoyi.xkt.domain; + +import com.ruoyi.common.core.domain.SimpleEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + +import java.math.BigDecimal; + +/** + * 支付单据明细 + * + * @author liangyq + * @date 2025-04-01 11:57:52.550 + **/ +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class PaymentBillDetail extends SimpleEntity { + /** + * 支付单据ID + */ + private Long paymentBillId; + /** + * 关联类型[1:代发订单明细] + */ + private Integer relType; + /** + * 关联ID + */ + private Long relId; + /** + * 业务金额 + */ + private BigDecimal businessAmount; + /** + * 交易金额 + */ + private BigDecimal transAmount; + /** + * 备注 + */ + private String remark; +} diff --git a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreOrder.java b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreOrder.java index a3fee4451..642bef85f 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreOrder.java +++ b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreOrder.java @@ -1,151 +1,155 @@ package com.ruoyi.xkt.domain; -import com.baomidou.mybatisplus.annotation.TableId; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.XktBaseEntity; +import com.baomidou.mybatisplus.annotation.Version; +import com.ruoyi.common.core.domain.SimpleEntity; import lombok.Data; import lombok.EqualsAndHashCode; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; +import lombok.ToString; import java.math.BigDecimal; import java.util.Date; /** - * 档口代发订单对象 store_order + * 代发订单 * - * @author ruoyi - * @date 2025-03-26 - */ -@EqualsAndHashCode(callSuper = true) + * @author liangyq + * @date 2025-04-01 11:57:52.566 + **/ @Data -public class StoreOrder extends XktBaseEntity { - private static final long serialVersionUID = 1L; - +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class StoreOrder extends SimpleEntity { /** - * 档口代发订单ID + * 档口ID */ - @TableId - private Long id; - - /** - * 档口id - */ - @Excel(name = "档口id") private Long storeId; - /** - * 下单用户ID sys_user.id + * 下单用户ID */ - @Excel(name = "下单用户ID sys_user.id") - private Long userId; - + private Long orderUserId; /** - * 代发订单CODE + * 订单号 */ - @Excel(name = "代发订单CODE") - private String code; - + private String orderNo; /** - * 订单类型（普通销售、销售退货） + * 订单类型[1:销售订单 2:退货订单] */ - @Excel(name = "订单类型", readConverterExp = "普=通销售、销售退货") - private Long orderType; - + private Integer orderType; /** - * 退货时，对应的原订单ID + * 订单状态（1开头为销售订单状态，2开头为退货订单状态）[10:已取消 11:待付款 12:待发货 13:已发货 14:已完成 21:售后中 22:售后拒绝 23:平台介入 24:售后完成] */ - @Excel(name = "退货时，对应的原订单ID") - private Long refundOriginalId; - + private Integer orderStatus; /** - * 下单发货的快递 + * 支付状态[1:初始 2:支付中 3:已支付] */ - @Excel(name = "下单发货的快递") - private Long expressId; - + private Integer payStatus; /** - * 快递费 + * 订单备注 */ - @Excel(name = "快递费") - private BigDecimal expressFee; - - /** - * 发货方式（货齐再发、有货先发） - */ - @Excel(name = "发货方式", readConverterExp = "货=齐再发、有货先发") - private Long deliveryType; - - /** - * 发货最晚时间（精确到小时） - */ - @Excel(name = "发货最晚时间", readConverterExp = "精=确到小时") - private Date deliveryEndTime; - - /** - * 退货原因 - */ - @Excel(name = "退货原因") - private Long refundReasonId; - + private String orderRemark; /** * 商品数量 */ - @Excel(name = "商品数量") - private Integer quantity; - + private Integer goodsQuantity; /** - * 订单金额 + * 商品金额 */ - @Excel(name = "订单金额") - private BigDecimal amount; - + private BigDecimal goodsAmount; /** - * 拒绝原因 + * 快递费 */ - @Excel(name = "拒绝原因") - private String rejectReason; - + private BigDecimal expressFee; + /** + * 总金额（商品金额+快递费） + */ + private BigDecimal totalAmount; + /** + * 实际总金额（总金额-支付渠道服务费） + */ + private BigDecimal realTotalAmount; + /** + * 退货原订单ID + */ + private Long refundOrderId; + /** + * 退货原因 + */ + private Integer refundReasonCode; + /** + * 退货拒绝原因 + */ + private String refundRejectReason; + /** + * 物流ID + */ + private Long expressId; + /** + * 发货人-名称 + */ + private String originContactName; + /** + * 发货人-电话 + */ + private String originContactPhoneNumber; + /** + * 发货人-省编码 + */ + private String originProvinceCode; + /** + * 发货人-市编码 + */ + private String originCityCode; + /** + * 发货人-区县编码 + */ + private String originCountyCode; + /** + * 发货人-详细地址 + */ + private String originDetailAddress; + /** + * 收货人-名称 + */ + private String destinationContactName; + /** + * 收货人-电话 + */ + private String destinationContactPhoneNumber; + /** + * 收货人-省编码 + */ + private String destinationProvinceCode; + /** + * 收货人-市编码 + */ + private String destinationCityCode; + /** + * 收货人-区县编码 + */ + private String destinationCountyCode; + /** + * 收货人-详细地址 + */ + private String destinationDetailAddress; + /** + * 发货方式[1:货其再发 2:有货先发] + */ + private Integer deliveryType; + /** + * 最晚发货时间 + */ + private Date deliveryEndTime; + /** + * 自动完成时间 + */ + private Date autoEndTime; /** * 凭证日期 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "凭证日期", width = 30, dateFormat = "yyyy-MM-dd") private Date voucherDate; - /** - * 订单状态 + * 版本号 */ - @Excel(name = "订单状态") - private String orderStatus; - - - @Override - public String toString() { - return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("storeId", getStoreId()) - .append("userId", getUserId()) - .append("code", getCode()) - .append("orderType", getOrderType()) - .append("refundOriginalId", getRefundOriginalId()) - .append("expressId", getExpressId()) - .append("expressFee", getExpressFee()) - .append("deliveryType", getDeliveryType()) - .append("deliveryEndTime", getDeliveryEndTime()) - .append("refundReasonId", getRefundReasonId()) - .append("quantity", getQuantity()) - .append("amount", getAmount()) - .append("rejectReason", getRejectReason()) - .append("voucherDate", getVoucherDate()) - .append("orderStatus", getOrderStatus()) - .append("version", getVersion()) - .append("delFlag", getDelFlag()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .toString(); - } + @Version + private Long version; } diff --git a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreOrderDetail.java b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreOrderDetail.java index ba100afdc..66eb54d98 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreOrderDetail.java +++ b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreOrderDetail.java @@ -1,106 +1,102 @@ package com.ruoyi.xkt.domain; -import com.baomidou.mybatisplus.annotation.TableId; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.XktBaseEntity; +import com.baomidou.mybatisplus.annotation.Version; +import com.ruoyi.common.core.domain.SimpleEntity; import lombok.Data; import lombok.EqualsAndHashCode; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; +import lombok.ToString; import java.math.BigDecimal; /** - * 档口代发订单明细对象 store_order_detail + * 代发订单明细 * - * @author ruoyi - * @date 2025-03-26 - */ -@EqualsAndHashCode(callSuper = true) + * @author liangyq + * @date 2025-04-01 11:57:52.582 + **/ @Data -public class StoreOrderDetail extends XktBaseEntity { - private static final long serialVersionUID = 1L; - +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class StoreOrderDetail extends SimpleEntity { /** - * 代发订单明细ID + * 订单ID */ - @TableId - private Long id; - - /** - * 代发订单ID - */ - @Excel(name = "代发订单ID") private Long storeOrderId; - /** - * 退货时对应的store_order_detail_id + * 商品颜色尺码ID */ - @Excel(name = "退货时对应的store_order_detail_id") - private Long storeOrderDetailRefundId; - - /** - * 档口商品颜色尺码ID - */ - @Excel(name = "档口商品颜色尺码ID") private Long storeProdColorSizeId; - /** - * 档口商品ID + * 商品ID */ - @Excel(name = "档口商品ID") private Long storeProdId; - /** - * 档口ID + * 订单明细状态（同订单状态）[10:已取消 11:待付款 12:待发货 13:已发货 14:已完成 21:售后中 22:售后拒绝 23:平台介入 24:售后完成] */ - @Excel(name = "档口ID") - private Long storeId; - + private Integer detailStatus; + /** + * 支付状态[1:初始 2:支付中 3:已支付] + */ + private Integer payStatus; + /** + * 物流ID + */ + private Long expressId; + /** + * 物流类型[1:平台物流 2:档口物流] + */ + private Integer expressType; + /** + * 物流状态[1:初始 2:下单中 3:已下单 4:取消中 5:已揽件 6:拦截中 99:已结束] + */ + private Integer expressStatus; + /** + * 物流请求单号 + */ + private String expressReqNo; + /** + * 物流运单号（快递单号），档口/用户自己填写时可能存在多个，使用“,”分割 + */ + private String expressWaybillNo; /** * 商品单价 */ - @Excel(name = "商品单价") - private BigDecimal price; - + private BigDecimal goodsPrice; /** - * 数量 + * 商品数量 */ - @Excel(name = "数量") - private Integer quantity; - + private Integer goodsQuantity; /** - * 总金额 + * 商品金额（商品单价*商品数量） */ - @Excel(name = "总金额") - private BigDecimal amount; - + private BigDecimal goodsAmount; /** - * 明细状态 + * 快递费 */ - @Excel(name = "明细状态") - private String detailStatus; - - - @Override - public String toString() { - return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("storeOrderId", getStoreOrderId()) - .append("storeOrderDetailRefundId", getStoreOrderDetailRefundId()) - .append("storeProdColorSizeId", getStoreProdColorSizeId()) - .append("storeProdId", getStoreProdId()) - .append("storeId", getStoreId()) - .append("price", getPrice()) - .append("quantity", getQuantity()) - .append("amount", getAmount()) - .append("detailStatus", getDetailStatus()) - .append("version", getVersion()) - .append("delFlag", getDelFlag()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .toString(); - } + private BigDecimal expressFee; + /** + * 总金额（商品金额+快递费） + */ + private BigDecimal totalAmount; + /** + * 实际总金额（总金额-支付渠道服务费） + */ + private BigDecimal realTotalAmount; + /** + * 退货原订单明细ID + */ + private Long refundOrderDetailId; + /** + * 退货原因 + */ + private Integer refundReasonCode; + /** + * 退货拒绝原因 + */ + private String refundRejectReason; + /** + * 版本号 + */ + @Version + private Long version; } diff --git a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreOrderExpress.java b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreOrderExpress.java deleted file mode 100644 index e96c40fa0..000000000 --- a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreOrderExpress.java +++ /dev/null @@ -1,99 +0,0 @@ -package com.ruoyi.xkt.domain; - -import com.baomidou.mybatisplus.annotation.TableId; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.XktBaseEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; - -import java.math.BigDecimal; - -/** - * 档口代发订单快递对象 store_order_express - * - * @author ruoyi - * @date 2025-03-26 - */ -@EqualsAndHashCode(callSuper = true) -@Data -public class StoreOrderExpress extends XktBaseEntity { - private static final long serialVersionUID = 1L; - - /** - * 代发订单明细快递信息ID - */ - @TableId - private Long id; - - /** - * 档口代发订单明细ID - */ - @Excel(name = "档口代发订单明细ID") - private Long storeOrderDetailId; - - /** - * 代发订单ID - */ - @Excel(name = "代发订单ID") - private Long storeOrderId; - - /** - * 档口ID - */ - @Excel(name = "档口ID") - private Long storeId; - - /** - * 发货类型（系统订单、自己打单） - */ - @Excel(name = "发货类型", readConverterExp = "系=统订单、自己打单") - private Long deliveryType; - - /** - * 发货物流ID - */ - @Excel(name = "发货物流ID") - private Long expressId; - - /** - * 快递费用 - */ - @Excel(name = "快递费用") - private BigDecimal expressFee; - - /** - * 快递单号（如有多个，用逗号相连） - */ - @Excel(name = "快递单号", readConverterExp = "如=有多个，用逗号相连") - private String trackingNum; - - /** - * 发货状态 - */ - @Excel(name = "发货状态") - private String exprStatus; - - - @Override - public String toString() { - return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("storeOrderDetailId", getStoreOrderDetailId()) - .append("storeOrderId", getStoreOrderId()) - .append("storeId", getStoreId()) - .append("deliveryType", getDeliveryType()) - .append("expressId", getExpressId()) - .append("expressFee", getExpressFee()) - .append("trackingNum", getTrackingNum()) - .append("exprStatus", getExprStatus()) - .append("version", getVersion()) - .append("delFlag", getDelFlag()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .toString(); - } -} diff --git a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreOrderExpressTrack.java b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreOrderExpressTrack.java new file mode 100644 index 000000000..147c9fc35 --- /dev/null +++ b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreOrderExpressTrack.java @@ -0,0 +1,42 @@ +package com.ruoyi.xkt.domain; + +import com.ruoyi.common.core.domain.SimpleEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + +/** + * 代发订单物流轨迹 + * + * @author liangyq + * @date 2025-04-01 11:57:52.599 + **/ +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class StoreOrderExpressTrack extends SimpleEntity { + /** + * 订单ID + */ + private Long storeOrderId; + /** + * 订单明细ID + */ + private Long storeOrderIdDetailId; + /** + * 排序 + */ + private Integer sort; + /** + * 节点事件 + */ + private String action; + /** + * 描述 + */ + private String description; + /** + * 备注 + */ + private String remark; +} diff --git a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreOrderOperationRecord.java b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreOrderOperationRecord.java new file mode 100644 index 000000000..4229a6b21 --- /dev/null +++ b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreOrderOperationRecord.java @@ -0,0 +1,44 @@ +package com.ruoyi.xkt.domain; + +import com.ruoyi.common.core.domain.SimpleEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + +import java.util.Date; + +/** + * 代发订单操作记录 + * + * @author liangyq + * @date 2025-04-01 11:57:52.615 + **/ +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class StoreOrderOperationRecord extends SimpleEntity { + /** + * 订单ID/订单明细ID，根据类型确定 + */ + private Long targetId; + /** + * 类型[1:订单 2:订单明细] + */ + private Integer targetType; + /** + * 节点事件[1:下单 2:支付 3:取消 4:发货 5:完成 6:申请售后 7:寄回 8:售后拒绝 9:平台介入 10:售后完成] + */ + private Integer action; + /** + * 操作人ID + */ + private Long operatorId; + /** + * 操作时间 + */ + private Date operationTime; + /** + * 备注 + */ + private String remark; +} diff --git a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreOrderReceive.java b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreOrderReceive.java deleted file mode 100644 index 9fffefefe..000000000 --- a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreOrderReceive.java +++ /dev/null @@ -1,97 +0,0 @@ -package com.ruoyi.xkt.domain; - -import com.baomidou.mybatisplus.annotation.TableId; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.XktBaseEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; - -/** - * 档口代发订单收件人对象 store_order_receive - * - * @author ruoyi - * @date 2025-03-26 - */ -@EqualsAndHashCode(callSuper = true) -@Data -public class StoreOrderReceive extends XktBaseEntity { - private static final long serialVersionUID = 1L; - - /** - * 代发订单收件人 - */ - @TableId - private Long id; - - /** - * 代发订单档口ID - */ - @Excel(name = "代发订单档口ID") - private Long storeOrderId; - - /** - * 代发地址ID - */ - @Excel(name = "代发地址ID") - private Long sysUserAddressId; - - /** - * 收件人名称 - */ - @Excel(name = "收件人名称") - private String receiveName; - - /** - * 收件人电话 - */ - @Excel(name = "收件人电话") - private String receivePhone; - - /** - * 省code - */ - @Excel(name = "省code") - private String provinceCode; - - /** - * 市code - */ - @Excel(name = "市code") - private String cityId; - - /** - * 区(县)code - */ - @Excel(name = "区(县)code") - private String districtCode; - - /** - * 详细地址 - */ - @Excel(name = "详细地址") - private String detailAddress; - - - @Override - public String toString() { - return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("storeOrderId", getStoreOrderId()) - .append("sysUserAddressId", getSysUserAddressId()) - .append("receiveName", getReceiveName()) - .append("receivePhone", getReceivePhone()) - .append("provinceCode", getProvinceCode()) - .append("cityId", getCityId()) - .append("districtCode", getDistrictCode()) - .append("detailAddress", getDetailAddress()) - .append("version", getVersion()) - .append("delFlag", getDelFlag()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .toString(); - } -} diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/express/ExpressDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/express/ExpressDTO.java new file mode 100644 index 000000000..51def8b58 --- /dev/null +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/express/ExpressDTO.java @@ -0,0 +1,63 @@ +package com.ruoyi.xkt.dto.express; + +import lombok.Data; + +import java.util.Date; + +/** + * 物流信息 + * + * @author liangyq + * @date 2025-04-01 11:57:52.434 + **/ +@Data +public class ExpressDTO { + /** + * 物流ID + */ + private Long id; + /** + * 物流编码 + */ + private String expressCode; + /** + * 物流名称 + */ + private String expressName; + /** + * 系统发货可选 + */ + private Boolean systemDeliverAccess; + /** + * 档口发货可选 + */ + private Boolean storeDeliverAccess; + /** + * 用户退货可选 + */ + private Boolean userRefundAccess; + /** + * 系统配置 + */ + private String systemConfig; + /** + * 删除标志（0代表存在 2代表删除） + */ + private String delFlag; + /** + * 创建者 + */ + private String createBy; + /** + * 创建时间 + */ + private Date createTime; + /** + * 更新者 + */ + private String updateBy; + /** + * 更新时间 + */ + private Date updateTime; +} diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/order/StoreOrderDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/order/StoreOrderDTO.java new file mode 100644 index 000000000..408f21360 --- /dev/null +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/order/StoreOrderDTO.java @@ -0,0 +1,172 @@ +package com.ruoyi.xkt.dto.order; + +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * 代发订单 + * + * @author liangyq + * @date 2025-04-01 11:57:52.566 + **/ +@Data +public class StoreOrderDTO { + /** + * 订单ID + */ + private Long id; + /** + * 档口ID + */ + private Long storeId; + /** + * 下单用户ID + */ + private Long orderUserId; + /** + * 订单号 + */ + private String orderNo; + /** + * 订单类型[1:销售订单 2:退货订单] + */ + private Integer orderType; + /** + * 订单状态（1开头为销售订单状态，2开头为退货订单状态）[10:已取消 11:待付款 12:待发货 13:已发货 14:已完成 21:售后中 22:售后拒绝 23:平台介入 24:售后完成] + */ + private Integer orderStatus; + /** + * 支付状态[1:初始 2:支付中 3:已支付] + */ + private Integer payStatus; + /** + * 订单备注 + */ + private String orderRemark; + /** + * 商品数量 + */ + private Integer goodsQuantity; + /** + * 商品金额 + */ + private BigDecimal goodsAmount; + /** + * 快递费 + */ + private BigDecimal expressFee; + /** + * 总金额（商品金额+快递费） + */ + private BigDecimal totalAmount; + /** + * 实际总金额（总金额-支付渠道服务费） + */ + private BigDecimal realTotalAmount; + /** + * 退货原订单ID + */ + private Long refundOrderId; + /** + * 退货原因 + */ + private Integer refundReasonCode; + /** + * 退货拒绝原因 + */ + private String refundRejectReason; + /** + * 物流ID + */ + private Long expressId; + /** + * 发货人-名称 + */ + private String originContactName; + /** + * 发货人-电话 + */ + private String originContactPhoneNumber; + /** + * 发货人-省编码 + */ + private String originProvinceCode; + /** + * 发货人-市编码 + */ + private String originCityCode; + /** + * 发货人-区县编码 + */ + private String originCountyCode; + /** + * 发货人-详细地址 + */ + private String originDetailAddress; + /** + * 收货人-名称 + */ + private String destinationContactName; + /** + * 收货人-电话 + */ + private String destinationContactPhoneNumber; + /** + * 收货人-省编码 + */ + private String destinationProvinceCode; + /** + * 收货人-市编码 + */ + private String destinationCityCode; + /** + * 收货人-区县编码 + */ + private String destinationCountyCode; + /** + * 收货人-详细地址 + */ + private String destinationDetailAddress; + /** + * 发货方式[1:货其再发 2:有货先发] + */ + private Integer deliveryType; + /** + * 最晚发货时间 + */ + private Date deliveryEndTime; + /** + * 自动完成时间 + */ + private Date autoEndTime; + /** + * 凭证日期 + */ + private Date voucherDate; + /** + * 删除标志（0代表存在 2代表删除） + */ + private String delFlag; + /** + * 创建者 + */ + private String createBy; + /** + * 创建时间 + */ + private Date createTime; + /** + * 更新者 + */ + private String updateBy; + /** + * 更新时间 + */ + private Date updateTime; + /** + * 版本号 + */ + private Integer version; +} diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/order/StoreOrderDetailDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/order/StoreOrderDetailDTO.java new file mode 100644 index 000000000..88d7739bd --- /dev/null +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/order/StoreOrderDetailDTO.java @@ -0,0 +1,120 @@ +package com.ruoyi.xkt.dto.order; + +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * 代发订单明细 + * + * @author liangyq + * @date 2025-04-01 11:57:52.582 + **/ +@Data +public class StoreOrderDetailDTO { + /** + * 订单明细ID + */ + private Long id; + /** + * 订单ID + */ + private Long storeOrderId; + /** + * 商品颜色尺码ID + */ + private Long storeProdColorSizeId; + /** + * 商品ID + */ + private Long storeProdId; + /** + * 订单明细状态（同订单状态）[10:已取消 11:待付款 12:待发货 13:已发货 14:已完成 21:售后中 22:售后拒绝 23:平台介入 24:售后完成] + */ + private Integer detailStatus; + /** + * 支付状态[1:初始 2:支付中 3:已支付] + */ + private Integer payStatus; + /** + * 物流ID + */ + private Long expressId; + /** + * 物流类型[1:平台物流 2:档口物流] + */ + private Integer expressType; + /** + * 物流状态[1:初始 2:下单中 3:已下单 4:取消中 5:已揽件 6:拦截中 99:已结束] + */ + private Integer expressStatus; + /** + * 物流请求单号 + */ + private String expressReqNo; + /** + * 物流运单号（快递单号），档口/用户自己填写时可能存在多个，使用“,”分割 + */ + private String expressWaybillNo; + /** + * 商品单价 + */ + private BigDecimal goodsPrice; + /** + * 商品数量 + */ + private Integer goodsQuantity; + /** + * 商品金额（商品单价*商品数量） + */ + private BigDecimal goodsAmount; + /** + * 快递费 + */ + private BigDecimal expressFee; + /** + * 总金额（商品金额+快递费） + */ + private BigDecimal totalAmount; + /** + * 实际总金额（总金额-支付渠道服务费） + */ + private BigDecimal realTotalAmount; + /** + * 退货原订单明细ID + */ + private Long refundOrderDetailId; + /** + * 退货原因 + */ + private Integer refundReasonCode; + /** + * 退货拒绝原因 + */ + private String refundRejectReason; + /** + * 删除标志（0代表存在 2代表删除） + */ + private String delFlag; + /** + * 创建者 + */ + private String createBy; + /** + * 创建时间 + */ + private Date createTime; + /** + * 更新者 + */ + private String updateBy; + /** + * 更新时间 + */ + private Date updateTime; + /** + * 版本号 + */ + private Integer version; +} diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/order/StoreOrderExpressTrackDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/order/StoreOrderExpressTrackDTO.java new file mode 100644 index 000000000..b844c27dc --- /dev/null +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/order/StoreOrderExpressTrackDTO.java @@ -0,0 +1,63 @@ +package com.ruoyi.xkt.dto.order; + +import lombok.Data; + +import java.util.Date; + +/** + * 代发订单物流轨迹 + * + * @author liangyq + * @date 2025-04-01 11:57:52.599 + **/ +@Data +public class StoreOrderExpressTrackDTO { + /** + * 订单物流明细ID + */ + private Long id; + /** + * 订单ID + */ + private Long storeOrderId; + /** + * 订单明细ID + */ + private Long storeOrderIdDetailId; + /** + * 排序 + */ + private Integer sort; + /** + * 节点事件 + */ + private String action; + /** + * 描述 + */ + private String description; + /** + * 备注 + */ + private String remark; + /** + * 删除标志（0代表存在 2代表删除） + */ + private String delFlag; + /** + * 创建者 + */ + private String createBy; + /** + * 创建时间 + */ + private Date createTime; + /** + * 更新者 + */ + private String updateBy; + /** + * 更新时间 + */ + private Date updateTime; +} diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/order/StoreOrderOperationRecordDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/order/StoreOrderOperationRecordDTO.java new file mode 100644 index 000000000..28637fbaf --- /dev/null +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/order/StoreOrderOperationRecordDTO.java @@ -0,0 +1,63 @@ +package com.ruoyi.xkt.dto.order; + +import lombok.Data; + +import java.util.Date; + +/** + * 代发订单操作记录 + * + * @author liangyq + * @date 2025-04-01 11:57:52.615 + **/ +@Data +public class StoreOrderOperationRecordDTO { + /** + * 代发订单操作记录ID + */ + private Long id; + /** + * 订单ID/订单明细ID，根据类型确定 + */ + private Long targetId; + /** + * 类型[1:订单 2:订单明细] + */ + private Integer targetType; + /** + * 节点事件[1:下单 2:支付 3:取消 4:发货 5:完成 6:申请售后 7:寄回 8:售后拒绝 9:平台介入 10:售后完成] + */ + private Integer action; + /** + * 操作人ID + */ + private Long operatorId; + /** + * 操作时间 + */ + private Date operationTime; + /** + * 备注 + */ + private String remark; + /** + * 删除标志（0代表存在 2代表删除） + */ + private String delFlag; + /** + * 创建者 + */ + private String createBy; + /** + * 创建时间 + */ + private Date createTime; + /** + * 更新者 + */ + private String updateBy; + /** + * 更新时间 + */ + private Date updateTime; +} diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/payment/AlipayCallbackDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/payment/AlipayCallbackDTO.java new file mode 100644 index 000000000..479b43bbd --- /dev/null +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/payment/AlipayCallbackDTO.java @@ -0,0 +1,164 @@ +package com.ruoyi.xkt.dto.payment; + +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * 阿里支付回调信息 + * + * @author liangyq + * @date 2025-04-01 11:57:52.300 + **/ +@Data +public class AlipayCallbackDTO { + /** + * ID + */ + private Long id; + /** + * 通知的类型 + */ + private String notifyType; + /** + * 通知校验 ID + */ + private String notifyId; + /** + * 支付宝分配给开发者的应用 ID + */ + private String appId; + /** + * 编码格式，如 utf-8、gbk、gb2312 等 + */ + private String charset; + /** + * 调用的接口版本，固定为：1.0 + */ + private String version; + /** + * 商家生成签名字符串所使用的签名算法类型，目前支持 RSA2 和 RSA，推荐使用 RSA2 + */ + private String signType; + /** + * 详情可查看 异步返回结果的验签 + */ + private String sign; + /** + * 支付宝交易凭证号 + */ + private String tradeNo; + /** + * 原支付请求的商户订单号 + */ + private String outTradeNo; + /** + * 商户业务 ID + */ + private String outBizNo; + /** + * 买家支付宝用户号 + */ + private String buyerId; + /** + * 买家支付宝账号 + */ + private String buyerLogonId; + /** + * 卖家支付宝用户号 + */ + private String sellerId; + /** + * 卖家支付宝账号 + */ + private String sellerEmail; + /** + * 交易目前所处的状态[WAIT_BUYER_PAY 交易创建，等待买家付款 TRADE_CLOSED 未付款交易超时关闭，或支付完成后全额退款 TRADE_SUCCESS 交易支付成功 TRADE_FINISHED 交易结束，不可退款] + */ + private String tradeStatus; + /** + * 本次交易支付的订单金额，单位为人民币（元） + */ + private BigDecimal totalAmount; + /** + * 商家在收益中实际收到的款项，单位人民币（元） + */ + private BigDecimal receiptAmount; + /** + * 用户在交易中支付的可开发票的金额 + */ + private BigDecimal invoiceAmount; + /** + * 用户在交易中支付的金额 + */ + private BigDecimal buyerPayAmount; + /** + * 使用集分宝支付的金额 + */ + private BigDecimal pointAmount; + /** + * 退款通知中，返回总退款金额，单位为人民币（元），支持两位小数 + */ + private BigDecimal refundFee; + /** + * 商品的标题/交易标题/订单标题/订单关键字等，是请求时对应的参数，原样通知回来 + */ + private String subject; + /** + * 订单的备注、描述、明细等。对应请求时的 body 参数，原样通知回来 + */ + private String body; + /** + * 该笔交易创建的时间 + */ + private String gmtCreate; + /** + * 该笔交易 的买家付款时间 + */ + private String gmtPayment; + /** + * 该笔交易的退款时间 + */ + private String gmtRefund; + /** + * 该笔交易结束时间 + */ + private String gmtClose; + /** + * 支付成功的各个渠道金额信息 + */ + private String fundBillList; + /** + * 公共回传参数，如果请求时传递了该参数，则返回给商家时会在异步通知时将该参数原样返回 + */ + private String passbackParams; + /** + * 本交易支付时所有优惠券信息 + */ + private String voucherDetailList; + /** + * 回调处理状态[1:初始 2:处理中 3:处理成功 4:处理失败] + */ + private Integer processStatus; + /** + * 删除标志（0代表存在 2代表删除） + */ + private String delFlag; + /** + * 创建者 + */ + private String createBy; + /** + * 创建时间 + */ + private Date createTime; + /** + * 更新者 + */ + private String updateBy; + /** + * 更新时间 + */ + private Date updateTime; +} diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/payment/ExternalAccountDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/payment/ExternalAccountDTO.java new file mode 100644 index 000000000..79447b181 --- /dev/null +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/payment/ExternalAccountDTO.java @@ -0,0 +1,75 @@ +package com.ruoyi.xkt.dto.payment; + +import lombok.Data; + +import java.util.Date; + +/** + * 外部账户 + * + * @author liangyq + * @date 2025-04-01 11:57:52.450 + **/ +@Data +public class ExternalAccountDTO { + /** + * 外部账户ID + */ + private Long id; + /** + * 归属[1:平台 2:档口 3:用户] + */ + private Integer ownerType; + /** + * 归属ID（平台=-1，档口=store_id，用户=user_id） + */ + private Long ownerId; + /** + * 账户状态[1:正常 2:冻结] + */ + private Integer accountStatus; + /** + * 账户类型[1:支付宝账户] + */ + private Integer accountType; + /** + * 归属人实际账户 + */ + private String accountOwnerNumber; + /** + * 归属人真实姓名 + */ + private String accountOwnerName; + /** + * 归属人手机号 + */ + private String accountOwnerPhoneNumber; + /** + * 归属人认证通过 + */ + private Boolean accountAuthAccess; + /** + * 备注 + */ + private String remark; + /** + * 删除标志（0代表存在 2代表删除） + */ + private String delFlag; + /** + * 创建者 + */ + private String createBy; + /** + * 创建时间 + */ + private Date createTime; + /** + * 更新者 + */ + private String updateBy; + /** + * 更新时间 + */ + private Date updateTime; +} diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/payment/ExternalAccountTransDetailDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/payment/ExternalAccountTransDetailDTO.java new file mode 100644 index 000000000..a83f7d3e6 --- /dev/null +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/payment/ExternalAccountTransDetailDTO.java @@ -0,0 +1,76 @@ +package com.ruoyi.xkt.dto.payment; + +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * 外部账户交易明细 + * + * @author liangyq + * @date 2025-04-01 11:57:52.470 + **/ +@Data +public class ExternalAccountTransDetailDTO { + /** + * 外部账户交易明细ID + */ + private Long id; + /** + * 外部账户ID + */ + private Long externalAccountId; + /** + * 来源单据ID + */ + private Long srcBillId; + /** + * 来源单据类型[2:付款] + */ + private Integer srcBillType; + /** + * 借贷方向[1:借(D) 2:贷(C)] + */ + private Integer loanDirection; + /** + * 交易金额 + */ + private BigDecimal transAmount; + /** + * 交易时间 + */ + private Date transTime; + /** + * 经办人ID + */ + private Long handlerId; + /** + * 入账状态 [1:已入账 2:未入账] + */ + private Integer entryStatus; + /** + * 备注 + */ + private String remark; + /** + * 删除标志（0代表存在 2代表删除） + */ + private String delFlag; + /** + * 创建者 + */ + private String createBy; + /** + * 创建时间 + */ + private Date createTime; + /** + * 更新者 + */ + private String updateBy; + /** + * 更新时间 + */ + private Date updateTime; +} diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/payment/InternalAccountDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/payment/InternalAccountDTO.java new file mode 100644 index 000000000..63d729ff2 --- /dev/null +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/payment/InternalAccountDTO.java @@ -0,0 +1,72 @@ +package com.ruoyi.xkt.dto.payment; + +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * 内部账户 + * + * @author liangyq + * @date 2025-04-01 11:57:52.493 + **/ +@Data +public class InternalAccountDTO { + /** + * 内部账户ID + */ + private Long id; + /** + * 归属[1:平台 2:档口 3:用户] + */ + private Integer ownerType; + /** + * 归属ID（平台=-1，档口=store_id） + */ + private Long ownerId; + /** + * 账户状态[1:正常 2:冻结] + */ + private Integer accountStatus; + /** + * 交易密码 + */ + private String transactionPassword; + /** + * 余额 + */ + private BigDecimal balance; + /** + * 可用余额 + */ + private BigDecimal usableBalance; + /** + * 支付中金额 + */ + private BigDecimal paymentAmount; + /** + * 备注 + */ + private String remark; + /** + * 删除标志（0代表存在 2代表删除） + */ + private String delFlag; + /** + * 创建者 + */ + private String createBy; + /** + * 创建时间 + */ + private Date createTime; + /** + * 更新者 + */ + private String updateBy; + /** + * 更新时间 + */ + private Date updateTime; +} diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/payment/InternalAccountTransDetailDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/payment/InternalAccountTransDetailDTO.java new file mode 100644 index 000000000..f1f9115de --- /dev/null +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/payment/InternalAccountTransDetailDTO.java @@ -0,0 +1,80 @@ +package com.ruoyi.xkt.dto.payment; + +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * 内部账户交易明细 + * + * @author liangyq + * @date 2025-04-01 11:57:52.516 + **/ +@Data +public class InternalAccountTransDetailDTO { + /** + * 内部账户交易明细ID + */ + private Long id; + /** + * 内部账户ID + */ + private Long internalAccountId; + /** + * 来源单据ID + */ + private Long srcBillId; + /** + * 来源单据类型[1:收款 2:付款 3:转移] + */ + private Integer srcBillType; + /** + * 借贷方向[1:借(D) 2:贷(C)] + */ + private Integer loanDirection; + /** + * 交易金额 + */ + private BigDecimal transAmount; + /** + * 交易时间 + */ + private Date transTime; + /** + * 经办人ID + */ + private Long handlerId; + /** + * 入账状态 [1:已入账 2:未入账] + */ + private Integer entryStatus; + /** + * 入账执行标识[1:已执行 2:未执行] + */ + private Integer entryExecuted; + /** + * 备注 + */ + private String remark; + /** + * 删除标志（0代表存在 2代表删除） + */ + private String delFlag; + /** + * 创建者 + */ + private String createBy; + /** + * 创建时间 + */ + private Date createTime; + /** + * 更新者 + */ + private String updateBy; + /** + * 更新时间 + */ + private Date updateTime; +} diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/payment/PaymentBillDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/payment/PaymentBillDTO.java new file mode 100644 index 000000000..591a75dce --- /dev/null +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/payment/PaymentBillDTO.java @@ -0,0 +1,96 @@ +package com.ruoyi.xkt.dto.payment; + +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * 支付单据 + * + * @author liangyq + * @date 2025-04-01 11:57:52.533 + **/ +@Data +public class PaymentBillDTO { + /** + * 支付单据ID + */ + private Long id; + /** + * 单号 + */ + private String billNo; + /** + * 单据类型[1:收款 2:付款 3:转移] + */ + private Integer billType; + /** + * 单据状态[1:初始 2:执行中 3:执行成功 4:执行失败] + */ + private Integer billStatus; + /** + * 来源类型[1:代发订单支付 2:代发订单完成 3:提现] + */ + private Integer srcType; + /** + * 来源ID + */ + private Long srcId; + /** + * 关联类型[1:代发订单] + */ + private Integer relType; + /** + * 关联ID + */ + private Long relId; + /** + * 收入内部账户ID + */ + private Long inputInternalAccountId; + /** + * 支出内部账户ID + */ + private Long outputInternalAccountId; + /** + * 收入外部账户ID + */ + private Long inputExternalAccountId; + /** + * 支出外部账户ID + */ + private Long outputExternalAccountId; + /** + * 业务金额 + */ + private BigDecimal businessAmount; + /** + * 交易金额 + */ + private BigDecimal transAmount; + /** + * 备注 + */ + private String remark; + /** + * 删除标志（0代表存在 2代表删除） + */ + private String delFlag; + /** + * 创建者 + */ + private String createBy; + /** + * 创建时间 + */ + private Date createTime; + /** + * 更新者 + */ + private String updateBy; + /** + * 更新时间 + */ + private Date updateTime; +} diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/payment/PaymentBillDetailDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/payment/PaymentBillDetailDTO.java new file mode 100644 index 000000000..bf1930223 --- /dev/null +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/payment/PaymentBillDetailDTO.java @@ -0,0 +1,64 @@ +package com.ruoyi.xkt.dto.payment; + +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * 支付单据明细 + * + * @author liangyq + * @date 2025-04-01 11:57:52.550 + **/ +@Data +public class PaymentBillDetailDTO { + /** + * 支付单据明细ID + */ + private Long id; + /** + * 支付单据ID + */ + private Long paymentBillId; + /** + * 关联类型[1:代发订单明细] + */ + private Integer relType; + /** + * 关联ID + */ + private Long relId; + /** + * 业务金额 + */ + private BigDecimal businessAmount; + /** + * 交易金额 + */ + private BigDecimal transAmount; + /** + * 备注 + */ + private String remark; + /** + * 删除标志（0代表存在 2代表删除） + */ + private String delFlag; + /** + * 创建者 + */ + private String createBy; + /** + * 创建时间 + */ + private Date createTime; + /** + * 更新者 + */ + private String updateBy; + /** + * 更新时间 + */ + private Date updateTime; +} diff --git a/xkt/src/main/java/com/ruoyi/xkt/mapper/AlipayCallbackMapper.java b/xkt/src/main/java/com/ruoyi/xkt/mapper/AlipayCallbackMapper.java new file mode 100644 index 000000000..55e9b5839 --- /dev/null +++ b/xkt/src/main/java/com/ruoyi/xkt/mapper/AlipayCallbackMapper.java @@ -0,0 +1,13 @@ +package com.ruoyi.xkt.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.xkt.domain.AlipayCallback; +import org.springframework.stereotype.Repository; + +/** + * @author liangyq + * @date 2025-04-02 12:48 + */ +@Repository +public interface AlipayCallbackMapper extends BaseMapper { +} diff --git a/xkt/src/main/java/com/ruoyi/xkt/mapper/ExpressMapper.java b/xkt/src/main/java/com/ruoyi/xkt/mapper/ExpressMapper.java new file mode 100644 index 000000000..e08ee75e3 --- /dev/null +++ b/xkt/src/main/java/com/ruoyi/xkt/mapper/ExpressMapper.java @@ -0,0 +1,13 @@ +package com.ruoyi.xkt.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.xkt.domain.Express; +import org.springframework.stereotype.Repository; + +/** + * @author liangyq + * @date 2025-04-02 12:48 + */ +@Repository +public interface ExpressMapper extends BaseMapper { +} diff --git a/xkt/src/main/java/com/ruoyi/xkt/mapper/ExternalAccountMapper.java b/xkt/src/main/java/com/ruoyi/xkt/mapper/ExternalAccountMapper.java new file mode 100644 index 000000000..bd5930252 --- /dev/null +++ b/xkt/src/main/java/com/ruoyi/xkt/mapper/ExternalAccountMapper.java @@ -0,0 +1,13 @@ +package com.ruoyi.xkt.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.xkt.domain.ExternalAccount; +import org.springframework.stereotype.Repository; + +/** + * @author liangyq + * @date 2025-04-02 12:48 + */ +@Repository +public interface ExternalAccountMapper extends BaseMapper { +} diff --git a/xkt/src/main/java/com/ruoyi/xkt/mapper/ExternalAccountTransDetailMapper.java b/xkt/src/main/java/com/ruoyi/xkt/mapper/ExternalAccountTransDetailMapper.java new file mode 100644 index 000000000..948ced596 --- /dev/null +++ b/xkt/src/main/java/com/ruoyi/xkt/mapper/ExternalAccountTransDetailMapper.java @@ -0,0 +1,13 @@ +package com.ruoyi.xkt.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.xkt.domain.ExternalAccountTransDetail; +import org.springframework.stereotype.Repository; + +/** + * @author liangyq + * @date 2025-04-02 12:48 + */ +@Repository +public interface ExternalAccountTransDetailMapper extends BaseMapper { +} diff --git a/xkt/src/main/java/com/ruoyi/xkt/mapper/InternalAccountMapper.java b/xkt/src/main/java/com/ruoyi/xkt/mapper/InternalAccountMapper.java new file mode 100644 index 000000000..50320300c --- /dev/null +++ b/xkt/src/main/java/com/ruoyi/xkt/mapper/InternalAccountMapper.java @@ -0,0 +1,13 @@ +package com.ruoyi.xkt.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.xkt.domain.InternalAccount; +import org.springframework.stereotype.Repository; + +/** + * @author liangyq + * @date 2025-04-02 12:48 + */ +@Repository +public interface InternalAccountMapper extends BaseMapper { +} diff --git a/xkt/src/main/java/com/ruoyi/xkt/mapper/InternalAccountTransDetailMapper.java b/xkt/src/main/java/com/ruoyi/xkt/mapper/InternalAccountTransDetailMapper.java new file mode 100644 index 000000000..422a292b4 --- /dev/null +++ b/xkt/src/main/java/com/ruoyi/xkt/mapper/InternalAccountTransDetailMapper.java @@ -0,0 +1,13 @@ +package com.ruoyi.xkt.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.xkt.domain.InternalAccountTransDetail; +import org.springframework.stereotype.Repository; + +/** + * @author liangyq + * @date 2025-04-02 12:48 + */ +@Repository +public interface InternalAccountTransDetailMapper extends BaseMapper { +} diff --git a/xkt/src/main/java/com/ruoyi/xkt/mapper/PaymentBillDetailMapper.java b/xkt/src/main/java/com/ruoyi/xkt/mapper/PaymentBillDetailMapper.java new file mode 100644 index 000000000..862d42df2 --- /dev/null +++ b/xkt/src/main/java/com/ruoyi/xkt/mapper/PaymentBillDetailMapper.java @@ -0,0 +1,13 @@ +package com.ruoyi.xkt.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.xkt.domain.PaymentBillDetail; +import org.springframework.stereotype.Repository; + +/** + * @author liangyq + * @date 2025-04-02 12:48 + */ +@Repository +public interface PaymentBillDetailMapper extends BaseMapper { +} diff --git a/xkt/src/main/java/com/ruoyi/xkt/mapper/PaymentBillMapper.java b/xkt/src/main/java/com/ruoyi/xkt/mapper/PaymentBillMapper.java new file mode 100644 index 000000000..758d727c4 --- /dev/null +++ b/xkt/src/main/java/com/ruoyi/xkt/mapper/PaymentBillMapper.java @@ -0,0 +1,13 @@ +package com.ruoyi.xkt.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.xkt.domain.PaymentBill; +import org.springframework.stereotype.Repository; + +/** + * @author liangyq + * @date 2025-04-02 12:48 + */ +@Repository +public interface PaymentBillMapper extends BaseMapper { +} diff --git a/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreOrderDetailMapper.java b/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreOrderDetailMapper.java index 9c64fb94c..85f6c8d75 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreOrderDetailMapper.java +++ b/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreOrderDetailMapper.java @@ -2,61 +2,12 @@ package com.ruoyi.xkt.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ruoyi.xkt.domain.StoreOrderDetail; - -import java.util.List; +import org.springframework.stereotype.Repository; /** - * 档口代发订单明细Mapper接口 - * - * @author ruoyi - * @date 2025-03-26 + * @author liangyq + * @date 2025-04-02 12:48 */ +@Repository public interface StoreOrderDetailMapper extends BaseMapper { - /** - * 查询档口代发订单明细 - * - * @param id 档口代发订单明细主键 - * @return 档口代发订单明细 - */ - public StoreOrderDetail selectStoreOrderDetailByStoreOrderDetailId(Long id); - - /** - * 查询档口代发订单明细列表 - * - * @param storeOrderDetail 档口代发订单明细 - * @return 档口代发订单明细集合 - */ - public List selectStoreOrderDetailList(StoreOrderDetail storeOrderDetail); - - /** - * 新增档口代发订单明细 - * - * @param storeOrderDetail 档口代发订单明细 - * @return 结果 - */ - public int insertStoreOrderDetail(StoreOrderDetail storeOrderDetail); - - /** - * 修改档口代发订单明细 - * - * @param storeOrderDetail 档口代发订单明细 - * @return 结果 - */ - public int updateStoreOrderDetail(StoreOrderDetail storeOrderDetail); - - /** - * 删除档口代发订单明细 - * - * @param id 档口代发订单明细主键 - * @return 结果 - */ - public int deleteStoreOrderDetailByStoreOrderDetailId(Long id); - - /** - * 批量删除档口代发订单明细 - * - * @param storeOrderDetailIds 需要删除的数据主键集合 - * @return 结果 - */ - public int deleteStoreOrderDetailByStoreOrderDetailIds(Long[] storeOrderDetailIds); } diff --git a/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreOrderExpressMapper.java b/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreOrderExpressMapper.java deleted file mode 100644 index 6ebaed2d4..000000000 --- a/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreOrderExpressMapper.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.ruoyi.xkt.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.ruoyi.xkt.domain.StoreOrderExpress; - -import java.util.List; - -/** - * 档口代发订单快递Mapper接口 - * - * @author ruoyi - * @date 2025-03-26 - */ -public interface StoreOrderExpressMapper extends BaseMapper { - /** - * 查询档口代发订单快递 - * - * @param id 档口代发订单快递主键 - * @return 档口代发订单快递 - */ - public StoreOrderExpress selectStoreOrderExpressByStoreOrderExprId(Long id); - - /** - * 查询档口代发订单快递列表 - * - * @param storeOrderExpress 档口代发订单快递 - * @return 档口代发订单快递集合 - */ - public List selectStoreOrderExpressList(StoreOrderExpress storeOrderExpress); - - /** - * 新增档口代发订单快递 - * - * @param storeOrderExpress 档口代发订单快递 - * @return 结果 - */ - public int insertStoreOrderExpress(StoreOrderExpress storeOrderExpress); - - /** - * 修改档口代发订单快递 - * - * @param storeOrderExpress 档口代发订单快递 - * @return 结果 - */ - public int updateStoreOrderExpress(StoreOrderExpress storeOrderExpress); - - /** - * 删除档口代发订单快递 - * - * @param id 档口代发订单快递主键 - * @return 结果 - */ - public int deleteStoreOrderExpressByStoreOrderExprId(Long id); - - /** - * 批量删除档口代发订单快递 - * - * @param storeOrderExprIds 需要删除的数据主键集合 - * @return 结果 - */ - public int deleteStoreOrderExpressByStoreOrderExprIds(Long[] storeOrderExprIds); -} diff --git a/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreOrderExpressTrackMapper.java b/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreOrderExpressTrackMapper.java new file mode 100644 index 000000000..5e4871bc3 --- /dev/null +++ b/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreOrderExpressTrackMapper.java @@ -0,0 +1,14 @@ +package com.ruoyi.xkt.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.xkt.domain.Express; +import com.ruoyi.xkt.domain.StoreOrderExpressTrack; +import org.springframework.stereotype.Repository; + +/** + * @author liangyq + * @date 2025-04-02 12:48 + */ +@Repository +public interface StoreOrderExpressTrackMapper extends BaseMapper { +} diff --git a/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreOrderMapper.java b/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreOrderMapper.java index 106014618..0732924ca 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreOrderMapper.java +++ b/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreOrderMapper.java @@ -2,61 +2,12 @@ package com.ruoyi.xkt.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ruoyi.xkt.domain.StoreOrder; - -import java.util.List; +import org.springframework.stereotype.Repository; /** - * 档口代发订单Mapper接口 - * - * @author ruoyi - * @date 2025-03-26 + * @author liangyq + * @date 2025-04-02 12:48 */ +@Repository public interface StoreOrderMapper extends BaseMapper { - /** - * 查询档口代发订单 - * - * @param id 档口代发订单主键 - * @return 档口代发订单 - */ - public StoreOrder selectStoreOrderByStoreOrderId(Long id); - - /** - * 查询档口代发订单列表 - * - * @param storeOrder 档口代发订单 - * @return 档口代发订单集合 - */ - public List selectStoreOrderList(StoreOrder storeOrder); - - /** - * 新增档口代发订单 - * - * @param storeOrder 档口代发订单 - * @return 结果 - */ - public int insertStoreOrder(StoreOrder storeOrder); - - /** - * 修改档口代发订单 - * - * @param storeOrder 档口代发订单 - * @return 结果 - */ - public int updateStoreOrder(StoreOrder storeOrder); - - /** - * 删除档口代发订单 - * - * @param id 档口代发订单主键 - * @return 结果 - */ - public int deleteStoreOrderByStoreOrderId(Long id); - - /** - * 批量删除档口代发订单 - * - * @param storeOrderIds 需要删除的数据主键集合 - * @return 结果 - */ - public int deleteStoreOrderByStoreOrderIds(Long[] storeOrderIds); } diff --git a/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreOrderOperationRecordMapper.java b/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreOrderOperationRecordMapper.java new file mode 100644 index 000000000..0d5a09d68 --- /dev/null +++ b/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreOrderOperationRecordMapper.java @@ -0,0 +1,13 @@ +package com.ruoyi.xkt.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.xkt.domain.StoreOrderOperationRecord; +import org.springframework.stereotype.Repository; + +/** + * @author liangyq + * @date 2025-04-02 12:48 + */ +@Repository +public interface StoreOrderOperationRecordMapper extends BaseMapper { +} diff --git a/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreOrderReceiveMapper.java b/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreOrderReceiveMapper.java deleted file mode 100644 index 46adceb04..000000000 --- a/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreOrderReceiveMapper.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.ruoyi.xkt.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.ruoyi.xkt.domain.StoreOrderReceive; - -import java.util.List; - -/** - * 档口代发订单收件人Mapper接口 - * - * @author ruoyi - * @date 2025-03-26 - */ -public interface StoreOrderReceiveMapper extends BaseMapper { - /** - * 查询档口代发订单收件人 - * - * @param id 档口代发订单收件人主键 - * @return 档口代发订单收件人 - */ - public StoreOrderReceive selectStoreOrderReceiveByStoreOrderRcvId(Long id); - - /** - * 查询档口代发订单收件人列表 - * - * @param storeOrderReceive 档口代发订单收件人 - * @return 档口代发订单收件人集合 - */ - public List selectStoreOrderReceiveList(StoreOrderReceive storeOrderReceive); - - /** - * 新增档口代发订单收件人 - * - * @param storeOrderReceive 档口代发订单收件人 - * @return 结果 - */ - public int insertStoreOrderReceive(StoreOrderReceive storeOrderReceive); - - /** - * 修改档口代发订单收件人 - * - * @param storeOrderReceive 档口代发订单收件人 - * @return 结果 - */ - public int updateStoreOrderReceive(StoreOrderReceive storeOrderReceive); - - /** - * 删除档口代发订单收件人 - * - * @param id 档口代发订单收件人主键 - * @return 结果 - */ - public int deleteStoreOrderReceiveByStoreOrderRcvId(Long id); - - /** - * 批量删除档口代发订单收件人 - * - * @param storeOrderRcvIds 需要删除的数据主键集合 - * @return 结果 - */ - public int deleteStoreOrderReceiveByStoreOrderRcvIds(Long[] storeOrderRcvIds); -} diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/IStoreOrderDetailService.java b/xkt/src/main/java/com/ruoyi/xkt/service/IStoreOrderDetailService.java deleted file mode 100644 index f5f568c93..000000000 --- a/xkt/src/main/java/com/ruoyi/xkt/service/IStoreOrderDetailService.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.ruoyi.xkt.service; - -import com.ruoyi.xkt.domain.StoreOrderDetail; - -import java.util.List; - -/** - * 档口代发订单明细Service接口 - * - * @author ruoyi - * @date 2025-03-26 - */ -public interface IStoreOrderDetailService { - /** - * 查询档口代发订单明细 - * - * @param storeOrderDetailId 档口代发订单明细主键 - * @return 档口代发订单明细 - */ - public StoreOrderDetail selectStoreOrderDetailByStoreOrderDetailId(Long storeOrderDetailId); - - /** - * 查询档口代发订单明细列表 - * - * @param storeOrderDetail 档口代发订单明细 - * @return 档口代发订单明细集合 - */ - public List selectStoreOrderDetailList(StoreOrderDetail storeOrderDetail); - - /** - * 新增档口代发订单明细 - * - * @param storeOrderDetail 档口代发订单明细 - * @return 结果 - */ - public int insertStoreOrderDetail(StoreOrderDetail storeOrderDetail); - - /** - * 修改档口代发订单明细 - * - * @param storeOrderDetail 档口代发订单明细 - * @return 结果 - */ - public int updateStoreOrderDetail(StoreOrderDetail storeOrderDetail); - - /** - * 批量删除档口代发订单明细 - * - * @param storeOrderDetailIds 需要删除的档口代发订单明细主键集合 - * @return 结果 - */ - public int deleteStoreOrderDetailByStoreOrderDetailIds(Long[] storeOrderDetailIds); - - /** - * 删除档口代发订单明细信息 - * - * @param storeOrderDetailId 档口代发订单明细主键 - * @return 结果 - */ - public int deleteStoreOrderDetailByStoreOrderDetailId(Long storeOrderDetailId); -} diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/IStoreOrderExpressService.java b/xkt/src/main/java/com/ruoyi/xkt/service/IStoreOrderExpressService.java deleted file mode 100644 index 14feedceb..000000000 --- a/xkt/src/main/java/com/ruoyi/xkt/service/IStoreOrderExpressService.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.ruoyi.xkt.service; - -import com.ruoyi.xkt.domain.StoreOrderExpress; - -import java.util.List; - -/** - * 档口代发订单快递Service接口 - * - * @author ruoyi - * @date 2025-03-26 - */ -public interface IStoreOrderExpressService { - /** - * 查询档口代发订单快递 - * - * @param storeOrderExprId 档口代发订单快递主键 - * @return 档口代发订单快递 - */ - public StoreOrderExpress selectStoreOrderExpressByStoreOrderExprId(Long storeOrderExprId); - - /** - * 查询档口代发订单快递列表 - * - * @param storeOrderExpress 档口代发订单快递 - * @return 档口代发订单快递集合 - */ - public List selectStoreOrderExpressList(StoreOrderExpress storeOrderExpress); - - /** - * 新增档口代发订单快递 - * - * @param storeOrderExpress 档口代发订单快递 - * @return 结果 - */ - public int insertStoreOrderExpress(StoreOrderExpress storeOrderExpress); - - /** - * 修改档口代发订单快递 - * - * @param storeOrderExpress 档口代发订单快递 - * @return 结果 - */ - public int updateStoreOrderExpress(StoreOrderExpress storeOrderExpress); - - /** - * 批量删除档口代发订单快递 - * - * @param storeOrderExprIds 需要删除的档口代发订单快递主键集合 - * @return 结果 - */ - public int deleteStoreOrderExpressByStoreOrderExprIds(Long[] storeOrderExprIds); - - /** - * 删除档口代发订单快递信息 - * - * @param storeOrderExprId 档口代发订单快递主键 - * @return 结果 - */ - public int deleteStoreOrderExpressByStoreOrderExprId(Long storeOrderExprId); -} diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/IStoreOrderReceiveService.java b/xkt/src/main/java/com/ruoyi/xkt/service/IStoreOrderReceiveService.java deleted file mode 100644 index 2890a23a6..000000000 --- a/xkt/src/main/java/com/ruoyi/xkt/service/IStoreOrderReceiveService.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.ruoyi.xkt.service; - -import com.ruoyi.xkt.domain.StoreOrderReceive; - -import java.util.List; - -/** - * 档口代发订单收件人Service接口 - * - * @author ruoyi - * @date 2025-03-26 - */ -public interface IStoreOrderReceiveService { - /** - * 查询档口代发订单收件人 - * - * @param storeOrderRcvId 档口代发订单收件人主键 - * @return 档口代发订单收件人 - */ - public StoreOrderReceive selectStoreOrderReceiveByStoreOrderRcvId(Long storeOrderRcvId); - - /** - * 查询档口代发订单收件人列表 - * - * @param storeOrderReceive 档口代发订单收件人 - * @return 档口代发订单收件人集合 - */ - public List selectStoreOrderReceiveList(StoreOrderReceive storeOrderReceive); - - /** - * 新增档口代发订单收件人 - * - * @param storeOrderReceive 档口代发订单收件人 - * @return 结果 - */ - public int insertStoreOrderReceive(StoreOrderReceive storeOrderReceive); - - /** - * 修改档口代发订单收件人 - * - * @param storeOrderReceive 档口代发订单收件人 - * @return 结果 - */ - public int updateStoreOrderReceive(StoreOrderReceive storeOrderReceive); - - /** - * 批量删除档口代发订单收件人 - * - * @param storeOrderRcvIds 需要删除的档口代发订单收件人主键集合 - * @return 结果 - */ - public int deleteStoreOrderReceiveByStoreOrderRcvIds(Long[] storeOrderRcvIds); - - /** - * 删除档口代发订单收件人信息 - * - * @param storeOrderRcvId 档口代发订单收件人主键 - * @return 结果 - */ - public int deleteStoreOrderReceiveByStoreOrderRcvId(Long storeOrderRcvId); -} diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/IStoreOrderService.java b/xkt/src/main/java/com/ruoyi/xkt/service/IStoreOrderService.java deleted file mode 100644 index 82dcd2c0b..000000000 --- a/xkt/src/main/java/com/ruoyi/xkt/service/IStoreOrderService.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.ruoyi.xkt.service; - -import com.ruoyi.xkt.domain.StoreOrder; - -import java.util.List; - -/** - * 档口代发订单Service接口 - * - * @author ruoyi - * @date 2025-03-26 - */ -public interface IStoreOrderService { - /** - * 查询档口代发订单 - * - * @param storeOrderId 档口代发订单主键 - * @return 档口代发订单 - */ - public StoreOrder selectStoreOrderByStoreOrderId(Long storeOrderId); - - /** - * 查询档口代发订单列表 - * - * @param storeOrder 档口代发订单 - * @return 档口代发订单集合 - */ - public List selectStoreOrderList(StoreOrder storeOrder); - - /** - * 新增档口代发订单 - * - * @param storeOrder 档口代发订单 - * @return 结果 - */ - public int insertStoreOrder(StoreOrder storeOrder); - - /** - * 修改档口代发订单 - * - * @param storeOrder 档口代发订单 - * @return 结果 - */ - public int updateStoreOrder(StoreOrder storeOrder); - - /** - * 批量删除档口代发订单 - * - * @param storeOrderIds 需要删除的档口代发订单主键集合 - * @return 结果 - */ - public int deleteStoreOrderByStoreOrderIds(Long[] storeOrderIds); - - /** - * 删除档口代发订单信息 - * - * @param storeOrderId 档口代发订单主键 - * @return 结果 - */ - public int deleteStoreOrderByStoreOrderId(Long storeOrderId); -} diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreOrderDetailServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreOrderDetailServiceImpl.java deleted file mode 100644 index 83b907f0c..000000000 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreOrderDetailServiceImpl.java +++ /dev/null @@ -1,97 +0,0 @@ -package com.ruoyi.xkt.service.impl; - -import com.ruoyi.common.utils.DateUtils; -import com.ruoyi.xkt.domain.StoreOrderDetail; -import com.ruoyi.xkt.mapper.StoreOrderDetailMapper; -import com.ruoyi.xkt.service.IStoreOrderDetailService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.List; - -/** - * 档口代发订单明细Service业务层处理 - * - * @author ruoyi - * @date 2025-03-26 - */ -@Service -public class StoreOrderDetailServiceImpl implements IStoreOrderDetailService { - @Autowired - private StoreOrderDetailMapper storeOrderDetailMapper; - - /** - * 查询档口代发订单明细 - * - * @param storeOrderDetailId 档口代发订单明细主键 - * @return 档口代发订单明细 - */ - @Override - @Transactional(readOnly = true) - public StoreOrderDetail selectStoreOrderDetailByStoreOrderDetailId(Long storeOrderDetailId) { - return storeOrderDetailMapper.selectStoreOrderDetailByStoreOrderDetailId(storeOrderDetailId); - } - - /** - * 查询档口代发订单明细列表 - * - * @param storeOrderDetail 档口代发订单明细 - * @return 档口代发订单明细 - */ - @Override - @Transactional(readOnly = true) - public List selectStoreOrderDetailList(StoreOrderDetail storeOrderDetail) { - return storeOrderDetailMapper.selectStoreOrderDetailList(storeOrderDetail); - } - - /** - * 新增档口代发订单明细 - * - * @param storeOrderDetail 档口代发订单明细 - * @return 结果 - */ - @Override - @Transactional - public int insertStoreOrderDetail(StoreOrderDetail storeOrderDetail) { - storeOrderDetail.setCreateTime(DateUtils.getNowDate()); - return storeOrderDetailMapper.insertStoreOrderDetail(storeOrderDetail); - } - - /** - * 修改档口代发订单明细 - * - * @param storeOrderDetail 档口代发订单明细 - * @return 结果 - */ - @Override - @Transactional - public int updateStoreOrderDetail(StoreOrderDetail storeOrderDetail) { - storeOrderDetail.setUpdateTime(DateUtils.getNowDate()); - return storeOrderDetailMapper.updateStoreOrderDetail(storeOrderDetail); - } - - /** - * 批量删除档口代发订单明细 - * - * @param storeOrderDetailIds 需要删除的档口代发订单明细主键 - * @return 结果 - */ - @Override - @Transactional - public int deleteStoreOrderDetailByStoreOrderDetailIds(Long[] storeOrderDetailIds) { - return storeOrderDetailMapper.deleteStoreOrderDetailByStoreOrderDetailIds(storeOrderDetailIds); - } - - /** - * 删除档口代发订单明细信息 - * - * @param storeOrderDetailId 档口代发订单明细主键 - * @return 结果 - */ - @Override - @Transactional - public int deleteStoreOrderDetailByStoreOrderDetailId(Long storeOrderDetailId) { - return storeOrderDetailMapper.deleteStoreOrderDetailByStoreOrderDetailId(storeOrderDetailId); - } -} diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreOrderExpressServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreOrderExpressServiceImpl.java deleted file mode 100644 index a1bc988ac..000000000 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreOrderExpressServiceImpl.java +++ /dev/null @@ -1,93 +0,0 @@ -package com.ruoyi.xkt.service.impl; - -import com.ruoyi.common.utils.DateUtils; -import com.ruoyi.xkt.domain.StoreOrderExpress; -import com.ruoyi.xkt.mapper.StoreOrderExpressMapper; -import com.ruoyi.xkt.service.IStoreOrderExpressService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.List; - -/** - * 档口代发订单快递Service业务层处理 - * - * @author ruoyi - * @date 2025-03-26 - */ -@Service -public class StoreOrderExpressServiceImpl implements IStoreOrderExpressService { - @Autowired - private StoreOrderExpressMapper storeOrderExpressMapper; - - /** - * 查询档口代发订单快递 - * - * @param storeOrderExprId 档口代发订单快递主键 - * @return 档口代发订单快递 - */ - @Override - public StoreOrderExpress selectStoreOrderExpressByStoreOrderExprId(Long storeOrderExprId) { - return storeOrderExpressMapper.selectStoreOrderExpressByStoreOrderExprId(storeOrderExprId); - } - - /** - * 查询档口代发订单快递列表 - * - * @param storeOrderExpress 档口代发订单快递 - * @return 档口代发订单快递 - */ - @Override - public List selectStoreOrderExpressList(StoreOrderExpress storeOrderExpress) { - return storeOrderExpressMapper.selectStoreOrderExpressList(storeOrderExpress); - } - - /** - * 新增档口代发订单快递 - * - * @param storeOrderExpress 档口代发订单快递 - * @return 结果 - */ - @Override - @Transactional - public int insertStoreOrderExpress(StoreOrderExpress storeOrderExpress) { - storeOrderExpress.setCreateTime(DateUtils.getNowDate()); - return storeOrderExpressMapper.insertStoreOrderExpress(storeOrderExpress); - } - - /** - * 修改档口代发订单快递 - * - * @param storeOrderExpress 档口代发订单快递 - * @return 结果 - */ - @Override - @Transactional - public int updateStoreOrderExpress(StoreOrderExpress storeOrderExpress) { - storeOrderExpress.setUpdateTime(DateUtils.getNowDate()); - return storeOrderExpressMapper.updateStoreOrderExpress(storeOrderExpress); - } - - /** - * 批量删除档口代发订单快递 - * - * @param storeOrderExprIds 需要删除的档口代发订单快递主键 - * @return 结果 - */ - @Override - public int deleteStoreOrderExpressByStoreOrderExprIds(Long[] storeOrderExprIds) { - return storeOrderExpressMapper.deleteStoreOrderExpressByStoreOrderExprIds(storeOrderExprIds); - } - - /** - * 删除档口代发订单快递信息 - * - * @param storeOrderExprId 档口代发订单快递主键 - * @return 结果 - */ - @Override - public int deleteStoreOrderExpressByStoreOrderExprId(Long storeOrderExprId) { - return storeOrderExpressMapper.deleteStoreOrderExpressByStoreOrderExprId(storeOrderExprId); - } -} diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreOrderReceiveServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreOrderReceiveServiceImpl.java deleted file mode 100644 index 076bba4d8..000000000 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreOrderReceiveServiceImpl.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.ruoyi.xkt.service.impl; - -import com.ruoyi.common.utils.DateUtils; -import com.ruoyi.xkt.domain.StoreOrderReceive; -import com.ruoyi.xkt.mapper.StoreOrderReceiveMapper; -import com.ruoyi.xkt.service.IStoreOrderReceiveService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.List; - -/** - * 档口代发订单收件人Service业务层处理 - * - * @author ruoyi - * @date 2025-03-26 - */ -@Service -public class StoreOrderReceiveServiceImpl implements IStoreOrderReceiveService { - @Autowired - private StoreOrderReceiveMapper storeOrderReceiveMapper; - - /** - * 查询档口代发订单收件人 - * - * @param storeOrderRcvId 档口代发订单收件人主键 - * @return 档口代发订单收件人 - */ - @Override - public StoreOrderReceive selectStoreOrderReceiveByStoreOrderRcvId(Long storeOrderRcvId) { - return storeOrderReceiveMapper.selectStoreOrderReceiveByStoreOrderRcvId(storeOrderRcvId); - } - - /** - * 查询档口代发订单收件人列表 - * - * @param storeOrderReceive 档口代发订单收件人 - * @return 档口代发订单收件人 - */ - @Override - public List selectStoreOrderReceiveList(StoreOrderReceive storeOrderReceive) { - return storeOrderReceiveMapper.selectStoreOrderReceiveList(storeOrderReceive); - } - - /** - * 新增档口代发订单收件人 - * - * @param storeOrderReceive 档口代发订单收件人 - * @return 结果 - */ - @Override - @Transactional - public int insertStoreOrderReceive(StoreOrderReceive storeOrderReceive) { - storeOrderReceive.setCreateTime(DateUtils.getNowDate()); - return storeOrderReceiveMapper.insertStoreOrderReceive(storeOrderReceive); - } - - /** - * 修改档口代发订单收件人 - * - * @param storeOrderReceive 档口代发订单收件人 - * @return 结果 - */ - @Override - public int updateStoreOrderReceive(StoreOrderReceive storeOrderReceive) { - storeOrderReceive.setUpdateTime(DateUtils.getNowDate()); - return storeOrderReceiveMapper.updateStoreOrderReceive(storeOrderReceive); - } - - /** - * 批量删除档口代发订单收件人 - * - * @param storeOrderRcvIds 需要删除的档口代发订单收件人主键 - * @return 结果 - */ - @Override - public int deleteStoreOrderReceiveByStoreOrderRcvIds(Long[] storeOrderRcvIds) { - return storeOrderReceiveMapper.deleteStoreOrderReceiveByStoreOrderRcvIds(storeOrderRcvIds); - } - - /** - * 删除档口代发订单收件人信息 - * - * @param storeOrderRcvId 档口代发订单收件人主键 - * @return 结果 - */ - @Override - public int deleteStoreOrderReceiveByStoreOrderRcvId(Long storeOrderRcvId) { - return storeOrderReceiveMapper.deleteStoreOrderReceiveByStoreOrderRcvId(storeOrderRcvId); - } -} diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreOrderServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreOrderServiceImpl.java deleted file mode 100644 index 4f675d250..000000000 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreOrderServiceImpl.java +++ /dev/null @@ -1,93 +0,0 @@ -package com.ruoyi.xkt.service.impl; - -import com.ruoyi.common.utils.DateUtils; -import com.ruoyi.xkt.domain.StoreOrder; -import com.ruoyi.xkt.mapper.StoreOrderMapper; -import com.ruoyi.xkt.service.IStoreOrderService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.List; - -/** - * 档口代发订单Service业务层处理 - * - * @author ruoyi - * @date 2025-03-26 - */ -@Service -public class StoreOrderServiceImpl implements IStoreOrderService { - @Autowired - private StoreOrderMapper storeOrderMapper; - - /** - * 查询档口代发订单 - * - * @param storeOrderId 档口代发订单主键 - * @return 档口代发订单 - */ - @Override - public StoreOrder selectStoreOrderByStoreOrderId(Long storeOrderId) { - return storeOrderMapper.selectStoreOrderByStoreOrderId(storeOrderId); - } - - /** - * 查询档口代发订单列表 - * - * @param storeOrder 档口代发订单 - * @return 档口代发订单 - */ - @Override - public List selectStoreOrderList(StoreOrder storeOrder) { - return storeOrderMapper.selectStoreOrderList(storeOrder); - } - - /** - * 新增档口代发订单 - * - * @param storeOrder 档口代发订单 - * @return 结果 - */ - @Override - @Transactional - public int insertStoreOrder(StoreOrder storeOrder) { - storeOrder.setCreateTime(DateUtils.getNowDate()); - return storeOrderMapper.insertStoreOrder(storeOrder); - } - - /** - * 修改档口代发订单 - * - * @param storeOrder 档口代发订单 - * @return 结果 - */ - @Override - @Transactional - public int updateStoreOrder(StoreOrder storeOrder) { - storeOrder.setUpdateTime(DateUtils.getNowDate()); - return storeOrderMapper.updateStoreOrder(storeOrder); - } - - /** - * 批量删除档口代发订单 - * - * @param storeOrderIds 需要删除的档口代发订单主键 - * @return 结果 - */ - @Override - public int deleteStoreOrderByStoreOrderIds(Long[] storeOrderIds) { - return storeOrderMapper.deleteStoreOrderByStoreOrderIds(storeOrderIds); - } - - /** - * 删除档口代发订单信息 - * - * @param storeOrderId 档口代发订单主键 - * @return 结果 - */ - @Override - public int deleteStoreOrderByStoreOrderId(Long storeOrderId) { - return storeOrderMapper.deleteStoreOrderByStoreOrderId(storeOrderId); - } -} diff --git a/xkt/src/main/resources/mapper/AlipayCallbackMapper.xml b/xkt/src/main/resources/mapper/AlipayCallbackMapper.xml new file mode 100644 index 000000000..f7f1f0ecf --- /dev/null +++ b/xkt/src/main/resources/mapper/AlipayCallbackMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/xkt/src/main/resources/mapper/ExpressMapper.xml b/xkt/src/main/resources/mapper/ExpressMapper.xml new file mode 100644 index 000000000..f317a7e9e --- /dev/null +++ b/xkt/src/main/resources/mapper/ExpressMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/xkt/src/main/resources/mapper/ExternalAccountMapper.xml b/xkt/src/main/resources/mapper/ExternalAccountMapper.xml new file mode 100644 index 000000000..9da9e7bc9 --- /dev/null +++ b/xkt/src/main/resources/mapper/ExternalAccountMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/xkt/src/main/resources/mapper/ExternalAccountTransDetailMapper.xml b/xkt/src/main/resources/mapper/ExternalAccountTransDetailMapper.xml new file mode 100644 index 000000000..858350177 --- /dev/null +++ b/xkt/src/main/resources/mapper/ExternalAccountTransDetailMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/xkt/src/main/resources/mapper/InternalAccountMapper.xml b/xkt/src/main/resources/mapper/InternalAccountMapper.xml new file mode 100644 index 000000000..af5cc8f60 --- /dev/null +++ b/xkt/src/main/resources/mapper/InternalAccountMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/xkt/src/main/resources/mapper/InternalAccountTransDetailMapper.xml b/xkt/src/main/resources/mapper/InternalAccountTransDetailMapper.xml new file mode 100644 index 000000000..4aa8553ff --- /dev/null +++ b/xkt/src/main/resources/mapper/InternalAccountTransDetailMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/xkt/src/main/resources/mapper/PaymentBillDetailMapper.xml b/xkt/src/main/resources/mapper/PaymentBillDetailMapper.xml new file mode 100644 index 000000000..1d0706cb2 --- /dev/null +++ b/xkt/src/main/resources/mapper/PaymentBillDetailMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/xkt/src/main/resources/mapper/PaymentBillMapper.xml b/xkt/src/main/resources/mapper/PaymentBillMapper.xml new file mode 100644 index 000000000..eb897c6c3 --- /dev/null +++ b/xkt/src/main/resources/mapper/PaymentBillMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/xkt/src/main/resources/mapper/StoreOrderDetailMapper.xml b/xkt/src/main/resources/mapper/StoreOrderDetailMapper.xml index 7d45f7d8d..a74545802 100644 --- a/xkt/src/main/resources/mapper/StoreOrderDetailMapper.xml +++ b/xkt/src/main/resources/mapper/StoreOrderDetailMapper.xml @@ -1,121 +1,5 @@ - + - - - - - - - - - - - - - - - - - - - - - select id, store_order_id, store_order_detail_refund_id, store_prod_color_size_id, store_prod_id, store_id, price, quantity, amount, detail_status, version, del_flag, create_by, create_time, update_by, update_time from store_order_detail - - - - - - - - insert into store_order_detail - - store_order_id, - store_order_detail_refund_id, - store_prod_color_size_id, - store_prod_id, - store_id, - price, - quantity, - amount, - detail_status, - version, - del_flag, - create_by, - create_time, - update_by, - update_time, - - - #{storeOrderId}, - #{storeOrderDetailRefundId}, - #{storeProdColorSizeId}, - #{storeProdId}, - #{storeId}, - #{price}, - #{quantity}, - #{amount}, - #{detailStatus}, - #{version}, - #{delFlag}, - #{createBy}, - #{createTime}, - #{updateBy}, - #{updateTime}, - - - - - update store_order_detail - - store_order_id = #{storeOrderId}, - store_order_detail_refund_id = #{storeOrderDetailRefundId}, - store_prod_color_size_id = #{storeProdColorSizeId}, - store_prod_id = #{storeProdId}, - store_id = #{storeId}, - price = #{price}, - quantity = #{quantity}, - amount = #{amount}, - detail_status = #{detailStatus}, - version = #{version}, - del_flag = #{delFlag}, - create_by = #{createBy}, - create_time = #{createTime}, - update_by = #{updateBy}, - update_time = #{updateTime}, - - where id = #{id} - - - - delete from store_order_detail where id = #{id} - - - - delete from store_order_detail where id in - - #{id} - - \ No newline at end of file diff --git a/xkt/src/main/resources/mapper/StoreOrderExpressMapper.xml b/xkt/src/main/resources/mapper/StoreOrderExpressMapper.xml deleted file mode 100644 index ea6dc3e28..000000000 --- a/xkt/src/main/resources/mapper/StoreOrderExpressMapper.xml +++ /dev/null @@ -1,116 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - select id, store_order_detail_id, store_order_id, store_id, delivery_type, express_id, express_fee, tracking_num, expr_status, version, del_flag, create_by, create_time, update_by, update_time from store_order_express - - - - - - - - insert into store_order_express - - store_order_detail_id, - store_order_id, - store_id, - delivery_type, - express_id, - express_fee, - tracking_num, - expr_status, - version, - del_flag, - create_by, - create_time, - update_by, - update_time, - - - #{storeOrderDetailId}, - #{storeOrderId}, - #{storeId}, - #{deliveryType}, - #{expressId}, - #{expressFee}, - #{trackingNum}, - #{exprStatus}, - #{version}, - #{delFlag}, - #{createBy}, - #{createTime}, - #{updateBy}, - #{updateTime}, - - - - - update store_order_express - - store_order_detail_id = #{storeOrderDetailId}, - store_order_id = #{storeOrderId}, - store_id = #{storeId}, - delivery_type = #{deliveryType}, - express_id = #{expressId}, - express_fee = #{expressFee}, - tracking_num = #{trackingNum}, - expr_status = #{exprStatus}, - version = #{version}, - del_flag = #{delFlag}, - create_by = #{createBy}, - create_time = #{createTime}, - update_by = #{updateBy}, - update_time = #{updateTime}, - - where id = #{id} - - - - delete from store_order_express where id = #{id} - - - - delete from store_order_express where id in - - #{id} - - - \ No newline at end of file diff --git a/xkt/src/main/resources/mapper/StoreOrderExpressTrackMapper.xml b/xkt/src/main/resources/mapper/StoreOrderExpressTrackMapper.xml new file mode 100644 index 000000000..a0d8d5ac6 --- /dev/null +++ b/xkt/src/main/resources/mapper/StoreOrderExpressTrackMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/xkt/src/main/resources/mapper/StoreOrderMapper.xml b/xkt/src/main/resources/mapper/StoreOrderMapper.xml index 8ff7b57ba..ccfbb80d3 100644 --- a/xkt/src/main/resources/mapper/StoreOrderMapper.xml +++ b/xkt/src/main/resources/mapper/StoreOrderMapper.xml @@ -1,151 +1,5 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - select id, store_id, user_id, code, order_type, refund_original_id, express_id, express_fee, delivery_type, delivery_end_time, refund_reason_id, quantity, amount, reject_reason, voucher_date, order_status, version, del_flag, create_by, create_time, update_by, update_time from store_order - - - - - - - - insert into store_order - - store_id, - user_id, - code, - order_type, - refund_original_id, - express_id, - express_fee, - delivery_type, - delivery_end_time, - refund_reason_id, - quantity, - amount, - reject_reason, - voucher_date, - order_status, - version, - del_flag, - create_by, - create_time, - update_by, - update_time, - - - #{storeId}, - #{userId}, - #{code}, - #{orderType}, - #{refundOriginalId}, - #{expressId}, - #{expressFee}, - #{deliveryType}, - #{deliveryEndTime}, - #{refundReasonId}, - #{quantity}, - #{amount}, - #{rejectReason}, - #{voucherDate}, - #{orderStatus}, - #{version}, - #{delFlag}, - #{createBy}, - #{createTime}, - #{updateBy}, - #{updateTime}, - - - - - update store_order - - store_id = #{storeId}, - user_id = #{userId}, - code = #{code}, - order_type = #{orderType}, - refund_original_id = #{refundOriginalId}, - express_id = #{expressId}, - express_fee = #{expressFee}, - delivery_type = #{deliveryType}, - delivery_end_time = #{deliveryEndTime}, - refund_reason_id = #{refundReasonId}, - quantity = #{quantity}, - amount = #{amount}, - reject_reason = #{rejectReason}, - voucher_date = #{voucherDate}, - order_status = #{orderStatus}, - version = #{version}, - del_flag = #{delFlag}, - create_by = #{createBy}, - create_time = #{createTime}, - update_by = #{updateBy}, - update_time = #{updateTime}, - - where id = #{id} - - - - delete from store_order where id = #{id} - - - - delete from store_order where id in - - #{id} - - \ No newline at end of file diff --git a/xkt/src/main/resources/mapper/StoreOrderOperationRecordMapper.xml b/xkt/src/main/resources/mapper/StoreOrderOperationRecordMapper.xml new file mode 100644 index 000000000..da5862e57 --- /dev/null +++ b/xkt/src/main/resources/mapper/StoreOrderOperationRecordMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/xkt/src/main/resources/mapper/StoreOrderReceiveMapper.xml b/xkt/src/main/resources/mapper/StoreOrderReceiveMapper.xml deleted file mode 100644 index b13580984..000000000 --- a/xkt/src/main/resources/mapper/StoreOrderReceiveMapper.xml +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - select id, store_order_id, sys_user_address_id, receive_name, receive_phone, province_code, city_id, district_code, detail_address, remark, version, del_flag, create_by, create_time, update_by, update_time from store_order_receive - - - - - - - - insert into store_order_receive - - store_order_id, - sys_user_address_id, - receive_name, - receive_phone, - province_code, - city_id, - district_code, - detail_address, - remark, - version, - del_flag, - create_by, - create_time, - update_by, - update_time, - - - #{storeOrderId}, - #{sysUserAddressId}, - #{receiveName}, - #{receivePhone}, - #{provinceCode}, - #{cityId}, - #{districtCode}, - #{detailAddress}, - #{remark}, - #{version}, - #{delFlag}, - #{createBy}, - #{createTime}, - #{updateBy}, - #{updateTime}, - - - - - update store_order_receive - - store_order_id = #{storeOrderId}, - sys_user_address_id = #{sysUserAddressId}, - receive_name = #{receiveName}, - receive_phone = #{receivePhone}, - province_code = #{provinceCode}, - city_id = #{cityId}, - district_code = #{districtCode}, - detail_address = #{detailAddress}, - remark = #{remark}, - version = #{version}, - del_flag = #{delFlag}, - create_by = #{createBy}, - create_time = #{createTime}, - update_by = #{updateBy}, - update_time = #{updateTime}, - - where id = #{id} - - - - delete from store_order_receive where id = #{id} - - - - delete from store_order_receive where id in - - #{id} - - - \ No newline at end of file