From 7bd55c95924df292ae6444fef11d75b5891a795e Mon Sep 17 00:00:00 2001
From: guohb <ghb01699725@alibaba-inc.com>
Date: Mon, 29 Apr 2024 11:20:30 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E7=BC=B4=E8=B4=B9=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/cool/store/mapper/FranchiseFeeMapper.java     | 1 -
 .../java/com/cool/store/response/FranchiseFeeResponse.java | 4 ++++
 .../cool/store/service/impl/FranchiseFeeServiceImpl.java   | 7 +++++++
 .../store/controller/webb/PCFranchiseFeeController.java    | 3 +++
 .../com/cool/store/controller/webc/LinePayController.java  | 2 +-
 5 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/FranchiseFeeMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/FranchiseFeeMapper.java
index e1f2ea8cd..750e0ae6c 100644
--- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/FranchiseFeeMapper.java
+++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/FranchiseFeeMapper.java
@@ -1,6 +1,5 @@
 package com.cool.store.mapper;
 
-import com.cool.store.entity.FirstOrderDO;
 import com.cool.store.entity.FranchiseFeeDO;
 import tk.mybatis.mapper.common.Mapper;
 
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/response/FranchiseFeeResponse.java b/coolstore-partner-model/src/main/java/com/cool/store/response/FranchiseFeeResponse.java
index 3cf1e79d7..af0a15fa5 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/response/FranchiseFeeResponse.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/response/FranchiseFeeResponse.java
@@ -1,6 +1,7 @@
 package com.cool.store.response;
 
 import com.cool.store.entity.FranchiseFeeDO;
+import com.cool.store.entity.LinePayDO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -41,6 +42,9 @@ public class FranchiseFeeResponse {
     private Date createTime;
     private Date updateTime;
 
+    private LinePayDO linePayDO;
+
+
 
     public static FranchiseFeeResponse from(FranchiseFeeDO franchiseFeeDO) {
         if (franchiseFeeDO == null) {
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseFeeServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseFeeServiceImpl.java
index e4919eaf4..d7dd0d829 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseFeeServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseFeeServiceImpl.java
@@ -2,7 +2,9 @@ package com.cool.store.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.cool.store.entity.FranchiseFeeDO;
+import com.cool.store.entity.LinePayDO;
 import com.cool.store.mapper.FranchiseFeeMapper;
+import com.cool.store.mapper.LinePayMapper;
 import com.cool.store.request.FranchiseFeeRequest;
 import com.cool.store.response.FranchiseFeeResponse;
 import com.cool.store.service.FranchiseFeeService;
@@ -18,6 +20,9 @@ public class FranchiseFeeServiceImpl implements FranchiseFeeService {
     @Resource
     FranchiseFeeMapper franchiseFeeMapper;
 
+    @Resource
+    LinePayMapper linePayMapper;
+
     @Override
     public Boolean submitLicense(FranchiseFeeRequest request) {
         log.info("submitLicense request：{}", JSONObject.toJSONString(request));
@@ -31,7 +36,9 @@ public class FranchiseFeeServiceImpl implements FranchiseFeeService {
         FranchiseFeeDO franchiseFeeDO = new FranchiseFeeDO();
         franchiseFeeDO.setShopId(shopId);
         FranchiseFeeDO result = franchiseFeeMapper.selectOneByExample(franchiseFeeDO);
+        LinePayDO linePayDO = linePayMapper.selectByPrimaryKey(result.getPayId());
         FranchiseFeeResponse resp = FranchiseFeeResponse.from(result);
+        resp.setLinePayDO(linePayDO);
         return resp;
     }
 }
diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCFranchiseFeeController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCFranchiseFeeController.java
index c39ea8f9b..febdc7df7 100644
--- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCFranchiseFeeController.java
+++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCFranchiseFeeController.java
@@ -10,6 +10,8 @@ import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+
 @RestController
 @RequestMapping("/pc/franchiseFee")
 @Api(tags = "PC加盟费/保证金")
@@ -17,6 +19,7 @@ import org.springframework.web.bind.annotation.*;
 public class PCFranchiseFeeController {
 
 
+    @Resource
     FranchiseFeeService franchiseFeeService;
 
     @ApiOperation("基本信息提交")
diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/LinePayController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/LinePayController.java
index c85d3f3aa..39a71e927 100644
--- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/LinePayController.java
+++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/LinePayController.java
@@ -38,7 +38,7 @@ public class LinePayController {
         return ResponseResult.success(linePayService.getLinePayInfo(lineId));
     }
 
-    @ApiOperation("缴纳意向金")
+    @ApiOperation("缴纳意向金/加盟费")
     @PostMapping("/submitPayInfo")
     public ResponseResult<Long> submitPayInfo(@RequestBody LinePaySubmitRequest request){
         PartnerUserInfoVO partnerUser = PartnerUserHolder.getUser();