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

优化jd订单拉取

This commit is contained in:
启航 2026-01-26 09:52:24 +08:00
parent 0c191559b1
commit 9057f0abd6
5 changed files with 20 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
api/oms-api/src/main/java/cn/qihangerp/oms/jd/controller/JdOrderController.java
View File

@ -28,15 +28,5 @@ public class JdOrderController extends BaseController {
return getDataTable(result);
}
@PostMapping("/push_oms")
@ResponseBody
public AjaxResult pushOms(@RequestBody JdOrderPushBo bo) {
// TODO:需要优化消息格式
if(bo!=null && bo.getIds()!=null) {
for(String id: bo.getIds()) {
mqUtils.sendApiMessage(MqMessage.build(EnumShopType.JD, MqType.ORDER_MESSAGE, id));
}
}
return success();
}
}

17
api/oms-api/src/main/java/cn/qihangerp/oms/pdd/controller/PddOrderController.java
View File

@ -43,23 +43,6 @@ public class PddOrderController extends BaseController {
return success(orderService.queryDetailById(id));
}
/**
* 手动推送到系统
* @param bo
* @return
*/
@PostMapping("/push_oms")
@ResponseBody
public AjaxResult pushOms(@RequestBody PddOrderPushBo bo) {
// TODO:需要优化消息格式
if(bo!=null && bo.getIds()!=null) {
for(String id: bo.getIds()) {
mqUtils.sendApiMessage(MqMessage.build(EnumShopType.PDD, MqType.ORDER_MESSAGE, id));
}
}
return success();
}
@PostMapping("/confirmOrder")
public AjaxResult confirmOrder(@RequestBody PddOrderConfirmBo bo) {
log.info("=========确认订单======={}", JSONObject.toJSONString(bo));

17
api/oms-api/src/main/java/cn/qihangerp/oms/tao/controller/TaoOrderController.java
View File

@ -42,22 +42,7 @@ public class TaoOrderController extends BaseController {
return success(taoOrder);
}
/**
* 手动推送到系统
* @param bo
* @return
*/
@PostMapping("/push_oms")
@ResponseBody
public AjaxResult pushOms(@RequestBody TaoOrderPushBo bo) {
// TODO:需要优化消息格式
if(bo!=null && bo.getIds()!=null) {
for(String id: bo.getIds()) {
mqUtils.sendApiMessage(MqMessage.build(EnumShopType.TAO, MqType.ORDER_MESSAGE, id));
}
}
return success();
}
@PostMapping("/confirmOrder")
public AjaxResult confirmOrder(@RequestBody TaoOrderConfirmBo bo) {

16
service/src/main/java/cn/qihangerp/module/service/impl/JdOrderServiceImpl.java
View File

@ -49,24 +49,28 @@ public class JdOrderServiceImpl extends ServiceImpl<JdOrderMapper, JdOrder>
if(org.springframework.util.StringUtils.hasText(bo.getStartTime())){
Matcher matcher = DATE_FORMAT.matcher(bo.getStartTime());
boolean b = matcher.find();
if(b){
bo.setStartTime(bo.getStartTime()+" 00:00:00");
if(!b){
bo.setEndTime("");
// bo.setStartTime(bo.getStartTime()+" 00:00:00");
}
}
if(org.springframework.util.StringUtils.hasText(bo.getEndTime())){
Matcher matcher = DATE_FORMAT.matcher(bo.getEndTime());
boolean b = matcher.find();
if(b){
bo.setEndTime(bo.getEndTime()+" 23:59:59");
if(!b){
// bo.setEndTime(bo.getEndTime()+" 23:59:59");
bo.setStartTime("");
}
}else{
bo.setEndTime(bo.getStartTime());
}
LambdaQueryWrapper<JdOrder> queryWrapper = new LambdaQueryWrapper<JdOrder>()
.eq(bo.getShopId()!=null,JdOrder::getShopId,bo.getShopId())
.eq(StringUtils.hasText(bo.getOrderId()),JdOrder::getOrderId,bo.getOrderId())
.eq(StringUtils.hasText(bo.getOrderState()),JdOrder::getOrderState,bo.getOrderState())
.ge(org.springframework.util.StringUtils.hasText(bo.getStartTime()),JdOrder::getOrderStartTime,bo.getStartTime())
.le(org.springframework.util.StringUtils.hasText(bo.getEndTime()),JdOrder::getOrderStartTime,bo.getEndTime())
.ge(org.springframework.util.StringUtils.hasText(bo.getStartTime()),JdOrder::getOrderStartTime,bo.getStartTime()+" 00:00:00")
.le(org.springframework.util.StringUtils.hasText(bo.getEndTime()),JdOrder::getOrderStartTime,bo.getEndTime()+" 23:59:59")
;
pageQuery.setOrderByColumn("order_start_time");

17
vue/src/views/jd/order/index.vue
View File

@ -19,13 +19,10 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="下单时间" prop="orderTime">
<el-date-picker clearable
v-model="orderTime" value-format="yyyy-MM-dd"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期">
<el-form-item label="下单时间" prop="startTime">
<el-date-picker clearable @change="handleQuery"
v-model="queryParams.startTime" value-format="yyyy-MM-dd"
type="date" placeholder="下单时间">
</el-date-picker>
</el-form-item>
<el-form-item label="订单状态" prop="orderState">
@ -284,8 +281,10 @@ export default {
this.queryParams.startTime = this.orderTime[0]
this.queryParams.endTime = this.orderTime[1]
}else {
this.queryParams.startTime = null
this.queryParams.endTime = null
if(!this.queryParams.startTime) {
this.queryParams.startTime = null
this.queryParams.endTime = null
}
}
this.loading = true;
listOrder(this.queryParams).then(response => {