diff --git a/api/open-api/libs/open-sdk-1.10.2.jar b/api/open-api/libs/open-sdk-1.10.2.jar deleted file mode 100644 index 8bd3583a..00000000 Binary files a/api/open-api/libs/open-sdk-1.10.2.jar and /dev/null differ diff --git a/api/open-api/libs/open-sdk-1.10.4.jar b/api/open-api/libs/open-sdk-1.10.4.jar new file mode 100644 index 00000000..336e1078 Binary files /dev/null and b/api/open-api/libs/open-sdk-1.10.4.jar differ diff --git a/api/open-api/libs/open-sdk-1.5.4.jar b/api/open-api/libs/open-sdk-1.5.4.jar deleted file mode 100644 index 4b7bc82c..00000000 Binary files a/api/open-api/libs/open-sdk-1.5.4.jar and /dev/null differ diff --git a/api/open-api/pom.xml b/api/open-api/pom.xml index 04ac62f5..344a2f1b 100644 --- a/api/open-api/pom.xml +++ b/api/open-api/pom.xml @@ -89,7 +89,7 @@ open-sdk 1.0 system - ${project.basedir}/libs/open-sdk-1.10.2.jar + ${project.basedir}/libs/open-sdk-1.10.4.jar diff --git a/microservices/wei-api/libs/open-sdk-1.10.1.jar b/microservices/wei-api/libs/open-sdk-1.10.1.jar deleted file mode 100644 index 8ef4821b..00000000 Binary files a/microservices/wei-api/libs/open-sdk-1.10.1.jar and /dev/null differ diff --git a/microservices/wei-api/libs/open-sdk-1.10.4.jar b/microservices/wei-api/libs/open-sdk-1.10.4.jar new file mode 100644 index 00000000..336e1078 Binary files /dev/null and b/microservices/wei-api/libs/open-sdk-1.10.4.jar differ diff --git a/microservices/wei-api/libs/open-sdk-1.5.4.jar b/microservices/wei-api/libs/open-sdk-1.5.4.jar deleted file mode 100644 index 4b7bc82c..00000000 Binary files a/microservices/wei-api/libs/open-sdk-1.5.4.jar and /dev/null differ diff --git a/microservices/wei-api/pom.xml b/microservices/wei-api/pom.xml index 780cb00e..c93c1401 100644 --- a/microservices/wei-api/pom.xml +++ b/microservices/wei-api/pom.xml @@ -23,7 +23,7 @@ open-sdk 1.0.2 system - ${project.basedir}/libs/open-sdk-1.10.1.jar + ${project.basedir}/libs/open-sdk-1.10.4.jar cn.qihangerp.service diff --git a/microservices/wei-api/src/main/java/cn/qihangerp/api/wei/controller/WeiOrderApiController.java b/microservices/wei-api/src/main/java/cn/qihangerp/api/wei/controller/WeiOrderApiController.java index 2de877ee..6eaf57f3 100644 --- a/microservices/wei-api/src/main/java/cn/qihangerp/api/wei/controller/WeiOrderApiController.java +++ b/microservices/wei-api/src/main/java/cn/qihangerp/api/wei/controller/WeiOrderApiController.java @@ -71,8 +71,8 @@ public class WeiOrderApiController extends BaseController { order.setOrderId(orderInfo.getOrder_id()); order.setShopId(params.getShopId()); order.setOpenid(orderInfo.getOpenid()); - order.setCreateTime(orderInfo.getCreate_time()); - order.setUpdateTime(orderInfo.getUpdate_time()); + order.setCreateTime(orderInfo.getCreate_time().longValue()); + order.setUpdateTime(orderInfo.getUpdate_time().longValue()); order.setUnionid(orderInfo.getUnionid()); order.setStatus(orderInfo.getStatus()); order.setAftersaleDetail(JSONObject.toJSONString(orderInfo.getAftersale_detail())); diff --git a/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/domain/WeiOrder.java b/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/domain/WeiOrder.java index adeab9cc..288c217e 100644 --- a/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/domain/WeiOrder.java +++ b/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/domain/WeiOrder.java @@ -41,12 +41,12 @@ public class WeiOrder implements Serializable { /** * 秒级时间戳 */ - private Integer createTime; + private Long createTime; /** * 秒级时间戳 */ - private Integer updateTime; + private Long updateTime; /** * diff --git a/vue/src/views/dou/order/index.vue b/vue/src/views/dou/order/index.vue index a8ff7d3b..c86eb344 100644 --- a/vue/src/views/dou/order/index.vue +++ b/vue/src/views/dou/order/index.vue @@ -62,16 +62,16 @@ >API拉取订单 - - 重新推送选中订单到订单库 - + + + + + + + + + + diff --git a/vue/src/views/jd/order/index.vue b/vue/src/views/jd/order/index.vue index f92de048..2e805eba 100644 --- a/vue/src/views/jd/order/index.vue +++ b/vue/src/views/jd/order/index.vue @@ -58,16 +58,16 @@ @click="handlePull" >API拉取订单 - - 重新推送选中订单到订单库 - + + + + + + + + + + diff --git a/vue/src/views/order/private/index.vue b/vue/src/views/order/private/index.vue index d9fa9111..6e49e8fe 100644 --- a/vue/src/views/order/private/index.vue +++ b/vue/src/views/order/private/index.vue @@ -78,16 +78,16 @@ @click="handleAdd" >手动创建订单 - - 重新推送选中订单到订单库 - + + + + + + + + + + diff --git a/vue/src/views/pdd/order/index.vue b/vue/src/views/pdd/order/index.vue index 7027dd73..aa8ee03c 100644 --- a/vue/src/views/pdd/order/index.vue +++ b/vue/src/views/pdd/order/index.vue @@ -64,16 +64,16 @@ >API拉取订单 - - 重新推送选中订单到订单库 - + + + + + + + + + + diff --git a/vue/src/views/wei/order/index.vue b/vue/src/views/wei/order/index.vue index 2ec51b94..36b7aee8 100644 --- a/vue/src/views/wei/order/index.vue +++ b/vue/src/views/wei/order/index.vue @@ -54,16 +54,16 @@ @click="handlePull" >API拉取订单 - - 重新推送选中订单到订单库 - + + + + + + + + + + @@ -128,7 +128,11 @@ - + + + @@ -146,7 +150,7 @@ @@ -250,83 +254,44 @@ {{form.provinceName}}{{form.cityName}}{{form.countyName}} {{form.detailInfo}} - - - {{form.expressCompanyCode}} - {{form.expressTrackingNo}} - - + + + + + + + + + 订单商品 - + - + + + + + - - - + + + - - - - - - 订单商品 - - - 添加赠品 - - - 删除 - - - - - - + - - - - - - - - - - - - - - - + @@ -408,6 +373,17 @@ export default { // this.getList(); }, methods: { + getSkuValues(spec){ + try { + // 解析 JSON，返回一个数组 + const parsedSpec = JSON.parse(spec) || []; + + // 使用 map 提取所有 value，使用 join() 用逗号连接 + return parsedSpec.map(item => item.attr_value).join(', ') || ''; + } catch (error) { + return spec; // 如果 JSON 解析出错，返回空字符串 + } + }, copyActiveCode(event,queryParams) { console.log(queryParams) const clipboard = new Clipboard(".tag-copy")