提交 ed747c4a authored 作者: huyufan's avatar huyufan

修改mq队列名称

上级 b71f98b9
...@@ -6,6 +6,7 @@ import lombok.Getter; ...@@ -6,6 +6,7 @@ import lombok.Getter;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import lombok.Setter; import lombok.Setter;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
@Getter @Getter
...@@ -13,9 +14,9 @@ import javax.validation.constraints.NotNull; ...@@ -13,9 +14,9 @@ import javax.validation.constraints.NotNull;
@NoArgsConstructor @NoArgsConstructor
public class OrderGoodsListPageParam extends PageParam { public class OrderGoodsListPageParam extends PageParam {
// @ApiModelProperty(value = "货单类型", example = "1:全部 2:专属") @ApiModelProperty(value = "货单类型", example = "1:全部 2:专属")
// @NotBlank(message = "类型") @NotBlank(message = "类型")
// private String orderGoodsType; private String orderGoodsType;
@ApiModelProperty(value = "车牌号", example = "1") @ApiModelProperty(value = "车牌号", example = "1")
// @NotNull(message = "车牌号") // @NotNull(message = "车牌号")
......
...@@ -2,23 +2,23 @@ package com.clx.performance.constant; ...@@ -2,23 +2,23 @@ package com.clx.performance.constant;
public class RabbitKeyConstants { public class RabbitKeyConstants {
public static final String ORDER_POSTED_QUEUE = "order.posted.queue"; public static final String ORDER_POSTED_QUEUE = "clx-order.order.posted.queue";
public static final String ORDER_POSTED_EXCHANGE = "order.posted.exchange"; public static final String ORDER_POSTED_EXCHANGE = "clx-order.order.posted.exchange";
public static final String ORDER_POSTED_ROUTE_KEY ="order.posted.route.key"; public static final String ORDER_POSTED_ROUTE_KEY ="clx-order.order.posted.route.key";
public static final String ORDER_ON_ROUTE_KEY ="order.on.route.key"; public static final String ORDER_ON_ROUTE_KEY ="clx-order.order.on.route.key";
public static final String ORDER_ON_QUEUE ="order.on.queue"; public static final String ORDER_ON_QUEUE ="clx-order.order.on.queue";
public static final String ORDER_ON_EXCHANGE ="order.on.exchange"; public static final String ORDER_ON_EXCHANGE ="clx-order.order.on.exchange";
public static final String ORDER_ON_DEAD_EXCHANGE ="order.on.dead.exchange"; public static final String ORDER_ON_DEAD_EXCHANGE ="clx-order.order.on.dead.exchange";
public static final String ORDER_ON_DEAD_QUEUE ="order.on.dead.queue"; public static final String ORDER_ON_DEAD_QUEUE ="clx-order.order.on.dead.queue";
public static final String ORDER_GOODS_SYNC_TRUCK_DRIVER_INFO_QUEUE = "order.goods.sync.truck.driver.info.queue"; public static final String ORDER_GOODS_SYNC_TRUCK_DRIVER_INFO_QUEUE = "clx-order.order.goods.sync.truck.driver.info.queue";
} }
...@@ -45,11 +45,11 @@ public class AppGoodsOrderController { ...@@ -45,11 +45,11 @@ public class AppGoodsOrderController {
return Result.ok(orderGoodsService.getOrderGoodsInfoByOrderGoodsNoForAPP(orderGoodsNo)); return Result.ok(orderGoodsService.getOrderGoodsInfoByOrderGoodsNoForAPP(orderGoodsNo));
} }
@ApiOperation(value = "公开货单", notes = "<br>By:胡宇帆") @ApiOperation(value = "货单列表", notes = "<br>By:胡宇帆")
@PostMapping("/openOrderGoodsList") @PostMapping("/orderGoodsList")
@UnitCovert(param = false) @UnitCovert(param = false)
public Result<PageData<OrderGoodsAPPVO>> openOrderGoodsList(@RequestBody OrderGoodsListPageParam orderGoodsListPageParam) { public Result<PageData<OrderGoodsAPPVO>> orderGoodsList(@RequestBody OrderGoodsListPageParam orderGoodsListPageParam) {
IPage<OrderGoodsAPPVO> page = orderGoodsService.openOrderPageGoodsList(orderGoodsListPageParam); IPage<OrderGoodsAPPVO> page = orderGoodsService.orderGoodsList(orderGoodsListPageParam);
return Result.page(page.getRecords(), page.getTotal(), page.getPages()); return Result.page(page.getRecords(), page.getTotal(), page.getPages());
......
...@@ -23,5 +23,5 @@ public interface OrderGoodsService { ...@@ -23,5 +23,5 @@ public interface OrderGoodsService {
void updateOrderGoodsReduceWeightAndStatus(Integer id, BigDecimal orderChildWeight); void updateOrderGoodsReduceWeightAndStatus(Integer id, BigDecimal orderChildWeight);
IPage<OrderGoodsAPPVO> openOrderPageGoodsList(OrderGoodsListPageParam orderGoodsListParam); IPage<OrderGoodsAPPVO> orderGoodsList(OrderGoodsListPageParam orderGoodsListParam);
} }
...@@ -5,11 +5,13 @@ import com.clx.order.feign.OrderFeign; ...@@ -5,11 +5,13 @@ import com.clx.order.feign.OrderFeign;
import com.clx.order.params.PageOrderGoodsListParam; import com.clx.order.params.PageOrderGoodsListParam;
import com.clx.order.vo.feign.FeignOrderVO; import com.clx.order.vo.feign.FeignOrderVO;
import com.clx.performance.dao.OrderGoodsDao; import com.clx.performance.dao.OrderGoodsDao;
import com.clx.performance.dao.OrderGoodsTruckBindDao;
import com.clx.performance.param.app.OrderGoodsListPageParam; import com.clx.performance.param.app.OrderGoodsListPageParam;
import com.clx.performance.service.OrderGoodsService; import com.clx.performance.service.OrderGoodsService;
import com.clx.performance.struct.OrderGoodsStruct; import com.clx.performance.struct.OrderGoodsStruct;
import com.clx.performance.vo.app.OrderGoodsAPPVO; import com.clx.performance.vo.app.OrderGoodsAPPVO;
import com.clx.performance.vo.pc.OrderGoodsVO; import com.clx.performance.vo.pc.OrderGoodsVO;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
...@@ -32,6 +34,9 @@ public class OrderGoodsServiceImpl implements OrderGoodsService { ...@@ -32,6 +34,9 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
@Autowired @Autowired
private OrderFeign orderFeign; private OrderFeign orderFeign;
@Autowired
private OrderGoodsTruckBindDao orderGoodsTruckBindDao;
@Override @Override
public OrderGoodsVO getOrderGoodsInfoByOrderGoodsNoForPC(String orderGoodsNo) { public OrderGoodsVO getOrderGoodsInfoByOrderGoodsNoForPC(String orderGoodsNo) {
OrderGoodsVO orderGoodsVO = orderGoodsDao.getOrderGoodsInfoByOrderGoodsNoForPC(orderGoodsNo).map(orderGoodsStruct::convert).get(); OrderGoodsVO orderGoodsVO = orderGoodsDao.getOrderGoodsInfoByOrderGoodsNoForPC(orderGoodsNo).map(orderGoodsStruct::convert).get();
...@@ -63,8 +68,12 @@ public class OrderGoodsServiceImpl implements OrderGoodsService { ...@@ -63,8 +68,12 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
} }
@Override @Override
public IPage<OrderGoodsAPPVO> openOrderPageGoodsList(OrderGoodsListPageParam orderGoodsListParam) { public IPage<OrderGoodsAPPVO> orderGoodsList(OrderGoodsListPageParam orderGoodsListParam) {
if (StringUtils.equals(orderGoodsListParam.getOrderGoodsType(),"1")){
return orderGoodsDao.openOrderPageGoodsList(orderGoodsListParam); return orderGoodsDao.openOrderPageGoodsList(orderGoodsListParam);
}else {
return null;
}
} }
} }
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论