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

修复douOrder错误

This commit is contained in:
启航老齐 2025-10-01 17:18:45 +08:00
parent d12e2b1118
commit 803402ea8b
4 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/model/src/main/java/cn/qihangerp/model/entity/DouOrder.java
View File

@ -41,7 +41,7 @@ public class DouOrder implements Serializable {
/** /**
* 订单状态1 待确认/待支付（订单创建完毕）105 已支付 2 备货中 101 部分发货 3 已发货（全部发货）4 已取消5 已完成（已收货） * 订单状态1 待确认/待支付（订单创建完毕）105 已支付 2 备货中 101 部分发货 3 已发货（全部发货）4 已取消5 已完成（已收货）
*/ */
private Long orderStatus; private Integer orderStatus;
/** /**
* 订单状态描述 * 订单状态描述

2
core/model/src/main/java/cn/qihangerp/model/entity/DouOrderItem.java
View File

@ -126,7 +126,7 @@ public class DouOrderItem implements Serializable {
/** /**
* 订单商品数量 * 订单商品数量
*/ */
private Long itemNum; private Integer itemNum;
/** /**
* 物流收货时间 * 物流收货时间

24
microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouOrderApiController.java
View File

@ -136,14 +136,21 @@ public class DouOrderApiController {
BeanUtils.copyProperties(gitem, douOrder); BeanUtils.copyProperties(gitem, douOrder);
douOrder.setOrderPhaseList(JSONObject.toJSONString(gitem.getOrderPhaseList())); douOrder.setOrderPhaseList(JSONObject.toJSONString(gitem.getOrderPhaseList()));
douOrder.setEncryptPostAddress(gitem.getPostAddr().getEncryptDetail()); douOrder.setEncryptPostAddress(gitem.getPostAddr().getEncryptDetail());
douOrder.setProvinceName(gitem.getPostAddr().getProvince().getName()); // douOrder.setProvinceName(gitem.getPostAddr().getProvince().getName());
douOrder.setProvinceId(gitem.getPostAddr().getProvince().getId()); douOrder.setProvinceName(gitem.getPostAddr().getProvince()!=null?gitem.getPostAddr().getProvince().getName():"");
douOrder.setCityName(gitem.getPostAddr().getCity().getName()); // douOrder.setProvinceId(gitem.getPostAddr().getProvince().getId());
douOrder.setCityId(gitem.getPostAddr().getCity().getId()); douOrder.setProvinceId(gitem.getPostAddr().getProvince()!=null?gitem.getPostAddr().getProvince().getId():"0");
douOrder.setTownName(gitem.getPostAddr().getTown().getName()); // douOrder.setCityName(gitem.getPostAddr().getCity().getName());
douOrder.setTownId(gitem.getPostAddr().getTown().getId()); douOrder.setCityName(gitem.getPostAddr().getProvince()!=null?gitem.getPostAddr().getCity().getName():"");
douOrder.setStreetName(gitem.getPostAddr().getStreet().getName()); // douOrder.setCityId(gitem.getPostAddr().getCity().getId());
douOrder.setStreetId(gitem.getPostAddr().getStreet().getId()); douOrder.setCityId(gitem.getPostAddr().getProvince()!=null?gitem.getPostAddr().getCity().getId():"");
// douOrder.setTownName(gitem.getPostAddr().getTown().getName());
douOrder.setTownName(gitem.getPostAddr().getProvince()!=null?gitem.getPostAddr().getTown().getName():"");
// douOrder.setTownId(gitem.getPostAddr().getTown().getId());
douOrder.setTownId(gitem.getPostAddr().getProvince()!=null?gitem.getPostAddr().getTown().getId():"0");
// douOrder.setStreetName(gitem.getPostAddr().getStreet().getName());
douOrder.setStreetName(gitem.getPostAddr().getProvince()!=null?gitem.getPostAddr().getStreet().getName():"");
douOrder.setStreetId(gitem.getPostAddr().getProvince()!=null?gitem.getPostAddr().getStreet().getId():"0");
douOrder.setMaskPostAddress(gitem.getMaskPostAddr().getDetail()); douOrder.setMaskPostAddress(gitem.getMaskPostAddr().getDetail());
douOrder.setLogisticsInfo(JSONObject.toJSONString(gitem.getLogisticsInfo())); douOrder.setLogisticsInfo(JSONObject.toJSONString(gitem.getLogisticsInfo()));
List<DouOrderItem> items = new ArrayList<>(); List<DouOrderItem> items = new ArrayList<>();
@ -155,6 +162,7 @@ public class DouOrderApiController {
item.setAfterSaleType(i.getAfterSaleInfo().getAfterSaleType()); item.setAfterSaleType(i.getAfterSaleInfo().getAfterSaleType());
item.setRefundStatus(i.getAfterSaleInfo().getRefundStatus()); item.setRefundStatus(i.getAfterSaleInfo().getRefundStatus());
item.setSpec(JSONObject.toJSONString(i.getSpec())); item.setSpec(JSONObject.toJSONString(i.getSpec()));
// item.setItemNum(i.getItemNum());
items.add(item); items.add(item);
} }
douOrder.setItems(items); douOrder.setItems(items);

2
vue/src/views/dou/order/index.vue
View File

@ -304,6 +304,7 @@ export default {
}, },
/** 搜索按钮操作 */ /** 搜索按钮操作 */
handleQuery() { handleQuery() {
this.pullLoading=false
this.queryParams.pageNum = 1; this.queryParams.pageNum = 1;
this.getList(); this.getList();
}, },
@ -351,6 +352,7 @@ export default {
}else{ }else{
this.$modal.msgSuccess(JSON.stringify(response)); this.$modal.msgSuccess(JSON.stringify(response));
this.getList() this.getList()
this.pullLoading = false
} }
this.pullLoading = false this.pullLoading = false
}) })