Merge branch 'zx_1026_1111' of http://git.dayaedu.com/yonge/mec into test

mec-application/src/main/java/com/ym/mec/web/controller/open/OpenDouble11StaticsController.java

@@ -236,10 +236,15 @@ public class OpenDouble11StaticsController extends BaseController {
                 Collection<String> values = musical.values().stream().map(String::valueOf).collect(Collectors.toList());
                 query.setGoodId(String.join(",", values));
             }
-            query.setStartPayTime(Optional.ofNullable(configParam.getStartPayTime()).orElse(new SimpleDateFormat(
-                    "yyyy-MM-dd HH:mm:ss").parse("2023-11-11 00:00:00", new ParsePosition(0))));
-            query.setEndPayTime(Optional.ofNullable(configParam.getEndPayTime()).orElse(new SimpleDateFormat(
-                    "yyyy-MM-dd HH:mm:ss").parse("2023-11-11 23:59:59", new ParsePosition(0))));
+            SysConfig startTime = sysConfigService.findByParamName("2023_activity_start_time");
+            query.setStartPayTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(
+                    Optional.ofNullable(startTime.getParanValue()).orElse("2023-11-11 00:00:00"),
+                    new ParsePosition(0)));
+
+            SysConfig endTime = sysConfigService.findByParamName("2023_activity_end_time");
+            query.setEndPayTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(
+                    Optional.ofNullable(endTime.getParanValue()).orElse("2023-11-11 23:59:59"),
+                    new ParsePosition(0)));
         } else if (saleStaticsType == 6) {
             // 保价卡销售
             query.setGroupType(GroupType.SPORADIC);

mec-biz/src/main/java/com/ym/mec/biz/dal/wrapper/Double11StaticWrapper.java

@@ -10,6 +10,7 @@ import lombok.Data;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Pattern;
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.Date;
 import java.util.Map;
 import java.util.Optional;
@@ -194,7 +195,8 @@ public class Double11StaticWrapper {
         public BigDecimal getSaleAmount() {
             BigDecimal a = Optional.ofNullable(actualAmount).orElse(new BigDecimal(0));
             BigDecimal b = Optional.ofNullable(balancePaymentAmount).orElse(new BigDecimal(0));
-            return (a.add(b));
+            BigDecimal saleAmount = a.add(b);
+            return saleAmount.setScale(2, RoundingMode.HALF_UP);
         }
     }
 
@@ -209,7 +211,7 @@ public class Double11StaticWrapper {
         // 保价卡
         private String sporadic;
 
-        private Map<String,Long> musical;
+        private Map<String, Long> musical;
 
         private Integer tenantId;