Merge remote-tracking branch 'origin/base-modify' into base-modify

# Conflicts:
#	ace-modules/ace-admin/src/main/resources/mapper/AppUserDetailMapper.xml
#	xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleMapper.xml

ace-modules/ace-admin/src/main/resources/mapper/AppUserDetailMapper.xml

@@ -42,11 +42,11 @@
      where d.userid = #{userId}  limit 1
   </select>
 
-    <select id="getUserIdByUsername" resultType="java.lang.Integer">
+    <select id="getUserIdByUsername" resultType="java.lang.Integer" parameterType="java.lang.String">
         select d.userid  from app_user_login l
         left join  app_user_detail d
         on d.userid = l.id
-        where d.realname like concat("%", '#{keywords}', "%") or l.username like concat("%", '#{keywords}', "%")
+        where d.realname like concat("%", #{keywords}, "%") or l.username like concat("%", #{keywords}, "%")
     </select>
 
 

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

@@ -183,16 +183,9 @@ public class MsgBiz {
         set.addAll(list);
         Query query = new Query(Criteria.where("id").in(set));
         query.addCriteria(Criteria.where("userId").is(userId));
-        List<Msg> msgList = mongoTemplate.find(query, Msg.class, "s_msg");
-        if(msgList.size() != set.size()) { //查询到的消息条数不等于查询的Id数
-            return ObjectRestResponse.createFailedResult(ResultCode.IM_DELETE_FAIL_CODE, ResultCode.getMsg(ResultCode.IM_DELETE_FAIL_CODE));
-        }
-        DeleteResult deleteResult = mongoTemplate.remove(query, Msg.class, "s_msg");
-        if (deleteResult != null && deleteResult.getDeletedCount() == set.size()) {
+        mongoTemplate.remove(query, Msg.class, "s_msg");
         return ObjectRestResponse.succ();
     }
-        return ObjectRestResponse.createFailedResult(ResultCode.IM_DELETE_FAIL_CODE, ResultCode.getMsg(ResultCode.IM_DELETE_FAIL_CODE));
-    }
 
 
     /**

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

@@ -180,7 +180,6 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> {
                 getDriverInfo(orderPageVo);
             } else if (orderPageVo.getStatus() >= 5 || orderPageVo.getStatus() == -1) {//出行中 已交车
                 //设置违约金金额
-                updateCrossRefund(orderPageVo);
                 getDriverInfo(orderPageVo);
                 getUserLicense(orderPageVo);
             }
@@ -330,7 +329,7 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> {
                 orderVehicleCrosstownDto.setLicenseName(orderUserLicenses.get(0).getLicenseName());
                 orderVehicleCrosstownDto.setLicensePhone(orderUserLicenses.get(0).getLicensePhone());
             }
-            //设置保留金
+            //设置违约明细
             for (OrderVehicleCrosstownDto a : orderVehicleCrosstown) {
                 if(a.getType() != CrosstownTypeEnum.DEPARTURE.getCode()) {
                     if(StringUtils.isNotBlank(a.getViolateDetail())) {
@@ -339,6 +338,9 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> {
                 }
             }
         }
+        if (StringUtils.isBlank(orderPageVo.getDedDetailDTO())) {
+            updateCrossRefund(orderPageVo);
+        }
         orderPageVo.setOrderVehicleCrosstownDto(orderVehicleCrosstownDto);
     }
 

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

@@ -250,6 +250,7 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
         //定损扣除费用
         if (StringUtils.isNotBlank(orderVehicleCrosstownDto.getDedDetail())) {
             JSONArray jsonArray = JSONArray.parseArray(orderVehicleCrosstownDto.getDedDetail());
+            if(jsonArray != null && jsonArray.size() > 0) {
                 for (int i = 0; i < jsonArray.size(); i++) {
                     JSONObject jsonObject = JSONObject.parseObject(jsonArray.get(i).toString());
                     if (jsonObject != null) {
@@ -257,9 +258,11 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
                     }
                 }
             }
+        }
         //延期扣除费用
         if (StringUtils.isNotBlank(orderVehicleCrosstownDto.getViolateDetail())) {
             JSONArray jsonArray = JSONArray.parseArray(orderVehicleCrosstownDto.getDedDetail());
+            if(jsonArray != null && jsonArray.size() > 0) {
                 for (int i = 0; i < jsonArray.size(); i++) {
                     JSONObject jsonObject = JSONObject.parseObject(jsonArray.get(i).toString());
                     if (jsonObject != null) {
@@ -272,6 +275,7 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
                     }
                 }
             }
+        }
         orderVehicleCrosstownDto.getViolateDetail();
         BigDecimal amount = new BigDecimal(cost.toString()).divide(new BigDecimal("1"), 2, BigDecimal.ROUND_UP);
         //出车成功后修改订单状态

xx-order/xx-order-server/src/main/resources/mapper/OrderVehicaleCrosstownMapper.xml

@@ -26,6 +26,7 @@
       <result column="deduction_cost" jdbcType="INTEGER" property="deductionCost"/>
       <result column="rest_deposit" jdbcType="INTEGER" property="restDeposit"/>
       <result column="user_license_id" jdbcType="VARCHAR" property="userLicenseId"/>
+      <result column="violate_amount_detail" jdbcType="VARCHAR" property="violateDetail"/>
   </resultMap>
     <resultMap id="orderMap" type="com.xxfc.platform.order.pojo.order.OrderVehicleCrosstownDto">
         <result column="id" javaType="java.lang.Integer" property="id"/>
@@ -34,20 +35,20 @@
                      javaType="com.xxfc.platform.order.entity.DepositRefundRecord"/>
     </resultMap>
     <select id="selectByOrderId" parameterType="com.xxfc.platform.order.pojo.order.OrderVehicleCrosstownDto" resultType="com.xxfc.platform.order.pojo.order.OrderVehicleCrosstownDto">
-        select *
-        from order_vehicle_crosstown
+        select o.*, o.violate_amount_detail violateDetail
+        from order_vehicle_crosstown o
         <where>
             <if test="status != null">
-                and status = #{status}
+                and o.status = #{status}
             </if>
             <if test="type != null">
-                and type = #{type}
+                and o.type = #{type}
             </if>
             <if test="orderId != null">
-                and order_id = #{orderId}
+                and o.order_id = #{orderId}
             </if>
             <if test="orderNo != null">
-                and order_no = #{orderNo}
+                and o.order_no = #{orderNo}
             </if>
         </where>
     </select>

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

@@ -418,9 +418,6 @@
            <if test="code != null and code != ''">
                and v1.code = #{code}
            </if>
-           <if test="keywords != null and keywords != ''">
-               and v1.code like concat("%", #{code} "%") or  v1.number_plate like concat("%", #{numberPlate} "%")
-           </if>
            <if test="companyIds != null and companyIds.size > 0">
                and v1.park_branch_company_id in
                <foreach collection="companyIds" item="id" open="(" separator="," close=")">
@@ -485,6 +482,9 @@
             <if test="status != null">
                 and v1.status = #{status}
             </if>
+            <if test="code !=null">
+                and v1.code=#{code}
+            </if>
             <if test="companyIds != null and companyIds.size > 0">
                 and v1.park_branch_company_id in
                 <foreach collection="companyIds" item="id" open="(" separator="," close=")">
@@ -508,6 +508,9 @@
             <if test="status != null">
                 and v2.status = #{status}
             </if>
+            <if test="code !=null">
+                and v2.code=#{code}
+            </if>
             <if test="companyIds != null and companyIds.size > 0">
                 and v2.park_branch_company_id in
                 <foreach collection="companyIds" item="id" open="(" separator="," close=")">