Merge branch 'dev-chw' of http://113.105.137.151:22280/youjj/cloud-platform into dev-chw

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

@@ -732,7 +732,7 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
         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);
+        baseOrderBiz.sendOrderMq(orvd, null, null, baseOrder, OrderMQDTO.ORDER_TRAFFIC_DEPOSIT);
     }
 
     /**

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/ShuntApplyController.java

@@ -310,7 +310,7 @@ public class ShuntApplyController extends BaseController<ShuntApplyBiz, ShuntApp
         }
 
         ShuntApply shuntApply = baseBiz.selectById(dto.getApplyId());
-        if(null == shuntApply && shuntApply.getStatus() != STATUS_CRT) {
+        if(null == shuntApply || shuntApply.getStatus() != STATUS_CRT) {
             throw new BaseException(ResultCode.PARAM_ILLEGAL_CODE);
         }