Merge remote-tracking branch 'origin/dev' into dev

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

@@ -198,7 +198,8 @@ public class AppUserLoginBiz extends BaseBiz<AppUserLoginMapper, AppUserLogin> {
         }
         return null;
     }
-
+    
+    @CacheClear(pre = "user{1}")
     public void disable(AppUserLogin appUserLogin) {
       mapper.updateByPrimaryKeySelective(appUserLogin);
     }
@@ -214,12 +215,12 @@ public class AppUserLoginBiz extends BaseBiz<AppUserLoginMapper, AppUserLogin> {
         mapper.deleteByExample(example);
     }
 
-//    @CacheClear(pre = "appUser{1}")
+    @CacheClear(pre = "user{1}")
     @Transactional(rollbackFor = Exception.class)
     public void deleteAppUserById(Integer id) {
         AppUserLogin appUserLogin = new AppUserLogin();
         appUserLogin.setId(id);
-        appUserLogin.setIsdel(0);
+        appUserLogin.setIsdel(1);
         mapper.updateByPrimaryKeySelective(appUserLogin);
     }
 

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

@@ -62,7 +62,7 @@ public class AppUserRelationBiz extends BaseBiz<AppUserRelationMapper,AppUserRel
      * @param parentId
      */
     public   void bindRelation(Integer userId,Integer parentId,Integer type){
-        if (userId==parentId){
+        if (userId.equals(parentId)){
             log.info("----userId==="+userId+"----parentId===="+parentId+"----自己不能成为自己的上线");
             return;
         }
@@ -155,12 +155,12 @@ public class AppUserRelationBiz extends BaseBiz<AppUserRelationMapper,AppUserRel
     public  void upRelationTemp(Integer pid,Integer userid){
 
         AppUserRelationTemp relationTemp=new AppUserRelationTemp();
-        relationTemp.setUserId(pid);
         relationTemp.setTempId(userid);
         relationTemp.setIsDel(0);
         relationTemp.setType(1);
         AppUserRelationTemp relationTemp1= relationTempBiz.selectOne(relationTemp);
         if(relationTemp1==null){
+            relationTemp.setUserId(pid);
             relationTempBiz.insertSelective(relationTemp);
         }
 

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

@@ -12,8 +12,9 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 
 @SpringBootApplication(scanBasePackages = {
         "com.xxfc.platform",
-        "com.github.wxiaoqi.security.common.handler",
-        "com.github.wxiaoqi.security.common.log"
+        "com.github.wxiaoqi.security.common.handler"
+//        ,
+//        "com.github.wxiaoqi.security.common.log"
 })
 @EnableDiscoveryClient
 @EnableScheduling

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

@@ -24,6 +24,7 @@ import com.xxfc.platform.order.pojo.order.OrderPageVO;
 import com.xxfc.platform.order.pojo.order.OrderVehicleCrosstownDto;
 import com.xxfc.platform.tour.feign.TourFeign;
 import com.xxfc.platform.universal.constant.DictionaryKey;
+import com.xxfc.platform.universal.dto.SendMsgDTO;
 import com.xxfc.platform.universal.entity.Dictionary;
 import com.xxfc.platform.universal.feign.MQSenderFeign;
 import com.xxfc.platform.universal.feign.ThirdFeign;
@@ -434,19 +435,24 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> {
     private void sendQueue(OrderMQDTO orderMQDTO, Integer sign) {
         try {
             orderMQDTO.setSign(sign);
+            SendMsgDTO sendMsgDTO = new SendMsgDTO(){{
+                setExchange(ORDER_TOPIC);
+            }};
+            sendMsgDTO.setJson(JSONUtil.toJsonStr(orderMQDTO));
             switch (sign) {
                 case 2:
-                    mqSenderFeign.sendMessage(ORDER_TOPIC, KEY_ORDER_CANCEL, JSONUtil.toJsonStr(orderMQDTO));
+                    sendMsgDTO.setRoutKey(KEY_ORDER_CANCEL);
                     break;
                 case 4:
-                    mqSenderFeign.sendMessage(ORDER_TOPIC, KEY_ORDER_PAY, JSONUtil.toJsonStr(orderMQDTO));
+                    sendMsgDTO.setRoutKey(KEY_ORDER_PAY);
                     break;
                 case 6:
-                    mqSenderFeign.sendMessage(ORDER_TOPIC, KEY_ORDER_FINLISH, JSONUtil.toJsonStr(orderMQDTO));
+                    sendMsgDTO.setRoutKey(KEY_ORDER_FINLISH);
                     break;
                 default:
                     break;
             }
+            mqSenderFeign.postSendMessage(BeanUtil.beanToMap(sendMsgDTO, Boolean.FALSE, Boolean.TRUE));
         } catch (Exception e) {
             log.error(e.getMessage(), e);
         }

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

@@ -330,6 +330,11 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
                 newValue.setCrosstownId(orderVehicleCrosstown.getId());
                 newValue.setId(null);
                 orderDepositRefundRecordBiz.save(newValue);
+                DepositRefundRecord nextValue = orderDepositRefundRecordBiz.findByCrossIdAndStatus(orderVehicleCrosstown.getId(), DepositRefundStatus.FIXLOSSREFUNDARRIVAL.getCode());
+                if(nextValue != null) {
+                    nextValue.setRestAmount(newValue.getRestAmount());
+                    orderDepositRefundRecordBiz.update(nextValue);
+                }
             } else {
                 throw new BaseException("定损记录不存在！请联系客服");
             }

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/OrderRentVehicleController.java

@@ -4,7 +4,6 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken;
-import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
 import com.github.wxiaoqi.security.common.context.BaseContextHandler;
 import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
@@ -14,12 +13,11 @@ import com.xxfc.platform.order.biz.BaseOrderBiz;
 import com.xxfc.platform.order.biz.OrderRentVehicleBiz;
 import com.xxfc.platform.order.entity.BaseOrder;
 import com.xxfc.platform.order.entity.OrderRentVehicleDetail;
-import com.xxfc.platform.order.service.OrderRentVehicleService;
 import com.xxfc.platform.order.pojo.AddRentVehicleDTO;
 import com.xxfc.platform.order.pojo.order.RentVehicleBO;
 import com.xxfc.platform.order.pojo.price.RentVehiclePriceVO;
+import com.xxfc.platform.order.service.OrderRentVehicleService;
 import com.xxfc.platform.vehicle.entity.BranchCompany;
-import com.xxfc.platform.vehicle.entity.Vehicle;
 import com.xxfc.platform.vehicle.feign.VehicleFeign;
 import com.xxfc.platform.vehicle.pojo.BookVehicleVO;
 import com.xxfc.platform.vehicle.pojo.CompanyDetail;
@@ -31,13 +29,10 @@ import org.mockito.internal.util.collections.Sets;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
-import springfox.documentation.annotations.ApiIgnore;
 
-import javax.persistence.Column;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 @Controller
 @RequestMapping("orderRentVehicle")
@@ -77,9 +72,16 @@ public class OrderRentVehicleController extends CommonBaseController {
                         }else {
                                 BranchCompany endCompany = vehicleFeign.branchCompanyEntityList(map).getData().get(0);
                                 vo.setEndCompanyId(endCompany.getId());
+                                vo.setEndAddr(endCompany.detailAddr());
                         }
                 }
             }
+            if(vo.getStartCompanyId() != null) {
+                    CompanyDetail companyDetail = vehicleFeign.getCompanyDetail(vo.getStartCompanyId()).getData();
+                    if(companyDetail != null) {
+                            vo.setStartAddr(companyDetail.detailAddr());
+                    }
+            }
             RentVehicleBO bo = BeanUtil.toBean(vo, RentVehicleBO.class);
             bo.setBookVehicleVO(new BookVehicleVO(){{
                     setBookStartDate(vo.getBookStartDate());

xx-universal/xx-universal-api/src/main/java/com/xxfc/platform/universal/dto/SendMsgDTO.java

+package com.xxfc.platform.universal.dto;
+
+import lombok.Data;
+
+@Data
+public class SendMsgDTO {
+    String exchange;
+    String routKey;
+    String json;
+}

xx-universal/xx-universal-api/src/main/java/com/xxfc/platform/universal/feign/MQSenderFeign.java

@@ -3,12 +3,18 @@ package com.xxfc.platform.universal.feign;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
+import java.util.Map;
+
 @FeignClient(value = "xx-universal", contextId = "sendMessage")
 public interface MQSenderFeign {
 
     @GetMapping(value = "/message/sendMessage")
     public ObjectRestResponse sendMessage(@RequestParam(value = "exchange") String exchange, @RequestParam(value = "routKey")String routKey, @RequestParam(value = "json") String json);
 
+    @PostMapping(value = "/message/sendMessage")
+    public ObjectRestResponse postSendMessage(@RequestParam("entity") Map<String, Object> entity);
+
 }

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

@@ -2,10 +2,9 @@ package com.xxfc.platform.universal.controller;
 
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.xxfc.platform.universal.biz.MQServiceBiZ;
+import com.xxfc.platform.universal.dto.SendMsgDTO;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 @RestController
 @RequestMapping(value = "message")
@@ -19,4 +18,10 @@ public class MQSenderController {
         return mqServiceBiZ.sendMessage(exchange, routKey, json);
     }
 
+    @PostMapping(value = "/sendMessage")
+    public ObjectRestResponse sendMessage(@RequestBody SendMsgDTO dto) {
+        return mqServiceBiZ.sendMessage(dto.getExchange(), dto.getRoutKey(), dto.getJson());
+    }
+
+
 }

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/BookVehicleVO.java

@@ -102,4 +102,5 @@ public class BookVehicleVO {
 
     private String upkeepIds;
 
+    private String orderNo;
 }
\ No newline at end of file

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

@@ -362,6 +362,7 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
         vehicleBookRecord.setDestination(bookVehicleVo.getDestination());
         vehicleBookRecord.setLiftCompany(bookVehicleVo.getLiftCompany());
         vehicleBookRecord.setRetCompany(bookVehicleVo.getRetCompany());
+        vehicleBookRecord.setOrderNo(bookVehicleVo.getOrderNo());
         vehicleBookRecordBiz.save(vehicleBookRecord);
 //        //添加预定时间记录
 //