From 42d9ee9f889e760cb9276952ff35d216b3a50100 Mon Sep 17 00:00:00 2001
From: Lemon <ziao4956@gmail.com>
Date: Fri, 4 Aug 2023 13:55:50 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=90=8E=E7=AE=A1=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=E5=BC=80=E7=A5=A8=E9=A1=B5=E9=9D=A2=E6=97=B6=E9=97=B4=E5=80=92?=
 =?UTF-8?q?=E5=BA=8F=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/pile/OrderInvoiceRecordMapper.xml  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/jsowell-pile/src/main/resources/mapper/pile/OrderInvoiceRecordMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/OrderInvoiceRecordMapper.xml
index 90f5b16c4..9f27066d2 100644
--- a/jsowell-pile/src/main/resources/mapper/pile/OrderInvoiceRecordMapper.xml
+++ b/jsowell-pile/src/main/resources/mapper/pile/OrderInvoiceRecordMapper.xml
@@ -44,6 +44,7 @@
             <if test="totalServiceAmount != null "> and total_service_amount = #{totalServiceAmount}</if>
             <if test="totalElecAmount != null "> and total_elec_amount = #{totalElecAmount}</if>
         </where>
+        order by create_time desc
     </select>
 
     <select id="selectOrderInvoiceRecordById" parameterType="Integer" resultMap="OrderInvoiceRecordResult">

From d4287259a3b5b4d42bc72e81a05c9f8e6103d7d5 Mon Sep 17 00:00:00 2001
From: Lemon <ziao4956@gmail.com>
Date: Fri, 4 Aug 2023 14:19:45 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=96=B9=E6=B3=95=E4=BF=AE=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=20=20=E6=A0=B9=E6=8D=AEappid=E6=9F=A5=E8=AF=A2=E4=B8=80?=
 =?UTF-8?q?=E7=BA=A7=E8=BF=90=E8=90=A5=E5=95=86merchantid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jsowell/service/AgentDevService.java  |  2 +-
 .../com/jsowell/service/MemberService.java    |  2 +-
 .../pile/mapper/PileMerchantInfoMapper.java   |  7 ++++++
 .../service/IPileMerchantInfoService.java     |  9 ++++---
 .../impl/PileMerchantInfoServiceImpl.java     | 25 +++----------------
 .../mapper/pile/PileMerchantInfoMapper.xml    | 10 ++++++++
 6 files changed, 29 insertions(+), 26 deletions(-)

diff --git a/jsowell-admin/src/main/java/com/jsowell/service/AgentDevService.java b/jsowell-admin/src/main/java/com/jsowell/service/AgentDevService.java
index 0403a85f7..5ecc66bff 100644
--- a/jsowell-admin/src/main/java/com/jsowell/service/AgentDevService.java
+++ b/jsowell-admin/src/main/java/com/jsowell/service/AgentDevService.java
@@ -633,7 +633,7 @@ public class AgentDevService {
         // 获取openId
         String openId = getOpenIdByCode(dto.getOpenIdCode(), appId);
         // 通过 appid 查询 merchantId
-        String merchantId = pileMerchantInfoService.getMerchantIdByAppId(appId);
+        String merchantId = pileMerchantInfoService.getFirstLevelMerchantIdByAppId(appId);
         logger.info("微信一键登录 获取merchantId:{}", merchantId);
         // 下面方法有判断 merchantId 是否为空，因此可直接传值
         return memberService.memberRegisterAndLogin(phoneNumber, merchantId, openId);
diff --git a/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java b/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java
index fc6401ec0..97980cb66 100644
--- a/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java
+++ b/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java
@@ -207,7 +207,7 @@ public class MemberService {
 			log.error("getOpenIdByCode发生异常", e);
 		}
 		// 根据appid查询merchantId
-		String merchantId = pileMerchantInfoService.getMerchantIdByAppId(APP_ID);
+		String merchantId = pileMerchantInfoService.getFirstLevelMerchantIdByAppId(APP_ID);
 		// 查询手机号码是否注册过
 		return memberRegisterAndLogin(mobileNumber, merchantId, openId);
 	}
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileMerchantInfoMapper.java b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileMerchantInfoMapper.java
index 28be2bdeb..bc4de775d 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileMerchantInfoMapper.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileMerchantInfoMapper.java
@@ -89,4 +89,11 @@ public interface PileMerchantInfoMapper {
 	 * 查询一级运营商
 	 */
 	List<PileMerchantInfo> queryFirstLevelMerchant();
+
+	/**
+	 * 根据appid查询对应一级运营商id
+	 * @param appId
+	 * @return
+	 */
+	String getFirstLevelMerchantIdByAppId(String appId);
 }
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/IPileMerchantInfoService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/IPileMerchantInfoService.java
index 488864d5d..127cd7b20 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/IPileMerchantInfoService.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/IPileMerchantInfoService.java
@@ -64,9 +64,12 @@ public interface IPileMerchantInfoService {
 	 */
 	public int deletePileMerchantInfoById(Long id);
 
-	String getMerchantIdByAppId(String appId);
-
-	List<String> getMerchantIdsByAppId(String appId);
+	/**
+	 * 获取一级运营商merchantId
+	 * @param appId
+	 * @return
+	 */
+	String getFirstLevelMerchantIdByAppId(String appId);
 
 	MerchantInfoVO getMerchantInfo(String merchantId);
 
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMerchantInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMerchantInfoServiceImpl.java
index d92ac4477..930664435 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMerchantInfoServiceImpl.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMerchantInfoServiceImpl.java
@@ -253,14 +253,14 @@ public class PileMerchantInfoServiceImpl implements IPileMerchantInfoService {
 	}
 
 	@Override
-	public String getMerchantIdByAppId(String appId) {
+	public String getFirstLevelMerchantIdByAppId(String appId) {
 		if (StringUtils.isBlank(appId)) {
 			return null;
 		}
 		try {
-			List<PileMerchantInfo> pileMerchantInfos = pileMerchantInfoMapper.selectPileMerchantInfoByAppId(appId);
-			if (CollectionUtils.isNotEmpty(pileMerchantInfos)) {
-				return pileMerchantInfos.get(0).getId().toString();
+			String merchantId = pileMerchantInfoMapper.getFirstLevelMerchantIdByAppId(appId);
+			if (StringUtils.isNotBlank(merchantId)) {
+				return merchantId;
 			}
 		} catch (Exception e) {
 			log.error("通过appid获取运营商id error", e);
@@ -268,23 +268,6 @@ public class PileMerchantInfoServiceImpl implements IPileMerchantInfoService {
 		return null;
 	}
 
-	@Override
-	public List<String> getMerchantIdsByAppId(String appId) {
-		if (StringUtils.isBlank(appId)) {
-			return null;
-		}
-		List<String> resultList = Lists.newArrayList();
-		try {
-			List<PileMerchantInfo> pileMerchantInfos = pileMerchantInfoMapper.selectPileMerchantInfoByAppId(appId);
-			if (CollectionUtils.isNotEmpty(pileMerchantInfos)) {
-				resultList = pileMerchantInfos.stream().map(x -> String.valueOf(x.getId())).collect(Collectors.toList());
-			}
-		} catch (Exception e) {
-			log.error("通过appid获取运营商ids error", e);
-		}
-		return resultList;
-	}
-
 	@Override
 	public MerchantInfoVO getMerchantInfo(String merchantId) {
 		PileMerchantInfo pileMerchantInfo = selectPileMerchantInfoById(Long.parseLong(merchantId));
diff --git a/jsowell-pile/src/main/resources/mapper/pile/PileMerchantInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/PileMerchantInfoMapper.xml
index 9cf85548f..dac8f655e 100644
--- a/jsowell-pile/src/main/resources/mapper/pile/PileMerchantInfoMapper.xml
+++ b/jsowell-pile/src/main/resources/mapper/pile/PileMerchantInfoMapper.xml
@@ -333,4 +333,14 @@
         where del_flag = '0'
         and merchant_level = '1'
     </select>
+
+    <select id="getFirstLevelMerchantIdByAppId" resultType="java.lang.String">
+        select
+            id
+        from
+            pile_merchant_info
+        where
+            app_id = #{appId,jdbcType=VARCHAR}
+            and merchant_level = '1'
+    </select>
 </mapper>
\ No newline at end of file