diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxCarCallBackController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxCarCallBackController.java index bce24ee6f..ec598a3ba 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxCarCallBackController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxCarCallBackController.java @@ -228,10 +228,17 @@ public class WxCarCallBackController extends BaseController { logger.info("["+getIpAddr()+"etcpPaidCallback: " + paramMap.toString()); String carNumber = paramMap.get("plateNumber"); - // TODO how to get the parkId + // 根据orderId获取入场信息,确定租户ID + String orderId = paramMap.get("orderId"); + HashMap map = new HashMap(); + map.put("synId", orderId); + String tenant_id = wxCarCmdLogService.getTenantIdBySynId(map); Date currentDate = new Date(); WxCarCmdLog wxCarCmdLog = new WxCarCmdLog(); + if(StringUtils.isNotBlank(tenant_id)) { + wxCarCmdLog.setTenantId(tenant_id); + } wxCarCmdLog.setVendorType(EnumCarVendor.CAR_ETCP.getCode()); wxCarCmdLog.setCmdType(EnumCarCmd.CAR_ETCP_CALLBACK_PAY_MANUAL.getCode()); wxCarCmdLog.setCmdJson(JSON.toJSONString(paramMap)); diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCarCmdLogMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCarCmdLogMapper.java index c9d913946..ce6651f5f 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCarCmdLogMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCarCmdLogMapper.java @@ -23,4 +23,6 @@ public interface WxCarCmdLogMapper extends CommonMapper { List> queryPlateNumberList(Map carParams); + String queryTenantIdBySynId(HashMap params); + } diff --git a/mallinkService/src/main/java/com/iformall/service/WxCarCmdLogService.java b/mallinkService/src/main/java/com/iformall/service/WxCarCmdLogService.java index 6bf2c506e..7016361a5 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCarCmdLogService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCarCmdLogService.java @@ -3,14 +3,16 @@ package com.iformall.service; import com.github.pagehelper.PageInfo; import com.iformall.domain.po.WxCarCmdLog; +import java.util.HashMap; + public interface WxCarCmdLogService { /** * 根据实体查询分页列表 * * @param record - * @param offset - * @param limit + * @param pageIndex + * @param pageSize * @return */ PageInfo listAsPage(WxCarCmdLog record, Integer pageIndex, Integer pageSize); @@ -36,12 +38,20 @@ public interface WxCarCmdLogService { * @param id */ void deleteById(Long id); - - - - - - - + + /** + * 根据synId获取tenantId + * @param params + * @return + */ + String getTenantIdBySynId(HashMap params); + + + + + + + + } 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 3e8b35b03..6b36ff66f 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCarCmdLogServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCarCmdLogServiceImpl.java @@ -11,6 +11,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.iformall.common.IdWorker; +import java.util.HashMap; + @Service public class WxCarCmdLogServiceImpl implements WxCarCmdLogService { private final Logger logger = LoggerFactory.getLogger(this.getClass()); @@ -47,7 +49,11 @@ public class WxCarCmdLogServiceImpl implements WxCarCmdLogService { } - + @Override + public String getTenantIdBySynId(HashMap params) { + return wxCarCmdLogMapper.queryTenantIdBySynId(params); + } + diff --git a/mallinkService/src/main/resources/mapper/WxCarCmdLogMapper.xml b/mallinkService/src/main/resources/mapper/WxCarCmdLogMapper.xml index c8218729f..c6a675023 100644 --- a/mallinkService/src/main/resources/mapper/WxCarCmdLogMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCarCmdLogMapper.xml @@ -103,8 +103,11 @@ and json_unquote(JSON_EXTRACT(cmd_json,'$.plateNumber')) is not null group by plateNumber - - + +