From d1c6020dc36ce118ce9f13ba81caa70d7117d94c Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 12 十月 2023 12:14:33 +0800
Subject: [PATCH] Merge branch 'dev' of http://139.186.142.91:10010/r/productDev/parkBike into dev
---
server/services/src/main/java/com/doumee/core/constants/ResponseStatus.java | 1
server/services/src/main/java/com/doumee/core/Jwt/JwtPayLoad.java | 6 +-
server/services/src/main/java/com/doumee/core/Jwt/JwtTokenUtil.java | 2
server/services/src/main/java/com/doumee/dao/business/web/response/HomeResponse.java | 12 +++---
server/web/src/main/java/com/doumee/api/web/PaymentCallback.java | 2
server/services/src/main/java/com/doumee/dao/business/web/response/AccountResponse.java | 7 +++
server/services/src/main/java/com/doumee/dao/business/web/response/UserResponse.java | 2
server/services/src/main/java/com/doumee/service/business/GoodsorderService.java | 4 +-
server/services/src/main/resources/application-dev.yml | 8 ++--
server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 22 +++++------
server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java | 28 ++++++++++----
server/services/src/main/java/com/doumee/core/Jwt/WebMvcConfig.java | 2
12 files changed, 55 insertions(+), 41 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/core/Jwt/JwtPayLoad.java b/server/services/src/main/java/com/doumee/core/Jwt/JwtPayLoad.java
index 6201c02..359f0e1 100644
--- a/server/services/src/main/java/com/doumee/core/Jwt/JwtPayLoad.java
+++ b/server/services/src/main/java/com/doumee/core/Jwt/JwtPayLoad.java
@@ -18,14 +18,14 @@
/**
* 鐢ㄦ埛id
*/
- private Integer memberId;
+ private String memberId;
private long expire;
public JwtPayLoad() {
}
- public JwtPayLoad(Integer memberId) {
+ public JwtPayLoad(String memberId) {
this.memberId = memberId;
}
@@ -52,7 +52,7 @@
return new JwtPayLoad();
} else {
JwtPayLoad jwtPayLoad = new JwtPayLoad();
- jwtPayLoad.setMemberId((Integer) map.get("memberId"));
+ jwtPayLoad.setMemberId(map.get("memberId").toString());
return jwtPayLoad;
}
diff --git a/server/services/src/main/java/com/doumee/core/Jwt/JwtTokenUtil.java b/server/services/src/main/java/com/doumee/core/Jwt/JwtTokenUtil.java
index 3b1c474..392c7a2 100644
--- a/server/services/src/main/java/com/doumee/core/Jwt/JwtTokenUtil.java
+++ b/server/services/src/main/java/com/doumee/core/Jwt/JwtTokenUtil.java
@@ -126,7 +126,7 @@
/**
* 鐢熸垚token,鏍规嵁userId鍜岃繃鏈熸椂闂�
*/
- public static String generateToken(Integer userId, Date exppiredDate, Map<String, Object> claims) {
+ public static String generateToken(String userId, Date exppiredDate, Map<String, Object> claims) {
final Date createdDate = new Date();
String secret = getJwtSecret();
diff --git a/server/services/src/main/java/com/doumee/core/Jwt/WebMvcConfig.java b/server/services/src/main/java/com/doumee/core/Jwt/WebMvcConfig.java
index 0025d16..d27f826 100644
--- a/server/services/src/main/java/com/doumee/core/Jwt/WebMvcConfig.java
+++ b/server/services/src/main/java/com/doumee/core/Jwt/WebMvcConfig.java
@@ -81,7 +81,7 @@
throw new BusinessException(ResponseStatus.TOKEN_EXCEED_TIME.getCode(),"闀挎椂闂存湭鎿嶄綔,璇烽噸鏂扮櫥褰�");
}
//鑾峰彇璐﹀彿ID
- Integer memberId = JwtTokenUtil.getJwtPayLoad(token).getMemberId();
+ String memberId = JwtTokenUtil.getJwtPayLoad(token).getMemberId();
Integer isDeleted = dao.queryForObject(" select COALESCE(isdeleted,1) from member where id = ?", Integer.class, memberId);
if(isDeleted.equals(Constants.ONE)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐢ㄦ埛宸插垹闄�,璇疯仈绯荤鐞嗗憳");
diff --git a/server/services/src/main/java/com/doumee/core/constants/ResponseStatus.java b/server/services/src/main/java/com/doumee/core/constants/ResponseStatus.java
index 1f5270c..4053b00 100644
--- a/server/services/src/main/java/com/doumee/core/constants/ResponseStatus.java
+++ b/server/services/src/main/java/com/doumee/core/constants/ResponseStatus.java
@@ -1,6 +1,5 @@
package com.doumee.core.constants;
-import javafx.scene.input.KeyCodeCombination;
import lombok.AllArgsConstructor;
import lombok.Getter;
diff --git a/server/services/src/main/java/com/doumee/dao/business/web/response/AccountResponse.java b/server/services/src/main/java/com/doumee/dao/business/web/response/AccountResponse.java
index 9497fa8..2ed8af7 100644
--- a/server/services/src/main/java/com/doumee/dao/business/web/response/AccountResponse.java
+++ b/server/services/src/main/java/com/doumee/dao/business/web/response/AccountResponse.java
@@ -1,5 +1,6 @@
package com.doumee.dao.business.web.response;
+import com.doumee.core.constants.Constants;
import com.doumee.dao.system.model.SystemUser;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -20,9 +21,13 @@
@ApiModelProperty(value = "鐢ㄦ埛token")
private String token;
+
+ @ApiModelProperty(value = "sessionKey")
+ private String sessionKey;
+
@ApiModelProperty(value = "鐢ㄦ埛淇℃伅")
private UserResponse userResponse;
@ApiModelProperty(value = "杩斿洖鐘舵�侊細0=鐧诲綍鎴愬姛锛�1=鏈淮鎶ゆ墜鏈哄彿锛岃缁存姢鎵嬫満鍙凤紱2=鐧诲綍澶辫触")
- private Integer status;
+ private Integer status = Constants.ZERO;
}
diff --git a/server/services/src/main/java/com/doumee/dao/business/web/response/HomeResponse.java b/server/services/src/main/java/com/doumee/dao/business/web/response/HomeResponse.java
index 31d9b99..9585687 100644
--- a/server/services/src/main/java/com/doumee/dao/business/web/response/HomeResponse.java
+++ b/server/services/src/main/java/com/doumee/dao/business/web/response/HomeResponse.java
@@ -49,14 +49,14 @@
@ApiModelProperty(value = "灏忕▼搴忔槸鍚﹀仠姝㈡湇鍔� 0鍚� 1鏄�")
private Integer isStopServe;
+ @ApiModelProperty(value = "灏忕▼搴忔槸鍚﹁惀涓� 0鍚� 1鏄�")
+ private Integer isBusiness;
+
+ @ApiModelProperty(value = "鏈紑濮嬭惀涓氭彁绀鸿")
+ private String unBusinessTips;
+
@ApiModelProperty(value = "灏忕▼搴忓仠姝㈡湇鍔℃彁绀�")
private String stopServeTips;
-
- @ApiModelProperty(value = "灏忕▼搴忚惀涓氬紑濮嬫椂闂寸偣")
- private String businessStartTime;
-
- @ApiModelProperty(value = "灏忕▼搴忚惀涓氱粨鏉熸椂闂寸偣")
- private String businessEndTime;
@ApiModelProperty(value = "楠戣鎯呭喌")
private MemberRidesResponse memberRidesResponse;
diff --git a/server/services/src/main/java/com/doumee/dao/business/web/response/UserResponse.java b/server/services/src/main/java/com/doumee/dao/business/web/response/UserResponse.java
index 55825c4..4a522a6 100644
--- a/server/services/src/main/java/com/doumee/dao/business/web/response/UserResponse.java
+++ b/server/services/src/main/java/com/doumee/dao/business/web/response/UserResponse.java
@@ -15,7 +15,7 @@
public class UserResponse {
@ApiModelProperty(value = "鐢ㄦ埛涓婚敭")
- private Integer id;
+ private String id;
@ApiModelProperty(value = "濮撳悕")
private String name;
diff --git a/server/services/src/main/java/com/doumee/service/business/GoodsorderService.java b/server/services/src/main/java/com/doumee/service/business/GoodsorderService.java
index 96bceda..486f330 100644
--- a/server/services/src/main/java/com/doumee/service/business/GoodsorderService.java
+++ b/server/services/src/main/java/com/doumee/service/business/GoodsorderService.java
@@ -172,12 +172,12 @@
/**
* 楠岃瘉鏄惁涓鸿惀涓氭椂闂�
*/
- void checkBusiness();
+ Boolean checkBusiness();
/**
* 楠岃瘉鏄惁澶勪簬鍋滄杩愯惀鏃堕棿
*/
- void checkTemporaryStop();
+ Boolean checkTemporaryStop();
Goodsorder findOneByWrapper(QueryWrapper<Goodsorder> wrapper);
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
index 4630a8e..8010bb4 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
@@ -57,6 +57,8 @@
import java.net.UnknownHostException;
import java.sql.Ref;
+import java.time.LocalTime;
+import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.stream.Collectors;
@@ -243,7 +245,9 @@
homeResponse.setLeaseVideoUrl(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.RENT_TIPS_VIDEO).getCode());
homeResponse.setPricingRules(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.PRICING_RULE).getCode());
homeResponse.setStopServeTips(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.STOP_SERVE_TIPS).getCode());
- homeResponse.setIsStopServe(Constants.ZERO);
+ homeResponse.setIsStopServe(this.checkTemporaryStop()?1:0);
+ homeResponse.setIsBusiness(this.checkBusiness()?0:1);
+ homeResponse.setUnBusinessTips("钀ヤ笟鏃堕棿涓�"+ systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.BUSINESS_STARTTIME).getCode() +" ~ "+systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.BUSINESS_ENDTIME).getCode()+"锛岃鍦ㄨ惀涓氭椂闂村唴浣跨敤鏈郴缁�");
homeResponse.setAdList(adMapper.selectList(new QueryWrapper<Ad>()
.eq("isdeleted",Constants.ZERO)
.eq("status",Constants.ZERO)
@@ -637,9 +641,13 @@
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"宸叉敮浠樿繃瀹氶噾锛屾棤娉曢噸澶嶈鎿嶄綔");
}
//鏄惁澶勪簬灏忕▼搴忓仠姝㈡湇鍔℃椂闂村唴
- this.checkTemporaryStop();
+ if(this.checkTemporaryStop()){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.STOP_SERVE_TIPS).getCode());
+ };
//鏄惁澶勪簬钀ヤ笟鏃堕棿
- this.checkBusiness();
+ if(this.checkBusiness()){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"钀ヤ笟鏃堕棿涓�"+ systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.BUSINESS_STARTTIME).getCode() +" ~ "+systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.BUSINESS_ENDTIME).getCode()+"锛岃鍦ㄨ惀涓氭椂闂村唴浣跨敤鏈郴缁�");
+ };
Goodsorder goodsorder = new Goodsorder();
goodsorder.setId(Constants.getUUID());
goodsorder.setCreateDate(new Date());
@@ -675,21 +683,24 @@
* 楠岃瘉钀ヤ笟鏃堕棿
*/
@Override
- public void checkBusiness(){
+ public Boolean checkBusiness(){
String businessStartTime = systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.BUSINESS_STARTTIME).getCode();
String businessEndTime = systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.BUSINESS_ENDTIME).getCode();
- String nowTime = DateUtil.getDate(new Date(),"HH:mm");
+ LocalTime currentTime = LocalTime.now();
+ DateTimeFormatter formatter = DateTimeFormatter.ofPattern("HH:mm");
+ String nowTime = currentTime.format(formatter);
if(Integer.valueOf(nowTime.replace(":",""))<= Integer.valueOf(businessStartTime.replace(":",""))
||Integer.valueOf(nowTime.replace(":","")) > Integer.valueOf(businessEndTime.replace(":",""))){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"钀ヤ笟鏃堕棿涓�06:00 ~ 23:59锛岃鍦ㄨ惀涓氭椂闂村唴浣跨敤鏈郴缁�");
+ return true;
}
+ return false;
}
/**
* 涓存椂鍋滄鏈嶅姟 鏈氦鎶奸噾鐨勭敤鎴凤紝鏃犳硶鎵溅浣跨敤锛涘凡缁忎氦杩囨娂閲戠殑鐢ㄦ埛鍙互缁х画鎵爜楠戣锛�
*/
@Override
- public void checkTemporaryStop(){
+ public Boolean checkTemporaryStop(){
if(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.IS_STOP_SERVE).getCode().equals(Constants.ONE)){
String stopServeStartTime = systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.STOP_SERVE_STARTTIME).getCode();
String stopServeEndTime = systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.STOP_SERVE_ENDTIME).getCode();
@@ -697,9 +708,10 @@
long s = DateUtil.StringToDate(stopServeStartTime).getTime();
long e = DateUtil.StringToDate(stopServeEndTime).getTime();
if(e>System.currentTimeMillis()&&s<=System.currentTimeMillis()){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.STOP_SERVE_TIPS).getCode());
+ return true;
}
}
+ return false;
}
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index cfbb756..ea705f5 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -318,31 +318,29 @@
if(Objects.isNull(member)){
//鏂板鐢ㄦ埛 闇�瑕佽繘琛岀敤鎴风粦瀹氭墜鏈哄彿
member = new Member();
+ member.setId(Constants.getUUID());
member.setCreateDate(new Date());
member.setIsdeleted(Constants.ZERO);
member.setOpenid(openId);
member.setUnionid(unionId);
member.setType(Constants.ZERO);
+ member.setRegisterDate(new Date());
member.setOrigin(Constants.ZERO.toString());
member.setStatus(Constants.ZERO);
memberMapper.insert(member);
- accountResponse.setStatus(Constants.ONE);
- }else{
- UserResponse userResponse = getUserInfo(member.getId());
- if(StringUtils.isBlank(member.getPhone())){
- accountResponse.setStatus(Constants.ONE);
- }else{
- JwtPayLoad payLoad = new JwtPayLoad(userResponse.getId());
- accountResponse.setToken(JwtTokenUtil.generateToken(payLoad));
- }
- accountResponse.setUserResponse(userResponse);
}
-
+ UserResponse userResponse = getUserInfo(member.getId());
+ if(StringUtils.isBlank(member.getPhone())){
+ accountResponse.setStatus(Constants.ONE);
+ }
+ JwtPayLoad payLoad = new JwtPayLoad(member.getId());
+ accountResponse.setToken(JwtTokenUtil.generateToken(payLoad));
+ accountResponse.setSessionKey(session.getSessionKey());
+ accountResponse.setUserResponse(userResponse);
return accountResponse;
} catch (WxErrorException e) {
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "寰俊鐧诲綍寮傚父锛佽鑱旂郴绠＄悊鍛�");
}
-
}
diff --git a/server/services/src/main/resources/application-dev.yml b/server/services/src/main/resources/application-dev.yml
index c3be70a..7a3b775 100644
--- a/server/services/src/main/resources/application-dev.yml
+++ b/server/services/src/main/resources/application-dev.yml
@@ -44,12 +44,12 @@
########################寰俊鏀粯鐩稿叧閰嶇疆########################
wx:
pay:
- appId: wx6b8c6d9df01fbe1e
- appSecret: 8ae8fbe2e4b9866439a87d64a42b9214
+ appId: wxcd2b89fd2ff065f8
+ appSecret: 1ceb7c9dff3c4330d653adc3ca55ea24
mchId: 1229817002
mchKey: u4TSNtv0wFP7WRfnxBgijYOtRhS9FvlM
- notifyUrl: https://dmtest.ahapp.net/martempo_interface/web/api/wxPayNotify
- keyPath: D:/work/svn/cert/apiclient_cert.p12
+ notifyUrl: http://xiaopiqiu.natapp1.cc/api/wxPayNotify
+ keyPath: D:\DouMee\config\doumeeTest\apiclient_cert.p12
########################mqtt鐩稿叧閰嶇疆########################
mqtt:
diff --git a/server/web/src/main/java/com/doumee/api/web/PaymentCallback.java b/server/web/src/main/java/com/doumee/api/web/PaymentCallback.java
index ebf0845..1a6f131 100644
--- a/server/web/src/main/java/com/doumee/api/web/PaymentCallback.java
+++ b/server/web/src/main/java/com/doumee/api/web/PaymentCallback.java
@@ -47,7 +47,7 @@
if ("SUCCESS".equals(result.getReturnCode())) {
// 鏀粯鎴愬姛
switch (result.getAttach()) {
- //瀹堕暱鏀粯璁㈠崟
+ //鏀粯璁㈠崟鍥炶皟
case "createGoodsOrder": {
goodsorderService.payNotify(outTradeNo,paymentNo);
break;
--
Gitblit v1.9.3