Merge remote-tracking branch 'origin/base-modify' into base-modify

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/AppUsersManageController.java

@@ -126,7 +126,5 @@ public class AppUsersManageController extends BaseController<AppUserManageBiz,Ap
         appUserLoginBiz.deleteAppUserById(id);
         return ObjectRestResponse.succ();
     }
-
-
 }
 

xx-activity/xx-activity-api/src/main/java/com/xxfc/platform/activity/entity/IntegralUserStatus.java

@@ -21,4 +21,10 @@ public class IntegralUserStatus {
     private Long crtTime;
 
     private Long updTime;
+
+    @Transient
+    private Long startTime;
+    @Transient
+    private Long endTime;
+
 }
\ No newline at end of file

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/biz/IntegralRuleBiz.java

@@ -8,11 +8,10 @@ import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.util.Query;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.xxfc.platform.activity.entity.IntegralRule;
-import com.xxfc.platform.activity.entity.IntegralUserRecord;
+import com.xxfc.platform.activity.entity.IntegralUserStatus;
 import com.xxfc.platform.activity.mapper.IntegralRuleMapper;
 import com.xxfc.platform.activity.user.UserInfoBiz;
 import com.xxfc.platform.activity.vo.IntegralRuleDto;
-import com.xxfc.platform.activity.vo.IntegralUserRecordDto;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -27,7 +26,8 @@ public class IntegralRuleBiz extends BaseBiz<IntegralRuleMapper, IntegralRule> {
     UserInfoBiz userInfoBiz;
     @Autowired
     IntegralUserRecordBiz integralUserRecordBiz;
-
+    @Autowired
+    IntegralUserStatusBiz integralUserStatusBiz;
     /**
      * 添加、更新积分规则
      * @param integralRule
@@ -97,22 +97,17 @@ public class IntegralRuleBiz extends BaseBiz<IntegralRuleMapper, IntegralRule> {
         Query query = new Query(integralRule);
         PageDataVO<IntegralRule> pageDataVO = PageDataVO.pageInfo(query, () -> mapper.selectAllByParam(integralRule));
         //添加个人积分状态
+        pageDataVO.getData().forEach((a) -> getIntegralStatus(appUserDTO, a));
         return ObjectRestResponse.succ(pageDataVO);
     }
 
 
-    public boolean  getIntegralStatus(AppUserDTO appUserDTO, IntegralRule integralRule) {
-        IntegralUserRecordDto integralUserRecordDto = new IntegralUserRecordDto();
-        integralUserRecordDto.setUserId(appUserDTO.getUserid());
-        integralUserRecordDto.setIntegralRuleCode(integralRule.getCode());
-        List<IntegralUserRecord> integralUserRecords = integralUserRecordBiz.getByUserAndTime(integralUserRecordDto).getData();
-        if(integralUserRecords == null || integralUserRecords.size() <=0 ) {
-            return false;
-        } else if(integralUserRecords.size() == integralRule.getNumber()){//记录 == 规则数 代表已经完成
-            return true;
-        } else {
-            return false;
+    public void  getIntegralStatus(AppUserDTO appUserDTO, IntegralRule integralRule) {
+        IntegralUserStatus integralUserStatus1 = integralUserStatusBiz.selectByUserAndCode(integralRule.getCode(), appUserDTO.getUserid());
+        if(integralUserStatus1 != null) {
+            integralRule.setIntegralStatus(integralUserStatus1.getIntegralStatus());
         }
     }
 
+
 }

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/biz/IntegralUserStatusBiz.java

@@ -10,6 +10,8 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.TimeZone;
+
 @Service
 @Transactional
 public class IntegralUserStatusBiz extends BaseBiz<IntegralUserStatusMapper, IntegralUserStatus> {
@@ -28,9 +30,13 @@ public class IntegralUserStatusBiz extends BaseBiz<IntegralUserStatusMapper, Int
 
     public IntegralUserStatus selectByUserAndCode(String code, Integer userId) {
         if(!StringUtils.isAllBlank(code, userId + "")) {
+            long current = System.currentTimeMillis();
+            long startTime = current / (1000 * 3600 * 24) * (1000 * 3600 * 24) - TimeZone.getDefault().getRawOffset();
             IntegralUserStatus integralUserStatus = new IntegralUserStatus();
             integralUserStatus.setIntegralRuleCode(code);
             integralUserStatus.setUserId(userId);
+            integralUserStatus.setStartTime(startTime);
+            integralUserStatus.setEndTime(startTime  + 24 * 60 * 60 * 1000 - 1);
             return mapper.selectByUserAndCode(integralUserStatus);
         }
         return null;

xx-activity/xx-activity-server/src/main/resources/mapper/IntegralRuleMapper.xml

@@ -31,15 +31,11 @@
 
   <select id="selectAllByParam" resultType="com.xxfc.platform.activity.entity.IntegralRule" parameterType="com.xxfc.platform.activity.vo.IntegralRuleDto">
 
-    select i1.*, i2.integral_status from integral_rule i1
-    left join integral_user_status i2 on i1.code = i2.integral_rule_code
+    select i1.* from integral_rule i1
     <where>
         <if test="id != null">
          and i1.id = #{id}
         </if>
-        <if test="userId != null">
-          and i2.user_id = #{userId}
-        </if>
         <if test="code != null">
           and i1.code = #{code}
         </if>

xx-activity/xx-activity-server/src/main/resources/mapper/IntegralUserStatusMapper.xml

@@ -11,5 +11,6 @@
     <select id="selectByUserAndCode" resultType="com.xxfc.platform.activity.entity.IntegralUserStatus" parameterType="com.xxfc.platform.activity.entity.IntegralUserStatus">
       select * from integral_user_status
       where integral_rule_code = #{integralRuleCode} and user_id = #{userId}
+      and crt_time between #{startTime} and #{endTime} and integral_status =1
     </select>
 </mapper>
\ No newline at end of file

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/DailyMembersOrderStatisticsBiz.java

@@ -9,24 +9,26 @@ import org.apache.commons.beanutils.BeanUtils;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
 /**
  * 每日购买会员订单统计
+ *
  * @author Administrator
  */
 @Service
 public class DailyMembersOrderStatisticsBiz extends BaseBiz<DailyMembersOrderStatisticsMapper, DailyMembersOrderStatistics> {
 
 
-    public boolean memberOrderStatistics()  {
+    public boolean memberOrderStatistics() {
         try {
             HashMap<String, Object> resultMap = new HashMap<>();
-            Map<String,Object> travelGmv = mapper.getTravelGmv();
+            Map<String, Object> travelGmv = mapper.getTravelGmv();
             resultMap.putAll(travelGmv);
             DailyMembersOrderStatistics MembersStatistics = new DailyMembersOrderStatistics();
-            BeanUtils.copyProperties(MembersStatistics,resultMap);
+            BeanUtils.copyProperties(MembersStatistics, resultMap);
             insertSelective(MembersStatistics);
             return true;
         } catch (Exception e) {
@@ -34,4 +36,10 @@ public class DailyMembersOrderStatisticsBiz extends BaseBiz<DailyMembersOrderSta
             return false;
         }
     }
+
+    @Override
+    public int insertSelectiveRe(DailyMembersOrderStatistics entity) {
+        entity.setCrtTime(new Date());
+        return mapper.insertSelective(entity);
+    }
 }

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/DailyOrderStatisticsBiz.java

@@ -25,7 +25,7 @@ public class DailyOrderStatisticsBiz extends BaseBiz<DailyOrderStatisticsMapper,
     @Autowired
     private DailyMembersOrderStatisticsBiz membersStatisticsBiz;
 
-//    @Scheduled(cron = "0 0/1 * * * ?")
+    @Scheduled(cron = "0 0 2 * * ?")
     public boolean statisticalOrder(){
         boolean vehicleFlag = vehicleStatisticsBiz.StatisticsOfCarRentalOrders();
         boolean travelFlag = travelStatisticsBiz.StatisticsOfTravelOrders();

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/DailyTravelOrderStatisticsBiz.java

 package com.xxfc.platform.order.biz;
 
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import com.github.wxiaoqi.security.common.util.EntityUtils;
 import com.xxfc.platform.order.entity.DailyTravelOrderStatistics;
 import com.xxfc.platform.order.mapper.DailyTravelOrderStatisticsMapper;
 import org.apache.commons.beanutils.BeanUtils;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
 /**
  * 每日旅游订单统计
+ *
  * @author Administrator
  */
 @Service
 public class DailyTravelOrderStatisticsBiz extends BaseBiz<DailyTravelOrderStatisticsMapper, DailyTravelOrderStatistics> {
 
 
-    public boolean StatisticsOfTravelOrders()  {
+    public boolean StatisticsOfTravelOrders() {
         try {
             HashMap<String, Object> resultMap = new HashMap<>();
-            Map<String,Object> travelGmv = mapper.getTravelGmv();
+            Map<String, Object> travelGmv = mapper.getTravelGmv();
             BigDecimal travelPenalSum = mapper.getTravelPenalSum();
             resultMap.putAll(travelGmv);
-            resultMap.put("penalSum",travelPenalSum);
+            resultMap.put("penalSum", travelPenalSum);
             DailyTravelOrderStatistics TravelStatistics = new DailyTravelOrderStatistics();
-            BeanUtils.copyProperties(TravelStatistics,resultMap);
+            BeanUtils.copyProperties(TravelStatistics, resultMap);
             insertSelective(TravelStatistics);
             return true;
         } catch (Exception e) {
@@ -34,4 +37,10 @@ public class DailyTravelOrderStatisticsBiz extends BaseBiz<DailyTravelOrderStati
             return false;
         }
     }
+
+    @Override
+    public int insertSelectiveRe(DailyTravelOrderStatistics entity) {
+        entity.setCrtTime(new Date());
+        return mapper.insertSelective(entity);
+    }
 }

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/DailyVehicleOrderStatisticsBiz.java

@@ -2,6 +2,7 @@ package com.xxfc.platform.order.biz;
 
 import com.alibaba.fastjson.JSON;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import com.xxfc.platform.order.entity.DailyMembersOrderStatistics;
 import com.xxfc.platform.order.entity.DailyVehicleOrderStatistics;
 import com.xxfc.platform.order.mapper.DailyVehicleOrderStatisticsMapper;
 import com.xxfc.platform.order.pojo.DedDetailDTO;
@@ -12,10 +13,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /** 每日租车订单统计
  * @author Administrator
@@ -102,4 +100,12 @@ public class DailyVehicleOrderStatisticsBiz extends BaseBiz<DailyVehicleOrderSta
         return null;
     }
 
+
+    @Override
+    public int insertSelectiveRe(DailyVehicleOrderStatistics entity) {
+        Date date = new Date();
+        entity.setCrtTime(new Date());
+        return mapper.insertSelective(entity);
+    }
+
 }

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/jobhandler/BaseOrderStatisticsJobHandler.java

@@ -28,17 +28,19 @@ public class BaseOrderStatisticsJobHandler extends IJobHandler {
 
             XxlJobLogger.log("-----定时器进入---baseOrderStatisticsHandler---");
             log.info("-----定时器进入---baseOrderStatisticsHandler---");
-            boolean flag = statisticsBiz.statisticalOrder();
+//            boolean flag = statisticsBiz.statisticalOrder();
             ReturnT returnT = new ReturnT();
-            if (flag) {
+//            if (flag) {
                 returnT.setCode(100);
                 returnT.setMsg("成功");
                 return returnT;
-            }else {
-                returnT.setCode(500);
-                returnT.setMsg("失败");
-                return returnT;
-            }
+//            }
+
+//            else {
+//                returnT.setCode(500);
+//                returnT.setMsg("失败");
+//                return returnT;
+//            }
         } catch (Exception e) {
             XxlJobLogger.log(e);
             return FAIL;

xx-order/xx-order-server/src/main/resources/mapper/DepositRefundRecordMapper.xml

@@ -11,5 +11,6 @@
             parameterType="java.lang.Integer">
      select * from deposit_refund_record
      where crosstown_id = #{crossId} and isshow = 1
+     order by status
   </select>
 </mapper>
\ No newline at end of file

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/controller/CertificationController.java

@@ -12,6 +12,7 @@ import com.xxfc.platform.universal.biz.MQServiceBiZ;
 import com.xxfc.platform.universal.entity.IdInformation;
 import com.xxfc.platform.universal.service.CertificationService;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.aop.framework.AopContext;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.core.task.TaskExecutor;
@@ -21,6 +22,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 
 /**
@@ -46,9 +50,11 @@ public class CertificationController   {
     private TaskExecutor executor;
 
     @Autowired
-    MQServiceBiZ mqServiceBiZ;
+    private MQServiceBiZ mqServiceBiZ;
 
 
+    private ExecutorService executorService = Executors.newCachedThreadPool();
+
     /**
      * 实名认证
      * @param idInformation
@@ -90,13 +96,17 @@ public class CertificationController   {
             if (type!=null&&type==0){
                 ObjectRestResponse<Integer> result = certificationService.certificate(idInformation);
                 if (result.getRel()) {
-                    Thread thread = new Thread(new Runnable() {
-                        @Override
-                        public void run() {
-                            setIntegral(appUserDTO.getUserid(),result.getData());
-                        }
-                    });
-                   thread.start();
+                    CompletableFuture.supplyAsync(()->{
+                        setIntegral(appUserDTO.getUserid(),result.getData());
+                        return null;
+                    },executorService);
+//                    Thread thread = new Thread(new Runnable() {
+//                        @Override
+//                        public void run() {
+//                            setIntegral(appUserDTO.getUserid(),result.getData());
+//                        }
+//                    });
+//                   thread.start();
                 }
                 return result ;
             }

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/service/TrafficViolationsService.java

@@ -23,6 +23,10 @@ import org.springframework.stereotype.Service;
 
 import java.sql.SQLException;
 import java.util.*;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.Executor;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -41,6 +45,8 @@ public class TrafficViolationsService {
     private String CODE;
     @Value("${RETURN.TYPE}")
     private String TYPE;
+
+    private  ExecutorService executorService= Executors.newCachedThreadPool();
     /**
      *  下列参数,根据使用不同的公司的接口进行修改
      */
@@ -190,6 +196,13 @@ public class TrafficViolationsService {
 
             List<LicensePlateType> finalLicensePlateTypes = licensePlateTypes;
 
+
+
+            CompletableFuture.supplyAsync(()->{
+                insertLicensePlateType(finalLicensePlateTypes);
+                return null;
+            },executorService);
+
             Thread thread = new Thread(new Runnable() {
                 @Override
                 public void run() {