Merge branch 'master-modify-cutAmount' into dev

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

@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.lang.Dict;
 import cn.hutool.core.util.StrUtil;
+import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
 import com.github.wxiaoqi.security.admin.constant.enumerate.MemberEnum;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
@@ -414,13 +415,13 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
      */
     private void costDetail(RentVehiclePriceVO vo, String children) {
         OrderTemplate template = orderTemplateBiz.selectByCode(OrderCostEnum.RENT_VEHICLE.getCode());
-//        (Map<String, String>)CollUtil.zip(CollUtil.newArrayList("children", "vehicleAmount", "realAmount", "paramJson")
-//                , CollUtil.newArrayList(children, vo.getVehicleAmount()+"", vo.getRealAmount()+"", vo.getParamJson()));
         template.setTemplate(orderTemplateBiz.result(template.getTemplate()
                 , CollUtil.zip(CollUtil.newArrayList("children", "vehicleAmount", "realAmount", "paramJson")
-                                , CollUtil.newArrayList(children, vo.getVehicleAmount()
-                                , vo.getRealAmount(), vo.getParamJson()))));
+                                , CollUtil.newArrayList(children, vo.getVehicleAmount(), vo.getRealAmount(), ""))));
         String result = orderTemplateBiz.result(template, Dict.parse(vo));
+        JSONObject jsonObject = JSONUtil.parseObj(result);
+        jsonObject.put("paramJson", vo.getParamJson());
+        result = JSONUtil.toJsonStr(jsonObject);
         vo.setCostDetail(result);
     }
 

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

@@ -383,9 +383,6 @@
             <if test="numberPlate != null">
                 and v1.number_plate = #{numberPlate}
             </if>
-            <if test="keywords != null and keywords != ''">
-                and (v1.number_plate like concat('%', #{keywords}, '%') or v1.code like concat('%', #{keywords}, '%'))
-            </if>
             <if test="status != null">
                 and v1.status = #{status}
             </if>
@@ -421,6 +418,9 @@
            <if test="code != null and code != ''">
                and v1.code = #{code}
            </if>
+           <if test="keywords != null and keywords != ''">
+               and (v1.number_plate like concat('%', #{keywords}, '%') or v1.code like concat('%', #{keywords}, '%'))
+           </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 +485,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 +511,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=")">