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

# Conflicts:
#	ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/DataController.java

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

@@ -198,12 +198,13 @@ public class AppUserLoginBiz extends BaseBiz<AppUserLoginMapper, AppUserLogin> {
         }
         return null;
     }
-    
-    @CacheClear(pre = "user{1}")
+
+    @CacheClear(pre = "user{1.id}")
     public void disable(AppUserLogin appUserLogin) {
       mapper.updateByPrimaryKeySelective(appUserLogin);
     }
 
+    @CacheClear(pre = "user{1.id}")
     public void available(AppUserLogin appUserLogin) {
         mapper.updateByPrimaryKeySelective(appUserLogin);
     }

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

@@ -31,6 +31,7 @@ import tk.mybatis.mapper.entity.Example;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
+import java.time.Instant;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -361,16 +362,6 @@ public class MyWalletBiz extends BaseBiz<MyWalletMapper, MyWallet> {
             }
         }
         return  ObjectRestResponse.succ();
-
-    }
-
-
-  public void insertBatchWallet(){
-
-      List<AppUserLogin> appUserLogins = appUserLoginBiz.selectListAll();
-      List<Integer> userIds = appUserLogins.stream().map(AppUserLogin::getId).collect(Collectors.toList());
-
-
   }
 
 }

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

@@ -7,11 +7,13 @@ import com.github.wxiaoqi.security.admin.biz.AppUserSellingWaterBiz;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.xxfc.platform.activity.feign.ActivityFeign;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.PostConstruct;
 import java.util.*;
 
 /**
@@ -20,10 +22,16 @@ import java.util.*;
  * @description
  * @data 2019/7/24 15:11
  */
+@ConditionalOnProperty(prefix = "data.clean", name = "enable",havingValue = "true")
 @RestController
 @RequestMapping("/app/unauth/user_data")
 public class DataController {
 
+    @PostConstruct
+    public void init(){
+        System.out.println("启动了****************************");
+    }
+
     @Autowired
     private AppUserLoginBiz appUserLoginBiz;
 
@@ -53,13 +61,16 @@ public class DataController {
         }
         return ObjectRestResponse.succ();
     }
-    @GetMapping("/clearRelationphone")
+
+    @GetMapping("/clear_relation_withphone")
     public ObjectRestResponse<Void> clearRelationphone(@RequestParam("phones") List<String> phons) {
 
         Map<String, Integer> phoneAndUserIdMapByPhones = appUserLoginBiz.findPhoneAndUserIdMapByPhones(phons);
         if (Objects.nonNull(phoneAndUserIdMapByPhones)){
             Collection<Integer> userIds = phoneAndUserIdMapByPhones.values();
             appUserRelationBiz.deleteByMemberIds(userIds);
+            appUserSellingWaterBiz.deleteByMemberIds(userIds);
+
         }
         return ObjectRestResponse.succ();
     }

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

@@ -435,24 +435,27 @@ 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));
+//            SendMsgDTO sendMsgDTO = new SendMsgDTO(){{
+//                setExchange(ORDER_TOPIC);
+//            }};
+//            sendMsgDTO.setJson(JSONUtil.toJsonStr(orderMQDTO));
             switch (sign) {
                 case 2:
-                    sendMsgDTO.setRoutKey(KEY_ORDER_CANCEL);
+//                    sendMsgDTO.setRoutKey(KEY_ORDER_CANCEL);
+                    mqSenderFeign.sendMessage(ORDER_TOPIC, KEY_ORDER_CANCEL, JSONUtil.toJsonStr(orderMQDTO));
                     break;
                 case 4:
-                    sendMsgDTO.setRoutKey(KEY_ORDER_PAY);
+//                    sendMsgDTO.setRoutKey(KEY_ORDER_PAY);
+                    mqSenderFeign.sendMessage(ORDER_TOPIC, KEY_ORDER_PAY, JSONUtil.toJsonStr(orderMQDTO));
                     break;
                 case 6:
-                    sendMsgDTO.setRoutKey(KEY_ORDER_FINLISH);
+//                    sendMsgDTO.setRoutKey(KEY_ORDER_FINLISH);
+                    mqSenderFeign.sendMessage(ORDER_TOPIC, KEY_ORDER_FINLISH, JSONUtil.toJsonStr(orderMQDTO));
                     break;
                 default:
                     break;
             }
-            mqSenderFeign.postSendMessage(BeanUtil.beanToMap(sendMsgDTO, Boolean.FALSE, Boolean.TRUE));
+//            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

@@ -72,16 +72,21 @@ public class OrderRentVehicleController extends CommonBaseController {
                         }else {
                                 BranchCompany endCompany = vehicleFeign.branchCompanyEntityList(map).getData().get(0);
                                 vo.setEndCompanyId(endCompany.getId());
-                                vo.setEndAddr(endCompany.getAddrDetail());
                         }
                 }
             }
             if(vo.getStartCompanyId() != null) {
                     CompanyDetail companyDetail = vehicleFeign.getCompanyDetail(vo.getStartCompanyId()).getData();
                     if(companyDetail != null) {
-                            vo.setStartAddr(companyDetail.getAddrDetail());
+                            vo.setStartAddr(companyDetail.detailAddr());
                     }
             }
+                if(vo.getEndCompanyId() != null) {
+                        CompanyDetail companyDetail = vehicleFeign.getCompanyDetail(vo.getEndCompanyId()).getData();
+                        if(companyDetail != null) {
+                                vo.setEndAddr(companyDetail.detailAddr());
+                        }
+                }
             RentVehicleBO bo = BeanUtil.toBean(vo, RentVehicleBO.class);
             bo.setBookVehicleVO(new BookVehicleVO(){{
                     setBookStartDate(vo.getBookStartDate());