diff --git a/api/oms-api/libs/open-sdk-2.1.7.jar b/api/oms-api/libs/open-sdk-2.1.7.jar deleted file mode 100644 index 3f3cd358..00000000 Binary files a/api/oms-api/libs/open-sdk-2.1.7.jar and /dev/null differ diff --git a/api/oms-api/libs/open-sdk-2.1.8.jar b/api/oms-api/libs/open-sdk-2.1.8.jar new file mode 100644 index 00000000..b82af3e5 Binary files /dev/null and b/api/oms-api/libs/open-sdk-2.1.8.jar differ diff --git a/api/oms-api/pom.xml b/api/oms-api/pom.xml index b3dcd4e8..27cf9d19 100644 --- a/api/oms-api/pom.xml +++ b/api/oms-api/pom.xml @@ -98,7 +98,7 @@ open-sdk 1.0 system - ${project.basedir}/libs/open-sdk-2.1.7.jar + ${project.basedir}/libs/open-sdk-2.1.8.jar diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/tao/OrderAssembleHelper.java b/api/oms-api/src/main/java/cn/qihangerp/oms/tao/OrderAssembleHelper.java index e99f22ec..0d54880e 100644 --- a/api/oms-api/src/main/java/cn/qihangerp/oms/tao/OrderAssembleHelper.java +++ b/api/oms-api/src/main/java/cn/qihangerp/oms/tao/OrderAssembleHelper.java @@ -71,39 +71,72 @@ public class OrderAssembleHelper { order.setOaid(trade.getOaid()); List items = new ArrayList<>(); for (var item : trade.getOrders()) { +// TaoOrderItem orderItem = new TaoOrderItem(); +// orderItem.setTitle(item.getTitle()); +// orderItem.setTid(Long.parseLong(trade.getTid())); +// orderItem.setOid(Long.parseLong(item.getOid())); +// orderItem.setTotalFee(StringUtils.hasText(item.getTotal_fee()) ? BigDecimal.valueOf(Double.parseDouble(item.getTotal_fee())): BigDecimal.valueOf(0)); +// orderItem.setDiscountFee(StringUtils.hasText(item.getDiscount_fee()) ? BigDecimal.valueOf(Double.parseDouble(item.getDiscount_fee())): BigDecimal.valueOf(0)); +// orderItem.setAdjustFee(StringUtils.hasText(item.getAdjust_fee()) ?BigDecimal.valueOf(Double.parseDouble(item.getAdjust_fee())): BigDecimal.valueOf(0)); +// orderItem.setDivideOrderFee( StringUtils.hasText(item.getDivide_order_fee()) ? Double.parseDouble(item.getDivide_order_fee()):null); +// orderItem.setPartMjzDiscount(StringUtils.hasText(item.getPart_mjz_discount()) ? Double.parseDouble(item.getPart_mjz_discount()):0.0); +// orderItem.setPayment(StringUtils.hasText(item.getPayment()) ? Double.parseDouble(item.getPayment()):0.0); +// orderItem.setPrice(StringUtils.hasText(item.getPrice()) ? BigDecimal.valueOf(Double.parseDouble(item.getPrice())): BigDecimal.valueOf(0)); +// orderItem.setPicPath(item.getPic_path()); +// orderItem.setNumIid(item.getNum_iid()+""); +// orderItem.setSkuId(item.getSku_id()); +//// orderItem.setOuterIid(item.getOuterIid()); +// orderItem.setOuterSkuId(item.getOuter_sku_id()); +// orderItem.setSkuPropertiesName(item.getSku_properties_name()); +//// orderItem.setItemMealId(item.getItemMealId() == null ? "" : item.getItemMealId() + ""); +//// orderItem.setItemMealName(item.getItemMealName()); +// orderItem.setNum(item.getNum()); +// orderItem.setRefundStatus(item.getRefund_status()); +// orderItem.setStatus(item.getStatus()); +//// orderItem.setBuyerRate(item.getBuyerRate() + ""); +//// orderItem.setSellerRate(item.getSellerRate() + ""); +//// orderItem.setRefundId(item.getRefundId()); +// orderItem.setSellerType(item.getSeller_type()); +// orderItem.setCid(item.getCid()); +// orderItem.setEndTime(item.getEnd_time()); +// orderItem.setConsignTime(item.getConsign_time()); +// orderItem.setShippingType(item.getShipping_type()); +// orderItem.setLogisticsCompany(item.getLogistics_company()); +// orderItem.setInvoiceNo(item.getInvoice_no()); TaoOrderItem orderItem = new TaoOrderItem(); orderItem.setTitle(item.getTitle()); - orderItem.setTid(Long.parseLong(trade.getTid())); - orderItem.setOid(Long.parseLong(item.getOid())); - orderItem.setTotalFee(StringUtils.hasText(item.getTotal_fee()) ? BigDecimal.valueOf(Double.parseDouble(item.getTotal_fee())): BigDecimal.valueOf(0)); - orderItem.setDiscountFee(StringUtils.hasText(item.getDiscount_fee()) ? BigDecimal.valueOf(Double.parseDouble(item.getDiscount_fee())): BigDecimal.valueOf(0)); - orderItem.setAdjustFee(StringUtils.hasText(item.getAdjust_fee()) ?BigDecimal.valueOf(Double.parseDouble(item.getAdjust_fee())): BigDecimal.valueOf(0)); - orderItem.setDivideOrderFee( StringUtils.hasText(item.getDivide_order_fee()) ? Double.parseDouble(item.getDivide_order_fee()):null); - orderItem.setPartMjzDiscount(StringUtils.hasText(item.getPart_mjz_discount()) ? Double.parseDouble(item.getPart_mjz_discount()):0.0); - orderItem.setPayment(StringUtils.hasText(item.getPayment()) ? Double.parseDouble(item.getPayment()):0.0); - orderItem.setPrice(StringUtils.hasText(item.getPrice()) ? BigDecimal.valueOf(Double.parseDouble(item.getPrice())): BigDecimal.valueOf(0)); - orderItem.setPicPath(item.getPic_path()); - orderItem.setNumIid(item.getNum_iid()+""); - orderItem.setSkuId(item.getSku_id()); -// orderItem.setOuterIid(item.getOuterIid()); - orderItem.setOuterSkuId(item.getOuter_sku_id()); - orderItem.setSkuPropertiesName(item.getSku_properties_name()); -// orderItem.setItemMealId(item.getItemMealId() == null ? "" : item.getItemMealId() + ""); -// orderItem.setItemMealName(item.getItemMealName()); - orderItem.setNum(item.getNum()); - orderItem.setRefundStatus(item.getRefund_status()); - orderItem.setStatus(item.getStatus()); -// orderItem.setBuyerRate(item.getBuyerRate() + ""); -// orderItem.setSellerRate(item.getSellerRate() + ""); -// orderItem.setRefundId(item.getRefundId()); - orderItem.setSellerType(item.getSeller_type()); - orderItem.setCid(item.getCid()); - orderItem.setEndTime(item.getEnd_time()); - orderItem.setConsignTime(item.getConsign_time()); - orderItem.setShippingType(item.getShipping_type()); - orderItem.setLogisticsCompany(item.getLogistics_company()); - orderItem.setInvoiceNo(item.getInvoice_no()); + orderItem.setTid(Long.parseLong(trade.getTid())); + orderItem.setOid(Long.parseLong(item.getOid())); + orderItem.setTotalFee(StringUtils.hasText(item.getTotalFee()) ? BigDecimal.valueOf(Double.parseDouble(item.getTotalFee())) : BigDecimal.valueOf(0)); + orderItem.setDiscountFee(StringUtils.hasText(item.getDiscountFee()) ? BigDecimal.valueOf(Double.parseDouble(item.getDiscountFee())) : BigDecimal.valueOf(0)); + orderItem.setAdjustFee(StringUtils.hasText(item.getAdjustFee()) ? BigDecimal.valueOf(Double.parseDouble(item.getAdjustFee())) : BigDecimal.valueOf(0)); + orderItem.setDivideOrderFee(StringUtils.hasText(item.getDivideOrderFee()) ? Double.parseDouble(item.getDivideOrderFee()) : null); + orderItem.setPartMjzDiscount(StringUtils.hasText(item.getPartMjzDiscount()) ? Double.parseDouble(item.getPartMjzDiscount()) : 0.0); + orderItem.setPayment(StringUtils.hasText(item.getPayment()) ? Double.parseDouble(item.getPayment()) : 0.0); + orderItem.setPrice(StringUtils.hasText(item.getPrice()) ? BigDecimal.valueOf(Double.parseDouble(item.getPrice())) : BigDecimal.valueOf(0)); + orderItem.setPicPath(item.getPicPath()); + orderItem.setNumIid(item.getNumIid()); + orderItem.setSkuId(item.getSkuId()); + orderItem.setOuterIid(item.getOuterIid()); + orderItem.setOuterSkuId(item.getOuterSkuId()); + orderItem.setSkuPropertiesName(item.getSkuPropertiesName()); + orderItem.setItemMealId(item.getItemMealId()); + orderItem.setItemMealName(item.getItemMealName()); + orderItem.setNum(item.getNum()); + orderItem.setIsShShip(item.getIsShShip()!=null?item.getIsShShip().toString():""); + orderItem.setRefundStatus(item.getRefundStatus()); + orderItem.setStatus(item.getStatus()); + orderItem.setBuyerRate(item.getBuyerRate() + ""); + orderItem.setSellerRate(item.getSellerRate() + ""); + orderItem.setRefundId(item.getRefundId()); +// orderItem.setSellerType(item.getSeller_type()); + orderItem.setCid(item.getCid()); + orderItem.setEndTime(item.getEndTime()); + orderItem.setConsignTime(item.getConsignTime()); +// orderItem.setShippingType(item.getShippingType()); + orderItem.setLogisticsCompany(item.getLogisticsCompany()); + orderItem.setInvoiceNo(item.getLogisticsCode()); items.add(orderItem); } order.setItems(items); @@ -185,6 +218,7 @@ public class OrderAssembleHelper { orderItem.setItemMealId(item.getItemMealId()); orderItem.setItemMealName(item.getItemMealName()); orderItem.setNum(item.getNum()); + orderItem.setIsShShip(item.getIsShShip().toString()); orderItem.setRefundStatus(item.getRefundStatus()); orderItem.setStatus(item.getStatus()); orderItem.setBuyerRate(item.getBuyerRate() + ""); diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/tao/TaoRequest.java b/api/oms-api/src/main/java/cn/qihangerp/oms/tao/TaoRequest.java index 0229ca9f..ad1aefd1 100644 --- a/api/oms-api/src/main/java/cn/qihangerp/oms/tao/TaoRequest.java +++ b/api/oms-api/src/main/java/cn/qihangerp/oms/tao/TaoRequest.java @@ -8,6 +8,16 @@ public class TaoRequest { private Integer pullType;//拉取类型：0或不传全量；1更新（用于拉取商品的条件） + private String orderDate; + + public String getOrderDate() { + return orderDate; + } + + public void setOrderDate(String orderDate) { + this.orderDate = orderDate; + } + public Integer getPullType() { return pullType; } diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/tao/controller/TaoOrderApiController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/tao/controller/TaoOrderApiController.java index 689dc0b9..e949f792 100644 --- a/api/oms-api/src/main/java/cn/qihangerp/oms/tao/controller/TaoOrderApiController.java +++ b/api/oms-api/src/main/java/cn/qihangerp/oms/tao/controller/TaoOrderApiController.java @@ -25,6 +25,7 @@ import cn.qihangerp.open.tao.response.TaoOrderListResponse; import lombok.AllArgsConstructor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.*; import java.io.IOException; @@ -81,24 +82,33 @@ public class TaoOrderApiController { // 获取最后更新时间 LocalDateTime startTime = null; LocalDateTime endTime = null; - OShopPullLasttime lasttime = pullLasttimeService.getLasttimeByShop(req.getShopId(), "ORDER"); - if(lasttime == null){ - endTime = LocalDateTime.now(); - startTime = endTime.minusDays(1); - }else { - startTime = lasttime.getLasttime().minusHours(1);//取上次结束一个小时前 - Duration duration = Duration.between(startTime, LocalDateTime.now()); - long hours = duration.toHours(); - if (hours > 24) { - // 大于24小时，只取24小时 - endTime = startTime.plusHours(24); - } else { + OShopPullLasttime lasttime = null; + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); + if(StringUtils.isEmpty(req.getOrderDate())) { + lasttime = pullLasttimeService.getLasttimeByShop(req.getShopId(), "ORDER"); + if (lasttime == null) { endTime = LocalDateTime.now(); - } + startTime = endTime.minusDays(1); + } else { + startTime = lasttime.getLasttime().minusHours(1);//取上次结束一个小时前 + Duration duration = Duration.between(startTime, LocalDateTime.now()); + long hours = duration.toHours(); + if (hours > 24) { + // 大于24小时，只取24小时 + endTime = startTime.plusHours(24); + } else { + endTime = LocalDateTime.now(); + } // endTime = startTime.plusDays(1);//取24小时 // if(endTime.isAfter(LocalDateTime.now())){ // endTime = LocalDateTime.now(); // } + } + }else { + // 使用条件传过来的时间 + // 将时间字符串转换为 LocalDateTime + startTime = LocalDateTime.parse(req.getOrderDate() + " 00:00:01", formatter); + endTime = LocalDateTime.parse(req.getOrderDate() + " 23:59:59", formatter); } //第一次获取 @@ -156,7 +166,7 @@ public class TaoOrderApiController { pullLasttimeService.updateById(updateLasttime); } } - DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss"); + DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); OShopPullLogs logs = new OShopPullLogs(); logs.setShopType(EnumShopType.TAO.getIndex()); logs.setShopId(req.getShopId()); diff --git a/model/src/main/java/cn/qihangerp/model/entity/TaoOrderItem.java b/model/src/main/java/cn/qihangerp/model/entity/TaoOrderItem.java index 360d0541..2c3b7fcb 100644 --- a/model/src/main/java/cn/qihangerp/model/entity/TaoOrderItem.java +++ b/model/src/main/java/cn/qihangerp/model/entity/TaoOrderItem.java @@ -220,11 +220,21 @@ PAY_PENDING(国际信用卡支付付款确认中) */ private String remark; + private String isShShip; + private String oGoodsId; private String oGoodsSkuId; private static final long serialVersionUID = 1L; + public String getIsShShip() { + return isShShip; + } + + public void setIsShShip(String isShShip) { + this.isShShip = isShShip; + } + public String getoGoodsId() { return oGoodsId; } diff --git a/serviceImpl/tao/src/main/resources/mapper/tao/TaoOrderItemMapper.xml b/serviceImpl/tao/src/main/resources/mapper/tao/TaoOrderItemMapper.xml index 0cd6bbf4..f710affc 100644 --- a/serviceImpl/tao/src/main/resources/mapper/tao/TaoOrderItemMapper.xml +++ b/serviceImpl/tao/src/main/resources/mapper/tao/TaoOrderItemMapper.xml @@ -46,6 +46,7 @@ + @@ -62,6 +63,6 @@ is_service_order,consign_time,shipping_type, logistics_company,invoice_no,bind_oid, status,refund_status,refund_id,o_goods_id,o_goods_sku_id, - remark + remark,is_sh_ship diff --git a/vue/src/views/tao/order/index.vue b/vue/src/views/tao/order/index.vue index 99d7b7d9..263a8e9b 100644 --- a/vue/src/views/tao/order/index.vue +++ b/vue/src/views/tao/order/index.vue @@ -475,30 +475,41 @@ export default { } }, handlePull() { - if(this.queryParams.shopId){ - this.pullLoading = true - pullOrder({shopId:this.queryParams.shopId,updType:0}).then(response => { - console.log('拉取淘宝订单接口返回=====',response) - if(response.code === 1401) { - MessageBox.confirm('Token已过期，需要重新授权！请前往店铺列表重新获取授权！', '系统提示', { confirmButtonText: '前往授权', cancelButtonText: '取消', type: 'warning' }).then(() => { - this.$router.push({path:"/shop/shop_list",query:{type:1}}) - // isRelogin.show = false; - // store.dispatch('LogOut').then(() => { - // location.href = response.data.tokenRequestUrl+'?shopId='+this.queryParams.shopId - // }) - }).catch(() => { - isRelogin.show = false; - }); - - // return Promise.reject('无效的会话，或者会话已过期，请重新登录。') - }else{ - this.$modal.msgSuccess(JSON.stringify(response)); - } - this.pullLoading = false - }) - }else{ - this.$modal.msgSuccess("请先选择店铺"); + if (!this.orderTime) { + this.$modal.msgError("请选择订单时间") + return } + if (!this.queryParams.shopId) { + this.$modal.msgSuccess("请先选择店铺"); + return; + } + const orderDate = this.orderTime[0] + this.pullLoading = true + pullOrder({shopId: this.queryParams.shopId, updType: 0, orderDate: orderDate}).then(response => { + console.log('拉取淘宝订单接口返回=====', response) + if (response.code === 1401) { + MessageBox.confirm('Token已过期，需要重新授权！请前往店铺列表重新获取授权！', '系统提示', { + confirmButtonText: '前往授权', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + this.$router.push({path: "/shop/shop_list", query: {type: 1}}) + // isRelogin.show = false; + // store.dispatch('LogOut').then(() => { + // location.href = response.data.tokenRequestUrl+'?shopId='+this.queryParams.shopId + // }) + }).catch(() => { + isRelogin.show = false; + }); + + // return Promise.reject('无效的会话，或者会话已过期，请重新登录。') + } else { + this.$modal.msgSuccess(JSON.stringify(response)); + this.getList() + } + this.pullLoading = false + }) + // this.$modal.msgSuccess("请先配置API"); },