From f1599d8230e83fb08ebb0473bbe486979b4d1d38 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期三, 29 五月 2024 17:24:16 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/client/ClientCtrl.java | 191 +++++++++++++++++++++++++++++++----------------
1 files changed, 124 insertions(+), 67 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/client/ClientCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/client/ClientCtrl.java
index bc45365..af54665 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/client/ClientCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/client/ClientCtrl.java
@@ -10,10 +10,15 @@
import com.dy.common.webUtil.ResultCodeMsg;
import com.dy.pipIrrGlobal.pojoBa.BaClient;
import com.dy.pipIrrGlobal.pojoSe.SeClient;
+import com.dy.pipIrrGlobal.pojoSe.SeCodeVerify;
+import com.dy.pipIrrGlobal.pojoSe.SeOpenId;
import com.dy.pipIrrGlobal.voSe.VoClient;
+import com.dy.pipIrrSell.client.dto.CodeVerifyDTO;
import com.dy.pipIrrSell.result.SellResultCode;
import com.dy.pipIrrSell.sms.AliyunSmsSv;
import com.dy.pipIrrSell.sms.RandomCode;
+import com.dy.pipIrrSell.util.RestTemplateUtil;
+import com.dy.pipIrrSell.wechatpay.PayInfo;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.media.Content;
import io.swagger.v3.oas.annotations.media.Schema;
@@ -29,6 +34,7 @@
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*;
+import java.io.IOException;
import java.util.*;
/**
@@ -47,10 +53,21 @@
private final ClientSv clientSv;
private final AliyunSmsSv aliyunSmsSv;
//private final RedisUtils redisUtils;
+ private final RestTemplateUtil restTemplateUtil;
+
+ private final String privateCertFileName = PayInfo.privateCertFileName;
+ private final String appid = PayInfo.appid;
+ private final String secret = PayInfo.secret;
+ private final String mchid = PayInfo.mchid;
+ private final String schema = PayInfo.schema;
+ private final String signType = PayInfo.signType;
+ private final String description = PayInfo.description;
+ private final String loginUrl = PayInfo.loginUrl;
+ private final String notifyUrl = PayInfo.notifyUrl;
+ private final String grantType = PayInfo.grantType;
/**
* 鑾峰彇鍐滄埛鍒楄〃
- *
* @param vo
* @return
*/
@@ -65,19 +82,18 @@
})
@GetMapping(path = "get")
@SsoAop()
- public BaseResponse<QueryResultVo<List<VoClient>>> get(QueryVo vo) {
+ public BaseResponse<QueryResultVo<List<VoClient>>> get(QueryVo vo){
try {
QueryResultVo<List<VoClient>> res = clientSv.getClients(vo);
return BaseResponseUtils.buildSuccess(res);
} catch (Exception e) {
log.error("鏌ヨ鍐滄埛寮傚父", e);
- return BaseResponseUtils.buildException(e.getMessage());
+ return BaseResponseUtils.buildException(e.getMessage()) ;
}
}
/**
* 鏍规嵁涓婚敭鑾峰彇涓�涓啘鎴峰璞�
- *
* @param id
* @return
*/
@@ -92,20 +108,19 @@
})
@GetMapping(path = "/getone/{id}")
@SsoAop()
- public BaseResponse<VoClient> getOneClient(@PathVariable("id") Long id) {
+ public BaseResponse<VoClient> getOneClient(@PathVariable("id") Long id){
try {
VoClient res = clientSv.getOneClient(id);
return BaseResponseUtils.buildSuccess(res);
} catch (Exception e) {
log.error("鏌ヨ鍐滄埛寮傚父", e);
- return BaseResponseUtils.buildException(e.getMessage());
+ return BaseResponseUtils.buildException(e.getMessage()) ;
}
}
/**
* 娣诲姞涓�涓啘鎴峰璞�
- *
* @param po
* @param bindingResult
* @return
@@ -123,7 +138,7 @@
@Transactional(rollbackFor = Exception.class)
@SsoAop()
public BaseResponse<Boolean> add(@RequestBody @Valid DtoClient po, BindingResult bindingResult) {
- if (bindingResult != null && bindingResult.hasErrors()) {
+ if(bindingResult != null && bindingResult.hasErrors()){
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
@@ -134,7 +149,7 @@
* 鑾峰彇5绾ц鏀垮尯鍒掍俊鎭�
*/
Map map_districts = Optional.ofNullable(clientSv.getDistrictsByVillageId(villageId)).orElse(new HashMap());
- if (map_districts.size() <= 0) {
+ if(map_districts.size() <= 0) {
return BaseResponseUtils.buildFail("鍖哄垝淇℃伅鏈夎");
}
@@ -159,11 +174,11 @@
// 鐢熸垚铏氭嫙鍗″彿
Long virtualId = Optional.ofNullable(clientSv.getMa1xVirtualId()).orElse(0L);
- if (virtualId == 0) {
+ if(virtualId == 0) {
virtualId = 1000000000L;
- } else {
+ }else {
virtualId = virtualId + 1;
- if (virtualId > 10000000000L) {
+ if(virtualId > 10000000000L) {
return BaseResponseUtils.buildFail("铏氭嫙鍗″彿瓒呴檺");
}
}
@@ -178,33 +193,33 @@
Date operateTime = new Date();
seClient.setOperatedt(operateTime);
- seClient.setDisabled((byte) 0);
- seClient.setDeleted((byte) 0);
+ seClient.setDisabled((byte)0);
+ seClient.setDeleted((byte)0);
Integer rec = Optional.ofNullable(clientSv.addClient(seClient)).orElse(0);
- if (rec == 0) {
+ if(rec == 0) {
return BaseResponseUtils.buildFail("娣诲姞鍐滄埛澶辫触");
}
- return BaseResponseUtils.buildSuccess(true);
+ return BaseResponseUtils.buildSuccess(true) ;
}
/**
* 鐢熸垚10浣嶅啘鎴风紪鍙�
* 1. 鍒板啘鎴疯〃涓煡璇�6浣嶅尯鍒掍覆寮�澶寸殑鏈�澶х殑鍐滄埛缂栧彿
* 2. 鏄惁鍙栧埌璁板綍
- * 2.1 鍙栧埌
- * 2.1.1 鍙栧嚭鍚�4浣嶉『搴忓彿骞惰浆鎴愭暣褰�
- * 2.1.2. 鏁村舰鏍煎紡鐨勯『搴忓彿鍔�1骞跺垽鏂槸鍚﹀ぇ浜�9999
- * 2.1.2.1 濡傛灉澶т簬鍒欐彁绀虹敤鎴风紪鍙峰凡婊�
- * 2.1.2.2 濡傛灉涓嶅ぇ 6浣嶅尯鍒掑姞涓婃牸寮忓寲鍚庣殑椤哄簭鍙�
- * 2.2 鏈彇鍒� 6浣嶅尯鍒掑姞涓�0001
+ * 2.1 鍙栧埌
+ * 2.1.1 鍙栧嚭鍚�4浣嶉『搴忓彿骞惰浆鎴愭暣褰�
+ * 2.1.2. 鏁村舰鏍煎紡鐨勯『搴忓彿鍔�1骞跺垽鏂槸鍚﹀ぇ浜�9999
+ * 2.1.2.1 濡傛灉澶т簬鍒欐彁绀虹敤鎴风紪鍙峰凡婊�
+ * 2.1.2.2 濡傛灉涓嶅ぇ 6浣嶅尯鍒掑姞涓婃牸寮忓寲鍚庣殑椤哄簭鍙�
+ * 2.2 鏈彇鍒� 6浣嶅尯鍒掑姞涓�0001
* 3. 杩斿洖鍐滄埛缂栧彿
*/
private String generateClientNum(String district8) {
String clientNum = Optional.ofNullable(clientSv.getClientNumOfMax(district8)).orElse("");
- if (clientNum != null && clientNum.trim().length() > 0) {
+ if(clientNum != null && clientNum.trim().length() > 0) {
Integer number = Integer.parseInt(clientNum.substring(8));
number = number + 1;
- if (number > 9999) {
+ if(number > 9999) {
return "鍐滄埛缂栧彿瓒呴檺";
}
clientNum = clientNum.substring(0, 8) + String.format("%04d", number);
@@ -216,8 +231,7 @@
/**
* 淇敼鍐滄埛瀵硅薄锛堣櫄鎷熷崱鍙枫�佺姝㈡爣蹇椼�侀�昏緫鍒犻櫎鏍囪瘑涓嶅弬涓庝慨鏀癸級
- *
- * @param po 鍐滄埛瀵硅薄
+ * @param po 鍐滄埛瀵硅薄
* @param bindingResult
* @return
*/
@@ -233,8 +247,8 @@
@PostMapping(path = "update", consumes = MediaType.APPLICATION_JSON_VALUE)
@Transactional(rollbackFor = Exception.class)
@SsoAop()
- public BaseResponse<Boolean> update(@RequestBody @Valid DtoClient po, BindingResult bindingResult) {
- if (bindingResult != null && bindingResult.hasErrors()) {
+ public BaseResponse<Boolean> update(@RequestBody @Valid DtoClient po, BindingResult bindingResult){
+ if(bindingResult != null && bindingResult.hasErrors()){
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
@@ -245,7 +259,7 @@
* 鑾峰彇5绾ц鏀垮尯鍒掍俊鎭�
*/
Map map_districts = Optional.ofNullable(clientSv.getDistrictsByVillageId(villageId)).orElse(new HashMap());
- if (map_districts.size() <= 0) {
+ if(map_districts.size() <= 0) {
return BaseResponseUtils.buildFail("鍖哄垝淇℃伅鏈夎");
}
@@ -278,15 +292,14 @@
seClient.setOperatedt(operateTime);
Integer rec = Optional.ofNullable(clientSv.updateByPrimaryKey(seClient)).orElse(0);
- if (rec == 0) {
+ if(rec == 0) {
return BaseResponseUtils.buildFail("鍐滄埛淇敼澶辫触");
}
- return BaseResponseUtils.buildSuccess(true);
+ return BaseResponseUtils.buildSuccess(true) ;
}
/**
* 鏍规嵁鍐滄埛ID閫昏緫鍒犻櫎鍐滄埛
- *
* @param id
* @return
*/
@@ -302,22 +315,21 @@
@GetMapping(path = "/delone/{id}")
@SsoAop()
- public BaseResponse<Boolean> deleteClientById(@PathVariable("id") Long id) {
+ public BaseResponse<Boolean> deleteClientById(@PathVariable("id") Long id){
try {
Integer res = Optional.ofNullable(clientSv.deleteClientById(id)).orElse(0);
- if (res == 0) {
+ if(res == 0) {
return BaseResponseUtils.buildFail("鍐滄埛鍒犻櫎澶辫触");
}
return BaseResponseUtils.buildSuccess(true);
} catch (Exception e) {
log.error("鏌ヨ鍐滄埛寮傚父", e);
- return BaseResponseUtils.buildException(e.getMessage());
+ return BaseResponseUtils.buildException(e.getMessage()) ;
}
}
/**
* 鑾峰彇鐢ㄦ按鏂瑰紡鍒楄〃
- *
* @param
* @return
*/
@@ -332,17 +344,16 @@
})
@GetMapping(path = "/watertypes")
@SsoAop()
- public BaseResponse<QueryResultVo<List<Map<String, Object>>>> getWaterTypes() {
+ public BaseResponse<QueryResultVo<List<Map<String, Object>>>> getWaterTypes(){
List<Map<String, Object>> map_WaterTypes = Optional.ofNullable(clientSv.getWaterTypes()).orElse(new ArrayList<>());
- if (map_WaterTypes == null || map_WaterTypes.size() == 0) {
- return BaseResponseUtils.buildFail("娌℃湁鐢ㄦ按鏂瑰紡");
+ if(map_WaterTypes == null || map_WaterTypes.size() == 0) {
+ return BaseResponseUtils.buildFail("娌℃湁鐢ㄦ按鏂瑰紡") ;
}
return BaseResponseUtils.buildSuccess(map_WaterTypes);
}
/**
* 鍙戦�侀獙璇佺爜
- *
* @param phoneNumber
* @return
*/
@@ -358,7 +369,7 @@
@PostMapping(path = "send_sms")
@SsoAop()
public BaseResponse<Boolean> sendSms(@RequestParam(name = "phoneNumber", required = true) String phoneNumber) throws ClientException {
- if (phoneNumber == null || phoneNumber.length() <= 0) {
+ if(phoneNumber == null || phoneNumber.length() <= 0) {
return BaseResponseUtils.buildFail(SellResultCode.PHONE_NUMBER_CANNOT_BE_NULL.getMessage());
}
@@ -370,23 +381,35 @@
//redisUtils.set(phoneNumber, securityCode, 60);
+ // 鑾峰彇褰撳墠鏃堕棿鎴冲苟寤跺悗3鍒嗛挓
+ Long timestamp = System.currentTimeMillis();
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTimeInMillis(timestamp);
+ calendar.add(Calendar.SECOND, 180);
+ Long expires = calendar.getTimeInMillis();
+
+ SeCodeVerify codeVerify = new SeCodeVerify();
+ codeVerify.setPhoneNumber(phoneNumber);
+ codeVerify.setSecurityCode(securityCode);
+ codeVerify.setExpires(expires);
+ clientSv.addCodeVerify(codeVerify);
+
SendSmsResponse response = aliyunSmsSv.sendSms(phoneNumber, templateParam);
if (response.getCode().equals("OK")) {
// 鍙戦�佹垚鍔熷鐞嗛�昏緫
- return BaseResponseUtils.buildSuccess(true);
+ return BaseResponseUtils.buildSuccess(true) ;
} else {
// 鍙戦�佸け璐ュ鐞嗛�昏緫
- return BaseResponseUtils.buildFail(SellResultCode.SECURITY_CODE_SEND_FAIL.getMessage());
+ return BaseResponseUtils.buildFail(SellResultCode.SECURITY_CODE_SEND_FAIL.getMessage()) ;
}
}
/**
* 鏍￠獙楠岃瘉鐮�
- *
- * @param phoneNumber
- * @param code
+ * @param po
+ * @param bindingResult
* @return
- * @throws ClientException
+ * @throws IOException
*/
@Operation(summary = "鏍￠獙楠岃瘉鐮�", description = "鏍￠獙楠岃瘉鐮�")
@ApiResponses(value = {
@@ -397,32 +420,66 @@
schema = @Schema(implementation = Boolean.class))}
)
})
- @PostMapping(path = "verify")
+ @PostMapping(path = "verify", consumes = MediaType.APPLICATION_JSON_VALUE)
+ @Transactional(rollbackFor = Exception.class)
@SsoAop()
- public BaseResponse<Boolean> verify(@RequestParam("phoneNumber") String phoneNumber, @RequestParam("code") String code) throws ClientException {
- if (phoneNumber == null || phoneNumber.length() <= 0 || code == null || code.length() <= 0) {
- return BaseResponseUtils.buildFail(SellResultCode.VERIFY_PARAMS_INCOMPLETE.getMessage());
+ public BaseResponse<Boolean> verify(@RequestBody @Valid CodeVerifyDTO po, BindingResult bindingResult) throws IOException {
+ if(bindingResult != null && bindingResult.hasErrors()){
+ return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
- // redis涓敭涓嶅瓨鍦ㄦ垨閿�间笉瀛樺湪鍒欐彁绀烘牎楠屽け璐�
- //if(!redisUtils.hasKey(phoneNumber) || redisUtils.get(phoneNumber) == null)
- // return BaseResponseUtils.buildFail(SellResultCode.CODE_VERIFY_FAIL.getMessage());
- //
- //String code_redis = redisUtils.get(phoneNumber).toString();
- //System.out.println("--------------------: " + code_redis);
- //
- //if(code_redis != null && code_redis.equals(code)) {
- // return BaseResponseUtils.buildSuccess(true) ;
- //}else {
- // return BaseResponseUtils.buildFail(SellResultCode.CODE_VERIFY_FAIL.getMessage());
- //}
+ String phoneNumber = po.getPhoneNumber();
+ String securityCode = po.getSecurityCode();
+ String code = po.getCode();
- return BaseResponseUtils.buildSuccess(true);
+ // 杩涜鎵嬫満鍙枫�侀獙璇佺爜銆佽繃鏈熸椂闂存牎楠�
+ SeCodeVerify codeVerify = clientSv.getCodeVerify(phoneNumber);
+ if(codeVerify == null) {
+ return BaseResponseUtils.buildFail(SellResultCode.NO_SECURITY_CODE_FOR_PHONE.getMessage());
+ }
+
+ if(!codeVerify.getSecurityCode().equals(securityCode)) {
+ return BaseResponseUtils.buildFail(SellResultCode.SECURITY_CODE_ERROR.getMessage());
+ }
+
+ Long currentTimestamp = System.currentTimeMillis();
+ if(currentTimestamp > codeVerify.getExpires() ) {
+ return BaseResponseUtils.buildFail(SellResultCode.VALIDATION_TIMEOUT.getMessage());
+ }
+
+ // 鏍￠獙閫氳繃锛岃繘琛岀櫥褰曞嚟璇佹牎楠�
+ Map<String, Object> queryParams = new HashMap<>();
+ queryParams.put("appid", appid);
+ queryParams.put("secret", secret);
+ queryParams.put("js_code", code);
+ queryParams.put("grant_type", grantType);
+ Map<String, String> headerParams = new HashMap<>();
+ JSONObject job = restTemplateUtil.get(loginUrl, queryParams, headerParams);
+
+ if(job.getLong("errcode") != null && job.getLong("errcode") >= -1) {
+ return BaseResponseUtils.buildFail("鐧诲綍鍑瘉鏍￠獙澶辫触");
+ }
+ String openid = job.getString("openid");
+ String sessionKey = job.getString("session_key");
+
+ Long clientId = clientSv.getClientIdByPhone(phoneNumber);
+ if(clientId != null) {
+ // 娣诲姞寰俊鐢ㄦ埛璐︽埛璁板綍
+ SeOpenId seOpenId = new SeOpenId();
+ seOpenId.setClientId(clientId);
+ seOpenId.setOpenId(openid);
+ seOpenId.setSessionKey(sessionKey);
+ seOpenId.setCreateTime(new Date());
+ Long SessionId = clientSv.addOpenId(seOpenId);
+ return BaseResponseUtils.buildSuccess(SessionId);
+
+ } else {
+ return BaseResponseUtils.buildError(SellResultCode.PHONE_NUMBER_IS_ERROR.getMessage());
+ }
}
/**
* 鏍规嵁鏉慖D鑾峰彇12浣嶈鏀垮尯鍒�
- *
* @param villageId
* @return
*/
@@ -437,12 +494,12 @@
})
@GetMapping(path = "district")
@SsoAop()
- public BaseResponse<Boolean> getDistrictNum(@RequestParam("villageId") @NotNull(message = "鏉戠紪鍙蜂笉鑳戒负绌�") Long villageId) {
+ public BaseResponse<Boolean> getDistrictNum(@RequestParam("villageId") @NotNull(message = "鏉戠紪鍙蜂笉鑳戒负绌�") Long villageId){
/**
* 鑾峰彇5绾ц鏀垮尯鍒掍俊鎭�
*/
Map map_districts = Optional.ofNullable(clientSv.getDistrictsByVillageId(villageId)).orElse(new HashMap());
- if (map_districts.size() <= 0) {
+ if(map_districts.size() <= 0) {
return BaseResponseUtils.buildFail("鍖哄垝淇℃伅鏈夎");
}
--
Gitblit v1.8.0