diff --git a/api/open-api/libs/open-sdk-1.10.1.jar b/api/open-api/libs/open-sdk-1.10.2.jar similarity index 89% rename from api/open-api/libs/open-sdk-1.10.1.jar rename to api/open-api/libs/open-sdk-1.10.2.jar index 8ef4821b..8bd3583a 100644 Binary files a/api/open-api/libs/open-sdk-1.10.1.jar and b/api/open-api/libs/open-sdk-1.10.2.jar differ diff --git a/api/open-api/pom.xml b/api/open-api/pom.xml index de8ea2b7..04ac62f5 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.1.jar + ${project.basedir}/libs/open-sdk-1.10.2.jar diff --git a/microservices/tao-api/libs/open-sdk-1.10.1.jar b/microservices/tao-api/libs/open-sdk-1.10.2.jar similarity index 89% rename from microservices/tao-api/libs/open-sdk-1.10.1.jar rename to microservices/tao-api/libs/open-sdk-1.10.2.jar index 8ef4821b..8bd3583a 100644 Binary files a/microservices/tao-api/libs/open-sdk-1.10.1.jar and b/microservices/tao-api/libs/open-sdk-1.10.2.jar differ diff --git a/microservices/tao-api/libs/open-sdk-1.5.4.jar b/microservices/tao-api/libs/open-sdk-1.5.4.jar deleted file mode 100644 index 4b7bc82c..00000000 Binary files a/microservices/tao-api/libs/open-sdk-1.5.4.jar and /dev/null differ diff --git a/microservices/tao-api/pom.xml b/microservices/tao-api/pom.xml index d7f8ecbe..fa528cda 100644 --- a/microservices/tao-api/pom.xml +++ b/microservices/tao-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.2.jar com.squareup.okhttp3 diff --git a/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/OrderAssembleHelper.java b/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/OrderAssembleHelper.java index 5dc30b2f..eab8a764 100644 --- a/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/OrderAssembleHelper.java +++ b/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/OrderAssembleHelper.java @@ -3,6 +3,7 @@ package cn.qihangerp.api.tao; import cn.qihangerp.module.open.tao.domain.TaoOrder; import cn.qihangerp.module.open.tao.domain.TaoOrderItem; +import cn.qihangerp.open.tao.response.TaoOrderDetailResponse; import cn.qihangerp.open.tao.response.TaoOrderListResponse; import org.springframework.util.StringUtils; @@ -35,7 +36,7 @@ public class OrderAssembleHelper { order.setPostFee(StringUtils.hasText(trade.getPost_fee()) ? BigDecimal.valueOf(Double.parseDouble(trade.getPost_fee())) : null); order.setDiscountFee(StringUtils.hasText(trade.getDiscount_fee()) ? BigDecimal.valueOf(Double.parseDouble(trade.getDiscount_fee())) : null); order.setPayment(BigDecimal.valueOf(Double.parseDouble(trade.getPayment()))); - order.setReceivedPayment(StringUtils.hasText(trade.getDiscount_fee()) ? BigDecimal.valueOf(Double.parseDouble(trade.getReceived_payment())) : null); + order.setReceivedPayment(StringUtils.hasText(trade.getReceived_payment()) ? BigDecimal.valueOf(Double.parseDouble(trade.getReceived_payment())) : null); } catch (Exception ee) { ee.printStackTrace(); } @@ -82,7 +83,7 @@ public class OrderAssembleHelper { 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.setNumIid(item.getNum_iid()+""); orderItem.setSkuId(item.getSku_id()); // orderItem.setOuterIid(item.getOuterIid()); orderItem.setOuterSkuId(item.getOuter_sku_id()); @@ -109,4 +110,98 @@ public class OrderAssembleHelper { return order; } + + public static TaoOrder assembleOrder(TaoOrderDetailResponse trade) { + + TaoOrder order = new TaoOrder(); + order.setTid(trade.getTid()); + order.setTitle(trade.getTitle()); + order.setType(trade.getType()); + order.setSellerFlag(trade.getSellerFlag() + ""); +// order.setHasBuyerMessage(trade.isHas_buyer_message() + ""); +// order.setCreditCardFee(trade.getCredit_card_fee()); + order.setCreated(trade.getCreated()); + order.setModified(trade.getModified()); + order.setPayTime(trade.getPayTime()); +// order.setPrice(Double.parseDouble(trade.getPrice())); + try { + order.setTotalFee(StringUtils.hasText(trade.getTotalFee()) ? Double.parseDouble(trade.getTotalFee()) : null); + order.setAdjustFee(StringUtils.hasText(trade.getAdjustFee()) ? Double.parseDouble(trade.getAdjustFee()) : null); + order.setPostFee(StringUtils.hasText(trade.getPostFee()) ? BigDecimal.valueOf(Double.parseDouble(trade.getPostFee())) : null); + order.setDiscountFee(StringUtils.hasText(trade.getDiscountFee()) ? BigDecimal.valueOf(Double.parseDouble(trade.getDiscountFee())) : null); + order.setPayment(BigDecimal.valueOf(Double.parseDouble(trade.getPayment()))); + order.setReceivedPayment(StringUtils.hasText(trade.getReceivedPayment()) ? BigDecimal.valueOf(Double.parseDouble(trade.getReceivedPayment())) : null); + } catch (Exception ee) { + ee.printStackTrace(); + } + order.setBuyerNick(trade.getBuyerNick()); + order.setBuyerOpenUid(trade.getBuyerOpenUid()); + order.setAlipayNo(trade.getAlipayNo()); +// order.setBuyerAlipayNo(trade.getBuyerAlipayNo()); +// order.setBuyerEmail(trade.getBuyerEmail()); +// order.setBuyerMemo(trade.getBuyerMemo()); +// order.setBuyerMessage(trade.getBuyerMessage()); +// order.setMarkDesc(trade.getMarkDesc()); +// order.setSellerMemo(trade.getSellerMemo()); + +// order.setReceiverCountry(trade.getReceiverCountry()); + order.setReceiverState(trade.getReceiverState()); + order.setReceiverCity(trade.getReceiverCity()); + order.setReceiverDistrict(trade.getReceiverDistrict()); + order.setReceiverTown(trade.getReceiverTown()); + order.setReceiverAddress(trade.getReceiverAddress()); + order.setReceiverName(trade.getReceiverName()); + order.setReceiverMobile(trade.getReceiverMobile()); +// order.setReceiverPhone(trade.getReceiverPhone()); + order.setSid(trade.getSid()); +// order.setYfxFee(trade.getYfxFee()); + order.setHasYfx(trade.getHasYfx() + ""); +// order.setLogisticsInvoiceNo(trade.getinvoice); +// order.setNumIid(trade.getNumIid() + ""); +// order.setNum(trade.getNum().intValue()); + order.setStatus(trade.getStatus()); +// order.setConsignTime(trade.getConsignTime()); +// order.setEndTime(trade.getEndTime()); + order.setOaid(trade.getOaid()); + List items = new ArrayList<>(); + for (var item : trade.getOrders().getOrder()) { + 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.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.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); + return order; + + } } diff --git a/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoOrderApiController.java b/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoOrderApiController.java index 9f580f4e..19c250dd 100644 --- a/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoOrderApiController.java +++ b/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoOrderApiController.java @@ -205,20 +205,10 @@ public class TaoOrderApiController { // ApiResultVo resultVo = OrderApiHelper.pullOrderDetail(taoRequest.getOrderId(), url, appKey, appSecret, sessionKey); - ApiResultVo resultVo = TaoOrderApiHelper.pullOrderDetail(taoRequest.getOrderId(), appKey, appSecret, sessionKey); + ApiResultVo resultVo = TaoOrderApiHelper.pullOrderDetail(taoRequest.getOrderId().toString(), appKey, appSecret, sessionKey); if (resultVo.getCode() == ResultVoEnum.SUCCESS.getIndex()) { - TaoOrder taoOrder = new TaoOrder(); - BeanUtils.copyProperties(resultVo.getData(),taoOrder); -// List orderItems = new ArrayList<>(); -// if(resultVo.getData().getItems()!=null && resultVo.getData().getItems().size()>0){ -// for (var item : resultVo.getData().getItems()) { -// TaoOrderItem orderItem = new TaoOrderItem(); -// BeanUtils.copyProperties(item,orderItem); -// orderItems.add(orderItem); -// } -// } -// taoOrder.setItems(orderItems); + TaoOrder taoOrder = OrderAssembleHelper.assembleOrder(resultVo.getData()); var result = orderService.saveOrder(taoRequest.getShopId(), taoOrder); if (result.getCode() == ResultVoEnum.DataExist.getIndex()) { //已经存在 diff --git a/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/domain/TaoOrder.java b/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/domain/TaoOrder.java index c18bc5ba..5180d337 100644 --- a/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/domain/TaoOrder.java +++ b/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/domain/TaoOrder.java @@ -408,6 +408,9 @@ public class TaoOrder implements Serializable { // 天猫商家订单使用的红包金额 private Long tmallCouponFee; + private Integer auditStatus; + private Date auditTime; + @TableField(exist = false) private List items; diff --git a/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/domain/TaoOrderItem.java b/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/domain/TaoOrderItem.java index 531eb33e..676e905d 100644 --- a/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/domain/TaoOrderItem.java +++ b/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/domain/TaoOrderItem.java @@ -78,7 +78,7 @@ public class TaoOrderItem implements Serializable { /** * 商品数字ID */ - private Long numIid; + private String numIid; /** * 商品的最小库存单位Sku的id.可以通过taobao.item.sku.get获取详细的Sku信息天猫的SKUID @@ -412,14 +412,14 @@ PAY_PENDING(国际信用卡支付付款确认中) /** * 商品数字ID */ - public Long getNumIid() { + public String getNumIid() { return numIid; } /** * 商品数字ID */ - public void setNumIid(Long numIid) { + public void setNumIid(String numIid) { this.numIid = numIid; } diff --git a/serviceImpl/tao/src/main/resources/mapper/tao/TaoOrderMapper.xml b/serviceImpl/tao/src/main/resources/mapper/tao/TaoOrderMapper.xml index db3a38b4..cb62f4b9 100644 --- a/serviceImpl/tao/src/main/resources/mapper/tao/TaoOrderMapper.xml +++ b/serviceImpl/tao/src/main/resources/mapper/tao/TaoOrderMapper.xml @@ -84,6 +84,8 @@ + + @@ -112,6 +114,6 @@ alipay_no,buyer_alipay_no,buyer_email, seller_alipay_no,has_post_fee,timeout_action_time, snapshot_url,promotion,yfx_fee,has_yfx,sid, - send_time,is_part_consign + send_time,is_part_consign,audit_status,audit_time diff --git a/vue/src/api/tao/order.js b/vue/src/api/tao/order.js index dd49a260..df8cf10b 100644 --- a/vue/src/api/tao/order.js +++ b/vue/src/api/tao/order.js @@ -44,4 +44,12 @@ export function pushOms(data) { }) } +// 确认订单 +export function confirmOrder(data) { + return request({ + url: '/api/open-api/tao/order/confirmOrder', + method: 'post', + data: data + }) +} diff --git a/vue/src/views/tao/order/index.vue b/vue/src/views/tao/order/index.vue index 1fa470e6..3133bd39 100644 --- a/vue/src/views/tao/order/index.vue +++ b/vue/src/views/tao/order/index.vue @@ -63,36 +63,36 @@ @click="handlePull" >API拉取订单 - - API拉取单个订单 - - - 重新推送选中订单到订单库 - - - 手动更新订单 - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -186,16 +186,24 @@ 禁止发货 - - - - - - - - - - + + + + + + + + {{form.id}} + {{form.orderId}} + + {{ shopList.find(x=>x.id === form.shopId)?shopList.find(x=>x.id === form.shopId).name:'' }} + + + {{form.btypeDesc}} + + + {{ form.orderStatusDesc }} + + + {{ form.mainStatusDesc }} + + + + + + + + {{form.buyerWords}} + + + {{form.sellerWords}} + + + {{form.cancelReason}} + + + {{ parseTime(form.createTime*1000) }} + + {{ parseTime(form.payTime*1000) }} + {{ parseTime(form.updateTime*1000) }} + + + + + {{form.promotionShopAmount}} + {{form.promotionTalentAmount}} + {{form.postAmount}} + {{form.orderAmount}} + {{ form.payAmount }} + + + + + {{form.maskPostReceiver}} + {{form.maskPostTel}} + {{form.provinceName}}{{form.cityName}}{{form.townName}} + {{form.maskPostAddress}} + + + + + + + + + + + 订单商品 + + + + + + + + + + + + + + + 收件人 + + + + + + + + + + + + + + + + + + + + + + +
+ 确认发货 + 取 消 +
+ +