gongdecai 3 rokov pred
rodič
commit
a1509297f3

+ 74 - 44
winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/PublishTaskInfoServiceImpl.java

@@ -16,6 +16,7 @@ import com.yh.saas.plugin.yiliangyiyun.service.*;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 import com.yh.saas.plugin.yiliangyiyun.util.EntCoordUtil;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
@@ -57,8 +58,30 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
      */
     private static final double EARTH_RADIUS = 6378.137;
 
+
+    /**
+     * 每天0点更新
+     */
+    @Transactional
+    @Scheduled(cron = "0 20 1 * * ?")
+    public void rushTime() {
+        List<PublishTaskInfo> publishTaskInfos = this.selectList(new EntityWrapper<PublishTaskInfo>().eq("delete_flag", "0"));
+        if (!CollectionUtils.isEmpty(publishTaskInfos)) {
+            publishTaskInfos.forEach(publishTaskInfo -> {
+                publishTaskInfo.setRefreshTimes("0");
+            });
+        }
+        List<CargoOwnerInfo> cargoOwnerInfos = cargoOwnerInfoService.selectList(new EntityWrapper<CargoOwnerInfo>().eq("delete_flag", "0"));
+        if (!CollectionUtils.isEmpty(cargoOwnerInfos)) {
+            cargoOwnerInfos.forEach(cargoOwnerInfo -> {
+                cargoOwnerInfo.setRefreshTimes(0l);
+            });
+        }
+    }
+
     /**
      * 任务列表
+     *
      * @param publishTaskInfo
      * @return
      */
@@ -86,6 +109,7 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
 
     /**
      * 货源列表
+     *
      * @param publishTaskInfo
      * @return
      */
@@ -95,24 +119,24 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
         pageView.put("startRecord", (publishTaskInfo.getCurrentPage() - 1)
                 * publishTaskInfo.getPageSize());
         //自定义装货区
-        if(!StringUtils.isEmpty(publishTaskInfo.getLoadingPlace())){
+        if (!StringUtils.isEmpty(publishTaskInfo.getLoadingPlace())) {
             String loading = publishTaskInfo.getLoadingPlace();
             boolean loadingt = loading.contains(",");
-            if(loadingt){
+            if (loadingt) {
                 List<String> loadingList = Arrays.asList(loading.split(","));
                 pageView.put("loadingList", loadingList);
-            }else {
+            } else {
                 pageView.put("loadingPlace", publishTaskInfo.getLoadingPlace());
             }
         }
         //自定义卸货区
-        if(!StringUtils.isEmpty(publishTaskInfo.getUnLoadingPlace())){
+        if (!StringUtils.isEmpty(publishTaskInfo.getUnLoadingPlace())) {
             String unloading = publishTaskInfo.getUnLoadingPlace();
             boolean unloadingt = unloading.contains(",");
-            if(unloadingt){
+            if (unloadingt) {
                 List<String> unloadingList = Arrays.asList(unloading.split(","));
                 pageView.put("unloadingList", unloadingList);
-            }else {
+            } else {
                 pageView.put("unLoadingPlace", publishTaskInfo.getUnLoadingPlace());
             }
         }
@@ -127,22 +151,22 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
         Integer dataCount = baseMapper.getCounstByCondition(pageView);
         Page<PublishTaskInfo> page = new Page<>();
         //推荐货源列表
-        if("1".equals(publishTaskInfo.getSearchKeyWord())){
+        if ("1".equals(publishTaskInfo.getSearchKeyWord())) {
             List<PublishTaskInfo> dataList = baseMapper.getListsByCondition(pageView);
-            page.setRecords( dataList == null ? Lists.newArrayList() : dataList);
+            page.setRecords(dataList == null ? Lists.newArrayList() : dataList);
         }
         //按时间排序货源列表
-        else if("2".equals(publishTaskInfo.getSearchKeyWord())) {
+        else if ("2".equals(publishTaskInfo.getSearchKeyWord())) {
             List<PublishTaskInfo> dataList = baseMapper.getListByTimeCondition(pageView);
-            page.setRecords( dataList == null ? Lists.newArrayList() : dataList);
+            page.setRecords(dataList == null ? Lists.newArrayList() : dataList);
         }
         //按距离排序货源列表
-        else{
+        else {
             List<PublishTaskInfo> dataList = baseMapper.getListsByDistanceCondition(pageView);
-            if("3".equals(publishTaskInfo.getSearchKeyWord())){
-                if(!CollectionUtils.isEmpty(dataList)){
+            if ("3".equals(publishTaskInfo.getSearchKeyWord())) {
+                if (!CollectionUtils.isEmpty(dataList)) {
                     //查询发货地经纬度
-                    for(int i = 0; i < dataList.size(); i++){
+                    for (int i = 0; i < dataList.size(); i++) {
                         PublishTaskInfo publishTaskInfo1 = dataList.get(i);
                         //发货地经纬度
                         double lat2 = Math.toRadians(Double.valueOf(publishTaskInfo1.getSendLatitude()));
@@ -158,12 +182,12 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
                         double s = 2 * Math.asin(Math.sqrt(Math.pow(Math.sin(a / 2), 2) +
                                 Math.cos(lat1) * Math.cos(lat2) * Math.pow(Math.sin(b / 2), 2)));
                         // 弧长乘地球半径, 返回单位: 千米
-                        s =  s * EARTH_RADIUS;
+                        s = s * EARTH_RADIUS;
                         publishTaskInfo1.setCargoDistance(Math.floor(s));
                     }
                     dataList.sort(Comparator.comparing(PublishTaskInfo::getCargoDistance));
                 }
-                page.setRecords( dataList == null ? Lists.newArrayList() : dataList);
+                page.setRecords(dataList == null ? Lists.newArrayList() : dataList);
             }
         }
         page.setTotal(dataCount == null ? 0 : dataCount);
@@ -174,6 +198,7 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
 
     /**
      * 周边信息列表
+     *
      * @param publishTaskInfo
      * @return
      */
@@ -260,7 +285,7 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
             publishTaskInfoList.sort(Comparator.comparing(PublishTaskInfo::getCargoDistance));
         }
         Page<PublishTaskInfo> page = new Page<>();
-        page.setRecords( publishTaskInfoList == null ? Lists.newArrayList() : publishTaskInfoList);
+        page.setRecords(publishTaskInfoList == null ? Lists.newArrayList() : publishTaskInfoList);
         page.setTotal(publishTaskInfoList.size() == 0 ? 0 : publishTaskInfoList.size());
         page.setCurrent(publishTaskInfo.getCurrentPage());
         page.setSize(publishTaskInfo.getPageSize());
@@ -285,6 +310,7 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
 
     /**
      * 发布任务
+     *
      * @param publishTaskInfo
      * @return
      */
@@ -298,20 +324,20 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
         String date = f.format(new Date(System.currentTimeMillis()));
         //查询当天任务集合
         List<PublishTaskInfo> publishTaskInfoList = this.selectPublishTaskInfoList();//调用Service中的方法
-        if(publishTaskInfoList.size() > 0){
+        if (publishTaskInfoList.size() > 0) {
             //取第一条数据的编号
             String n = publishTaskInfoList.get(0).getTaskNo();
             //截取编号后6位
             int intNumber = Integer.parseInt(n.substring(10));
             intNumber++;
             String number = String.valueOf(intNumber);
-            for (int i = 0; i < 6; i++){
+            for (int i = 0; i < 6; i++) {
                 number = number.length() < 6 ? "0" + number : number;
             }
             //编号自增
             number = "YS" + date + number;
             publishTaskInfo.setTaskNo(number);
-        }else{
+        } else {
             //如果当天数据为空,生成第一条数据
             String number = "YS" + date + "000001";
             publishTaskInfo.setTaskNo(number);
@@ -330,6 +356,7 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
 
     /**
      * 编辑任务
+     *
      * @param publishTaskInfo
      * @return
      */
@@ -338,7 +365,7 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
         //查询发布任务
         PublishTaskInfo publishTaskInfo1 = this.selectById(publishTaskInfo.getId());
         //除审核中状态其余可编辑
-        if(publishTaskInfo1 != null && publishTaskInfo1.getStatusKey() != "1") {
+        if (publishTaskInfo1 != null && publishTaskInfo1.getStatusKey() != "1") {
             this.updateById(publishTaskInfo1);
         }
         return "OK";
@@ -346,6 +373,7 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
 
     /**
      * 查看任务
+     *
      * @param id
      * @return
      */
@@ -355,15 +383,15 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
         PublishTaskInfo publishTaskInfo = this.selectById(id);
         //查询货主姓名
         CargoOwnerInfo cargoOwnerInfo = cargoOwnerInfoService.selectOne(new EntityWrapper<CargoOwnerInfo>()
-            .eq("common_id",publishTaskInfo.getCommonId()));
-        if (cargoOwnerInfo != null){
+                .eq("common_id", publishTaskInfo.getCommonId()));
+        if (cargoOwnerInfo != null) {
             publishTaskInfo.setCargoOwnerName(cargoOwnerInfo.getName());
             publishTaskInfo.setCargoOwnerPhone(cargoOwnerInfo.getPhone());
         }
         //查询货主头像
         CommonUser commonUser = commonUserService.selectOne(new EntityWrapper<CommonUser>()
-            .eq("id",publishTaskInfo.getCommonId()));
-        if (commonUser != null){
+                .eq("id", publishTaskInfo.getCommonId()));
+        if (commonUser != null) {
             publishTaskInfo.setCargoOwnerPortrait(commonUser.getAvatarUrl());
         }
         return publishTaskInfo;
@@ -371,6 +399,7 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
 
     /**
      * 删除任务
+     *
      * @param id
      * @return
      */
@@ -382,6 +411,7 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
 
     /**
      * 显示隐藏
+     *
      * @param id
      * @return
      */
@@ -402,14 +432,15 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
 
     /**
      * 刷新
+     *
      * @param publishTaskInfo
      * @return
      */
     @Override
-    public String refresh(PublishTaskInfo publishTaskInfo){
+    public String refresh(PublishTaskInfo publishTaskInfo) {
         //查询发布任务
         PublishTaskInfo publishTaskInfo1 = this.seeTask(publishTaskInfo.getId());
-        if(publishTaskInfo1!= null){
+        if (publishTaskInfo1 != null) {
             //将此发布任务刷新次数变为1
             publishTaskInfo1.setRefreshTimes("1");
             this.updateById(publishTaskInfo1);
@@ -418,12 +449,12 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
         CargoOwnerInfo cargoOwnerInfo = cargoOwnerInfoService.selectOne(new EntityWrapper<CargoOwnerInfo>()
                 .eq(CargoOwnerInfo.QueryFiles.COMMON_ID, publishTaskInfo.getCommonId())
                 .eq(CargoOwnerInfo.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0));
-        if(cargoOwnerInfo.getRefreshTimes() < 3){
+        if (cargoOwnerInfo.getRefreshTimes() < 3) {
             //如果货主今日刷新次数小于3次,次数+1
             Long number = cargoOwnerInfo.getRefreshTimes() + 1;
             cargoOwnerInfo.setRefreshTimes(number);
             cargoOwnerInfoService.updateById(cargoOwnerInfo);
-        }else {
+        } else {
             throw new YException(YExceptionEnum.REFRESH_TIMES_UPPER_LIMIT);
         }
         return "ok";
@@ -431,11 +462,12 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
 
     /**
      * 抢单
+     *
      * @param publishTaskInfo
      * @return
      */
     @Override
-    public String addOrder(PublishTaskInfo publishTaskInfo){
+    public String addOrder(PublishTaskInfo publishTaskInfo) {
         //新增订单信息
         OrderInfo orderInfo = new OrderInfo();
         orderInfo.setId(IdGenerator.generateUUID());
@@ -446,20 +478,20 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
         String date = f.format(new Date(System.currentTimeMillis()));
         //查询订单集合
         List<OrderInfo> orderInfoList = orderInfoService.selectOrderInfoList();//调用Service中的方法
-        if(orderInfoList.size() > 0){
+        if (orderInfoList.size() > 0) {
             //取第一条数据的编号
             String n = orderInfoList.get(0).getOrderNo();
             //截取编号后6位
             int intNumber = Integer.parseInt(n.substring(10));
             intNumber++;
             String orderNumber = String.valueOf(intNumber);
-            for (int i = 0; i < 6; i++){
-                 orderNumber = orderNumber.length() < 6 ? "0" + orderNumber : orderNumber;
+            for (int i = 0; i < 6; i++) {
+                orderNumber = orderNumber.length() < 6 ? "0" + orderNumber : orderNumber;
             }
-             //编号自增
-             orderNumber = "CY" + date + orderNumber;
-             orderInfo.setOrderNo(orderNumber);
-        }else{
+            //编号自增
+            orderNumber = "CY" + date + orderNumber;
+            orderInfo.setOrderNo(orderNumber);
+        } else {
             //如果当天数据为空,生成第一条数据
             String orderNumber = "CY" + date + "000001";
             orderInfo.setOrderNo(orderNumber);
@@ -485,13 +517,13 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
         orderInfo.setOrderStatus(StatusEnum.OWNER_CONFIRMED.getName());
         orderInfo.setCargoOwnerStatusKey(StatusEnum.OWNER_PENDING_STATEMENT.getFlag());
         orderInfo.setCargoOwnerStatus(StatusEnum.OWNER_PENDING_STATEMENT.getName());
-        boolean one =  orderInfoService.insert(orderInfo);
+        boolean one = orderInfoService.insert(orderInfo);
 
         // 向货主发送信息
         NewsInfo newsInfo = new NewsInfo();
         newsInfo.setCrtCommonId(orderInfo.getCommonId());
         newsInfo.setReCommonId(orderInfo.getCargoCommonId());
-        newsInfo.setNewsContent("司机 "+orderInfo.getDriverName()+"师傅 已接单,订单编号"+orderInfo.getOrderNo()+"。");
+        newsInfo.setNewsContent("司机 " + orderInfo.getDriverName() + "师傅 已接单,订单编号" + orderInfo.getOrderNo() + "。");
         newsInfo.setNumber(orderInfo.getOrderNo());
         newsInfo.setBussId(orderInfo.getId());
         newsInfo.setNewsTypeKey("2");
@@ -513,7 +545,7 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
         repaymentInfo.setId(IdGenerator.generateUUID());
         repaymentInfo.setOrderId(orderInfo.getId());
         boolean four = repaymentInfoService.insert(repaymentInfo);
-        if( one && two && tre && four){
+        if (one && two && tre && four) {
             return "ok";
         } else {
             return "NG";
@@ -521,8 +553,6 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
     }
 
 
-
-
     /**
      * 审核
      *
@@ -531,7 +561,7 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public String examine(PublishTaskInfo publishTaskInfo){
+    public String examine(PublishTaskInfo publishTaskInfo) {
         //查询列表
         PublishTaskInfo publishTaskInfo1 = this.selectById(publishTaskInfo.getId());
 
@@ -554,7 +584,7 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
 //                webSocket.sendOneMessage(messageDO);
             }
 //            驳回
-            else if("2".equals(publishTaskInfo.getFlag())){
+            else if ("2".equals(publishTaskInfo.getFlag())) {
                 publishTaskInfo1.setStatusKey(StatusEnum.IDENTITY_FAILED.getFlag());
                 publishTaskInfo1.setStatus(StatusEnum.IDENTITY_FAILED.getName());
 //                geTuiUtils.pushByCid("驳回通知", "您的司机认证申请已被驳回", commonUser.getId());