Mr.qian преди 4 седмици
родител
ревизия
25224a124b

+ 13 - 6
cif-service/src/main/java/com/txz/cif/configurer/CSHuaGuConf.java

@@ -18,18 +18,25 @@ import org.springframework.stereotype.Component;
 public class CSHuaGuConf {
     
     /**
-     * 短信服务API地址
+     * 电话API地址
      */
-    private String apiurl;
+    private String apiUrl;
     
     /**
-     * API密钥
+     * 电话API密钥
      */
-    private String apikey;
+    private String apiKey;
     
     /**
-     * API密钥
+     * 电话API密钥
      */
-    private String apisecret;
+    private String apiSecret;
+    
+    /**
+     * 短信
+     */
+    private String smsApiurl;
+    private String smsApiKey;
+    private String smsApisecret;
     
 }

+ 2 - 0
cif-service/src/main/java/com/txz/cif/service/CSHuaGuService.java

@@ -7,5 +7,7 @@ package com.txz.cif.service;
 
 public interface CSHuaGuService {
     
+    boolean sendSmsValidCode(String mobile, String message);
+    
     boolean sendValidCode(String mobile, String message);
 }

+ 31 - 3
cif-service/src/main/java/com/txz/cif/service/impl/CSHuaGuServiceImpl.java

@@ -20,17 +20,45 @@ public class CSHuaGuServiceImpl implements CSHuaGuService {
     
     private final CSHuaGuConf csHuaGuConf;
     
+    @Override
+    public boolean sendSmsValidCode(String mobile, String message) {
+        log.info("开始发送短信--->" + mobile + ",内容--->" + message);
+        JSONObject body = new JSONObject();
+        body.put("apikey", csHuaGuConf.getSmsApiKey());
+        body.put("phone", mobile);
+        body.put("context", message);
+        body.put("secret", csHuaGuConf.getSmsApisecret());
+        String result = "";
+        try {
+            result = HttpUtil.createPost(csHuaGuConf.getSmsApiurl())
+                    .body(body.toJSONString())
+                    .contentType("application/json")
+                    .execute()
+                    .body();
+            JSONObject resultJson = JSON.parseObject(result);
+            if (resultJson.getInteger("code") == 200) {
+                log.info("发送短信成功--->" + result);
+                return true;
+            }
+            log.info("发送短信失败--->" + result);
+            return false;
+        } catch (Exception e) {
+            log.error("发送短信异常--->" + result);
+            return false;
+        }
+    }
+    
     @Override
     public boolean sendValidCode(String mobile, String message) {
         log.info("开始发送短信--->" + mobile + ",内容--->" + message);
         JSONObject body = new JSONObject();
         body.put("phone", mobile);
         body.put("context", message);
-        body.put("apikey", csHuaGuConf.getApikey());
-        body.put("secret", csHuaGuConf.getApisecret());
+        body.put("apikey", csHuaGuConf.getApiKey());
+        body.put("secret", csHuaGuConf.getApiSecret());
         String result = "";
         try {
-            result = HttpUtil.createPost(csHuaGuConf.getApiurl())
+            result = HttpUtil.createPost(csHuaGuConf.getApiUrl())
                     .body(body.toJSONString())
                     .contentType("application/json")
                     .execute()

+ 1 - 1
cif-service/src/main/java/com/txz/cif/service/impl/UserServiceImpl.java

@@ -85,7 +85,7 @@ public class UserServiceImpl extends AbstractService<User> implements UserServic
             return Result.success();
         }
         String code = RandomUtil.randomNumbers(6);
-        if (csHuaGuService.sendValidCode(phoneNo, String.format(SMS_MESSAGE, code))) {
+        if (csHuaGuService.sendSmsValidCode(phoneNo, String.format(SMS_MESSAGE, code))) {
             redisClient.set(key, code, 60 * 5);
             return Result.fail();
         }

+ 13 - 2
cif-service/src/main/java/com/txz/cif/web/WithdrawRecordApiController.java

@@ -10,6 +10,7 @@ import com.baomidou.lock.LockTemplate;
 import com.baomidou.lock.executor.RedisTemplateLockExecutor;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.txz.cif.configurer.LocalUtil;
 import com.txz.cif.constants.MyConstants;
 import com.txz.cif.core.AuthService;
 import com.txz.cif.core.Result;
@@ -112,8 +113,18 @@ public class WithdrawRecordApiController {
                 if (StrUtil.isBlank(param.getBank()) || StrUtil.isBlank(param.getBankAccount()) || StrUtil.isBlank(param.getBankAccountName())) {
                     return ResultGenerator.genFailResult(ResultCode.BANK_IS_NULL);
                 }
-                userService.update(User.builder().
-                        id(user.getId()).bank(param.getBank())
+                Condition condition = new Condition(User.class);
+                condition.createCriteria()
+                        .andEqualTo("bank", param.getBank())
+                        .andEqualTo("bankAccount", param.getBankAccount())
+                        .andEqualTo("bankAccountName", param.getBankAccountName());
+                List<User> banks = userService.findByCondition(condition);
+                if (CollectionUtil.isNotEmpty(banks)) {
+                    return ResultGenerator.genFailResult(LocalUtil.get("bank.is.exist"));
+                }
+                userService.update(User.builder()
+                        .id(user.getId())
+                        .bank(param.getBank())
                         .bankAccountName(param.getBankAccountName())
                         .bankAccount(param.getBankAccount()).build());
                 user.setBank(param.getBank());

+ 1 - 1
cif-service/src/main/java/com/txz/cif/web/para/WithdrawParam.java

@@ -38,10 +38,10 @@ public class WithdrawParam {
     
     @ApiModelProperty(value = "bank银行")
     private String bank;
+    
     @ApiModelProperty(value = "银行用户名称")
     private String bankAccountName;
     
-    
     @ApiModelProperty(value = "bankAccount银行账号")
     private String bankAccount;
     

+ 1 - 1
cif-service/src/main/resources/static/i18n/messages_bn_BD.properties

@@ -119,6 +119,6 @@ exception.occurred=exception occurred
 method=method
 exception.summary=exception summary:
 
-bank.is.exist=????? ??????? ????????? ?????? ???? ???????? ??????? ??????, ??????????? ????? ????????
+bank.is.exist=\u098f\u0996\u09be\u09a8\u09c7 \u09ac\u09b0\u09cd\u09a4\u09ae\u09be\u09a8 \u0989\u09a4\u09cd\u09a4\u09cb\u09b2\u09a8\u09c7\u09b0 \u09ac\u09cd\u09af\u09be\u0982\u0995 \u09a4\u09a5\u09cd\u09af \u0987\u09a4\u09bf\u09ae\u09a7\u09cd\u09af\u09c7 \u09ac\u09be\u0981\u09a7\u09be\u09a8\u09cb \u09b9\u09af\u09bc\u09c7\u099b\u09c7, \u09aa\u09c1\u09a8\u09b0\u09be\u09ac\u09c3\u09a4\u09cd\u09a4\u09bf \u09ac\u09be\u0981\u09a7\u09a8 \u09a8\u09bf\u09b7\u09bf\u09a6\u09cd\u09a7\u0964
 
 

+ 1 - 1
cif-service/src/main/resources/static/i18n/messages_zh_CN.properties

@@ -136,7 +136,7 @@ method=\u65B9\u6CD5
 exception.summary=\u5F02\u5E38\u6982\u8981:
 
 
-bank.is.exist=??????????????????
+bank.is.exist=\u5f53\u524d\u63d0\u73b0\u94f6\u884c\u4fe1\u606f\u5df2\u7ed1\u5b9a\uff0c\u7981\u6b62\u91cd\u590d\u7ed1\u5b9a