修改mq队列名称

performance-api/src/main/java/com/clx/performance/param/app/OrderGoodsListPageParam.java

@@ -6,6 +6,7 @@ import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 
 @Getter
@@ -13,9 +14,9 @@ import javax.validation.constraints.NotNull;
 @NoArgsConstructor
 public class OrderGoodsListPageParam extends PageParam {
 
-//    @ApiModelProperty(value = "货单类型", example = "1：全部 2：专属")
-//    @NotBlank(message = "类型")
-//    private String orderGoodsType;
+    @ApiModelProperty(value = "货单类型", example = "1：全部 2：专属")
+    @NotBlank(message = "类型")
+    private String orderGoodsType;
 
     @ApiModelProperty(value = "车牌号", example = "1")
 //    @NotNull(message = "车牌号")

performance-web/src/main/java/com/clx/performance/constant/RabbitKeyConstants.java

@@ -2,23 +2,23 @@ package com.clx.performance.constant;
 
 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";
 }

performance-web/src/main/java/com/clx/performance/controller/app/AppGoodsOrderController.java

@@ -45,11 +45,11 @@ public class AppGoodsOrderController {
         return Result.ok(orderGoodsService.getOrderGoodsInfoByOrderGoodsNoForAPP(orderGoodsNo));
     }
 
-    @ApiOperation(value = "公开货单", notes = "<br>By:胡宇帆")
-    @PostMapping("/openOrderGoodsList")
+    @ApiOperation(value = "货单列表", notes = "<br>By:胡宇帆")
+    @PostMapping("/orderGoodsList")
     @UnitCovert(param = false)
-    public Result<PageData<OrderGoodsAPPVO>> openOrderGoodsList(@RequestBody OrderGoodsListPageParam orderGoodsListPageParam) {
-        IPage<OrderGoodsAPPVO> page = orderGoodsService.openOrderPageGoodsList(orderGoodsListPageParam);
+    public Result<PageData<OrderGoodsAPPVO>> orderGoodsList(@RequestBody OrderGoodsListPageParam orderGoodsListPageParam) {
+        IPage<OrderGoodsAPPVO> page = orderGoodsService.orderGoodsList(orderGoodsListPageParam);
 
         return Result.page(page.getRecords(), page.getTotal(), page.getPages());
 

performance-web/src/main/java/com/clx/performance/service/OrderGoodsService.java

@@ -23,5 +23,5 @@ public interface OrderGoodsService {
 
     void updateOrderGoodsReduceWeightAndStatus(Integer id, BigDecimal orderChildWeight);
 
-    IPage<OrderGoodsAPPVO> openOrderPageGoodsList(OrderGoodsListPageParam orderGoodsListParam);
+    IPage<OrderGoodsAPPVO> orderGoodsList(OrderGoodsListPageParam orderGoodsListParam);
 }

performance-web/src/main/java/com/clx/performance/service/impl/OrderGoodsServiceImpl.java

@@ -5,11 +5,13 @@ import com.clx.order.feign.OrderFeign;
 import com.clx.order.params.PageOrderGoodsListParam;
 import com.clx.order.vo.feign.FeignOrderVO;
 import com.clx.performance.dao.OrderGoodsDao;
+import com.clx.performance.dao.OrderGoodsTruckBindDao;
 import com.clx.performance.param.app.OrderGoodsListPageParam;
 import com.clx.performance.service.OrderGoodsService;
 import com.clx.performance.struct.OrderGoodsStruct;
 import com.clx.performance.vo.app.OrderGoodsAPPVO;
 import com.clx.performance.vo.pc.OrderGoodsVO;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -32,6 +34,9 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
     @Autowired
     private OrderFeign orderFeign;
 
+    @Autowired
+    private OrderGoodsTruckBindDao orderGoodsTruckBindDao;
+
     @Override
     public OrderGoodsVO getOrderGoodsInfoByOrderGoodsNoForPC(String orderGoodsNo) {
         OrderGoodsVO orderGoodsVO = orderGoodsDao.getOrderGoodsInfoByOrderGoodsNoForPC(orderGoodsNo).map(orderGoodsStruct::convert).get();
@@ -63,8 +68,12 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
     }
 
     @Override
-    public IPage<OrderGoodsAPPVO> openOrderPageGoodsList(OrderGoodsListPageParam orderGoodsListParam) {
-        return orderGoodsDao.openOrderPageGoodsList(orderGoodsListParam);
+    public IPage<OrderGoodsAPPVO> orderGoodsList(OrderGoodsListPageParam orderGoodsListParam) {
+        if (StringUtils.equals(orderGoodsListParam.getOrderGoodsType(),"1")){
+            return orderGoodsDao.openOrderPageGoodsList(orderGoodsListParam);
+        }else {
+            return null;
+        }
     }
 
 }