|
@@ -5,8 +5,11 @@ import cn.hutool.core.collection.CollUtil;
|
|
|
import com.xy.annotate.RestMappingController;
|
|
|
import com.xy.dto.DeviceInfoDto;
|
|
|
import com.xy.dto.MemberDeviceDTO;
|
|
|
+import com.xy.dto.MemberOrdersDTO;
|
|
|
import com.xy.error.CommRuntimeException;
|
|
|
import com.xy.service.DeviceInfoServiceImpl;
|
|
|
+import com.xy.service.OrdersMemberService;
|
|
|
+import com.xy.utils.AuthorizeUtils;
|
|
|
import com.xy.utils.Emptys;
|
|
|
import com.xy.utils.PageBean;
|
|
|
import com.xy.utils.R;
|
|
@@ -17,6 +20,7 @@ import lombok.AllArgsConstructor;
|
|
|
import org.springframework.web.bind.annotation.PostMapping;
|
|
|
import org.springframework.web.bind.annotation.RequestBody;
|
|
|
|
|
|
+import java.util.ArrayList;
|
|
|
import java.util.List;
|
|
|
|
|
|
/***
|
|
@@ -30,6 +34,7 @@ import java.util.List;
|
|
|
public class MemberDeviceController {
|
|
|
|
|
|
private DeviceInfoServiceImpl deviceInfoService;
|
|
|
+ private OrdersMemberService ordersMemberService;
|
|
|
|
|
|
@PostMapping("nearbyPage")
|
|
|
@ApiOperation("附近设备列表")
|
|
@@ -62,4 +67,16 @@ public class MemberDeviceController {
|
|
|
}
|
|
|
|
|
|
|
|
|
+ @PostMapping("tradeDevices")
|
|
|
+ @ApiOperation("最近交易过的设备")
|
|
|
+ public R<List<DeviceInfoDto.Vo>> tradeDevices(@RequestBody MemberDeviceDTO.TradeDevices dto) {
|
|
|
+ List<DeviceInfoDto.Vo> voList = new ArrayList<>();
|
|
|
+ List<Long> deviceIds = R.feignCheckData(ordersMemberService.memberTradeDevices(new MemberOrdersDTO.MemberTradeDevices().setMemberId(AuthorizeUtils.getLoginId(Long.class))));
|
|
|
+ if (CollUtil.isEmpty(deviceIds)) {
|
|
|
+ return R.ok(voList);
|
|
|
+ }
|
|
|
+ List<DeviceInfoDto.Vo> vos = R.feignCheckData(deviceInfoService.list(new DeviceInfoDto.ListDto().setDeviceIds(deviceIds)));
|
|
|
+ return R.ok(vos);
|
|
|
+ }
|
|
|
+
|
|
|
}
|