修改食堂

pjcloud-app-server/pjcloud-app-server-biz/pom.xml

@@ -13,6 +13,11 @@
     <artifactId>pjcloud-app-server-biz</artifactId>
 
     <dependencies>
+        <dependency>
+            <groupId>com.bsd</groupId>
+            <artifactId>pjcloud-canteen-api</artifactId>
+            <version>5.7.0</version>
+        </dependency>
         <dependency>
             <groupId>com.bsd</groupId>
             <artifactId>pjcloud-upms-api</artifactId>

pjcloud-app-server/pjcloud-app-server-biz/src/main/java/com/bsd/pjcloud/app/controller/AppUserAutoLoginController.java

@@ -24,6 +24,10 @@ import com.bsd.pjcloud.admin.api.entity.SysUser;
 import com.bsd.pjcloud.admin.api.feign.RemoteTokenService;
 import com.bsd.pjcloud.admin.api.feign.RemoteUserService;
 import com.bsd.pjcloud.app.service.AppUserService;
+import com.bsd.pjcloud.canteen.api.feign.RemoteCanteenSpuService;
+import com.bsd.pjcloud.canteen.api.feign.RemoteOnlineCanteenSpuService;
+import com.bsd.pjcloud.canteen.entity.CanteenSpuEntity;
+import com.bsd.pjcloud.canteen.vo.app.CanteenOnlineSpuAppVO;
 import com.bsd.pjcloud.common.core.util.R;
 import com.bsd.pjcloud.common.security.annotation.Inner;
 import com.bsd.pjcloud.thirdparty.api.feign.RemoterThirdPartyAuthService;
@@ -47,6 +51,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -73,6 +78,10 @@ public class AppUserAutoLoginController {
 
 	private final RemoterThirdPartyAuthService remoterThirdPartyAuthService;
 
+	private final RemoteCanteenSpuService remoteCanteenSpuService;
+
+	private final RemoteOnlineCanteenSpuService remoteOnlineCanteenSpuService;
+
 	/*
 	 *
 	 * @param token 浙政钉前端获取的token
@@ -241,20 +250,20 @@ public class AppUserAutoLoginController {
 		stringObjectHashMap.put("refreshToken", refreshToken);
 		return R.ok(stringObjectHashMap);
 	}
+
+
+	@GetMapping(value = { "/test" })
+	@Inner(value = false)
+	public R info() {
+
+		R<List<CanteenOnlineSpuAppVO>> spuListByIds = remoteOnlineCanteenSpuService.getSpuListByIds(Arrays.asList(1876870696924069890L));
 //
-//	/**
-//	 * 获取当前用户全部信息
-//	 * @return 用户信息
-//	 */
-//	@GetMapping(value = { "/info" })
-//	public R info() {
-//		String username = SecurityUtils.getUser().getUsername();
-//		AppUser user = appUserService.getOne(Wrappers.<AppUser>query().lambda().eq(AppUser::getUsername, username));
-//		if (user == null) {
-//			return R.failed(MsgUtils.getMessage(ErrorCodes.SYS_USER_QUERY_ERROR));
-//		}
-//		return R.ok(appUserService.findUserInfo(user));
-//	}
+//	R<List<CanteenSpuEntity>> spuListByIds = remoteCanteenSpuService.getSpuListByIds(Arrays.asList(1876517188510273537L, 1866411313032441857L));
+
+		List<CanteenOnlineSpuAppVO> data = spuListByIds.getData();
+
+		return R.ok(data);
+	}
 //
 //	/**
 //	 * 分页查询