Ver código fonte

优化公摊问题

java110 5 anos atrás
pai
commit
6543cd4266

+ 2 - 1
service-fee/src/main/java/com/java110/fee/bmo/importFee/impl/FeeSharingBMOImpl.java

@@ -96,7 +96,7 @@ public class FeeSharingBMOImpl implements IFeeSharingBMO {
         if (reqJson.containsKey("roomType")) {
             roomDto.setRoomType(reqJson.getString("roomType"));
         }
-        if(reqJson.containsKey("feeLayer") && !"全部".equals(reqJson.getString("feeLayer"))){
+        if (reqJson.containsKey("feeLayer") && !"全部".equals(reqJson.getString("feeLayer"))) {
             String[] layers = reqJson.getString("feeLayer").split("#");
             roomDto.setLayers(layers);
         }
@@ -279,6 +279,7 @@ public class FeeSharingBMOImpl implements IFeeSharingBMO {
             BigDecimal priceObj = new BigDecimal(price);
             priceObj = valueObj.multiply(priceObj).setScale(2, BigDecimal.ROUND_HALF_EVEN);
             amount = priceObj.doubleValue();
+            value = valueObj.setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue() + "";
         } catch (Exception e) {
             throw new IllegalArgumentException("公式计算异常,公式为【" + orgFormulaValue + "】,计算 【" + formulaValue + "】异常");
         }

+ 11 - 11
service-user/src/main/java/com/java110/user/UserServiceApplicationStart.java

@@ -43,6 +43,17 @@ public class UserServiceApplicationStart {
 
     private static final String LISTENER_PATH = "java110.UserService.listeners";
 
+    public static void main(String[] args) throws Exception {
+        try {
+            ApplicationContext context = SpringApplication.run(UserServiceApplicationStart.class, args);
+            ServiceStartInit.initSystemConfig(context);
+            //加载业务侦听
+            // SystemStartLoadBusinessConfigure.initSystemConfig(LISTENER_PATH);
+        } catch (Throwable e) {
+            logger.error("系统启动失败", e);
+        }
+    }
+
     /**
      * 实例化RestTemplate,通过@LoadBalanced注解开启均衡负载能力.
      *
@@ -55,15 +66,4 @@ public class UserServiceApplicationStart {
         RestTemplate restTemplate = new RestTemplateBuilder().additionalMessageConverters(m).build(RestTemplate.class);
         return restTemplate;
     }
-
-    public static void main(String[] args) throws Exception {
-        try {
-            ApplicationContext context = SpringApplication.run(UserServiceApplicationStart.class, args);
-            ServiceStartInit.initSystemConfig(context);
-            //加载业务侦听
-            // SystemStartLoadBusinessConfigure.initSystemConfig(LISTENER_PATH);
-        } catch (Throwable e) {
-            logger.error("系统启动失败", e);
-        }
-    }
 }