订单分析and素材路线管理
This commit is contained in:
parent
b4665a0cbb
commit
ad6c63c4a1
4
pom.xml
4
pom.xml
@ -333,6 +333,10 @@
|
|||||||
<artifactId>junit</artifactId>
|
<artifactId>junit</artifactId>
|
||||||
<scope>test</scope>
|
<scope>test</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.springframework.boot</groupId>
|
||||||
|
<artifactId>spring-boot-starter-data-jpa</artifactId>
|
||||||
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
<build>
|
<build>
|
||||||
|
@ -3,6 +3,9 @@ package com.aircraft.api.od.dao;
|
|||||||
import com.aircraft.api.od.entity.OdOrder;
|
import com.aircraft.api.od.entity.OdOrder;
|
||||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||||
|
|
||||||
|
import java.time.LocalDateTime;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* <p>
|
* <p>
|
||||||
* Mapper 接口
|
* Mapper 接口
|
||||||
@ -13,4 +16,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
|||||||
*/
|
*/
|
||||||
public interface OdOrderMapper extends BaseMapper<OdOrder> {
|
public interface OdOrderMapper extends BaseMapper<OdOrder> {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 根据创建时间范围查询订单列表
|
||||||
|
* @param startTime 开始时间
|
||||||
|
* @param endTime 结束时间
|
||||||
|
* @return 订单列表
|
||||||
|
*/
|
||||||
|
List<OdOrder> selectByCreateTimeBetween(LocalDateTime startTime, LocalDateTime endTime);
|
||||||
}
|
}
|
||||||
|
@ -42,7 +42,7 @@ public class OdOrder implements Serializable {
|
|||||||
private String merchantAccount;
|
private String merchantAccount;
|
||||||
|
|
||||||
@ApiModelProperty(value = "支付金额")
|
@ApiModelProperty(value = "支付金额")
|
||||||
private String amount;
|
private float amount;
|
||||||
|
|
||||||
@ApiModelProperty(value = "创建时间")
|
@ApiModelProperty(value = "创建时间")
|
||||||
private LocalDateTime createtime;
|
private LocalDateTime createtime;
|
||||||
@ -59,5 +59,10 @@ public class OdOrder implements Serializable {
|
|||||||
@ApiModelProperty(value = "状态,t,f")
|
@ApiModelProperty(value = "状态,t,f")
|
||||||
private String state;
|
private String state;
|
||||||
|
|
||||||
|
@ApiModelProperty(value = "开始时间")
|
||||||
|
private LocalDateTime startTime;
|
||||||
|
|
||||||
|
@ApiModelProperty(value = "结束时间")
|
||||||
|
private LocalDateTime endTime;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
|
|||||||
import com.aircraft.api.od.entity.OdOrder;
|
import com.aircraft.api.od.entity.OdOrder;
|
||||||
import com.baomidou.mybatisplus.extension.service.IService;
|
import com.baomidou.mybatisplus.extension.service.IService;
|
||||||
|
|
||||||
|
import java.time.LocalDateTime;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -31,4 +32,5 @@ public interface OdOrderService extends IService<OdOrder> {
|
|||||||
*/
|
*/
|
||||||
IPage<OdOrder> page(OdOrder example,IPage page);
|
IPage<OdOrder> page(OdOrder example,IPage page);
|
||||||
|
|
||||||
|
List<OdOrder> findByCreateTimeBetween(LocalDateTime localDateTime, LocalDateTime localDateTime1);
|
||||||
}
|
}
|
||||||
|
@ -6,8 +6,10 @@ import com.aircraft.api.od.entity.OdOrder;
|
|||||||
import com.aircraft.api.od.dao.OdOrderMapper;
|
import com.aircraft.api.od.dao.OdOrderMapper;
|
||||||
import com.aircraft.api.od.service.OdOrderService;
|
import com.aircraft.api.od.service.OdOrderService;
|
||||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||||
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
|
import java.time.LocalDateTime;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -20,7 +22,8 @@ import java.util.List;
|
|||||||
*/
|
*/
|
||||||
@Service
|
@Service
|
||||||
public class OdOrderServiceImpl extends ServiceImpl<OdOrderMapper, OdOrder> implements OdOrderService {
|
public class OdOrderServiceImpl extends ServiceImpl<OdOrderMapper, OdOrder> implements OdOrderService {
|
||||||
|
@Autowired
|
||||||
|
private OdOrderMapper odOrderMapper;
|
||||||
@Override
|
@Override
|
||||||
public List<OdOrder> list(OdOrder example) {
|
public List<OdOrder> list(OdOrder example) {
|
||||||
return this.list(buildWrapper(example));
|
return this.list(buildWrapper(example));
|
||||||
@ -31,6 +34,20 @@ public class OdOrderServiceImpl extends ServiceImpl<OdOrderMapper, OdOrder> impl
|
|||||||
return this.page(page,buildWrapper(example));
|
return this.page(page,buildWrapper(example));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public List<OdOrder> findByCreateTimeBetween(LocalDateTime startTime, LocalDateTime endTime) {
|
||||||
|
// 参数校验
|
||||||
|
if (startTime == null || endTime == null) {
|
||||||
|
throw new IllegalArgumentException("开始时间和结束时间不能为空");
|
||||||
|
}
|
||||||
|
if (startTime.isAfter(endTime)) {
|
||||||
|
throw new IllegalArgumentException("开始时间不能晚于结束时间");
|
||||||
|
}
|
||||||
|
|
||||||
|
// 调用Mapper方法查询订单数据
|
||||||
|
return odOrderMapper.selectByCreateTimeBetween(startTime, endTime);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 构建查询
|
* 构建查询
|
||||||
*
|
*
|
||||||
|
@ -22,4 +22,10 @@
|
|||||||
id, memberid, order_num, member_account, merchant_account, amount, createtime, pa_order_type, paymen_status, result, state
|
id, memberid, order_num, member_account, merchant_account, amount, createtime, pa_order_type, paymen_status, result, state
|
||||||
</sql>
|
</sql>
|
||||||
|
|
||||||
|
<select id="selectByCreateTimeBetween" resultType="com.aircraft.api.od.entity.OdOrder">
|
||||||
|
SELECT * FROM od_order
|
||||||
|
WHERE createtime BETWEEN #{startTime} AND #{endTime}
|
||||||
|
ORDER BY createtime ASC
|
||||||
|
</select>
|
||||||
|
|
||||||
</mapper>
|
</mapper>
|
||||||
|
@ -7,11 +7,11 @@ author=gjj
|
|||||||
##############<23><><EFBFBD><EFBFBD>·<EFBFBD><C2B7>###############
|
##############<23><><EFBFBD><EFBFBD>·<EFBFBD><C2B7>###############
|
||||||
parent=com.pixelai.api.pa
|
parent=com.pixelai.api.pa
|
||||||
##############<23><><EFBFBD>ݿ<EFBFBD><DDBF><EFBFBD><EFBFBD>###############
|
##############<23><><EFBFBD>ݿ<EFBFBD><DDBF><EFBFBD><EFBFBD>###############
|
||||||
url=jdbc:postgresql://129.211.33.98:54321/pixelai
|
url=jdbc:postgresql://129.211.33.98:54321/aircraft
|
||||||
userName=postgres
|
userName=postgres
|
||||||
password=scutensave
|
password=scutensave
|
||||||
##############<23><>Ҫ<EFBFBD><D2AA><EFBFBD>ɵı<C9B5><C4B1><EFBFBD>###########
|
##############<23><>Ҫ<EFBFBD><D2AA><EFBFBD>ɵı<C9B5><C4B1><EFBFBD>###########
|
||||||
tableName=pa_picture_wall
|
tableName=route
|
||||||
# pa_service_option
|
# pa_service_option
|
||||||
# pa_the_charts,pa_collection,pa_creation,pa_creation_release,pa_recommend
|
# pa_the_charts,pa_collection,pa_creation,pa_creation_release,pa_recommend
|
||||||
# pa_vip_level,pa_vip_currency,pa_vip,pa_consumption,pa_services
|
# pa_vip_level,pa_vip_currency,pa_vip,pa_consumption,pa_services
|
||||||
|
Loading…
Reference in New Issue
Block a user