From 1048c3903790dd8963758b19464e524ae6e6bf51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=AF=E8=88=AA?= Date: Mon, 4 Mar 2024 19:51:33 +0800 Subject: [PATCH] up --- .../com/qihang/common/common/ResultVo.java | 8 ++--- .../{EnumResultVo.java => ResultVoEnum.java} | 10 +++---- doc/sql/qihang-oms.sql | 30 ++++++++++--------- .../tao/controller/GoodsApiController.java | 16 ++++------ .../tao/controller/OrderApiController.java | 14 ++++----- .../tao/controller/RefundApiController.java | 15 ++-------- .../tao/service/impl/TaoGoodsServiceImpl.java | 4 +-- .../tao/service/impl/TaoOrderServiceImpl.java | 8 ++--- .../service/impl/TaoRefundServiceImpl.java | 5 ++-- 9 files changed, 48 insertions(+), 62 deletions(-) rename core/common/src/main/java/com/qihang/common/common/{EnumResultVo.java => ResultVoEnum.java} (86%) diff --git a/core/common/src/main/java/com/qihang/common/common/ResultVo.java b/core/common/src/main/java/com/qihang/common/common/ResultVo.java index 68a3e79a..4c1c0123 100644 --- a/core/common/src/main/java/com/qihang/common/common/ResultVo.java +++ b/core/common/src/main/java/com/qihang/common/common/ResultVo.java @@ -15,23 +15,23 @@ public class ResultVo { public ResultVo() { } - public ResultVo(EnumResultVo result) { + public ResultVo(ResultVoEnum result) { this.code = result.getIndex(); this.msg = result.getName(); } - public ResultVo(EnumResultVo result, String msg, T data) { + public ResultVo(ResultVoEnum result, String msg, T data) { this.code = result.getIndex(); this.msg = msg; this.data = data; } - public ResultVo(EnumResultVo result, String msg) { + public ResultVo(ResultVoEnum result, String msg) { this.code = result.getIndex(); this.msg = msg; } - public ResultVo(EnumResultVo result, T data) { + public ResultVo(ResultVoEnum result, T data) { this.code = result.getIndex(); this.msg = result.getName(); this.data = data; diff --git a/core/common/src/main/java/com/qihang/common/common/EnumResultVo.java b/core/common/src/main/java/com/qihang/common/common/ResultVoEnum.java similarity index 86% rename from core/common/src/main/java/com/qihang/common/common/EnumResultVo.java rename to core/common/src/main/java/com/qihang/common/common/ResultVoEnum.java index 2f55dddf..58fbf280 100644 --- a/core/common/src/main/java/com/qihang/common/common/EnumResultVo.java +++ b/core/common/src/main/java/com/qihang/common/common/ResultVoEnum.java @@ -6,11 +6,11 @@ package com.qihang.common.common; * @author qlp * @date 2019-04-10 10:31 */ -public enum EnumResultVo { +public enum ResultVoEnum { SUCCESS("成功", 0), NotFound("NotFound", 404),//没有找到 Unable("Unable", 403),//无法处理 - NotLogin("未登录", 400),//未登录 +// NotLogin("未登录", 400),//未登录 Cancelled("Cancelled", 401),//已经取消的 StateError("StateError", 402),//状态错误 Locking("Locking", 405),//锁定，不能操作 @@ -22,21 +22,21 @@ public enum EnumResultVo { HasAssociatedData("存在关联数据", 501),//存在关联数据 Exist("已存在相同的数据", 502),//已存在相同的数据 SystemException("系统异常", 505),//系统异常 - TokenFail("token过期", 1401),//ali token过期 +// TokenFail("token过期", 1401),//ali token过期 Fail("失败", 1000); private String name; private int index; // 构造方法 - private EnumResultVo(String name, int index) { + private ResultVoEnum(String name, int index) { this.name = name; this.index = index; } // 普通方法 public static String getName(int index) { - for (EnumResultVo c : EnumResultVo.values()) { + for (ResultVoEnum c : ResultVoEnum.values()) { if (c.getIndex() == index) { return c.name; } diff --git a/doc/sql/qihang-oms.sql b/doc/sql/qihang-oms.sql index 6d74a6d1..61942d62 100644 --- a/doc/sql/qihang-oms.sql +++ b/doc/sql/qihang-oms.sql @@ -11,7 +11,7 @@ Target Server Version : 80032 File Encoding : 65001 - Date: 01/03/2024 19:24:01 + Date: 04/03/2024 19:51:08 */ SET NAMES utf8mb4; @@ -77,20 +77,22 @@ INSERT INTO `sys_menu` VALUES (117, '菜单管理', 5, 1, 'menu', 'system/menu/i DROP TABLE IF EXISTS `sys_platform`; CREATE TABLE `sys_platform` ( `id` int(0) NOT NULL, - `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, - `code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, + `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '平台名', + `code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '平台编码', `app_key` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, `app_secret` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, + `redirect_uri` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '平台回调uri', + `server_url` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '接口访问地址', PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; -- ---------------------------- -- Records of sys_platform -- ---------------------------- -INSERT INTO `sys_platform` VALUES (1, '天猫', 'TMALL', '12175777', '368dbbd183a77d551735be13f59bbcda'); -INSERT INTO `sys_platform` VALUES (2, '京东', 'JD', 'FB4CC3688E6F9065D4FF510A53BB60FF', '40e8c8b2427f4e6db8f4a39af27d719e'); -INSERT INTO `sys_platform` VALUES (3, '抖店', 'DOUDIAN', NULL, NULL); -INSERT INTO `sys_platform` VALUES (4, '拼多多', 'PDD', NULL, NULL); +INSERT INTO `sys_platform` VALUES (1, '天猫', 'TMALL', '12175777', '368dbbd183a77d551735be13f59bbcda', NULL, NULL); +INSERT INTO `sys_platform` VALUES (2, '京东', 'JD', 'FB4CC3688E6F9065D4FF510A53BB60FF', '40e8c8b2427f4e6db8f4a39af27d719e', 'http://www.qumei.com', 'https://api.jd.com/routerjson'); +INSERT INTO `sys_platform` VALUES (3, '抖店', 'DOUDIAN', NULL, NULL, NULL, NULL); +INSERT INTO `sys_platform` VALUES (4, '拼多多', 'PDD', NULL, NULL, NULL, NULL); -- ---------------------------- -- Table structure for sys_shop @@ -121,7 +123,7 @@ CREATE TABLE `sys_shop` ( -- Records of sys_shop -- ---------------------------- INSERT INTO `sys_shop` VALUES (1, '天猫旗舰店', 1, '', 98, 1, 0, '', 59972781, '31014100', '7b0769269b0c0ca88949791c14eb3a5c', '6102522199aaa4a42a2e6be95d0a5e18657c1576ec563a0351855490', NULL, NULL, NULL, NULL, 'http://gw.api.taobao.com/router/rest'); -INSERT INTO `sys_shop` VALUES (2, '京东旗舰店', 2, NULL, 9, 0, 0, NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `sys_shop` VALUES (2, '京东旗舰店', 2, NULL, 9, 0, 0, NULL, 0, NULL, NULL, '8abd974c62c34778935b34b5952e6f68izdk', 31535999, NULL, '919b21a3b9d247d08d7701cb8bcc2432ote5', NULL, NULL); INSERT INTO `sys_shop` VALUES (3, '抖音旗舰店', 3, 'http://openapi.jinritemai.com', 87, 1, 1653672695, NULL, 4463798, '7249607407477720636', '36a12497-fb9d-4b54-8cd1-fd1617346687', '', NULL, NULL, NULL, NULL, '2'); INSERT INTO `sys_shop` VALUES (5, '拼多多旗舰店', 4, NULL, 99, 1, 1680698886, 'pdd10006159121', 100061591, NULL, NULL, '87f8044d2a5f45a489aa3a952785b0d35e61788a', NULL, NULL, NULL, NULL, NULL); @@ -155,7 +157,7 @@ CREATE TABLE `sys_user` ( -- ---------------------------- -- Records of sys_user -- ---------------------------- -INSERT INTO `sys_user` VALUES (1, 103, 'admin', '启航oms', '00', '280645618@qq.com', '15888888888', '1', '', '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', '0', '0', '127.0.0.1', '2024-03-01 18:12:57', 'admin', '2023-08-07 19:31:37', '', '2024-03-01 18:12:57', '管理员'); +INSERT INTO `sys_user` VALUES (1, 103, 'admin', '启航oms', '00', '280645618@qq.com', '15888888888', '1', '', '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', '0', '0', '127.0.0.1', '2024-03-04 13:16:35', 'admin', '2023-08-07 19:31:37', '', '2024-03-04 13:16:34', '管理员'); -- ---------------------------- -- Table structure for tao_goods @@ -195,7 +197,7 @@ CREATE TABLE `tao_goods` ( `erp_goods_id` int(0) DEFAULT NULL COMMENT 'erp商品id', `create_time` datetime(0) DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 102 CHARACTER SET = utf8mb3 COLLATE = utf8mb3_general_ci ROW_FORMAT = Dynamic; +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb3 COLLATE = utf8mb3_general_ci ROW_FORMAT = Dynamic; -- ---------------------------- -- Table structure for tao_goods_sku @@ -222,7 +224,7 @@ CREATE TABLE `tao_goods_sku` ( `erp_goods_id` int(0) DEFAULT NULL COMMENT 'erp商品id', `create_time` datetime(0) DEFAULT NULL COMMENT '创建时间', PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 2282 CHARACTER SET = utf8mb3 COLLATE = utf8mb3_general_ci ROW_FORMAT = Dynamic; +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb3 COLLATE = utf8mb3_general_ci ROW_FORMAT = Dynamic; -- ---------------------------- -- Table structure for tao_order @@ -309,7 +311,7 @@ CREATE TABLE `tao_order` ( `is_part_consign` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '是否是多次发货的订单如果卖家对订单进行多次发货，则为true否则为false', `sid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '物流运单号', PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 117 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '淘宝订单表' ROW_FORMAT = Dynamic; +) ENGINE = InnoDB AUTO_INCREMENT = 1763461704736792578 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '淘宝订单表' ROW_FORMAT = Dynamic; -- ---------------------------- -- Records of tao_order @@ -393,7 +395,7 @@ CREATE TABLE `tao_order_item` ( `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最近退款ID', `remark` varchar(500) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL, PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 125 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '淘宝订单明细表' ROW_FORMAT = Dynamic; +) ENGINE = InnoDB AUTO_INCREMENT = 1763461704749375490 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '淘宝订单明细表' ROW_FORMAT = Dynamic; -- ---------------------------- -- Records of tao_order_item @@ -489,7 +491,7 @@ CREATE TABLE `tao_refund` ( `update_by` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '更新人', `update_time` datetime(0) DEFAULT NULL COMMENT '更新时间', PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 30 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '淘宝退款订单表' ROW_FORMAT = Dynamic; +) ENGINE = InnoDB AUTO_INCREMENT = 1763489314208354305 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '淘宝退款订单表' ROW_FORMAT = Dynamic; -- ---------------------------- -- Records of tao_refund diff --git a/tao-api/src/main/java/com/qihang/tao/controller/GoodsApiController.java b/tao-api/src/main/java/com/qihang/tao/controller/GoodsApiController.java index 26e2560f..1735e47e 100644 --- a/tao-api/src/main/java/com/qihang/tao/controller/GoodsApiController.java +++ b/tao-api/src/main/java/com/qihang/tao/controller/GoodsApiController.java @@ -1,25 +1,19 @@ package com.qihang.tao.controller; import com.qihang.common.common.ApiResult; -import com.qihang.common.common.EnumResultVo; +import com.qihang.common.common.ResultVoEnum; import com.qihang.common.enums.HttpStatus; import com.qihang.tao.api.ApiCommon; import com.qihang.tao.api.GoodsApiHelper; -import com.qihang.tao.api.OrderApiHelper; import com.qihang.tao.common.TaoRequest; import com.qihang.tao.domain.TaoGoods; -import com.qihang.tao.domain.TaoOrder; import com.qihang.tao.service.TaoGoodsService; import lombok.AllArgsConstructor; -import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; -import java.util.List; -import java.util.Map; - @RequestMapping("/goods") @RestController @AllArgsConstructor @@ -66,10 +60,10 @@ public class GoodsApiController { for (var goods:listApiResult.getList()) { int result = goodsService.saveAndUpdateGoods(req.getShopId(), goods); - if (result == EnumResultVo.DataExist.getIndex()) { + if (result == ResultVoEnum.DataExist.getIndex()) { //已经存在 hasExistOrder++; - } else if (result == EnumResultVo.SUCCESS.getIndex()) { + } else if (result == ResultVoEnum.SUCCESS.getIndex()) { insertSuccess++; }else { totalError++; @@ -85,10 +79,10 @@ public class GoodsApiController { //循环插入订单数据到数据库 for (var goods:listApiResult.getList()) { int result = goodsService.saveAndUpdateGoods(req.getShopId(), goods); - if (result == EnumResultVo.DataExist.getIndex()) { + if (result == ResultVoEnum.DataExist.getIndex()) { //已经存在 hasExistOrder++; - } else if (result == EnumResultVo.SUCCESS.getIndex()) { + } else if (result == ResultVoEnum.SUCCESS.getIndex()) { insertSuccess++; }else { totalError++; diff --git a/tao-api/src/main/java/com/qihang/tao/controller/OrderApiController.java b/tao-api/src/main/java/com/qihang/tao/controller/OrderApiController.java index a5dac5b1..9dc09514 100644 --- a/tao-api/src/main/java/com/qihang/tao/controller/OrderApiController.java +++ b/tao-api/src/main/java/com/qihang/tao/controller/OrderApiController.java @@ -1,7 +1,7 @@ package com.qihang.tao.controller; import com.qihang.common.common.ApiResult; -import com.qihang.common.common.EnumResultVo; +import com.qihang.common.common.ResultVoEnum; import com.qihang.common.enums.HttpStatus; import com.qihang.tao.api.ApiCommon; //import com.qihang.tao.api.ApiResult; @@ -74,11 +74,11 @@ public class OrderApiController { for (var order : upResult.getList()) { //插入订单数据 var result = orderService.saveOrder(req.getShopId(), order); - if (result.getCode() == EnumResultVo.DataExist.getIndex()) { + if (result.getCode() == ResultVoEnum.DataExist.getIndex()) { //已经存在 log.info("/**************主动更新tao订单：开始更新数据库：" + order.getId() + "存在、更新****************/"); hasExistOrder++; - } else if (result.getCode() == EnumResultVo.SUCCESS.getIndex()) { + } else if (result.getCode() == ResultVoEnum.SUCCESS.getIndex()) { log.info("/**************主动更新tao订单：开始更新数据库：" + order.getId() + "不存在、新增****************/"); insertSuccess++; } else { @@ -170,11 +170,11 @@ public class OrderApiController { //插入订单数据 var result = orderService.saveOrder(req.getShopId(), order); - if (result.getCode() == EnumResultVo.DataExist.getIndex()) { + if (result.getCode() == ResultVoEnum.DataExist.getIndex()) { //已经存在 log.info("/**************主动更新tao订单：开始更新数据库：" + order.getId() + "存在、更新****************/"); hasExistOrder++; - } else if (result.getCode() == EnumResultVo.SUCCESS.getIndex()) { + } else if (result.getCode() == ResultVoEnum.SUCCESS.getIndex()) { log.info("/**************主动更新tao订单：开始更新数据库：" + order.getId() + "不存在、新增****************/"); insertSuccess++; } else { @@ -194,11 +194,11 @@ public class OrderApiController { for (var order : upResult1.getList()) { //插入订单数据 var result = orderService.saveOrder(req.getShopId(), order); - if (result.getCode() == EnumResultVo.DataExist.getIndex()) { + if (result.getCode() == ResultVoEnum.DataExist.getIndex()) { //已经存在 log.info("/**************主动更新tao订单：开始更新数据库：" + order.getId() + "存在、更新****************/"); hasExistOrder++; - } else if (result.getCode() == EnumResultVo.SUCCESS.getIndex()) { + } else if (result.getCode() == ResultVoEnum.SUCCESS.getIndex()) { log.info("/**************主动更新tao订单：开始更新数据库：" + order.getId() + "不存在、新增****************/"); insertSuccess++; } else { diff --git a/tao-api/src/main/java/com/qihang/tao/controller/RefundApiController.java b/tao-api/src/main/java/com/qihang/tao/controller/RefundApiController.java index ef3b45ad..a3b80f2d 100644 --- a/tao-api/src/main/java/com/qihang/tao/controller/RefundApiController.java +++ b/tao-api/src/main/java/com/qihang/tao/controller/RefundApiController.java @@ -1,7 +1,7 @@ package com.qihang.tao.controller; import com.qihang.common.common.ApiResult; -import com.qihang.common.common.EnumResultVo; +import com.qihang.common.common.ResultVoEnum; import com.qihang.common.enums.HttpStatus; import com.qihang.tao.api.ApiCommon; import com.qihang.tao.api.RefundApiHelper; @@ -9,23 +9,14 @@ import com.qihang.tao.common.TaoRequest; import com.qihang.tao.domain.TaoRefund; import com.qihang.tao.service.TaoRefundService; import com.taobao.api.ApiException; -import com.taobao.api.DefaultTaobaoClient; -import com.taobao.api.TaobaoClient; -import com.taobao.api.request.RefundGetRequest; -import com.taobao.api.response.RefundGetResponse; -import jakarta.servlet.http.HttpServletRequest; import lombok.AllArgsConstructor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.ui.Model; -import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; -import java.math.BigDecimal; - @AllArgsConstructor @RestController @RequestMapping("/refund") @@ -82,11 +73,11 @@ public class RefundApiController { //插入订单数据 var result = refundService.saveAndUpdateRefund(shopId, refund); - if (result == EnumResultVo.DataExist.getIndex()) { + if (result == ResultVoEnum.DataExist.getIndex()) { //已经存在 log.info("/**************主动更新tao退货订单：开始更新数据库：" + refund.getRefundId() + "存在、更新****************/"); hasExistOrder++; - } else if (result == EnumResultVo.SUCCESS.getIndex()) { + } else if (result == ResultVoEnum.SUCCESS.getIndex()) { log.info("/**************主动更新tao退货订单：开始插入数据库：" + refund.getRefundId() + "不存在、新增****************/"); insertSuccess++; } else { diff --git a/tao-api/src/main/java/com/qihang/tao/service/impl/TaoGoodsServiceImpl.java b/tao-api/src/main/java/com/qihang/tao/service/impl/TaoGoodsServiceImpl.java index bb55a999..e64c1237 100644 --- a/tao-api/src/main/java/com/qihang/tao/service/impl/TaoGoodsServiceImpl.java +++ b/tao-api/src/main/java/com/qihang/tao/service/impl/TaoGoodsServiceImpl.java @@ -3,7 +3,7 @@ package com.qihang.tao.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.qihang.common.common.EnumResultVo; +import com.qihang.common.common.ResultVoEnum; import com.qihang.tao.common.PageQuery; import com.qihang.tao.common.PageResult; import com.qihang.tao.domain.TaoGoods; @@ -60,7 +60,7 @@ public class TaoGoodsServiceImpl extends ServiceImpl skuMapper.insert(sku); } } - return EnumResultVo.DataExist.getIndex(); + return ResultVoEnum.DataExist.getIndex(); }else { // 不存在，新增 goods.setShopId(shopId); diff --git a/tao-api/src/main/java/com/qihang/tao/service/impl/TaoOrderServiceImpl.java b/tao-api/src/main/java/com/qihang/tao/service/impl/TaoOrderServiceImpl.java index 8fb7b185..c01dfb17 100644 --- a/tao-api/src/main/java/com/qihang/tao/service/impl/TaoOrderServiceImpl.java +++ b/tao-api/src/main/java/com/qihang/tao/service/impl/TaoOrderServiceImpl.java @@ -2,7 +2,7 @@ package com.qihang.tao.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.qihang.common.common.EnumResultVo; +import com.qihang.common.common.ResultVoEnum; import com.qihang.common.common.ResultVo; import com.qihang.tao.domain.TaoOrder; import com.qihang.tao.domain.TaoOrderItem; @@ -69,7 +69,7 @@ public class TaoOrderServiceImpl extends ServiceImpl itemMapper.insert(item); } } - return new ResultVo<>(EnumResultVo.DataExist, "订单已经存在，更新成功"); + return new ResultVo<>(ResultVoEnum.DataExist, "订单已经存在，更新成功"); } else { // 不存在，新增 order.setShopId(shopId); @@ -79,11 +79,11 @@ public class TaoOrderServiceImpl extends ServiceImpl for (var item : order.getItems()) { itemMapper.insert(item); } - return new ResultVo<>(EnumResultVo.SUCCESS, "SUCCESS"); + return new ResultVo<>(ResultVoEnum.SUCCESS, "SUCCESS"); } } catch (Exception e) { TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); - return new ResultVo<>(EnumResultVo.SystemException, "系统异常：" + e.getMessage()); + return new ResultVo<>(ResultVoEnum.SystemException, "系统异常：" + e.getMessage()); } } } diff --git a/tao-api/src/main/java/com/qihang/tao/service/impl/TaoRefundServiceImpl.java b/tao-api/src/main/java/com/qihang/tao/service/impl/TaoRefundServiceImpl.java index 37c4030a..a8260e9f 100644 --- a/tao-api/src/main/java/com/qihang/tao/service/impl/TaoRefundServiceImpl.java +++ b/tao-api/src/main/java/com/qihang/tao/service/impl/TaoRefundServiceImpl.java @@ -2,14 +2,13 @@ package com.qihang.tao.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.qihang.common.common.EnumResultVo; +import com.qihang.common.common.ResultVoEnum; import com.qihang.tao.domain.TaoRefund; import com.qihang.tao.service.TaoRefundService; import com.qihang.tao.mapper.TaoRefundMapper; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; -import javax.crypto.Mac; import java.util.Date; import java.util.List; @@ -36,7 +35,7 @@ public class TaoRefundServiceImpl extends ServiceImpl