diff --git a/mallinkCallback/src/main/java/com/iformall/controller/callback/WxCarETCPCallBackController.java b/mallinkCallback/src/main/java/com/iformall/controller/callback/WxCarETCPCallBackController.java index 6fccafa83..eaa2b60d3 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/callback/WxCarETCPCallBackController.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/callback/WxCarETCPCallBackController.java @@ -11,6 +11,7 @@ import com.iformall.enums.EnumCarVendor; import com.iformall.enums.EnumCouponSendSendType; import com.iformall.enums.EnumETCPCode; import com.iformall.enums.EnumPayWay; +import com.iformall.exception.MallinkException; import com.iformall.service.*; import com.iformall.service.park.utils.ParkCacheUtils; import com.iformall.utils.DateUtils; @@ -321,7 +322,7 @@ public class WxCarETCPCallBackController extends BaseController { WxPark park = wxParkService.getByObj(parkQ); if (park == null) { logger.error("etcpParkInCallback: ETCP车场未找到" + etcpParkId); - //return new Result(ErrorCode.CAR_PARK_NOT_FOUND.getCode(), "ETCP车场未找到"+ etcpParkId); + throw new MallinkException(ErrorCode.CAR_PARK_NOT_FOUND.getCode(), "ETCP车场未找到"+ etcpParkId); } else { wxCarCmdLog.updateTenantInfo(park); } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCarCmdLogMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCarCmdLogMapper.java index abc96882f..0cfcb282f 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCarCmdLogMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCarCmdLogMapper.java @@ -7,11 +7,15 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import org.apache.ibatis.annotations.Param; + /** * @author gongbiao */ public interface WxCarCmdLogMapper extends CommonMapper { + WxCarCmdLog selectById(@Param("id")Long id,@Param("tenantId")String tenantId); + List findList(WxCarCmdLog wxCarCmdLog); List> queryHistory(HashMap params); @@ -31,4 +35,6 @@ public interface WxCarCmdLogMapper extends CommonMapper { WxCarCmdLog queryByOrderId(WxCarCmdLog carCmdLog); WxCarCmdLog queryBySynId(HashMap params); + + int deleteById(@Param("id")Long id,@Param("tenantId")String tenantId); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxCarCmdLogService.java b/mallinkService/src/main/java/com/iformall/service/WxCarCmdLogService.java index 7fdbe4a46..49663f176 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCarCmdLogService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCarCmdLogService.java @@ -26,7 +26,7 @@ public interface WxCarCmdLogService { * @param id * @return */ - WxCarCmdLog getById(Long id); + WxCarCmdLog getById(Long id,String tenantId); /** * 保存或更新实体 @@ -40,7 +40,7 @@ public interface WxCarCmdLogService { * * @param id */ - void deleteById(Long id); + void deleteById(Long id,String tenantId); /** diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCarCmdLogServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCarCmdLogServiceImpl.java index f47631263..0c2409252 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCarCmdLogServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCarCmdLogServiceImpl.java @@ -28,8 +28,8 @@ public class WxCarCmdLogServiceImpl implements WxCarCmdLogService { } @Override - public WxCarCmdLog getById(Long id) { - return wxCarCmdLogMapper.selectById(id); + public WxCarCmdLog getById(Long id,String tenantId) { + return wxCarCmdLogMapper.selectById(id,tenantId); } @Override @@ -45,8 +45,8 @@ public class WxCarCmdLogServiceImpl implements WxCarCmdLogService { } @Override - public void deleteById(Long id) { - wxCarCmdLogMapper.deleteById(id); + public void deleteById(Long id,String tenantId) { + wxCarCmdLogMapper.deleteById(id,tenantId); } @Override diff --git a/mallinkService/src/main/resources/mapper/WxCarCmdLogMapper.xml b/mallinkService/src/main/resources/mapper/WxCarCmdLogMapper.xml index 4b56d1176..c288886c4 100644 --- a/mallinkService/src/main/resources/mapper/WxCarCmdLogMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCarCmdLogMapper.xml @@ -57,6 +57,14 @@ order by ${sortColumns} + + + + + delete from wx_car_cmd_log where id = #{id} and tenant_id = #{tenantId} +