修复车辆查询问题

ace-common/src/main/java/com/github/wxiaoqi/security/common/config/rabbit/RabbitConstant.java

@@ -33,6 +33,7 @@ public class RabbitConstant {
     public static final String KEY_ORDER_FINLISH = "order.finlish";
     public static final String KEY_ORDER_CANCEL = "order.cancel";
     public static final String KEY_ORDER_PART_DEPOSIT = "order.partDeposit";
+    public static final String KEY_ORDER_TRAFFIC_DEPOSIT = "order.trafficDeposit";
 
     //钱包
     public static final String KEY_WALLET_ADD = "wallet.add";

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/config/RabbitAdminConfig.java

@@ -41,6 +41,7 @@ public class RabbitAdminConfig extends RabbitCommonConfig {
             add(new BindDTO(ORDER_WATER_QUEUE, ORDER_TOPIC, KEY_ORDER_FINLISH));
             add(new BindDTO(ORDER_WATER_QUEUE, ORDER_TOPIC, KEY_ORDER_CANCEL));
             add(new BindDTO(ORDER_WATER_QUEUE, ORDER_TOPIC, KEY_ORDER_PART_DEPOSIT));
+            add(new BindDTO(ORDER_WATER_QUEUE, ORDER_TOPIC, KEY_ORDER_TRAFFIC_DEPOSIT));
             add(new BindDTO(ORDER_FINLISH_USER_RE_QUEUE, ORDER_TOPIC, KEY_ORDER_FINLISH));
             //钱包
             add(new BindDTO(WALLET_ADD_QUEUE, ADMIN_TOPIC, KEY_WALLET_ADD));

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/mq/OrderMQDTO.java

@@ -16,6 +16,8 @@ public class OrderMQDTO extends BaseOrder implements OrderItemInter {
     public static final int ORDER_PAY = 4;
     public static final int ORDER_FINISH = 6;
     public static final int ORDER_PART_DEPOSIT = 101;
+    public static final int ORDER_TRAFFIC_DEPOSIT = 102;
+
 
     OrderRentVehicleDetail orderRentVehicleDetail;
 

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/BaseOrderBiz.java

@@ -81,6 +81,7 @@ import java.util.stream.Collectors;
 import static com.github.wxiaoqi.security.common.config.rabbit.RabbitConstant.*;
 import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_FALSE;
 import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_TRUE;
+import static com.xxfc.platform.order.pojo.mq.OrderMQDTO.*;
 import static com.xxfc.platform.universal.constant.DictionaryKey.APP_ORDER;
 import static com.xxfc.platform.universal.constant.DictionaryKey.ILLEGAL_TYPE;
 
@@ -845,9 +846,9 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
 
 				//处理后台用户提醒短信的发送
 //                orderMsgBiz.handelBgUserMsg4Pay(orvd, baseOrder, appUserDTO, OrderMsgBiz.RENT_PAY);
-				sendOrderMq(orvd, otd, omd, baseOrder, OrderMQDTO.ORDER_PAY);
+				sendOrderMq(orvd, otd, omd, baseOrder, ORDER_PAY);
 				if (OrderTypeEnum.MEMBER.getCode().equals(baseOrder.getType())) {
-					sendOrderMq(orvd, otd, omd, baseOrder, OrderMQDTO.ORDER_FINISH);
+					sendOrderMq(orvd, otd, omd, baseOrder, ORDER_FINISH);
 					//订单完成时，payway为 支付宝，则转支付
 					baseOrder.setPayWay(payWay);
 					orderAccountBiz.finishFreeze2PayAmount(baseOrder);
@@ -956,18 +957,21 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
 			}};
 			sendMsgDTO.setJson(JSONUtil.toJsonStr(orderMQDTO));
 			switch (sign) {
-				case 2:
+				case ORDER_CANCEL:
 					sendMsgDTO.setRoutKey(KEY_ORDER_CANCEL);
 					break;
-				case 4:
+				case ORDER_PAY:
 					sendMsgDTO.setRoutKey(KEY_ORDER_PAY);
 					break;
-				case 6:
+				case ORDER_FINISH:
 					sendMsgDTO.setRoutKey(KEY_ORDER_FINLISH);
 					break;
-				case 101:
+				case ORDER_PART_DEPOSIT:
 					sendMsgDTO.setRoutKey(KEY_ORDER_PART_DEPOSIT);
 					break;
+				case ORDER_TRAFFIC_DEPOSIT:
+					sendMsgDTO.setRoutKey(KEY_ORDER_TRAFFIC_DEPOSIT);
+					break;
 				default:
 					break;
 			}

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderAccountBiz.java

@@ -731,6 +731,8 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
         refundTrigger(baseOrder, orvd, BigDecimal.ZERO, orvd.getReturnPayResidue(), refundAmont, refundDesc, RefundStatusEnum.REFUND_DEPOSIT.getCode(), AccountTypeEnum.OUT_RESIDUE_DEPOSIT, oad);
         orderDepositRefundRecordBiz.completeRecordStatus(crosstown.getId(), DepositRefundStatus.VIOLATIONARRIVAL);
         orderMsgBiz.handelMsgDeposit(orvd, baseOrder, userFeign.userDetailById(baseOrder.getUserId()).getData());
+        //发送押金退还完成队列消息
+        baseOrderBiz.sendOrderMq(orvd, null, null, baseOrder, OrderMQDTO.ORDER_PART_DEPOSIT);
     }
 
     /**

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/jobhandler/RentDepositJobHandler.java

@@ -11,6 +11,7 @@ import com.xxfc.platform.order.entity.OrderVehicleCrosstown;
 import com.xxfc.platform.order.entity.OrderViolation;
 import com.xxfc.platform.order.pojo.account.OrderAccountDeduction;
 import com.xxfc.platform.order.pojo.account.OrderAccountDetail;
+import com.xxfc.platform.order.pojo.mq.OrderMQDTO;
 import com.xxfc.platform.universal.constant.DictionaryKey;
 import com.xxfc.platform.universal.entity.Dictionary;
 import com.xxfc.platform.universal.feign.ThirdFeign;