| @@ -11,6 +11,7 @@ import com.iformall.enums.EnumCarVendor; | |||||
| import com.iformall.enums.EnumCouponSendSendType; | import com.iformall.enums.EnumCouponSendSendType; | ||||
| import com.iformall.enums.EnumETCPCode; | import com.iformall.enums.EnumETCPCode; | ||||
| import com.iformall.enums.EnumPayWay; | import com.iformall.enums.EnumPayWay; | ||||
| import com.iformall.exception.MallinkException; | |||||
| import com.iformall.service.*; | import com.iformall.service.*; | ||||
| import com.iformall.service.park.utils.ParkCacheUtils; | import com.iformall.service.park.utils.ParkCacheUtils; | ||||
| import com.iformall.utils.DateUtils; | import com.iformall.utils.DateUtils; | ||||
| @@ -321,7 +322,7 @@ public class WxCarETCPCallBackController extends BaseController { | |||||
| WxPark park = wxParkService.getByObj(parkQ); | WxPark park = wxParkService.getByObj(parkQ); | ||||
| if (park == null) { | if (park == null) { | ||||
| logger.error("etcpParkInCallback: ETCP车场未找到" + etcpParkId); | 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 { | } else { | ||||
| wxCarCmdLog.updateTenantInfo(park); | wxCarCmdLog.updateTenantInfo(park); | ||||
| } | } | ||||
| @@ -7,11 +7,15 @@ import java.util.HashMap; | |||||
| import java.util.List; | import java.util.List; | ||||
| import java.util.Map; | import java.util.Map; | ||||
| import org.apache.ibatis.annotations.Param; | |||||
| /** | /** | ||||
| * @author gongbiao | * @author gongbiao | ||||
| */ | */ | ||||
| public interface WxCarCmdLogMapper extends CommonMapper<WxCarCmdLog, Long> { | public interface WxCarCmdLogMapper extends CommonMapper<WxCarCmdLog, Long> { | ||||
| WxCarCmdLog selectById(@Param("id")Long id,@Param("tenantId")String tenantId); | |||||
| List<WxCarCmdLog> findList(WxCarCmdLog wxCarCmdLog); | List<WxCarCmdLog> findList(WxCarCmdLog wxCarCmdLog); | ||||
| List<Map<String, Object>> queryHistory(HashMap<String, Object> params); | List<Map<String, Object>> queryHistory(HashMap<String, Object> params); | ||||
| @@ -31,4 +35,6 @@ public interface WxCarCmdLogMapper extends CommonMapper<WxCarCmdLog, Long> { | |||||
| WxCarCmdLog queryByOrderId(WxCarCmdLog carCmdLog); | WxCarCmdLog queryByOrderId(WxCarCmdLog carCmdLog); | ||||
| WxCarCmdLog queryBySynId(HashMap<String,Object> params); | WxCarCmdLog queryBySynId(HashMap<String,Object> params); | ||||
| int deleteById(@Param("id")Long id,@Param("tenantId")String tenantId); | |||||
| } | } | ||||
| @@ -26,7 +26,7 @@ public interface WxCarCmdLogService { | |||||
| * @param id | * @param id | ||||
| * @return | * @return | ||||
| */ | */ | ||||
| WxCarCmdLog getById(Long id); | |||||
| WxCarCmdLog getById(Long id,String tenantId); | |||||
| /** | /** | ||||
| * 保存或更新实体 | * 保存或更新实体 | ||||
| @@ -40,7 +40,7 @@ public interface WxCarCmdLogService { | |||||
| * | * | ||||
| * @param id | * @param id | ||||
| */ | */ | ||||
| void deleteById(Long id); | |||||
| void deleteById(Long id,String tenantId); | |||||
| /** | /** | ||||
| @@ -28,8 +28,8 @@ public class WxCarCmdLogServiceImpl implements WxCarCmdLogService { | |||||
| } | } | ||||
| @Override | @Override | ||||
| public WxCarCmdLog getById(Long id) { | |||||
| return wxCarCmdLogMapper.selectById(id); | |||||
| public WxCarCmdLog getById(Long id,String tenantId) { | |||||
| return wxCarCmdLogMapper.selectById(id,tenantId); | |||||
| } | } | ||||
| @Override | @Override | ||||
| @@ -45,8 +45,8 @@ public class WxCarCmdLogServiceImpl implements WxCarCmdLogService { | |||||
| } | } | ||||
| @Override | @Override | ||||
| public void deleteById(Long id) { | |||||
| wxCarCmdLogMapper.deleteById(id); | |||||
| public void deleteById(Long id,String tenantId) { | |||||
| wxCarCmdLogMapper.deleteById(id,tenantId); | |||||
| } | } | ||||
| @Override | @Override | ||||
| @@ -57,6 +57,14 @@ | |||||
| </if> | </if> | ||||
| <if test=" null != sortColumns">order by ${sortColumns}</if> | <if test=" null != sortColumns">order by ${sortColumns}</if> | ||||
| </sql> | </sql> | ||||
| <select id="selectById" parameterType="java.util.HashMap" resultMap="BaseResultMap"> | |||||
| select <include refid="allColumns"/> from wx_car_cmd_log where id = #{id} and tenant_id = #{tenantId} | |||||
| </select> | |||||
| <delete id="deleteById" parameterType="java.util.HashMap"> | |||||
| delete from wx_car_cmd_log where id = #{id} and tenant_id = #{tenantId} | |||||
| </delete> | |||||
| <select id="findList" parameterType="com.iformall.domain.po.WxCarCmdLog" resultMap="BaseResultMap"> | <select id="findList" parameterType="com.iformall.domain.po.WxCarCmdLog" resultMap="BaseResultMap"> | ||||
| select | select | ||||