java/jiashida.git

			@@ -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,12 +53,18 @@
			}

			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
			if (order.getPhysicalGoods() != null) {
			TPhysicalGoods goods = JSON.parseObject(order.getPhysicalGoods(), TPhysicalGoods.class);
			if (goods != null) {
			vo.setGoodsId(goods.getId());
			vo.setGoodsName(goods.getName());
			vo.setGoodsIntro(goods.getIntroduction());
			vo.setGoodsCover(goods.getCoverImage());
			@@ -80,6 +88,7 @@
			if (order.getBigGiftPackage() != null) {
			TBigGiftPackage goods = JSON.parseObject(order.getBigGiftPackage(), TBigGiftPackage.class);
			if (goods != null) {
			vo.setGoodsId(goods.getId());
			vo.setGoodsName(goods.getName());
			vo.setGoodsIntro(goods.getIntroduction());
			vo.setGoodsCover(goods.getCoverImage());