加盟审批通过短信模板更换

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/dao/BackUserAccountDao.java

@@ -54,8 +54,9 @@ public interface BackUserAccountDao {
      * 禁用后台用户（原删除信息）
      *
      * @param id
+     * @param accountNo
      */
-    void disableBackUserAccountDO(Integer id);
+    void disableBackUserAccountDO(Integer id, String accountNo);
 
     /**
      * 远程调用查询用户信息

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/impl/BackUserAccountServiceImpl.java

@@ -137,6 +137,7 @@ public class BackUserAccountServiceImpl implements BackUserAccountService {
 
     @Override
     public ResultBody disableBAccount(Integer accountId, Integer backUserAccountId) {
+        BackUserAccountDO backUserAccountDO = backUserAccountDao.getBackUserAccountDO(backUserAccountId);
         RoleInfoDO roleInfoDO = roleDao.getRoleInfoByUserId(accountId);
         if (roleInfoDO.getSuperAdmin().equals(RoleEnums.ADMIN.getId())) {
             return ResultBody.error(ResultEnum.DELETE_ADMIN_ERROR);
@@ -149,7 +150,8 @@ public class BackUserAccountServiceImpl implements BackUserAccountService {
             // 加盟企业的账号，需要把对应的成员和后台账号解绑
             companyService.unbindingAllUsers(companyInfoVO.getId());
         }
-        backUserAccountDao.disableBackUserAccountDO(accountId);
+        String accountNo = "DISABLE_" + backUserAccountDO.getAccountNo();
+        backUserAccountDao.disableBackUserAccountDO(accountId, accountNo);
         return ResultBody.success();
     }
 

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/impl/CooperationServiceImpl.java

@@ -200,7 +200,6 @@ public class CooperationServiceImpl implements CooperationService {
                 throw new BizException(ResultEnum.COOPERATION_CHECK_NOT_PASS_ERROR);
             }
             Map<String, String> param = new HashMap<String, String>();
-            param.put("accountNo", bUserAccountVO.getAccountNo());
             param.put("password", bUserAccountVO.getPassWord());
             SmsUtil.sendPassCooperationApply(JSONObject.toJSONString(param), bUserAccountVO.getPhoneNum());
         } else {

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/util/SmsUtil.java

@@ -20,7 +20,8 @@ public class SmsUtil {
     /**
      * 加盟审核通过
      */
-    private static String COOPERATION_TEMPLATE_CODE_0 = "SMS_461986130";
+    private static String COOPERATION_TEMPLATE_PASS_CODE_0 = "SMS_461986130";
+    private static String COOPERATION_TEMPLATE_PASS_CODE_2 = "SMS_462240459";
 
     /**
      * 加盟审核未通过
@@ -28,7 +29,7 @@ public class SmsUtil {
     private static String COOPERATION_TEMPLATE_CODE_1 = "SMS_462095054";
 
     public static String sendPassCooperationApply(String param, String phone) {
-        return send(CLOUD_JOIN_WEBSITE, COOPERATION_TEMPLATE_CODE_0, param, phone);
+        return send(CLOUD_JOIN_WEBSITE, COOPERATION_TEMPLATE_PASS_CODE_2, param, phone);
     }
 
     public static String sendNotPassCooperationApply(String phone) {

csm-service/cms-service-user/src/main/resources/mapper/BackUserAccountDao.xml

@@ -78,7 +78,7 @@
 
     <update id="disableBackUserAccountDO">
         update back_user_account
-        set disable = 1
+        set disable = 1, account_no = #{accountNo}
         where disable = 0
           and id = #{id}
     </update>