From 94bf84c45deb4205870b8b25118a1e4cb04fffc6 Mon Sep 17 00:00:00 2001
From: wangxiaopeng <807933401@qq.com>
Date: Mon, 8 Apr 2024 15:06:11 +0800
Subject: [PATCH] partnerName

---
 .../src/main/java/com/cool/store/vo/LinePayVO.java         | 3 +++
 .../com/cool/store/service/impl/LinePayServiceImpl.java    | 7 +++++++
 2 files changed, 10 insertions(+)

diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/LinePayVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/LinePayVO.java
index e71b13e83..a2c785484 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/vo/LinePayVO.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/LinePayVO.java
@@ -19,6 +19,9 @@ public class LinePayVO {
     @ApiModelProperty("xfsg_user_info.partner_id")
     private String partnerId;
 
+    @ApiModelProperty("加盟商姓名")
+    private String partnerName;
+
     @ApiModelProperty("line_info.id")
     private Long lineId;
 
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LinePayServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LinePayServiceImpl.java
index 9f3b63433..6a6bdf315 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LinePayServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LinePayServiceImpl.java
@@ -1,8 +1,10 @@
 package com.cool.store.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.cool.store.dao.HyPartnerUserInfoDAO;
 import com.cool.store.dao.LineInfoDAO;
 import com.cool.store.dao.LinePayDAO;
+import com.cool.store.entity.HyPartnerUserInfoDO;
 import com.cool.store.entity.LineInfoDO;
 import com.cool.store.entity.LinePayDO;
 import com.cool.store.enums.ErrorCodeEnum;
@@ -32,6 +34,9 @@ public class LinePayServiceImpl implements LinePayService {
     @Resource
     private LinePayDAO linePayDAO;
 
+    @Resource
+    private HyPartnerUserInfoDAO hyPartnerUserInfoDAO;
+
     @Resource
     private LineInfoDAO lineInfoDAO;
 
@@ -45,6 +50,8 @@ public class LinePayServiceImpl implements LinePayService {
         if (linePayDO != null){
             result = new LinePayVO();
             BeanUtil.copyProperties(linePayDO,result);
+            LineInfoDO lineInfo = lineInfoDAO.getLineInfo(lineId);
+            result.setPartnerName(lineInfo != null ? lineInfo.getUsername() : "");
         }
         return result;
     }