From d7cc6f2724c5c520fe51d4efff3b8d709088011a Mon Sep 17 00:00:00 2001 From: Richie <280645618@qq.com> Date: Mon, 24 Mar 2025 12:27:12 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=94=AE=E5=90=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AfterSaleProcessingController.java | 101 ++++++++++++ .../oms/controller/RefundController.java | 2 +- .../src/main/resources/application.yml | 4 +- vue/src/views/refund/shopRefund/index.vue | 37 +++-- vue/src/views/shop/shopOrder/pull_log.vue | 153 ------------------ 5 files changed, 126 insertions(+), 171 deletions(-) create mode 100644 api/oms-api/src/main/java/cn/qihangerp/oms/controller/AfterSaleProcessingController.java delete mode 100644 vue/src/views/shop/shopOrder/pull_log.vue diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/controller/AfterSaleProcessingController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/controller/AfterSaleProcessingController.java new file mode 100644 index 00000000..025f2849 --- /dev/null +++ b/api/oms-api/src/main/java/cn/qihangerp/oms/controller/AfterSaleProcessingController.java @@ -0,0 +1,101 @@ +package cn.qihangerp.oms.controller; + + +import cn.qihangerp.common.PageQuery; +import cn.qihangerp.common.PageResult; +import cn.qihangerp.common.TableDataInfo; +import cn.qihangerp.module.order.domain.OAfterSale; +import cn.qihangerp.module.order.service.OAfterSaleService; +import cn.qihangerp.security.common.BaseController; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@AllArgsConstructor +@RestController +@RequestMapping("/afterSale") +public class AfterSaleProcessingController extends BaseController { + private final OAfterSaleService afterSaleService; + /** + * 查询列表 + */ + @GetMapping("/list") + public TableDataInfo ship_again_list(OAfterSale bo, PageQuery pageQuery) + { + //private final OAfterSaleMapper mapper; + // @Override + // public PageResult queryPageList(OAfterSale bo, PageQuery pageQuery) { + // LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper(). + // eq( OAfterSale::getType, bo.getType()) + // .eq(bo.getShopId() != null, OAfterSale::getShopId, bo.getShopId()); + // + // Page pages = mapper.selectPage(pageQuery.build(), queryWrapper); + // return PageResult.build(pages); + // } +// bo.setType(80); + PageResult result = afterSaleService.queryPageList(bo, pageQuery); + return getDataTable(result); + } + +// @PostMapping("/shipAgain") +// public AjaxResult shipAgainAdd(@RequestBody ErpAfterSale addBo) +// { +// addBo.setType(80); +// addBo.setCreateTime(new Date()); +// addBo.setCreateBy("手动添加"); +// addBo.setStatus(1); +// var result = afterSaleService.save(addBo); +// return toAjax(result); +// } +// +// @PutMapping("/shipAgain/complete/{id}") +// public AjaxResult completeShipAgain(@PathVariable Long id) +// { +// ErpAfterSale complete = new ErpAfterSale(); +// complete.setId(id.toString()); +// complete.setStatus(2); +// complete.setUpdateTime(new Date()); +// complete.setUpdateBy("手动完成"); +// afterSaleService.updateById(complete); +// return toAjax(1); +// } +// +// +// @GetMapping("/returned_list") +// public TableDataInfo returned_list(ErpAfterSale bo, PageQuery pageQuery) +// { +// bo.setType(10); +// PageResult result = afterSaleService.queryPageList(bo, pageQuery); +// return getDataTable(result); +// } +// +// @GetMapping("/exchange_list") +// public TableDataInfo exchange_list(ErpAfterSale bo, PageQuery pageQuery) +// { +// bo.setType(20); +// PageResult result = afterSaleService.queryPageList(bo, pageQuery); +// return getDataTable(result); +// } +// +// @PostMapping("/exchange") +// public AjaxResult exchangeAdd(@RequestBody ErpAfterSale addBo) +// { +// addBo.setType(20); +// addBo.setCreateTime(new Date()); +// addBo.setCreateBy("手动添加"); +// addBo.setStatus(1); +// var result = afterSaleService.save(addBo); +// return toAjax(result); +// } +// +// @GetMapping("/intercept_list") +// public TableDataInfo intercept_list(ErpAfterSale bo, PageQuery pageQuery) +// { +// bo.setType(99); +// PageResult result = afterSaleService.queryPageList(bo, pageQuery); +// return getDataTable(result); +// } + + +} diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/controller/RefundController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/controller/RefundController.java index b4606500..41147877 100644 --- a/api/oms-api/src/main/java/cn/qihangerp/oms/controller/RefundController.java +++ b/api/oms-api/src/main/java/cn/qihangerp/oms/controller/RefundController.java @@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.*; */ @AllArgsConstructor @RestController -@RequestMapping("/api/oms-api/refund") +@RequestMapping("/refund") public class RefundController extends BaseController { diff --git a/api/open-api/src/main/resources/application.yml b/api/open-api/src/main/resources/application.yml index 7e290236..069bd0c9 100644 --- a/api/open-api/src/main/resources/application.yml +++ b/api/open-api/src/main/resources/application.yml @@ -81,5 +81,5 @@ spring: mybatis-plus: mapper-locations: classpath*:mapper/**/*Mapper.xml type-aliases-package: cn.qihangerp.open.domain;cn.qihangerp.security.entity; - configuration: - log-impl: org.apache.ibatis.logging.stdout.StdOutImpl # 开启sql日志 \ No newline at end of file +# configuration: +# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl # 开启sql日志 \ No newline at end of file diff --git a/vue/src/views/refund/shopRefund/index.vue b/vue/src/views/refund/shopRefund/index.vue index bd7f3ba4..9405b146 100644 --- a/vue/src/views/refund/shopRefund/index.vue +++ b/vue/src/views/refund/shopRefund/index.vue @@ -1,19 +1,16 @@ @@ -23,20 +20,30 @@ import TaoRefund from "@/views/tao/refund/index"; import JdRefund from "@/views/jd/refund/index"; import DouRefund from "@/views/dou/refund/index.vue"; import PddRefund from "@/views/pdd/refund/index.vue"; +import OrderTao from "@/views/tao/order/index.vue"; +import OrderPdd from "@/views/pdd/order/index.vue"; +import OrderDou from "@/views/dou/order/index.vue"; +import OrderWei from "@/views/wei/order/index.vue"; +import OrderJd from "@/views/jd/order/index.vue"; +import {listPlatform} from "@/api/shop/shop"; export default { name: "refund", - components:{PddRefund, DouRefund, TaoRefund,JdRefund}, + components:{OrderJd, OrderWei, OrderDou, OrderPdd, OrderTao, PddRefund, DouRefund, TaoRefund,JdRefund}, data() { return { - activeName: 'taoOrder' + activeName: 'taoOrder', + typeList: [], }; }, created() { }, mounted() { - + listPlatform({status:0}).then(res => { + this.typeList = res.rows; + this.activeName = this.typeList[0].code + }) }, methods: { handleClick(tab, event) { diff --git a/vue/src/views/shop/shopOrder/pull_log.vue b/vue/src/views/shop/shopOrder/pull_log.vue deleted file mode 100644 index 50b4e02c..00000000 --- a/vue/src/views/shop/shopOrder/pull_log.vue +++ /dev/null @@ -1,153 +0,0 @@ - - -