autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-06-17 21:59:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2023-10-26 11:48:03 +08:00
parent 14600a110d
commit 59ef031100
3 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
jsowell-admin/src/main/java/com/jsowell/service/MemberService.java
View File

@@ -167,10 +167,8 @@ public class MemberService {
.build(); .build();
transactionService.createMember(memberTransactionDTO); transactionService.createMember(memberTransactionDTO);
} else { } else {
if (StringUtils.isBlank(memberBasicInfo.getOpenId()) && StringUtils.isNotBlank(openId)) { memberBasicInfo.setOpenId(openId);
memberBasicInfo.setOpenId(openId); memberBasicInfoService.updateMemberBasicInfo(memberBasicInfo);
memberBasicInfoService.updateMemberBasicInfo(memberBasicInfo);
}
} }
// 服务器生成token返给前端 // 服务器生成token返给前端
String memberToken = JWTUtils.createMemberToken(memberBasicInfo.getMemberId(), memberBasicInfo.getNickName()); String memberToken = JWTUtils.createMemberToken(memberBasicInfo.getMemberId(), memberBasicInfo.getNickName());

2
jsowell-admin/src/test/java/SpringBootTestController.java
View File

@@ -238,7 +238,7 @@ public class SpringBootTestController {
public void checkPaymentTest() { public void checkPaymentTest() {
QueryOrderDTO dto = new QueryOrderDTO(); QueryOrderDTO dto = new QueryOrderDTO();
String startTime = "2023-10-01 00:00:00"; String startTime = "2023-10-01 00:00:00";
String endTime = "2023-10-23 23:59:59"; String endTime = "2023-10-25 23:59:59";
dto.setStartTime(startTime); dto.setStartTime(startTime);
dto.setEndTime(endTime); dto.setEndTime(endTime);

5
jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteIssuedQrCodeHandler.java
View File

@@ -8,10 +8,8 @@ import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode;
import com.jsowell.common.util.BytesUtil; import com.jsowell.common.util.BytesUtil;
import com.jsowell.common.util.YKCUtils; import com.jsowell.common.util.YKCUtils;
import com.jsowell.netty.factory.YKCOperateFactory; import com.jsowell.netty.factory.YKCOperateFactory;
import com.jsowell.pile.service.impl.YKCPushCommandServiceImpl;
import io.netty.channel.Channel; import io.netty.channel.Channel;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
/** /**
@@ -30,9 +28,6 @@ import org.springframework.stereotype.Component;
public class RemoteIssuedQrCodeHandler extends AbstractHandler{ public class RemoteIssuedQrCodeHandler extends AbstractHandler{
private final String type = YKCUtils.frameType2Str(YKCFrameTypeCode.REMOTE_ISSUE_QRCODE_CODE.getBytes()); private final String type = YKCUtils.frameType2Str(YKCFrameTypeCode.REMOTE_ISSUE_QRCODE_CODE.getBytes());
@Autowired
private YKCPushCommandServiceImpl ykcPushBusinessService;
@Override @Override
public void afterPropertiesSet() throws Exception { public void afterPropertiesSet() throws Exception {
YKCOperateFactory.register(type, this); YKCOperateFactory.register(type, this);