Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify

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

@@ -212,9 +212,6 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
 
         //生成订单明细
         RentVehiclePriceVO rvp = new RentVehiclePriceVO(){{
-            setOrderAmount(orderAmount);
-            setGoodsAmount(goodsAmount);
-            setRealAmount(orderAmount);
             setDeposit(vehicleModel.getDeposit());
             setDriverPrice(DRIVER_PRICE);
             setDamageSafePrice(DAMAGE_SAFE);
@@ -223,6 +220,9 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
             setVehicleNum(1);
             setDriverNum(1);
         }};
+        rvp.setOrderAmount(orderAmount);
+        rvp.setGoodsAmount(goodsAmount);
+        rvp.setRealAmount(orderAmount);
         rvp.setDriverAmount(driverAmount);
         rvp.setVehicleAmount(vehicleAmount);
         rvp.setDamageSafeAmount(damageSafeAmount);

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/biz/DictionaryBiz.java

@@ -2,6 +2,7 @@ package com.xxfc.platform.universal.biz;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;
+import com.ace.cache.annotation.Cache;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.google.common.collect.Lists;
@@ -98,6 +99,7 @@ public class DictionaryBiz extends BaseBiz<DictionaryMapper, Dictionary> {
         return dictionaryList;
     }
 
+    //@Cache()
     public Map<String, Dictionary> getAll4Map(){
 //        List<Dictionary> dictionaries = this.getParentCommon(null);
         List<Dictionary> dictionaries = selectListAll();