From ac337f75ec0277e9ddfa2dfd5ff84e0277d378b3 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期四, 25 十二月 2025 14:41:19 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/jiashida
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AppletOrderServiceImpl.java | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AppletOrderServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AppletOrderServiceImpl.java
index 8a54dbb..4dc5b93 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AppletOrderServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AppletOrderServiceImpl.java
@@ -3,6 +3,8 @@
import cn.hutool.core.bean.BeanUtil;
import com.alibaba.fastjson2.JSON;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.system.enums.BigGiftPackageOrderStatusEnum;
+import com.ruoyi.system.enums.PhysicalGoodsOrderStatusEnum;
import com.ruoyi.system.mapper.AppletOrderMapper;
import com.ruoyi.system.model.TBigGiftPackage;
import com.ruoyi.system.model.TBigGiftPackageOrder;
@@ -51,6 +53,11 @@
}
AppletOrderDetailVO vo = BeanUtil.copyProperties(order, AppletOrderDetailVO.class);
+ if (PhysicalGoodsOrderStatusEnum.PAID.getCode().equals(vo.getStatus())) {
+ vo.setStatus(BigGiftPackageOrderStatusEnum.PAID.getCode());
+ } else if (PhysicalGoodsOrderStatusEnum.CONFIRM_RECEIPT.getCode().equals(vo.getStatus())) {
+ vo.setStatus(BigGiftPackageOrderStatusEnum.CONFIRM_RECEIPT.getCode());
+ }
vo.setOrderType(2); // 实物商品
// 解析商品JSON
--
Gitblit v1.7.1