Просмотр исходного кода

[停车][修改]:停车优化

release_toaliyun_real
Stormeye Wu 6 лет назад
Родитель
Сommit
52ee16639a
2 измененных файлов: 8 добавлений и 8 удалений
  1. +1
    -0
      mallinkCallback/src/main/java/com/iformall/controller/callback/WxCarCallBackController.java
  2. +7
    -8
      mallinkService/src/main/resources/mapper/WxCarCmdLogMapper.xml

+ 1
- 0
mallinkCallback/src/main/java/com/iformall/controller/callback/WxCarCallBackController.java Просмотреть файл

@@ -383,6 +383,7 @@ public class WxCarCallBackController extends BaseController {
if(StringUtils.isNotBlank(tenantId)) { if(StringUtils.isNotBlank(tenantId)) {
map.put("tenantId", tenantId); map.put("tenantId", tenantId);
} }
map.put("plateNumber", carNumber);
map.put("orderId", orderId); map.put("orderId", orderId);
map.put("feeTime", etcpTime); map.put("feeTime", etcpTime);
WxCarCmdLog carCmdLog = wxCarCmdLogService.getByOrderId(map); WxCarCmdLog carCmdLog = wxCarCmdLogService.getByOrderId(map);


+ 7
- 8
mallinkService/src/main/resources/mapper/WxCarCmdLogMapper.xml Просмотреть файл

@@ -12,7 +12,7 @@
</resultMap> </resultMap>


<sql id="allColumns"> <sql id="allColumns">
`id`,`tenant_id`,`vendor_type`,`cmd_type`,`create_date`,`update_date`,`cmd_json`
`id`,`tenant_id`,`vendor_type`,`cmd_type`,`create_date`,`update_date`,`cmd_json`
</sql> </sql>
<sql id="dynamicWhereConditions"> <sql id="dynamicWhereConditions">
@@ -20,37 +20,30 @@
<if test=" null != id "> <if test=" null != id ">
and `id` = #{id} and `id` = #{id}
</if> </if>
<if test=" null != tenantId "> <if test=" null != tenantId ">
and `tenant_id` = #{tenantId} and `tenant_id` = #{tenantId}
</if> </if>
<if test=" null != vendorType "> <if test=" null != vendorType ">
and `vendor_type` = #{vendorType} and `vendor_type` = #{vendorType}
</if> </if>
<if test=" null != cmdType "> <if test=" null != cmdType ">
and `cmd_type` = #{cmdType} and `cmd_type` = #{cmdType}
</if> </if>
<if test=" null != createDate "> <if test=" null != createDate ">
and `create_date` = #{createDate} and `create_date` = #{createDate}
</if> </if>
<if test=" null != updateDate "> <if test=" null != updateDate ">
and `update_date` = #{updateDate} and `update_date` = #{updateDate}
</if> </if>
<if test=" null != cmdJson "> <if test=" null != cmdJson ">
and `cmd_json` like concat('%', #{cmdJson},'%') and `cmd_json` like concat('%', #{cmdJson},'%')
</if> </if>
<if test=" null != ids "> <if test=" null != ids ">
and id in and id in
@@ -134,6 +127,9 @@
<if test=" null != tenantId"> <if test=" null != tenantId">
and tenant_id = #{tenantId} and tenant_id = #{tenantId}
</if> </if>
<if test=" null != plateNumber">
and plateNumber = #{plateNumber}
</if>
<if test=" null != orderId"> <if test=" null != orderId">
and order_id = #{orderId} and order_id = #{orderId}
</if> </if>
@@ -149,6 +145,9 @@
<if test=" null != tenantId"> <if test=" null != tenantId">
and tenant_id = #{tenantId} and tenant_id = #{tenantId}
</if> </if>
<if test=" null != plateNumber">
and plateNumber = #{plateNumber}
</if>
<if test=" null != cmdType"> <if test=" null != cmdType">
and cmd_type = #{cmdType} and cmd_type = #{cmdType}
</if> </if>


Загрузка…
Отмена
Сохранить