修改短信和部分功能

xx-app/xx-app-api/src/main/java/com/xxfc/platform/app/feign/ConfigFeign.java

@@ -9,13 +9,21 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 
+import java.util.List;
+
 /**
  * Created by ace on 2017/9/15.
  */
 @FeignClient("xx-app")
 public interface ConfigFeign {
+
+    /**
+     * 客服
+     */
+    public static final int TYPE_CUS_SER = 400;
+
     @RequestMapping(value = "/cofig/app/unauth/types",method = RequestMethod.GET)
-    ObjectRestResponse<Cofig> getAllByType(String types);
+    ObjectRestResponse<List<Cofig>> getAllByType(String types);
 
      @GetMapping("/cofig/app/unauth/withdraw_rule")
      WithDrawRuleVo getWithDrawRule();

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

@@ -12,6 +12,11 @@ public class OrderAccompanyDTO {
      */
     private Integer id;
 
+    /**
+     * 物品类型
+     */
+    private Integer type;
+
     /**
      * 物品名称
      */

xx-order/xx-order-server/pom.xml

@@ -26,6 +26,13 @@
             <scope>compile</scope>
         </dependency>
 
+        <dependency>
+            <groupId>com.xxfc.platform</groupId>
+            <artifactId>xx-app-api</artifactId>
+            <version>2.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-amqp</artifactId>

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

@@ -71,7 +71,7 @@ public class RentDepositJobHandler extends IJobHandler {
                             .where(WeekendSqls.<BaseOrder>custom().andEqualTo(BaseOrder::getType, OrderTypeEnum.RENT_VEHICLE)
                                     .andEqualTo(BaseOrder::getStatus, OrderStatusEnum.ORDER_FINISH) //已完成的订单
                                     .andEqualTo(BaseOrder::getRefundStatus, RefundStatusEnum.RESIDUE_ILLEGAL) //已归还了部分押金
-                                    .andLessThanOrEqualTo(BaseOrder::getRefundTime, System.currentTimeMillis() - (rentDepositAutoRefundTime * 60 * 60 * 1000))
+                                    .andLessThanOrEqualTo(BaseOrder::getRefundTime, System.currentTimeMillis() - (rentDepositAutoRefundTime * 60 * 1000))
                                     .andLike(BaseOrder::getId, "%"+ i)).build());
 
                     //处理自动退剩余押金

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/service/OrderRentVehicleService.java

@@ -172,32 +172,20 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
         for(AccompanyingItemVo aiv : accompanyingItemList) {
             if(AccompanyingItemType.TOOL.getCode().equals(aiv.getType())
                 || AccompanyingItemType.EQUIPMENT.getCode().equals(aiv.getType())) {
-                OrderAccompanyDTO orderAccompanyDTO = new OrderAccompanyDTO();
-                orderAccompanyDTO.setId(aiv.getId());
-                orderAccompanyDTO.setName(aiv.getName());
-                orderAccompanyDTO.setUnit(aiv.getUnit());
+                OrderAccompanyDTO orderAccompanyDTO = BeanUtil.toBean(aiv, OrderAccompanyDTO.class);
                 orderAccompanyDTO.setUnitPrice(aiv.getPrice());
                 orderAccompanyDTO.setNum(aiv.getNumber());
                 oads.add(orderAccompanyDTO);
             }else {
                 OrderAccompanyDTO orderAccompanyDTO = orderAccompanyDTOMap.get(aiv.getId().toString());
                 if(null != orderAccompanyDTO) {
-                    orderAccompanyDTO.setName(aiv.getName());
-                    orderAccompanyDTO.setUnit(aiv.getUnit());
+                    BeanUtil.copyProperties(aiv, orderAccompanyDTO);
                     orderAccompanyDTO.setUnitPrice(aiv.getPrice());
                     oads.add(orderAccompanyDTO);
                 }
             }
         }
         bo.setAccompanyItems(oads);
-//        for(OrderAccompanyDTO oad : bo.getAccompanyItems()) {
-//            AccompanyingItemVo aiv = accompanyingItemMap.get(oad.getId().toString());
-//            oad.setName(aiv.getName());
-//            oad.setUnit(aiv.getUnit());
-//            oad.setUnitPrice(aiv.getPrice());
-//            oad.setNum(aiv.getNumber());
-//            oad.setTotalAmount(oad.getUnitPrice().multiply(new BigDecimal(oad.getNum().toString())));
-//        }
 
         //获取可用车辆
         acquireVehicle(bo);

xx-universal/xx-universal-api/src/main/java/com/xxfc/platform/universal/dto/SmsTemplateDTO.java

@@ -59,9 +59,9 @@ public class SmsTemplateDTO {
     public static final int CANCEL_E = 21;
 
     //租车押金退还
-    public static final int FINISH_A = 22;
+    public static final int REFUND_A = 22;
     //违章押金退还
-    public static final int FINISH_B = 23;
+    public static final int REFUND_B = 23;