mac 7 місяців тому
батько
коміт
2d7e4387b2

+ 2 - 2
kxs-common/kxs-common-security/src/main/java/com/kxs/common/security/service/WxUserDetailsServiceImpl.java

@@ -6,7 +6,7 @@ import com.kxs.common.core.constant.enums.UserStatusEnum;
 import com.kxs.common.core.util.R;
 import com.kxs.common.core.util.RetOps;
 import com.kxs.common.security.model.KxsSecurityUser;
-import com.kxs.lhb.basic.api.feign.RemoteLhbUserService;
+import com.kxs.lhb.basic.api.feign.RemoteLhbBasicService;
 import com.kxs.lhb.basic.api.model.LhbUser;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -27,7 +27,7 @@ import java.util.Objects;
 @RequiredArgsConstructor
 public class WxUserDetailsServiceImpl implements KxsUserDetailsService {
 
-	private final RemoteLhbUserService remoteLhbUserService;
+	private final RemoteLhbBasicService remoteLhbUserService;
 
 	@Override
 	public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {

+ 9 - 1
lhb-basic/lhb-basic-api/src/main/java/com/kxs/lhb/basic/api/feign/RemoteLhbUserService.java → lhb-basic/lhb-basic-api/src/main/java/com/kxs/lhb/basic/api/feign/RemoteLhbBasicService.java

@@ -12,7 +12,7 @@ import org.springframework.web.service.annotation.GetExchange;
  * @author Lxq
  * @date 2024/8/22
  */
-public interface RemoteLhbUserService {
+public interface RemoteLhbBasicService {
 
 
 	/**
@@ -24,4 +24,12 @@ public interface RemoteLhbUserService {
 	@GetExchange("/user/loadUserByWxCode")
 	R<LhbUser> loadUserByWxCode(@RequestParam("code") String code, @RequestHeader(SecurityConstants.FROM) String from);
 
+	@GetExchange("sysGoods/goodsInfoTask")
+	void goodsInfoTask(@RequestHeader(SecurityConstants.FROM) String from);
+
+	@GetExchange("sysOrder/orderStatusTask")
+	void orderStatusTask(@RequestHeader(SecurityConstants.FROM) String from);
+
+	@GetExchange("sysOrder/orderFirstCharge")
+	void orderFirstCharge(@RequestHeader(SecurityConstants.FROM) String from);
 }

+ 4 - 4
lhb-basic/lhb-basic-api/src/main/java/com/kxs/lhb/basic/api/feign/config/LhbUserFeignClientConfiguration.java

@@ -2,7 +2,7 @@ package com.kxs.lhb.basic.api.feign.config;
 
 import cn.hutool.core.text.CharSequenceUtil;
 import com.kxs.common.core.constant.ServiceNameConstants;
-import com.kxs.lhb.basic.api.feign.RemoteLhbUserService;
+import com.kxs.lhb.basic.api.feign.RemoteLhbBasicService;
 import jakarta.servlet.http.HttpServletRequest;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -38,7 +38,7 @@ public class LhbUserFeignClientConfiguration {
 
 	private static final String SERVICE_NAME = ServiceNameConstants.CLIENT_NAME + ServiceNameConstants.LHB_SERVICE;
 
-	@Bean("lhbUserFeignClient")
+	@Bean("lhbBasicFeignClient")
 	public WebClient oauthRequestInterceptor() {
 
 		return WebClient.builder()
@@ -70,9 +70,9 @@ public class LhbUserFeignClientConfiguration {
 	 * @return 远程日志服务
 	 */
 	@Bean
-	RemoteLhbUserService remoteLhbUserService(@Qualifier("lhbUserFeignClient") WebClient client) {
+	RemoteLhbBasicService remoteLhbBasicService(@Qualifier("lhbBasicFeignClient") WebClient client) {
 		HttpServiceProxyFactory factory = HttpServiceProxyFactory.builder(WebClientAdapter.forClient(client)).blockTimeout(ServiceNameConstants.REQ_TIMEOUT).build();
-		return factory.createClient(RemoteLhbUserService.class);
+		return factory.createClient(RemoteLhbBasicService.class);
 	}
 
 

+ 7 - 12
lhb-basic/lhb-basic-biz/src/main/java/com/kxs/lhb/basic/biz/controller/admin/SysGoodsController.java

@@ -1,24 +1,19 @@
 package com.kxs.lhb.basic.biz.controller.admin;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.kxs.common.core.util.R;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.kxs.common.security.annotation.Inner;
+import com.kxs.common.core.util.R;
 import com.kxs.common.log.annotation.SysLog;
-import org.springdoc.core.annotations.ParameterObject;
-import io.swagger.v3.oas.annotations.security.SecurityRequirement;
-import io.swagger.v3.oas.annotations.tags.Tag;
+import com.kxs.common.security.annotation.Inner;
 import com.kxs.lhb.basic.api.model.LhbGoods;
-import org.apache.ibatis.annotations.Param;
 import com.kxs.lhb.basic.biz.service.LhbGoodsService;
-
-import org.springframework.web.bind.annotation.*;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import org.springdoc.core.annotations.ParameterObject;
 import org.springframework.http.HttpHeaders;
 import org.springframework.security.access.prepost.PreAuthorize;
-
-import java.util.List;
-import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * 套餐管理(SysGoods)控制层

+ 57 - 0
lhb-quartz/src/main/java/com/kxs/daemon/quartz/task/BasicTask.java

@@ -0,0 +1,57 @@
+
+package com.kxs.daemon.quartz.task;
+
+import com.kxs.common.core.constant.SecurityConstants;
+import com.kxs.daemon.quartz.constants.SkyQuartzEnum;
+import com.kxs.lhb.basic.api.feign.RemoteLhbBasicService;
+import lombok.RequiredArgsConstructor;
+import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+
+/**
+ * 定时任务
+ *
+ * @author 没秃顶的码农
+ * @date 2024-10-20
+ */
+@Slf4j
+@Component("basicTask")
+@RequiredArgsConstructor
+public class BasicTask {
+
+	private final RemoteLhbBasicService remoteLhbUserService;
+
+	/**
+	 * 更新商品信息
+	 */
+	@SneakyThrows
+	public String goodsInfoTask() {
+
+		remoteLhbUserService.goodsInfoTask(SecurityConstants.FROM_IN);
+		return SkyQuartzEnum.JOB_LOG_STATUS_SUCCESS.getType();
+	}
+
+	/**
+	 * 更新订单状态
+	 */
+	@SneakyThrows
+	public String orderStatusTask() {
+
+		remoteLhbUserService.orderStatusTask(SecurityConstants.FROM_IN);
+		return SkyQuartzEnum.JOB_LOG_STATUS_SUCCESS.getType();
+	}
+
+	/**
+	 * 查询订单是否首冲
+	 */
+	@SneakyThrows
+	public String orderFirstChargeTask() {
+
+		remoteLhbUserService.orderFirstCharge(SecurityConstants.FROM_IN);
+		return SkyQuartzEnum.JOB_LOG_STATUS_SUCCESS.getType();
+	}
+
+
+}