修改

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

@@ -494,7 +494,7 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper,BaseOrder> {
                 AppUserDTO appUserDTO = userFeign.userDetailById(baseOrder.getUserId()).getData();
 
                 //处理App用户提醒短信的发送
-                //orderMsgBiz.handelAppUserMsg(orvd, omd, baseOrder, appUserDTO);
+                orderMsgBiz.handelAppUserMsg(orvd, omd, baseOrder, appUserDTO);
 
                 //处理后台用户提醒短信的发送
                 orderMsgBiz.handelBgUserMsg4Pay(orvd, baseOrder, appUserDTO, OrderMsgBiz.RENT_PAY);

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

 package com.xxfc.platform.order.biz;
 
+import cn.hutool.json.JSONUtil;
+import com.xxfc.platform.order.contant.enumerate.*;
+import com.xxfc.platform.order.entity.BaseOrder;
+import com.xxfc.platform.order.entity.OrderRentVehicleDetail;
+import com.xxfc.platform.order.entity.OrderVehicleCrosstown;
+import com.xxfc.platform.order.pojo.DedDetailDTO;
+import com.xxfc.platform.universal.constant.DictionaryKey;
+import com.xxfc.platform.universal.entity.Dictionary;
+import com.xxfc.platform.universal.feign.ThirdFeign;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.xxfc.platform.order.entity.OrderRefund;
 import com.xxfc.platform.order.mapper.OrderRefundMapper;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import tk.mybatis.mapper.entity.Example;
+import tk.mybatis.mapper.weekend.WeekendSqls;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+import static com.xxfc.platform.universal.constant.DictionaryKey.APP_ORDER;
 
 /**
  * 订单退款记录表
@@ -15,4 +33,51 @@ import com.github.wxiaoqi.security.common.biz.BaseBiz;
  */
 @Service
 public class OrderRefundBiz extends BaseBiz<OrderRefundMapper,OrderRefund> {
+    @Autowired
+    ThirdFeign thirdFeign;
+
+    @Autowired
+    BaseOrderBiz baseOrderBiz;
+
+    @Autowired
+    OrderRentVehicleBiz orderRentVehicleBiz;
+
+    @Autowired
+    OrderVehicalCrosstownBiz crosstownBiz;
+
+    public void refundDeposit(){
+        Map<String, Dictionary> dictionaryMap = thirdFeign.dictionaryGetAll4Map().getData();
+        BigDecimal illegalReserve = new BigDecimal(dictionaryMap.get(APP_ORDER+ "_"+ DictionaryKey.ILLEGAL_RESERVE).getDetail());
+
+        List<BaseOrder> lists = baseOrderBiz.selectByExample(new Example.Builder(BaseOrder.class)
+                //订单已完成的租车订单
+                .where(WeekendSqls.<BaseOrder>custom().andEqualTo(BaseOrder::getType, OrderTypeEnum.RENT_VEHICLE)
+                        .andEqualTo(BaseOrder::getStatus, OrderStatusEnum.ORDER_FINISH)
+//                        .andLike(BaseOrder::getId, "%"+ String.valueOf(i))
+                ).build());
+
+        //处理自动退押金
+        for(BaseOrder baseOrder : lists) {
+            OrderRentVehicleDetail orvd = orderRentVehicleBiz.selectOne(new OrderRentVehicleDetail() {{
+                setOrderId(baseOrder.getId());
+            }});
+            //未退还， 进行保留违章预备金 的退还
+            if(RefundStatusEnum.NONE.getCode().equals(baseOrder.getRefundStatus())) {
+                OrderVehicleCrosstown crosstown = crosstownBiz.selectOne(new OrderVehicleCrosstown(){{
+                    setOrderId(baseOrder.getId());
+                    setType(CrosstownTypeEnum.TOUR.getCode());
+                }});
+                BigDecimal refundAmont = crosstown.getRestDeposit().subtract(illegalReserve);
+                List<DedDetailDTO> dddList = JSONUtil.toBean(crosstown.getDedDetail(), List.class);
+                String refundDesc = "退还押金："+ refundAmont.toString()+ "(已扣除 违章预备金："+ illegalReserve.toString();
+                for(DedDetailDTO ddd : dddList) {
+                    refundDesc += ", "+ ddd.getDeductions()+ ":"+ ddd.getCost();
+                }
+                refundDesc += ")";
+                //退款子流程: 订单基础，退款描述，退款金额
+                baseOrderBiz.refundSubProcess(baseOrder, refundDesc, refundAmont, RefundTypeEnum.RentVehicle.getCode(), RefundStatusEnum.RESIDUE_ILLEGAL.getCode());
+                //设置剩余
+            }
+        }
+    }
 }
\ No newline at end of file

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/config/RabbitUserConfig.java → xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/config/RabbitDelayConfig.java

@@ -18,7 +18,7 @@ import java.util.Map;
  * @date 2019/1/7
  */
 @Configuration
-public class RabbitUserConfig {
+public class RabbitDelayConfig {
 
     public static final String ORDER_CANCEL_EXC = "order_cancel_delay_exchange";
     public static final String ORDER_CANCEL_QUE = "order_cancel_delay_queue";

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/config/RabbitOrderConfig.java

+package com.xxfc.platform.order.config;
+
+import com.github.wxiaoqi.security.common.config.RabbitCommonConfig;
+import com.github.wxiaoqi.security.common.config.rabbit.BindDTO;
+import org.springframework.context.annotation.Configuration;
+
+import java.util.ArrayList;
+
+import static com.github.wxiaoqi.security.common.config.rabbit.RabbitConstant.*;
+
+
+/**
+ * rabbitmq配置类
+ * 包含： 不知道什么orderWater队列
+ * @author zhoujw
+ * @date 2019/7/15
+ */
+@Configuration
+public class RabbitOrderConfig extends RabbitCommonConfig {
+
+    //优惠券
+    public static final String ORDER_DEPOSIT_REFUND_QUEUE = "order.deposit.refund.queue";
+
+    static {
+        myQueue = new ArrayList<BindDTO>(){{
+            add(new BindDTO(ORDER_DEPOSIT_REFUND_QUEUE, ORDER_TOPIC, KEY_ORDER_FINLISH));
+        }};
+    }
+
+}
+

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/mqhandler/RabbitConsumer.java

@@ -13,9 +13,8 @@ import org.springframework.stereotype.Component;
 
 import java.io.IOException;
 import java.time.LocalDateTime;
-import java.util.List;
 
-import static com.xxfc.platform.order.config.RabbitUserConfig.ORDER_CANCEL_QUE;
+import static com.xxfc.platform.order.config.RabbitDelayConfig.ORDER_CANCEL_QUE;
 
 /**
  * activeMq消费者类

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/mqhandler/RabbitProduct.java

@@ -7,10 +7,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.time.LocalDateTime;
-import java.util.List;
 
-import static com.xxfc.platform.order.config.RabbitUserConfig.ORDER_CANCEL_EXC;
-import static com.xxfc.platform.order.config.RabbitUserConfig.ORDER_CANCEL_KEY;
+import static com.xxfc.platform.order.config.RabbitDelayConfig.ORDER_CANCEL_EXC;
+import static com.xxfc.platform.order.config.RabbitDelayConfig.ORDER_CANCEL_KEY;
 
 /**
  * rabbitMq生产者类