记得上下班打卡 | git大法好,push需谨慎

Commit 7a3fb193 authored by jiangxiulong's avatar jiangxiulong

快递

parent 96eb77e3
package com.liquidnet.service.kylin.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.liquidnet.service.kylin.entity.KylinOrderExpress;
/**
* <p>
* 订单快递 服务类
* </p>
*
* @author jiangxiulong
* @since 2021-05-02
*/
public interface IKylinOrderExpress extends IService<KylinOrderExpress> {
}
...@@ -14,7 +14,6 @@ import org.springframework.stereotype.Controller; ...@@ -14,7 +14,6 @@ import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap; import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.util.HashMap;
import java.util.List; import java.util.List;
/** /**
......
...@@ -12,6 +12,7 @@ import com.liquidnet.service.kylin.dao.*; ...@@ -12,6 +12,7 @@ import com.liquidnet.service.kylin.dao.*;
import com.liquidnet.service.kylin.dto.param.*; import com.liquidnet.service.kylin.dto.param.*;
import com.liquidnet.service.kylin.entity.*; import com.liquidnet.service.kylin.entity.*;
import com.liquidnet.service.kylin.mapper.*; import com.liquidnet.service.kylin.mapper.*;
import com.liquidnet.service.kylin.service.IKylinOrderExpress;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoTemplate; import org.springframework.data.mongodb.core.MongoTemplate;
...@@ -33,7 +34,7 @@ import java.util.Map; ...@@ -33,7 +34,7 @@ import java.util.Map;
*/ */
@Service @Service
@Slf4j @Slf4j
public class PerformancesExpressServiceImpl extends ServiceImpl<KylinPerformancesMapper, KylinPerformances> { public class PerformancesExpressServiceImpl extends ServiceImpl<KylinOrderExpressMapper, KylinOrderExpress> implements IKylinOrderExpress {
@Autowired @Autowired
MongoTemplate mongoTemplate; MongoTemplate mongoTemplate;
...@@ -50,7 +51,6 @@ public class PerformancesExpressServiceImpl extends ServiceImpl<KylinPerformance ...@@ -50,7 +51,6 @@ public class PerformancesExpressServiceImpl extends ServiceImpl<KylinPerformance
@Autowired @Autowired
private KylinOrderExpressMapper kylinOrderExpressMapper; private KylinOrderExpressMapper kylinOrderExpressMapper;
@Autowired
private KylinOrderExpress kylinOrderExpress; private KylinOrderExpress kylinOrderExpress;
public List<PerformanceExpressPerformanceListAdminDao> getPerformancesList(PerformanceExpressSearchAdminParam performanceExpressSearchAdminParam) { public List<PerformanceExpressPerformanceListAdminDao> getPerformancesList(PerformanceExpressSearchAdminParam performanceExpressSearchAdminParam) {
......
package com.liquidnet.service.kylin.entity; package com.liquidnet.service.kylin.entity;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import java.io.Serializable; import java.io.Serializable;
import java.util.List;
/** /**
* <p> * <p>
......
...@@ -166,6 +166,9 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM ...@@ -166,6 +166,9 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
public KylinPerformanceVo detail(String performancesId, double latitudeFrom, double longitudeFrom, String agentId) { public KylinPerformanceVo detail(String performancesId, double latitudeFrom, double longitudeFrom, String agentId) {
KylinPerformanceVo performancesInfo = dataUtils.getPerformanceVo(performancesId); KylinPerformanceVo performancesInfo = dataUtils.getPerformanceVo(performancesId);
if (null == performancesInfo) {
return performancesInfo;
}
String agentName = dataUtils.getAgentInfoName(agentId); String agentName = dataUtils.getAgentInfoName(agentId);
performancesInfo.setAgentName(agentName); performancesInfo.setAgentName(agentName);
try { try {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment