diff --git a/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java b/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java index 88c27734c..efd5f134b 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java @@ -167,10 +167,8 @@ public class MemberService { .build(); transactionService.createMember(memberTransactionDTO); } else { - if (StringUtils.isBlank(memberBasicInfo.getOpenId()) && StringUtils.isNotBlank(openId)) { - memberBasicInfo.setOpenId(openId); - memberBasicInfoService.updateMemberBasicInfo(memberBasicInfo); - } + memberBasicInfo.setOpenId(openId); + memberBasicInfoService.updateMemberBasicInfo(memberBasicInfo); } // 服务器生成token返给前端 String memberToken = JWTUtils.createMemberToken(memberBasicInfo.getMemberId(), memberBasicInfo.getNickName()); diff --git a/jsowell-admin/src/test/java/SpringBootTestController.java b/jsowell-admin/src/test/java/SpringBootTestController.java index 01d42ae7b..21b2a01db 100644 --- a/jsowell-admin/src/test/java/SpringBootTestController.java +++ b/jsowell-admin/src/test/java/SpringBootTestController.java @@ -238,7 +238,7 @@ public class SpringBootTestController { public void checkPaymentTest() { QueryOrderDTO dto = new QueryOrderDTO(); 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.setEndTime(endTime); diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteIssuedQrCodeHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteIssuedQrCodeHandler.java index 6bc7de1bb..7e25a9fb1 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteIssuedQrCodeHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteIssuedQrCodeHandler.java @@ -8,10 +8,8 @@ import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; import com.jsowell.common.util.BytesUtil; import com.jsowell.common.util.YKCUtils; import com.jsowell.netty.factory.YKCOperateFactory; -import com.jsowell.pile.service.impl.YKCPushCommandServiceImpl; import io.netty.channel.Channel; import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; /** @@ -30,9 +28,6 @@ import org.springframework.stereotype.Component; public class RemoteIssuedQrCodeHandler extends AbstractHandler{ private final String type = YKCUtils.frameType2Str(YKCFrameTypeCode.REMOTE_ISSUE_QRCODE_CODE.getBytes()); - @Autowired - private YKCPushCommandServiceImpl ykcPushBusinessService; - @Override public void afterPropertiesSet() throws Exception { YKCOperateFactory.register(type, this);