From ab8ab40fab620a6914022c6c4af45241471abbfc Mon Sep 17 00:00:00 2001
From: XinYi Song <2037158277@qq.com>
Date: Mon, 20 Dec 2021 17:21:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E5=95=86=E5=AE=B6=E5=85=A5=E9=A9=BB=E9=80=9A=E8=BF=87=E7=9A=84?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=A8=A1=E5=9D=97=EF=BC=8C=E5=8A=A0=E5=85=A5?=
 =?UTF-8?q?=E4=BA=86=E7=9F=AD=E4=BF=A1=E9=80=9A=E7=9F=A5=E6=9C=8D=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/xkrs/service/MerchantSettlementService.java   |  3 ++-
 .../service/impl/MerchantSettlementServiceImpl.java   | 11 +++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/xkrs/service/MerchantSettlementService.java b/src/main/java/com/xkrs/service/MerchantSettlementService.java
index d5b94a4..b314cdb 100644
--- a/src/main/java/com/xkrs/service/MerchantSettlementService.java
+++ b/src/main/java/com/xkrs/service/MerchantSettlementService.java
@@ -1,5 +1,6 @@
 package com.xkrs.service;
 
+import com.aliyuncs.exceptions.ClientException;
 import com.xkrs.model.qo.BankCardQo;
 import com.xkrs.model.qo.BusinessQo;
 import org.springframework.web.multipart.MultipartFile;
@@ -63,5 +64,5 @@ public interface MerchantSettlementService {
      * @param
      * @return
      */
-    String updatePassBusiness(Integer id,String username,String province,String city,String county);
+    String updatePassBusiness(Integer id,String username,String province,String city,String county) throws ClientException;
 }
diff --git a/src/main/java/com/xkrs/service/impl/MerchantSettlementServiceImpl.java b/src/main/java/com/xkrs/service/impl/MerchantSettlementServiceImpl.java
index 3b2f0d6..0bbb183 100644
--- a/src/main/java/com/xkrs/service/impl/MerchantSettlementServiceImpl.java
+++ b/src/main/java/com/xkrs/service/impl/MerchantSettlementServiceImpl.java
@@ -1,15 +1,14 @@
 package com.xkrs.service.impl;
 
+import com.aliyuncs.dysmsapi.model.v20170525.SendSmsResponse;
+import com.aliyuncs.exceptions.ClientException;
 import com.xkrs.common.encapsulation.PromptMessageEnum;
 import com.xkrs.dao.*;
 import com.xkrs.model.entity.*;
 import com.xkrs.model.qo.BankCardQo;
 import com.xkrs.model.qo.BusinessQo;
 import com.xkrs.service.MerchantSettlementService;
-import com.xkrs.utils.DateTimeUtil;
-import com.xkrs.utils.PhotoUtil;
-import com.xkrs.utils.Query;
-import com.xkrs.utils.VerifyBankCardUtil;
+import com.xkrs.utils.*;
 import org.springframework.context.i18n.LocaleContextHolder;
 import org.springframework.security.crypto.keygen.KeyGenerators;
 import org.springframework.stereotype.Service;
@@ -169,7 +168,7 @@ public class MerchantSettlementServiceImpl implements MerchantSettlementService
      */
     @Transactional(rollbackOn = Exception.class)
     @Override
-    public String updatePassBusiness(Integer id,String username,String province,String city,String county) {
+    public String updatePassBusiness(Integer id,String username,String province,String city,String county) throws ClientException {
         Locale locale = LocaleContextHolder.getLocale();
         BusinessEntity businessEntity = businessDao.findById(id);
         if("1".equals(businessEntity.getBusinessType())){
@@ -205,7 +204,7 @@ public class MerchantSettlementServiceImpl implements MerchantSettlementService
         relRoleAuthorityDao.save(relRoleAuthorityEntity);
 
         // 这一块整合手机号发送初始账号，密码，发送给对应得商家，并提醒及时修改初始账号密码
-
+        SendSmsResponse lyb123 = AliYunSmsUtils.sendSmsToBusinessPass(username, username, "lyb123");
 
         // 修改商家入驻得状态（通过）
         businessDao.updatePassBusiness(id);