添加finlish代码

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

@@ -288,13 +288,8 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper,BaseOrder> {
                 tourFeign.stock(otd.getSpePriceId(), otd.getTotalNumber(), TourFeign.STOCK_PLUS);
             }
 
-            OrderMQDTO orderMQDTO = BeanUtil.toBean(baseOrder, OrderMQDTO.class);
-            orderMQDTO.setOrderMemberDetail(omd);
-            orderMQDTO.setOrderRentVehicleDetail(orvd);
-            orderMQDTO.setOrderTourDetail(otd);
-
             //发送队列消息
-            sendQueue(orderMQDTO, OrderMQDTO.ORDER_CANCEL);
+            sendOrderMq(orvd, otd, omd, baseOrder, OrderMQDTO.ORDER_CANCEL);
         }else {
             throw new BaseException(ResultCode.FAILED_CODE);
         }
@@ -502,17 +497,24 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper,BaseOrder> {
 
                 //处理后台用户提醒短信的发送
                 orderMsgBiz.handelBgUserMsg4Pay(orvd, baseOrder, appUserDTO, OrderMsgBiz.RENT_PAY);
+                sendOrderMq(orvd, otd, omd, baseOrder, OrderMQDTO.ORDER_PAY);
+                if(OrderTypeEnum.MEMBER.getCode().equals(baseOrder.getType())) {
+                    sendOrderMq(orvd, otd, omd, baseOrder, OrderMQDTO.ORDER_FINISH);
+                }
 
+            }
+        } else {
+            log.error(" order has payed , orderNo:{}, tradeNo:{} ", orderNo, tradeNo);
+        }
+    }
+
+    public void sendOrderMq(OrderRentVehicleDetail orvd, OrderTourDetail otd, OrderMemberDetail omd, BaseOrder baseOrder, Integer sign) {
         //发送队列消息
         OrderMQDTO orderMQDTO = BeanUtil.toBean(baseOrder, OrderMQDTO.class);
         orderMQDTO.setOrderRentVehicleDetail(orvd);
         orderMQDTO.setOrderTourDetail(otd);
         orderMQDTO.setOrderMemberDetail(omd);
-                sendQueue(orderMQDTO, OrderMQDTO.ORDER_PAY);
-            }
-        } else {
-            log.error(" order has payed , orderNo:{}, tradeNo:{} ", orderNo, tradeNo);
-        }
+        sendQueue(orderMQDTO, sign);
     }
 
     /**

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

 package com.xxfc.platform.order.biz;
 
+import com.github.wxiaoqi.security.common.exception.BaseException;
+import com.github.wxiaoqi.security.common.util.process.ResultCode;
+import com.xxfc.platform.order.entity.BaseOrder;
 import org.springframework.stereotype.Service;
 
 import com.xxfc.platform.order.entity.OrderTourDetail;
@@ -21,7 +24,16 @@ public class OrderTourDetailBiz extends BaseBiz<OrderTourDetailMapper,OrderTourD
     private static Map<Integer, List<Integer>> ChargeOffAble;
 
 
-    public void ChargeOff() {
-
+    /**
+     * 更新（不成功抛异常）
+     * @param orderTourDetail
+     * @return
+     */
+    public OrderTourDetail updateSelectiveByIdReT(OrderTourDetail orderTourDetail) {
+        if(updateSelectiveByIdRe(orderTourDetail) > 0) {
+            return selectById(orderTourDetail.getId());
+        }else {
+            throw new BaseException(ResultCode.DB_OPERATION_FAIL_CODE);
+        }
     }
 }
\ No newline at end of file

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

@@ -9,6 +9,7 @@ import com.xxfc.platform.order.contant.enumerate.OrderStatusEnum;
 import com.xxfc.platform.order.entity.BaseOrder;
 import com.xxfc.platform.order.entity.OrderTourDetail;
 import com.xxfc.platform.order.mapper.OrderTourVerificationMapper;
+import com.xxfc.platform.order.pojo.mq.OrderMQDTO;
 import com.xxfc.platform.order.pojo.order.OrderTourVerificationVO;
 import com.xxfc.platform.tour.feign.TourFeign;
 import com.xxfc.platform.tour.vo.TourGoodOrderFindVo;
@@ -102,12 +103,13 @@ public class OrderTourVerificationBiz{
         baseOrder.setId(orderId);
         baseOrder.setStatus(OrderStatusEnum.ORDER_FINISH.getCode());
         baseOrder.setVersion(version);
-        baseOrderBiz.updateSelectiveById(baseOrder);
+        baseOrder = baseOrderBiz.updateSelectiveByIdReT(baseOrder);
         tourDetail.setVerificationUser(userDTO.getId());
         tourDetail.setVerificationName(userDTO.getName());
         tourDetail.setVerificationTime(System.currentTimeMillis());
-        tourDetailBiz.updateSelectiveById(tourDetail);
+        tourDetail = tourDetailBiz.updateSelectiveByIdReT(tourDetail);
         tourFeign.updateTourGoodPersonNum(verificationId,"verification_person",total_number);
+        baseOrderBiz.sendOrderMq(null,tourDetail,null, baseOrder, OrderMQDTO.ORDER_FINISH);
         return  ObjectRestResponse.succ();
     }
 

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

@@ -9,6 +9,7 @@ import com.xxfc.platform.order.entity.OrderRentVehicleDetail;
 import com.xxfc.platform.order.entity.OrderUserLicense;
 import com.xxfc.platform.order.entity.OrderVehicleCrosstown;
 import com.xxfc.platform.order.mapper.OrderVehicaleCrosstownMapper;
+import com.xxfc.platform.order.pojo.mq.OrderMQDTO;
 import com.xxfc.platform.order.pojo.order.OrderVehicleCrosstownDto;
 import com.xxfc.platform.vehicle.common.RestResponse;
 import com.xxfc.platform.vehicle.entity.Vehicle;
@@ -60,14 +61,7 @@ public class OrderVehicalCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
         if (oldValue .size() == 1) {
             //已有直接返回
             //交车完成 设置订单状态为出行中
-            if(baseOrder.getStatus() == 4) {//
-                //判断交车时间是否是今天
-                   baseOrder.setStatus(5);
-                   baseOrderBiz.updateSelectiveById(baseOrder);
-            } else if(baseOrder.getStatus() == 5) {
-                baseOrder.setStatus(6);
-                baseOrderBiz.updateSelectiveById(baseOrder);
-            }
+            handleOrderStatus(baseOrder, orderRentVehicleDetail);
             OrderVehicleCrosstownDto vehicleCrosstownDto = new OrderVehicleCrosstownDto();
             BeanUtil.copyProperties(oldValue.get(0), vehicleCrosstownDto, CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true));
             List<OrderUserLicense> orderUserLicenses = orderUserLicenseBiz.selectByIds(oldValue.get(0).getUserLicenseId()).getData();
@@ -85,15 +79,7 @@ public class OrderVehicalCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
         } else if(oldValue .size() <= 0) {
             getOrderLicense(orderVehicleCrosstownDto);
             orderVehicalCrosstownBiz.insertSelective(orderVehicleCrosstownDto);
-            //交车完成 设置订单状态为出行中
-            if(baseOrder.getStatus() == 4) {
-                //判断是否是今日交车
-                    baseOrder.setStatus(5);
-                    baseOrderBiz.updateSelectiveById(baseOrder);
-            } else if(baseOrder.getStatus() == 5) {
-                baseOrder.setStatus(6);
-                baseOrderBiz.updateSelectiveById(baseOrder);
-            }
+            handleOrderStatus(baseOrder, orderRentVehicleDetail);
             RestResponse<Vehicle> restResponse = vehicleFeign.findById(orderRentVehicleDetail.getVehicleId());
             if(restResponse.getData() != null) {
                 orderVehicleCrosstownDto.setVehicleNumberPlat(restResponse.getData().getNumberPlate());
@@ -103,6 +89,19 @@ public class OrderVehicalCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
         return ObjectRestResponse.createDefaultFail();
     }
 
+    private void handleOrderStatus(BaseOrder baseOrder, OrderRentVehicleDetail orderRentVehicleDetail) {
+        //交车完成 设置订单状态为出行中
+        if (baseOrder.getStatus() == 4) {
+            //判断是否是今日交车
+            baseOrder.setStatus(5);
+            baseOrderBiz.updateSelectiveById(baseOrder);
+        } else if (baseOrder.getStatus() == 5) {
+            baseOrder.setStatus(6);
+            baseOrderBiz.updateSelectiveById(baseOrder);
+            baseOrderBiz.sendOrderMq(orderRentVehicleDetail, null, null, baseOrder, OrderMQDTO.ORDER_FINISH);
+        }
+    }
+
     public void getOrderLicense(OrderVehicleCrosstownDto orderVehicleCrosstownDto) {
         OrderUserLicense orderUserLicense = new OrderUserLicense();
         orderUserLicense.setLicenseIdCard(orderVehicleCrosstownDto.getLicenseIdCard());