From e6428dea081eb5225d185d49e414298706b0a091 Mon Sep 17 00:00:00 2001 From: xhxu Date: Fri, 9 Jun 2023 23:53:29 +0800 Subject: [PATCH] //tuikuan --- .../V2023060500001_douyin_permission.sql | 7 +++++++ .../controller/WxCouponOrderController.java | 16 +++++++++++++--- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/mallinkAdmin/src/main/resources/db/migration/V2023060500001_douyin_permission.sql b/mallinkAdmin/src/main/resources/db/migration/V2023060500001_douyin_permission.sql index 3dc054a89..9d9ee5537 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V2023060500001_douyin_permission.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V2023060500001_douyin_permission.sql @@ -3,3 +3,10 @@ INSERT INTO `mallink`.`mall_permission`(`id`, `name`, `parent_id`, `available`, INSERT INTO `mallink`.`mall_permission`(`id`, `name`, `parent_id`, `available`, `permission`, `resource_type`, `module_color`, `module_color_num`, `url`, `icon`, `version_type`, `sort`) VALUES (60202, '抖音代金券', 602, 'Y', NULL, 1, NULL, NULL, 'douyinVoucherCoupon', NULL, 0, 60202); INSERT INTO `mallink`.`mall_permission`(`id`, `name`, `parent_id`, `available`, `permission`, `resource_type`, `module_color`, `module_color_num`, `url`, `icon`, `version_type`, `sort`) VALUES (716, '预约订单', 610, 'Y', NULL, 1, NULL, NULL, 'reservationList', NULL, 0, 716); + + + +INSERT INTO `mallink`.`mall_sale_type`(`id`, `name`, `type`, `period`, `menus`) VALUES (13, '抖音尊享+到家', 13, 12, '[1, 2, 4, 5, 6, 50, 105, 110, 201, 205, 202, 210, 211, 212, 221, 222, 223, 224, 251, 261, 409, 410, 411, 416, 502, 504, 505, 506, 507, 511, 512, 521, 522, 523, 591, 592, 595, 601, 602, 605, 606, 610, 612, 615, 622, 647, 676, 680, 711, 716, 901, 902, 904, 907, 5502, 60201, 61202, 61501, 61502]'); + +UPDATE `mallink`.`mall_sale_type` SET `menus` = '[1, 2, 4, 5, 6, 50, 105, 110, 201, 205, 202, 210, 211, 212, 221, 222, 223, 224, 251, 261, 409, 410, 411, 416, 504, 505, 506, 507, 511, 512, 521, 522, 523, 591, 592, 595, 601, 602, 605, 606, 610, 612, 615, 622, 647, 650, 676, 680, 711, 901, 902, 904, 907, 5502, 41001, 60202, 61202, 61501, 61502, 71101]' WHERE `id` = 102; + diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java index 04a549592..d3327fea5 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java @@ -62,6 +62,9 @@ public class WxCouponOrderController extends BaseController { @Autowired private WxPayOrderService wxPayOrderService; + @Autowired + private WxRefundOrderService wxRefundOrderService; + @Autowired private WxCardInfoService wxCardInfoService; @@ -283,9 +286,16 @@ public class WxCouponOrderController extends BaseController { } Map res = new HashMap(); - - res.put("CouponOrderStatus", wxCouponOrderService.getById(Long.valueOf(couponOrderId),getTenantInfo().getTenantId()).getCouponOrderStatus()); - + WxCouponOrder couponOrder = wxCouponOrderService.getById(Long.valueOf(couponOrderId), getTenantInfo().getTenantId()); + res.put("CouponOrderStatus", couponOrder.getCouponOrderStatus()); + res.put("outOrderId",couponOrder.getComposeOrderId()); + if(EnumCouponOrderStatus.COUPON_ORDER_INVALID.getCode().equals(couponOrder.getCouponOrderStatus())){ + WxRefundOrder refundOrder = wxRefundOrderService.findRefundOrder(getTenantInfo(), couponOrder.getOrderId()); + if(refundOrder != null){ + res.put("outRefundOrderId",refundOrder.getId()); + res.put("refundOrderStatus",refundOrder.getRefundOrderStatus()); + } + } return new ResultData(res); }