From 6f512972722f144e49f37b2aa8f2ca84fa438277 Mon Sep 17 00:00:00 2001
From: liuqingkun <LIUqk6666_>
Date: Fri, 25 Aug 2023 17:50:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/desk/controller/CustomMadeInfoController.java    | 5 +++++
 .../java/org/springblade/modules/desk/mapper/OrderMapper.xml | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/springblade/modules/desk/controller/CustomMadeInfoController.java b/src/main/java/org/springblade/modules/desk/controller/CustomMadeInfoController.java
index 0dbde83..82bed43 100644
--- a/src/main/java/org/springblade/modules/desk/controller/CustomMadeInfoController.java
+++ b/src/main/java/org/springblade/modules/desk/controller/CustomMadeInfoController.java
@@ -25,6 +25,10 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.annotations.*;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springblade.common.cache.DictBizCache;
+import org.springblade.common.constant.BusinessConstant;
+import org.springblade.common.constant.CommonConstant;
+import org.springblade.common.constant.DictConstant;
 import org.springblade.common.enums.CervicalVertebraEnum;
 import org.springblade.common.enums.PillowHardnessEnum;
 import org.springblade.common.enums.PillowMaterialEnum;
@@ -183,6 +187,7 @@ public class CustomMadeInfoController extends BladeController {
 		dataList.forEach(item -> {
 			CustomMadeInfoExcelVO vo = BeanUtil.copy(item, CustomMadeInfoExcelVO.class);
 			String address = item.getProvince().concat(StringPool.SPACE).concat(item.getCity()).concat(StringPool.SPACE).concat(item.getDistrict()).concat(StringPool.SPACE).concat(item.getDetail());
+			vo.setPurchaseChannel(DictBizCache.getValue(DictConstant.PURCHASE_CHANNEL_CODE, item.getPurchaseChannel()));
 			vo.setAddress(address);
 			vo.setPillowHardnessName(PillowHardnessEnum.getName(item.getPillowHardness()));
 			vo.setPillowMaterialName(PillowMaterialEnum.getName(item.getPillowMaterial()));
diff --git a/src/main/java/org/springblade/modules/desk/mapper/OrderMapper.xml b/src/main/java/org/springblade/modules/desk/mapper/OrderMapper.xml
index 9a28615..feabacd 100644
--- a/src/main/java/org/springblade/modules/desk/mapper/OrderMapper.xml
+++ b/src/main/java/org/springblade/modules/desk/mapper/OrderMapper.xml
@@ -16,7 +16,7 @@
         <result column="goods_name" property="goodsName"/>
         <result column="goods_num" property="goodsNum"/>
         <result column="goods_price" property="goodsPrice"/>
-        <result column="goods_price" property="totalPrice"/>
+        <result column="total_price" property="totalPrice"/>
         <result column="buyer_id" property="buyerId"/>
         <result column="buyer_name" property="buyerName"/>
         <result column="buyer_phone" property="buyerPhone"/>