Merge branch 'dev' of http://113.105.137.151:22280/youjj/cloud-platform into dev

xx-im/xx-im-api/src/main/java/com/xxfc/platform/im/entity/ImQuestion.java

@@ -84,4 +84,6 @@ public class ImQuestion {
      */
     private Integer source;
 
+    private String address;
+
 }
\ No newline at end of file

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

 package com.xxfc.platform.im.biz;
 
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.bean.copier.CopyOptions;
 import com.alibaba.fastjson.JSONObject;
 import com.github.wxiaoqi.security.admin.entity.AppUserLogin;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
@@ -8,6 +10,7 @@ import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.github.wxiaoqi.security.common.config.rabbit.RabbitConstant;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.util.Query;
+import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.xxfc.platform.im.dto.MsgTypeEnum;
 import com.xxfc.platform.im.dto.QuestionParamDto;
@@ -51,6 +54,11 @@ public class ImQuestionBiz extends BaseBiz<ImQuestionMapper, ImQuestion> {
                 questionParamDto.setUserId(Long.parseLong(appUserLogin.getId() + ""));
             }
         }
+        if (questionParamDto.getStartTime() != null) {
+            if(questionParamDto.getEndTime() == null) {
+                questionParamDto.setEndTime(System.currentTimeMillis());
+            }
+        }
         Query query = new Query(questionParamDto);
         PageDataVO<QuestionListVo> pageDataVO = PageDataVO.pageInfo(query, () -> mapper.getQuestionList(query.getSuper()));
         AppUserDTO appUserDTO = userBiz.getUserInfo();
@@ -94,6 +102,19 @@ public class ImQuestionBiz extends BaseBiz<ImQuestionMapper, ImQuestion> {
         return ObjectRestResponse.succ();
     }
 
+    public ObjectRestResponse update(ImQuestion imQuestion) {
+        if (imQuestion == null || imQuestion.getId() == null) {
+            return ObjectRestResponse.paramIsEmpty();
+        }
+        ImQuestion oldValue = mapper.selectByPrimaryKey(imQuestion.getId());
+        if (oldValue == null) {
+            return ObjectRestResponse.createFailedResult(ResultCode.IM_MSG_NOT_EXIST_CODE, ResultCode.getMsg(ResultCode.IM_MSG_NOT_EXIST_CODE));
+        }
+        BeanUtil.copyProperties(imQuestion, oldValue, CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true));
+        updateSelectiveByIdRe(oldValue);
+        return ObjectRestResponse.succ();
+    }
+
     /**
      * 删除消息，修改isDel为true
      *

xx-im/xx-im-server/src/main/java/com/xxfc/platform/im/rest/ImQuestionController.java

@@ -47,4 +47,10 @@ public class ImQuestionController {
     public ObjectRestResponse deleteById(Long id) {
         return imQuestionBiz.deleteById(id);
     }
+
+    @PostMapping(value = "/bg/app/unauth/update")
+    @ApiOperation(value = "修改问答信息")
+    public ObjectRestResponse update(@RequestBody ImQuestion imQuestion) {
+        return imQuestionBiz.update(imQuestion);
+    }
 }

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/price/CostDetailExtend.java

 package com.xxfc.platform.order.pojo.price;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.json.JSONUtil;
 import com.xxfc.platform.vehicle.pojo.dto.order.VMCalendarPriceCostDTO;
 import lombok.Data;
@@ -41,7 +42,7 @@ public class CostDetailExtend {
     /**
      * 使用（消耗）详情列表
      */
-    List<VMCalendarPriceCostDTO> useAmountList;
+    List<VMCalendarPriceCostDTO> useAmountList = CollUtil.newArrayList();;
 
     public void initParamJson() {
         paramJson = JSONUtil.toJsonStr(this);

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

@@ -301,9 +301,10 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
                 if(inProgressVO.getExtraAmount() != null) {
                     dedDetailDTO.setExcessCost(inProgressVO.getExtraAmount());
                 }
-                stringBuilder.append("违约金( ¥");
-                stringBuilder.append(amount);
-                stringBuilder.append(" x ");
+//                stringBuilder.append("违约金( ¥");
+                stringBuilder.append("违约金( ");
+//                stringBuilder.append(amount);
+//                stringBuilder.append(" x ");
                 stringBuilder.append(noUsedDay);
                 stringBuilder.append("天) = ");
                 stringBuilder.append(inProgressVO.getViolateAmount());
@@ -314,12 +315,13 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
              */
         } else if (userUsedDay - actualDay > 0) {
             StringBuilder stringBuilder = new StringBuilder();
-            stringBuilder.append("违约金( ¥");
+//            stringBuilder.append("违约金( ¥");
+            stringBuilder.append("违约金( ");
             //延期的天数, 延期违约金是延期天数*200%
             int extraUsedDay = userUsedDay - actualDay;
             if(extraUsedDay > 0) {
-                stringBuilder.append(amount);
-                stringBuilder.append(" x ");
+//                stringBuilder.append(amount);
+//                stringBuilder.append(" x ");
                 stringBuilder.append(extraUsedDay);
                 stringBuilder.append("(天)");
                 stringBuilder.append(" x 2)");

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

@@ -469,6 +469,8 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
             csv.setHadConpon((StrUtil.isNotBlank(orderMQDTO.getCouponTickerNos())? Boolean.TRUE: Boolean.FALSE));
             csv.setSameUseUnitPriceFromList(inProgressVO.getUseAmountList());
             csv.setSameOverUnitPriceFromList(inProgressVO.getOverAmountList());
+            csv.setUseAmountList(inProgressVO.getUseAmountList());
+            csv.setOverAmountList(inProgressVO.getOverAmountList());
 
             if(csv.getUsedDayNum() == orderMQDTO.getOrderRentVehicleDetail().getDayNum()) {
                 csv.setType(CostDetailExtend.FINLISH_ONTIME);

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

@@ -177,6 +177,8 @@ public class OrderCancelBiz {
                         csv.setViolateDesc("");
                         csv.setSameUseUnitPriceFromList(inProgressVO.getUseAmountList());
                         csv.setSameOverUnitPriceFromList(inProgressVO.getOverAmountList());
+                        csv.setUseAmountList(inProgressVO.getUseAmountList());
+                        csv.setOverAmountList(inProgressVO.getOverAmountList());
 
                         //如果有扣款项，则生成额外的费用明细
                         if(oad.getDeductions().size() > 0) {

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

@@ -15,6 +15,7 @@ import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.google.common.collect.Lists;
 import com.xxfc.platform.vehicle.common.RestResponse;
 import com.xxfc.platform.vehicle.constant.RedisKey;
+import com.xxfc.platform.vehicle.constant.ResCode.ResCode;
 import com.xxfc.platform.vehicle.entity.Area;
 import com.xxfc.platform.vehicle.entity.BranchCompany;
 import com.xxfc.platform.vehicle.entity.BranchCompanyStockInfo;
@@ -416,4 +417,17 @@ public class BranchCompanyBiz extends BaseBiz<BranchCompanyMapper, BranchCompany
     public List<Integer> getCompanyIds(String dataZone ,String dataCompany) {
         return vehicleBiz.dataCompany(dataZone, dataCompany);
     }
+
+    public ObjectRestResponse delCompanyByBaseId(Integer id) {
+        Example example = new Example(BranchCompany.class);
+        example.createCriteria().andEqualTo("companyBaseId", id);
+        example.createCriteria().andEqualTo("isDel", 0);
+        BranchCompany branchCompany = mapper.selectOneByExample(example);
+        if(branchCompany == null) {
+            return ObjectRestResponse.createFailedResult(ResCode.BRANCH_COMPANY_UNEXIST.getCode(), ResCode.BRANCH_COMPANY_UNEXIST.getDesc());
+        }
+        branchCompany.setIsDel(1);
+        updateSelectiveByIdRe(branchCompany);
+        return ObjectRestResponse.succ();
+    }
 }

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

@@ -8,7 +8,6 @@ import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.util.RandomUtil;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
-import com.xxfc.platform.vehicle.common.RestResponse;
 import com.xxfc.platform.vehicle.constant.RedisKey;
 import com.xxfc.platform.vehicle.entity.*;
 import com.xxfc.platform.vehicle.mapper.BranchCompanyStockInfoMapper;
@@ -32,7 +31,6 @@ import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Scanner;
 
 @Service
 @Slf4j
@@ -388,6 +386,7 @@ public class CompanyBaseBiz extends BaseBiz<CompanyBaseMapper, CompanyBase>  {
         companyBase.setId(id);
         companyBase.setIsDel(1);
         updateSelectiveById(companyBase);
+        branchCompanyBiz.delCompanyByBaseId(id);
         return  ObjectRestResponse.succ();
     }
 

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

@@ -1182,17 +1182,19 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
     public PageDataVO<UsableVehicleModelVO> searchUsableModel(UsableVeicleDTO dto) {
         Map<String, Object> params = BeanUtil.beanToMap(dto);
         if (StrUtil.isNotBlank(dto.getStartDate()) && StrUtil.isNotBlank(dto.getEndDate())) {
-            initBookSearchParam(dto, params, Boolean.FALSE);
+            params = initBookSearchParam(dto, params, Boolean.FALSE);
         }
-        return PageDataVO.pageInfo(dto.getPage(), dto.getLimit(), () -> mapper.searchUsableModel(params));
+        Map<String, Object> finalParams = params;
+        return PageDataVO.pageInfo(dto.getPage(), dto.getLimit(), () -> mapper.searchUsableModel(finalParams));
     }
 
     public PageDataVO<UsableVehicleModelVO> searchUsableModelBackStage(UsableVeicleDTO dto) {
         Map<String, Object> params = BeanUtil.beanToMap(dto);
         if (StrUtil.isNotBlank(dto.getStartDate()) && StrUtil.isNotBlank(dto.getEndDate())) {
-            initBookSearchParam(dto, params, Boolean.FALSE);
+            params = initBookSearchParam(dto, params, Boolean.FALSE);
         }
-        return PageDataVO.pageInfo(dto.getPage(), dto.getLimit(), () -> mapper.searchUsableModel(params));
+        Map<String, Object> finalParams = params;
+        return PageDataVO.pageInfo(dto.getPage(), dto.getLimit(), () -> mapper.searchUsableModel(finalParams));
     }
 
     public PageDataVO<UsableVehicleModelVO> hotModel(HotVeicleDTO dto) {
@@ -1201,7 +1203,7 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
         return PageDataVO.pageInfo(dto.getPage(), dto.getLimit(), () -> mapper.searchUsableModel(params));
     }
 
-    private void initBookSearchParam(UsableVeicleDTO dto, Map<String, Object> params, Boolean needDateExtend) {
+    private Map<String, Object> initBookSearchParam(UsableVeicleDTO dto, Map<String, Object> params, Boolean needDateExtend) {
         List<String> notBookedDates = Lists.newArrayList();
         if (StringUtils.isNotBlank(dto.getStartDate()) &&
                 StringUtils.isNotBlank(dto.getEndDate())) {
@@ -1213,6 +1215,7 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
                     dto.getEndDate());
                 dto.setStartDateExtend(dto.getStartDate());
                 dto.setEndDateExtend(dto.getEndDate());
+                params = BeanUtil.beanToMap(dto);
             }
         }
 
@@ -1232,6 +1235,7 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
 
         //加入预定信息查询条件
         fillBookedDateSearchParam(params, yearMonthAndDate, yearMonthAndDateNotBooked);
+        return params;
     }
 
     public PageDataVO<Vehicle> searchUsableVehicle(RentVehicleBookDTO dto) {
@@ -1240,7 +1244,6 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
             dto.setUseType(null);
         }
 
-        Map<String, Object> params = BeanUtil.beanToMap(dto);
         List<String> notBookedDates = Lists.newArrayList();
         if (StringUtils.isNotBlank(dto.getBookEndDate()) &&
                 StringUtils.isNotBlank(dto.getBookEndDate())) {
@@ -1248,10 +1251,13 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
                     dto.getBookEndDate());
             dto.setStartDateExtend(dto.getBookStartDate());
             dto.setEndDateExtend(dto.getBookEndDate());
+
 //            notBookedDates = convertDatePeriod2List(dto.getStartDateExtend(),
 //                    dto.getEndDateExtend());
         }
 
+        Map<String, Object> params = BeanUtil.beanToMap(dto);
+
         //若传入预定信息查询条件，则查询对应月份预定信息查询条件（不超过3个月）
         if (CollectionUtils.isEmpty(notBookedDates)) {
             //return;