huangyujie
/
qihang-ecom-erp-open
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化接口返回处理

This commit is contained in:
启航 2026-01-23 17:36:59 +08:00
parent 7f5e6a6a45
commit 5b1a376f79
6 changed files with 31 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/oms-api/src/main/java/cn/qihangerp/oms/pdd/controller/PddOrderApiController.java
View File

@ -127,7 +127,7 @@ public class PddOrderApiController {
logs.setPullTime(currDateTime);
logs.setDuration(System.currentTimeMillis() - beginTime);
pullLogsService.save(logs);
return AjaxResult.error("接口拉取错误："+upResult.getMsg());
return AjaxResult.error(upResult.getMsg());
}

11
core/common/src/main/java/cn/qihangerp/common/AjaxResult.java
View File

@ -145,6 +145,14 @@ public class AjaxResult extends HashMap<String, Object>
{
return AjaxResult.error(msg, null);
}
public static AjaxResult paramError(String msg)
{
return AjaxResult.error(ResultVoEnum.ParamsError.getIndex(),msg, null);
}
public static AjaxResult apiError(String msg)
{
return AjaxResult.error(ResultVoEnum.API_FAIL.getIndex(),msg, null);
}
public static AjaxResult error(int code, String msg, Object data)
{
@ -169,7 +177,8 @@ public class AjaxResult extends HashMap<String, Object>
*/
public static AjaxResult error(String msg, Object data)
{
return new AjaxResult(HttpStatus.ERROR, msg, data);
// return new AjaxResult(HttpStatus.ERROR, msg, data);
return new AjaxResult(ResultVoEnum.API_FAIL.getIndex(), msg, data);
}
/**

1
core/common/src/main/java/cn/qihangerp/common/enums/HttpStatus.java
View File

@ -82,6 +82,7 @@ public class HttpStatus
*/
public static final int ERROR = 500;
/**
* 接口未实现
*/

21
service/src/main/java/cn/qihangerp/module/service/impl/DouOrderServiceImpl.java
View File

@ -24,6 +24,8 @@ import org.springframework.util.StringUtils;
import java.time.Instant;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.time.ZoneOffset;
import java.time.format.DateTimeFormatter;
import java.util.Date;
import java.util.List;
import java.util.regex.Matcher;
@ -51,14 +53,14 @@ public class DouOrderServiceImpl extends ServiceImpl<DouOrderMapper, DouOrder>
private final Pattern DATE_FORMAT = Pattern.compile(DATE_PATTERN);
@Override
public PageResult<DouOrder> queryPageList(DouOrderBo bo, PageQuery pageQuery) {
long startTimeStamp = 0;
long endTimeStamp = 0;
Long startTimestamp = null;
Long endTimestamp = null;
if(StringUtils.hasText(bo.getStartTime())){
Matcher matcher = DATE_FORMAT.matcher(bo.getStartTime());
boolean b = matcher.find();
if(b){
bo.setStartTime(bo.getStartTime()+" 00:00:00");
startTimeStamp = DateUtils.dateTimeStrToTimeStamp(null,bo.getStartTime());
// startTimeStamp = DateUtils.dateTimeStrToTimeStamp(null,bo.getStartTime());
}
}
if(StringUtils.hasText(bo.getEndTime())){
@ -66,16 +68,23 @@ public class DouOrderServiceImpl extends ServiceImpl<DouOrderMapper, DouOrder>
boolean b = matcher.find();
if(b){
bo.setEndTime(bo.getEndTime()+" 23:59:59");
endTimeStamp = DateUtils.dateTimeStrToTimeStamp(null,bo.getEndTime());
// endTimeStamp = DateUtils.dateTimeStrToTimeStamp(null,bo.getEndTime());
}
}
if(StringUtils.hasText(bo.getStartTime())) {
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
LocalDateTime startTime = LocalDateTime.parse(bo.getStartTime(), formatter);
LocalDateTime endTime = LocalDateTime.parse(bo.getEndTime(), formatter);
startTimestamp = startTime.toEpochSecond(ZoneOffset.ofHours(8));
endTimestamp = endTime.toEpochSecond(ZoneOffset.ofHours(8));
}
LambdaQueryWrapper<DouOrder> queryWrapper = new LambdaQueryWrapper<DouOrder>()
.eq(bo.getShopId()!=null,DouOrder::getSShopId,bo.getShopId())
.eq(StringUtils.hasText(bo.getOrderId()),DouOrder::getOrderId,bo.getOrderId())
.eq(StringUtils.hasText(bo.getOrderStatus()),DouOrder::getOrderStatus,bo.getOrderStatus())
.ge(StringUtils.hasText(bo.getStartTime()),DouOrder::getCreateTime, startTimeStamp)
.le(StringUtils.hasText(bo.getEndTime()),DouOrder::getCreateTime,endTimeStamp)
.ge(StringUtils.hasText(bo.getStartTime()),DouOrder::getCreateTime, startTimestamp)
.le(StringUtils.hasText(bo.getEndTime()),DouOrder::getCreateTime,endTimestamp)
;
pageQuery.setOrderByColumn("create_time");
pageQuery.setIsAsc("desc");

3
vue/src/views/order/order_list.vue
View File

@ -19,11 +19,10 @@
<span style="float: left">{{ item.name }}</span>
<span style="float: right; color: #8492a6; font-size: 13px" v-if="item.type === 500">微信小店</span>
<span style="float: right; color: #8492a6; font-size: 13px" v-if="item.type === 200">京东POP</span>
<span style="float: right; color: #8492a6; font-size: 13px" v-if="item.type === 280">京东自营</span>
<span style="float: right; color: #8492a6; font-size: 13px" v-if="item.type === 100">淘宝天猫</span>
<span style="float: right; color: #8492a6; font-size: 13px" v-if="item.type === 300">拼多多</span>
<span style="float: right; color: #8492a6; font-size: 13px" v-if="item.type === 400">抖店</span>
<span style="float: right; color: #8492a6; font-size: 13px" v-if="item.type === 999">线下渠道</span>
<span style="float: right; color: #8492a6; font-size: 13px" v-if="item.type === 999">其他</span>
</el-option>
</el-select>
</el-form-item>

4
vue/src/views/pdd/order/index.vue
View File

@ -475,9 +475,11 @@ export default {
});
// return Promise.reject('无效的会话，或者会话已过期，请重新登录。')
}else{
}else if(response.code === 200){
this.$modal.msgSuccess(JSON.stringify(response));
this.getList()
}else{
this.$modal.msgError(response.msg)
}
this.pullLoading = false
})