Merge branch 'dev' into base-modify

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

@@ -184,12 +184,12 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
                 vehicle = restResponse.getData();
             }
             if (vehicle == null) {
-                return ObjectRestResponse.createFailedResult(500, "订单车辆不存在！");
+                return ObjectRestResponse.createFailedResult(ResCode.VEHICLE_DEPARTURE_VEHICLE_UNEXIST.getCode(), ResCode.VEHICLE_DEPARTURE_VEHICLE_UNEXIST.getDesc());
             }
                 if( vehicle.getMileageLastUpdate() != null) {
                     //判断车辆公里数
                     if (orderVehicleCrosstownDto.getMileage() == null || orderVehicleCrosstownDto.getMileage() <= vehicle.getMileageLastUpdate()) {
-                        return ObjectRestResponse.createFailedResult(500, "请输入车辆仪表盘实际公里数！");
+                        return ObjectRestResponse.createFailedResult(ResCode.VEHICLE_BOOKED_RECORD_MILEAGE_CHANGED.getCode(), ResCode.VEHICLE_BOOKED_RECORD_MILEAGE_CHANGED.getDesc());
                     }
                 }
 
@@ -377,7 +377,7 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
 
     public boolean getTodayTime(Long time) {
         long current = System.currentTimeMillis();
-        if (current <= (time / (1000 * 3600 * 24) * (1000 * 3600 * 24) - TimeZone.getDefault().getRawOffset() )+ 24 * 60 * 60 * 1000 -1) {
+        if (current <= (time / (1000 * 3600 * 24) * (1000 * 3600 * 24) - TimeZone.getDefault().getRawOffset() ) + 24 * 60 * 60 * 1000 -1) {
             return true;
         }
         return false;

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

@@ -306,7 +306,8 @@ public class OrderMsgBiz {
                         }
 
                         //发送用户取消消息
-                        sms2RefundAppUser(BigDecimal.ZERO, orderRefund.getDeductAmount(), depositOrderRefund.getRefundAmount().add(orderRefund.getRefundAmount()), BigDecimal.ZERO, baseOrder, appUserDTO, smstype, smsParams);
+                        sms2AppUser(startCompanyDetail, endCompanyDetail, orvd, otd, omd, baseOrder, appUserDTO, smstype, smsParams);
+                        //sms2RefundAppUser(BigDecimal.ZERO, orderRefund.getDeductAmount(), depositOrderRefund.getRefundAmount().add(orderRefund.getRefundAmount()), BigDecimal.ZERO, baseOrder, appUserDTO, smstype, smsParams);
 
                         //后台发送消息(出车人)
                         smsParams.clear();
@@ -469,9 +470,9 @@ public class OrderMsgBiz {
         switch (paramHandelType) {
             case SmsTemplateDTO.PAY_A :
                 if(0 < appUserDTO.getMemberLevel() ) {
-                    smsParams.add(USER_M);
+                    smsParams.add(USER_M+ appUserDTO.getRealname());
                 }else {
-                    smsParams.add(USER_N);
+                    smsParams.add(USER_N+ appUserDTO.getRealname());
                 }
                 smsParams.add(baseOrder.getRealAmount().toString());
                 smsParams.add(DateUtil.formatDateTime(DateUtil.date(orvd.getStartTime())));
@@ -498,24 +499,24 @@ public class OrderMsgBiz {
                 break;
             case SmsTemplateDTO.CANCEL_A :
                 if(0 < appUserDTO.getMemberLevel() ) {
-                    smsParams.add(USER_M);
+                    smsParams.add(USER_M+ appUserDTO.getRealname());
                 }else {
-                    smsParams.add(USER_N);
+                    smsParams.add(USER_N+ appUserDTO.getRealname());
                 }
                 break;
             case SmsTemplateDTO.PAY_I :
                 if(0 < appUserDTO.getMemberLevel() ) {
-                    smsParams.add(USER_M);
+                    smsParams.add(USER_M+ appUserDTO.getRealname());
                 }else {
-                    smsParams.add(USER_N);
+                    smsParams.add(USER_N+ appUserDTO.getRealname());
                 }
                 smsParams.add(startCompanyDetail.getAddrDetail());
                 break;
             case SmsTemplateDTO.PAY_J :
                 if(0 < appUserDTO.getMemberLevel() ) {
-                    smsParams.add(USER_M);
+                    smsParams.add(USER_M+ appUserDTO.getRealname());
                 }else {
-                    smsParams.add(USER_N);
+                    smsParams.add(USER_N+ appUserDTO.getRealname());
                 }
                 smsParams.add(baseOrder.getName());
                 smsParams.add(HOUR_MINUTE_FORMATTE_HUTOOL.format(DateUtil.date(otd.getStartTime())));
@@ -530,9 +531,9 @@ public class OrderMsgBiz {
         switch (paramHandelType) {
             case SmsTemplateDTO.CANCEL_C :
                 if(0 < appUserDTO.getMemberLevel() ) {
-                    smsParams.add(USER_M);
+                    smsParams.add(USER_M+ appUserDTO.getRealname());
                 }else {
-                    smsParams.add(USER_N);
+                    smsParams.add(USER_N+ appUserDTO.getRealname());
                 }
                 smsParams.add(violateAmount.toString());
                 smsParams.add(refundAmount.toString());
@@ -545,9 +546,9 @@ public class OrderMsgBiz {
                 Map<String, Dictionary> dictionaryMap = thirdFeign.dictionaryGetAll4Map().getData();
                 Integer rentDepositAutoRefundTime = new Integer(dictionaryMap.get(APP_ORDER+ "_"+ DictionaryKey.RENT_DEPOSIT_AUTO_REFUND_TIME).getDetail());
                 if(0 < appUserDTO.getMemberLevel() ) {
-                    smsParams.add(USER_M);
+                    smsParams.add(USER_M+ appUserDTO.getRealname());
                 }else {
-                    smsParams.add(USER_N);
+                    smsParams.add(USER_N+ appUserDTO.getRealname());
                 }
                 smsParams.add(baseOrder.getNo());
                 smsParams.add(originalAmount.toString());
@@ -558,9 +559,9 @@ public class OrderMsgBiz {
                 break;
             case SmsTemplateDTO.REFUND_B:
                 if(0 < appUserDTO.getMemberLevel() ) {
-                    smsParams.add(USER_M);
+                    smsParams.add(USER_M+ appUserDTO.getRealname());
                 }else {
-                    smsParams.add(USER_N);
+                    smsParams.add(USER_N+ appUserDTO.getRealname());
                 }
                 smsParams.add(baseOrder.getNo());
                 smsParams.add(originalAmount.toString());

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

 package com.xxfc.platform.order.jobhandler;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ArrayUtil;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
@@ -66,24 +67,32 @@ public class RemindMsgJobHandler extends IJobHandler {
 
         try {
             Date tomorrow = DateUtil.offsetDay(DateUtil.parse(DateUtil.today(), "yyyy-MM-dd"), 1);
+            Date tomorrowBegin = DateUtil.beginOfDay(tomorrow);
+            Date tomorrowEnd = DateUtil.endOfDay(tomorrow);
             //检索明天需要出车的订单
             List<BaseOrder> lists = baseOrderBiz.selectByExample(new Example.Builder(BaseOrder.class)
                     //订单已完成的租车订单
                     .where(WeekendSqls.<BaseOrder>custom()
                                     .andIn(BaseOrder::getType, CollectionUtil.newArrayList(OrderTypeEnum.RENT_VEHICLE.getCode(), OrderTypeEnum.TOUR.getCode()))
                                     .andEqualTo(BaseOrder::getStatus, OrderStatusEnum.ORDER_TOSTART.getCode()) //待出发的订单
-                                    .andLessThanOrEqualTo(BaseOrder::getCrtTime, DateUtil.beginOfDay(tomorrow))
-                                    .andGreaterThanOrEqualTo(BaseOrder::getCrtTime, DateUtil.endOfDay(tomorrow))
+//                                    .andLessThanOrEqualTo(BaseOrder::getCrtTime, DateUtil.beginOfDay(tomorrow))
+//                                    .andGreaterThanOrEqualTo(BaseOrder::getCrtTime, DateUtil.endOfDay(tomorrow))
                     ).build());
 
             for(BaseOrder baseOrder : lists) {
                 AppUserDTO appUserDTO = userFeign.userDetailById(baseOrder.getUserId()).getData();
                 if(OrderTypeEnum.RENT_VEHICLE.getCode().equals(baseOrder.getType())) {
                     OrderRentVehicleDetail orvd = orderRentVehicleBiz.selectById(baseOrder.getDetailId());
-                    orderMsgBiz.handelMsgStart(orvd, null, null, baseOrder, appUserDTO);
+                    DateTime startDate = DateUtil.date(orvd.getStartTime());
+                    if(startDate.isAfterOrEquals(tomorrowBegin) && startDate.isBeforeOrEquals(tomorrowEnd)) {
+                        orderMsgBiz.handelMsgStart(orvd, null, null, baseOrder, appUserDTO);
+                    }
                 }else {
                     OrderTourDetail otd = orderTourDetailBiz.selectById(baseOrder.getDetailId());
-                    orderMsgBiz.handelMsgStart(null, otd, null, baseOrder, appUserDTO);
+                    DateTime startDate = DateUtil.date(otd.getStartTime());
+                    if(startDate.isAfterOrEquals(tomorrowBegin) && startDate.isBeforeOrEquals(tomorrowEnd)) {
+                        orderMsgBiz.handelMsgStart(null, otd, null, baseOrder, appUserDTO);
+                    }
                 }
             }
 

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/CompanyBaseBiz.java

@@ -116,6 +116,34 @@ public class CompanyBaseBiz extends BaseBiz<CompanyBaseMapper, CompanyBase>  {
 
         return  ObjectRestResponse.succ();
     }
+
+    //临时数据同步3
+    public ObjectRestResponse synchro3(){
+        List<BranchCompanyStockInfo> list= stockInfoMapper.selectAll();
+        if (list.size()>0){
+            int num=0;
+            for (BranchCompanyStockInfo companyStockInfo:list){
+                Integer  id=companyStockInfo.getId();
+                Integer balance=companyStockInfo.getBalance();
+                Integer total=companyStockInfo.getTotal();
+                BigDecimal price=companyStockInfo.getPrice();
+                Integer state=companyStockInfo.getState();
+                BranchCompanyStockRight branchCompanyStockRight=stockRightBiz.selectById(id);
+                if (branchCompanyStockRight!=null){
+                    branchCompanyStockRight=new BranchCompanyStockRight();
+                    branchCompanyStockRight.setId(id);
+                    branchCompanyStockRight.setBalance(balance);
+                    branchCompanyStockRight.setStockState(state);
+                    branchCompanyStockRight.setTotal(total);
+                    branchCompanyStockRight.setPrice(price);
+                    stockRightBiz.updateSelectiveById(branchCompanyStockRight);
+                    num++;
+                }
+                log.info("----成功---num=="+num+"---id==="+id);
+            }
+        }
+        return  ObjectRestResponse.succ();
+    }
     //设置基础信息
     public  ObjectRestResponse updCompany(CompanyVo companyVo){
         if (companyVo==null|| StringUtils.isBlank(companyVo.getCompanyName())|| StringUtils.isBlank(companyVo.getName())||

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/admin/CompanyController.java

@@ -31,6 +31,12 @@ public class CompanyController extends BaseController<CompanyBaseBiz> {
         return baseBiz.synchro2();
     }
 
+    @ApiOperation("同步股权3")
+    @PostMapping("synchro3")
+    public ObjectRestResponse<String> synchro3() {
+        return baseBiz.synchro3();
+    }
+
 
     @ApiOperation("查询公司列表")
     @RequestMapping(value = "/list", method = RequestMethod.GET)

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

@@ -53,6 +53,6 @@
                 and (b.`name` like CONCAT('%',#{name},'%') or c.`name` like CONCAT('%',#{name},'%') )
             </if>
         </where>
-       order by b.id desc
+       order by b.upd_time desc
   </select>
 </mapper>
\ No newline at end of file

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

@@ -43,8 +43,7 @@
           </choose>
 
     where
-          vehicle = #{vehicleId} and `year_month`=#{yearMonth} and
-          booked_date &amp; #{andOperationFactor} = #{andOperationRs}
+          vehicle = #{vehicleId} and `year_month`=#{yearMonth}
   </update>
     <update id="updateById" parameterType="com.xxfc.platform.vehicle.entity.VehicleBookInfo">
          update vehicle_book_info set