From ca8856539b447e4320bb2482d5fca9320b42531d Mon Sep 17 00:00:00 2001
From: wangxiaopeng <807933401@qq.com>
Date: Thu, 25 Apr 2024 20:27:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E4=BB=98=E4=BA=8C=E7=BB=B4=E7=A0=81?=
=?UTF-8?q?=E5=9B=BE=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../resources/mapper/RegionQrcodeConfigMapper.xml | 2 +-
.../java/com/cool/store/service/LineService.java | 3 +++
.../com/cool/store/service/impl/LineServiceImpl.java | 12 ++++++++++++
.../com/cool/store/config/SignValidateFilter.java | 3 ++-
.../cool/store/controller/webc/LineController.java | 8 ++++++--
5 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/coolstore-partner-dao/src/main/resources/mapper/RegionQrcodeConfigMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/RegionQrcodeConfigMapper.xml
index b748f6312..82535d753 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/RegionQrcodeConfigMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/RegionQrcodeConfigMapper.xml
@@ -150,7 +150,7 @@
select
from xfsg_region_qrcode_config
- where region_id = #{regionId}
+ where region_id = #{regionId} limit 1
\ No newline at end of file
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/LineService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/LineService.java
index c0c73c9b0..0d3544f6b 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/LineService.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/LineService.java
@@ -79,4 +79,7 @@ public interface LineService {
*/
Boolean addLine(AddLineRequest addLineRequest) ;
+ String getPayPicByLineId(Long lineId);
+
+
}
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineServiceImpl.java
index 6af219718..94c4870f3 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineServiceImpl.java
@@ -75,6 +75,8 @@ public class LineServiceImpl implements LineService {
LinePayDAO linePayDAO;
@Resource
TrainingExperienceService trainingExperienceService;
+ @Resource
+ private RegionQrcodeConfigDao regionQrcodeConfigDao;
@Override
@@ -420,6 +422,16 @@ public class LineServiceImpl implements LineService {
return Boolean.TRUE;
}
+ @Override
+ public String getPayPicByLineId(Long lineId) {
+ LineInfoDO lineInfo = lineInfoDAO.getLineInfo(lineId);
+ if (lineInfo==null){
+ throw new ServiceException(ErrorCodeEnum.LINE_ID_IS_NOT_EXIST);
+ }
+ Long bigRegionId = regionService.getBigRegionIdByAreaId(lineInfo.getWantShopAreaId());
+ return regionQrcodeConfigDao.getPayPicByRegionId(bigRegionId);
+ }
+
/**
* 计算预期时间
* @param startTime
diff --git a/coolstore-partner-web/src/main/java/com/cool/store/config/SignValidateFilter.java b/coolstore-partner-web/src/main/java/com/cool/store/config/SignValidateFilter.java
index 1d28cbf7b..21b531931 100644
--- a/coolstore-partner-web/src/main/java/com/cool/store/config/SignValidateFilter.java
+++ b/coolstore-partner-web/src/main/java/com/cool/store/config/SignValidateFilter.java
@@ -57,7 +57,8 @@ public class SignValidateFilter implements Filter {
"/**/swagger*/**",
"/**/webjars/**",
"/xfsg/mini/program/v1/partnerManage/openArea/areaApplyQuery",
- "/xfsg/*/api/audit/result"
+ "/xfsg/*/api/audit/result",
+ "/xfsg/mini/line/getRegionPayPic"
);
diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/LineController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/LineController.java
index 27bb9da46..d599aa4e9 100644
--- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/LineController.java
+++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/LineController.java
@@ -1,6 +1,7 @@
package com.cool.store.controller.webc;
import com.cool.store.response.ResponseResult;
+import com.cool.store.service.LinePayService;
import com.cool.store.service.LineService;
import com.cool.store.vo.IntendProcessTotalVO;
import com.cool.store.vo.LineInfoVO;
@@ -34,6 +35,10 @@ public class LineController {
@Resource
LineService lineService;
+ @Resource
+ LinePayService linePayService;
+
+
@ApiOperation("查询线索详情")
@GetMapping("/getLineDetail")
@ApiImplicitParams({
@@ -46,8 +51,7 @@ public class LineController {
@ApiOperation("根据线索id查询大区的支付二维码图片")
@GetMapping("/getRegionPayPic")
public ResponseResult getRegionPayPic(@RequestParam("lineId")Long lineId) {
- String pic = "https://coolstore-storage.oss-cn-hangzhou.aliyuncs.com/120207001943.png";
- return ResponseResult.success(pic);
+ return ResponseResult.success(lineService.getPayPicByLineId(lineId));
}