123

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/BaseUserMemberExportBiz.java

@@ -121,9 +121,9 @@ public class BaseUserMemberExportBiz extends BaseBiz<BaseUserMemberExportMapper,
             List<String[]> subResultDate = userMemberData.subList(startIndex,endIndex);
             threadPoolTaskExecutor.execute(()->{
                 wrapperData(subResultDate, userId, userName, baseUserMemberExports, levelAndbaseUserMemberMap, phoneAndUserIdMap, leaveNameAndLeaveEntry, memberLevel, discount, counter, numAndUserMemberMap);
-                latch.countDown();
-            });
-        }
+                 latch.countDown();
+                });
+         }
         try {
             latch.await();
         } catch (InterruptedException e) {

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rpc/service/AppPermissionService.java

@@ -30,6 +30,7 @@ import com.github.wxiaoqi.security.common.util.result.JsonResultUtil;
 import com.xxfc.platform.activity.feign.ActivityFeign;
 import com.xxfc.platform.im.feign.ImFeign;
 import com.xxfc.platform.universal.dto.RegionDTO;
+import com.xxfc.platform.universal.dto.SmsTemplateDTO;
 import com.xxfc.platform.universal.feign.MQSenderFeign;
 import com.xxfc.platform.universal.feign.RegionFeign;
 import com.xxfc.platform.universal.feign.ThirdFeign;
@@ -37,6 +38,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.stereotype.Service;

ace-modules/ace-admin/src/main/resources/mapper/AppUserDetailMapper.xml

@@ -146,7 +146,7 @@
         <if test="citySet != null ">
             and d.city_code in
             <foreach collection="citySet" item="item" index="index" open="(" separator="," close=")" >
-                #{item}
+                       #{item}
             </foreach>
         </if>
         order by l.id ASC

xx-im/xx-im-server/src/main/java/com/xxfc/platform/im/biz/MsgBiz.java

@@ -324,11 +324,11 @@ public class MsgBiz {
 
     public Integer getNumber() {
         Integer number = 0;
-        Dictionary dictionary =  thirdFeign.findDictionaryByTypeAndCode(IM_TYPE, DictionaryKey.MSG_LIMIT_NUMBER);
-        if (dictionary != null && StringUtils.isNotBlank(dictionary.getDetail())) {
-            log.info("查询IM限制数为字典表的结果为： dictionary = {}", dictionary.toString());
-            number = Integer.parseInt(dictionary.getDetail());
-        }
+            Dictionary dictionary =  thirdFeign.findDictionaryByTypeAndCode(IM_TYPE, DictionaryKey.MSG_LIMIT_NUMBER);
+            if (dictionary != null && StringUtils.isNotBlank(dictionary.getDetail())) {
+                log.info("查询IM限制数为字典表的结果为： dictionary = {}", dictionary.toString());
+                number = Integer.parseInt(dictionary.getDetail());
+            }
         log.info("IM消息数限制为： number = {}", number);
         return number;
     }

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/entity/DailyVehicleOrderStatistics.java

@@ -17,27 +17,28 @@ import java.util.Date;
 
 /**
  * 每日租车订单统计
+ *
  * @author Administrator
  */
 @Data
 @Table(name = "daily_vehicle_order_statistics")
-public class DailyVehicleOrderStatistics extends DailyOrderStatistics{
+public class DailyVehicleOrderStatistics extends DailyOrderStatistics {
 
 
     /**
      * 预交押金总额
      */
     @Column(name = "security_deposit")
-    private BigDecimal  securityDeposit;
+    private BigDecimal securityDeposit;
 
     /**
      * 退还押金总额
      */
     @Column(name = "refund_security_deposit")
-    private BigDecimal  refundSecurityDeposit;
+    private BigDecimal refundSecurityDeposit;
 
     /**
-     * 赔偿总额
+     * 损坏赔偿总额
      */
     @Column(name = "compensation")
     private BigDecimal compensation;
@@ -46,19 +47,25 @@ public class DailyVehicleOrderStatistics extends DailyOrderStatistics{
      * 违章总额
      */
     @Column(name = "forfeit")
-    private  BigDecimal violationMoney;
+    private BigDecimal violationMoney;
 
 
     /**
-     * 延期总额
+     * 退还订单金额
      */
-    @Column(name = "postpone")
-    private  BigDecimal postpone;
+    @Column(name = "return_gmv")
+    private BigDecimal returnGmv;
 
-//    /**
-//     * 取消订单扣款总额
-//     */
-//    @Column(name = "penal_sum")
-//    private BigDecimal penalSum;
+    /**
+     *  违约总额
+     */
+    @Column(name = "default_money ")
+    private BigDecimal defaultMoney ;
+
+    /**
+     * 消费金总额
+     */
+    @Column(name = "total_expenditure")
+    private BigDecimal totalExpenditure;
 
 }

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleBookRecordMapper.xml

@@ -508,12 +508,7 @@
             </if>
             <!--增加时间限制，已审核的未出车小于当前时间的不显示， 已出车的结束时间延后两天小于当前时间的不显示-->
             <if test="flag == true and status == 2">
-               and (
-<!--                (v4.id IS NOT NULL  AND DATE_ADD( v1.book_end_date, INTERVAL '2 00:00:00' DAY_SECOND ) &gt;= NOW())-->
-<!--                OR (-->
-                v4.id IS NULL
-                AND v1.book_end_date &gt;= now()
-                )
+                and ( v4.id IS NOT NULL  OR (v4.id IS NULL AND v1.book_end_date &gt;= now()))
             </if>
             and v1.book_user != -2
         </where>