From eac89b3d11ade67dc5d654337c6dbbbf0d26d0c3 Mon Sep 17 00:00:00 2001
From: liujiang <569804566@qq.com>
Date: Sun, 16 Nov 2025 17:27:32 +0800
Subject: [PATCH] =?UTF-8?q?master=EF=BC=9A=E7=AE=A1=E7=90=86=E5=91=98?=
 =?UTF-8?q?=E8=B4=A6=E5=8F=B7=E8=BF=94=E5=9B=9E=E6=A1=A3=E5=8F=A3=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=95=B0=E6=8D=AE=E8=B0=83=E6=95=B4=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ruoyi/xkt/dto/store/StorePageResDTO.java |  6 ++++++
 .../com/ruoyi/xkt/service/impl/StoreServiceImpl.java  | 11 +++++++++++
 xkt/src/main/resources/mapper/StoreMapper.xml         |  4 +++-
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/store/StorePageResDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/store/StorePageResDTO.java
index 2f63dca17..2ec7adc1e 100644
--- a/xkt/src/main/java/com/ruoyi/xkt/dto/store/StorePageResDTO.java
+++ b/xkt/src/main/java/com/ruoyi/xkt/dto/store/StorePageResDTO.java
@@ -3,6 +3,8 @@ package com.ruoyi.xkt.dto.store;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 /**
  * @author liujiang
  * @version v1.0
@@ -27,5 +29,9 @@ public class StorePageResDTO {
     private String delFlag;
     @ApiModelProperty(value = "档口权重")
     private Integer storeWeight;
+    @ApiModelProperty(value = "年费金额")
+    private BigDecimal serviceAmount;
+    @ApiModelProperty(value = "会员金额")
+    private BigDecimal memberAmount;
 
 }
diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreServiceImpl.java
index 2dea33acc..1f328d898 100644
--- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreServiceImpl.java
+++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreServiceImpl.java
@@ -92,6 +92,17 @@ public class StoreServiceImpl implements IStoreService {
     public Page<StorePageResDTO> page(StorePageDTO pageDTO) {
         PageHelper.startPage(pageDTO.getPageNum(), pageDTO.getPageSize());
         List<StorePageResDTO> storeList = this.storeMapper.selectStorePage(pageDTO);
+        if (CollectionUtils.isNotEmpty(storeList)) {
+            // 如果没有年费金额 或 会员金额 则设置默认值
+            storeList.forEach(store -> {
+                if (ObjectUtils.isEmpty(store.getServiceAmount())) {
+                    store.setServiceAmount(Constants.STORE_ANNUAL_AMOUNT);
+                }
+                if (ObjectUtils.isEmpty(store.getMemberAmount())) {
+                    store.setMemberAmount(Constants.STORE_MEMBER_AMOUNT);
+                }
+            });
+        }
         return Page.convert(new PageInfo<>(storeList));
     }
 
diff --git a/xkt/src/main/resources/mapper/StoreMapper.xml b/xkt/src/main/resources/mapper/StoreMapper.xml
index 426e61527..44ddf30ff 100644
--- a/xkt/src/main/resources/mapper/StoreMapper.xml
+++ b/xkt/src/main/resources/mapper/StoreMapper.xml
@@ -13,7 +13,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             s.contact_back_phone,
             s.store_status,
             s.del_flag,
-            s.store_weight
+            s.store_weight,
+            s.service_amount,
+            s.member_amount
         FROM
             store s JOIN sys_user u ON s.user_id = u.user_id
             <if test="storeName != null  and storeName != ''"> and s.store_name like concat('%', #{storeName}, '%')</if>