Browse Source

修改报错

yumeng 1 year ago
parent
commit
bcee33d92d

+ 17 - 4
ruixuan-live/src/main/java/com/ruixuan/jiaoyang/controller/JiaoYangReportController.java

@@ -26,6 +26,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.UnsupportedEncodingException;
+import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.time.LocalDate;
@@ -459,6 +460,7 @@ public class JiaoYangReportController extends BaseController {
         }
         List<JSONObject> list = jiaoYangReportService.promoter(requestMap);
         List<List<Object>> exportList = new ArrayList<>();
+        BigDecimal bigDecimal = new BigDecimal(100);
         if (!Check.isNull(list)) {
             for (int i = 0; i < list.size(); i++) {
                 JSONObject data = list.get(i);
@@ -466,10 +468,21 @@ public class JiaoYangReportController extends BaseController {
                 export.add(data.getString("promoterId"));
                 export.add(data.getString("promoterNickName"));
                 export.add(data.getString("orderNum"));
-                export.add(data.getString("validOrderNUm"));
-                export.add(data.getDouble("validRadio") * 100);
-                export.add(data.getString("payAmount"));
-                export.add(data.getString("validPayAmount"));
+                export.add(data.getString("validOrderNUm");
+                if (!Check.isNull(data.getDouble("validRadio"))) {
+                    export.add(data.getDouble("validRadio") * 100);
+                } else {
+                    export.add(0);
+                }
+                //  export.add(data.getString("payAmount"));
+                if (!Check.isNull(data.getBigDecimal("payAmount"))) {
+                    export.add(data.getBigDecimal("payAmount").divide(bigDecimal, BigDecimal.ROUND_CEILING));
+                }
+                //    export.add(data.getString("validPayAmount"));
+                if (!Check.isNull(data.getBigDecimal("validPayAmount"))) {
+                    export.add(data.getBigDecimal("validPayAmount").divide(bigDecimal, BigDecimal.ROUND_CEILING));
+
+                }
                 export.add(data.getString("deliveryNum"));
                 export.add(data.getString("notDeliveryNum"));
                 if (!Check.isNull(data.getDouble("deliveryRadio"))) {