From e8ac5e900563b9a28b6df9b5782b3d4cb881f6ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=AF=E8=88=AA?= Date: Tue, 5 Mar 2024 15:40:39 +0800 Subject: [PATCH] up --- doc/sql/qihang-oms.sql | 166 +++++++++++++++++- .../jd/controller/GoodsApiController.java | 43 ++--- .../jd/controller/OrderApiController.java | 20 ++- .../jd/controller/RefundApiController.java | 58 ++++++ 4 files changed, 257 insertions(+), 30 deletions(-) create mode 100644 jd-api/src/main/java/com/qihang/jd/controller/RefundApiController.java diff --git a/doc/sql/qihang-oms.sql b/doc/sql/qihang-oms.sql index 61942d62..778234e5 100644 --- a/doc/sql/qihang-oms.sql +++ b/doc/sql/qihang-oms.sql @@ -11,12 +11,174 @@ Target Server Version : 80032 File Encoding : 65001 - Date: 04/03/2024 19:51:08 + Date: 05/03/2024 15:40:18 */ SET NAMES utf8mb4; SET FOREIGN_KEY_CHECKS = 0; +-- ---------------------------- +-- Table structure for jd_goods +-- ---------------------------- +DROP TABLE IF EXISTS `jd_goods`; +CREATE TABLE `jd_goods` ( + `id` bigint(0) NOT NULL, + `wareId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '商品id', + `title` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '商品名称', + `wareStatus` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '商品状态 -1：删除 1:从未上架 2:自主下架 4:系统下架 8:上架 513:从未上架待审 514:自主下架待审 516:系统下架待审 520:上架待审核 1028:系统下架审核失败', + `outerId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT ' 商品外部ID,商家自行设置的ID（便于关联京东商品）', + `itemNum` varchar(0) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '商品货号', + `barCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '商品的条形码.UPC码,SN码,PLU码统称为条形码', + ` +modified` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '商品最后一次修改时间', + `created` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '商品创建时间，只读属性', + `offlineTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最后下架时间', + `onlineTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最后上架时间', + `delivery` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '发货地', + ` +packListing` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '包装清单', + `wrap` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '包装规格', + `weight` double DEFAULT NULL, + `width` double DEFAULT NULL, + `height` double DEFAULT NULL, + `length` double DEFAULT NULL, + `mobileDesc` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, + `introduction` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, + `afterSales` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, + `logo` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, + `marketPrice` decimal(10, 2) DEFAULT NULL, + `costPrice` decimal(10, 2) DEFAULT NULL, + `jdPrice` decimal(10, 2) DEFAULT NULL, + `brandName` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, + `stockNum` int(0) DEFAULT NULL, + `shopId` int(0) DEFAULT NULL, + `sellPoint` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, + `afterSaleDesc` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, + `spuId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- Table structure for jd_goods_sku +-- ---------------------------- +DROP TABLE IF EXISTS `jd_goods_sku`; +CREATE TABLE `jd_goods_sku` ( + `id` bigint(0) NOT NULL, + `goods_id` bigint(0) DEFAULT NULL COMMENT '外键（jd_goods表id）', + `wareId` int(0) DEFAULT NULL, + `skuId` int(0) DEFAULT NULL, + `status` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, + `jdPrice` decimal(10, 2) DEFAULT NULL, + `outerId` int(0) DEFAULT NULL, + `barCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, + `logo` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, + `skuName` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, + `stockNum` int(0) DEFAULT NULL, + `modified` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, + `created` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, + `currencySpuId` int(0) DEFAULT NULL, + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- Table structure for jd_order +-- ---------------------------- +DROP TABLE IF EXISTS `jd_order`; +CREATE TABLE `jd_order` ( + `id` bigint(0) NOT NULL, + `shop_id` int(0) DEFAULT NULL COMMENT '店铺id', + `orderId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '订单id', + `venderId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '商家id', + `orderType` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT ' 订单类型（22 SOP；75 LOC） 可选字段，需要在输入参数optional_fields中写入才能返回', + `payType` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '支付方式（1货到付款, 2邮局汇款, 3自提, 4在线支付, 5公司转账, 6银行卡转账）', + ` +orderTotalPrice` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '订单总金额。总金额=订单金额（不减优惠，不加运费服务费税费）', + `orderSellerPrice` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '订单货款金额（订单总金额-商家优惠金额）', + `orderPayment` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '用户应付金额。应付款=货款-用户优惠-余额+运费+税费+服务费。', + `freightPrice` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '商品的运费', + `sellerDiscount` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '商家优惠金额', + `orderState` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT ' 1）WAIT_SELLER_STOCK_OUT 等待出库 2）WAIT_GOODS_RECEIVE_CONFIRM 等待确认收货 3）WAIT_SELLER_DELIVERY等待发货（只适用于海外购商家，含义为\'等待境内发货\'标签下的订单,非海外购商家无需使用） 4) POP_ORDER_PAUSE POP暂停 5）FINISHED_L 完成 6）TRADE_CANCELED 取消 7）LOCKED 已锁定 8）WAIT_SEND_CODE 等待发码', + `orderStateRemark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '订单状态说明（中文）', + `deliveryType` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '送货（日期）类型（1-只工作日送货(双休日、假日不用送);2-只双休日、假日送货(工作日不用送);3-工作日、双休日与假日均可送货;其他值-返回“任意时间”）', + `invoiceInfo` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '发票信息 “invoice_info: 不需要开具发票”下无需开具发票；其它返回值请正常开具发票 。（没有电子发票具体信息）', + `invoiceCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '普通发票纳税人识别码', + `orderRemark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '买家下单时订单备注', + ` +orderStartTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '下单时间', + `orderEndTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '结单时间 如返回信息为“0001-01-01 00:00:00”和“1970-01-01 00:00:00”，可认为此订单为未完成状态。', + `fullname` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '姓名', + ` +telephone` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '固定电话', + `mobile` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '手机', + ` +fullAddress` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '地址', + `province` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, + `city` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, + `county` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, + `town` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, + `provinceId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, + `cityId` int(0) DEFAULT NULL, + `countyId` int(0) DEFAULT NULL, + `townId` int(0) DEFAULT NULL, + `venderRemark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '商家订单备注（不大于500字符） 可选字段，需要在输入参数optional_fields中写入才能返回', + `balanceUsed` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '余额支付金额 可选字段，需要在输入参数optional_fields中写入才能返回', + `pin` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '买家的账号信息', + `returnOrder` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '售后订单标记 0:不是换货订单 1返修发货,直接赔偿,客服补件 2售后调货 可选字段，需要在输入参数optional_fields中写入才能返回', + `paymentConfirmTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '付款确认时间 如果没有付款时间 默认返回0001-01-01 00:00:00 可选字段，需要在输入参数optional_fields中写入才能返回', + `waybill` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '运单号(当厂家自送时运单号可为空，不同物流公司的运单号用|分隔，如果同一物流公司有多个运单号，则用英文逗号分隔) 可选字段，需要在输入参数optional_fields中写入才能返回', + `logisticsId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '物流公司ID 可选字段，需要在输入参数optional_fields中写入才能返回', + `modified` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '订单更新时间', + `directParentOrderId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT ' 直接父订单号 可选字段，需要在输入参数optional_fields中写入才能返回', + `parentOrderId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT ' 根父订单号 可选字段，需要在输入参数optional_fields中写入才能返回', + `orderSource` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '订单来源。如：移动端订单', + `storeOrder` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '京仓订单/云仓订单/空“”', + `idSopShipmenttype` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '是否京配。68=京配，69=京配自提', + `realPin` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '买家的账号信息(区分大小写) 可选字段，需要在输入参数optional_fields中写入才能返回', + ` +open_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '买家的账号信息 ', + `open_id_buyer` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '买家的账号信息(区分大小写) 可选字段', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '京东订单表' ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- Table structure for jd_order_item +-- ---------------------------- +DROP TABLE IF EXISTS `jd_order_item`; +CREATE TABLE `jd_order_item` ( + `id` bigint(0) NOT NULL, + `order_id` bigint(0) NOT NULL COMMENT '外键id（jd_order表id）', + `skuId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '京东内部SKU的ID', + `outerSkuId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'SKU外部ID（极端情况下不保证返回，建议从商品接口获取', + `skuName` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '商品的名称+SKU规格', + `jdPrice` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'SKU的京东价', + `giftPoint` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '赠送积分', + `wareId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT ' 京东内部商品ID（极端情况下不保证返回，建议从商品接口获取）', + `itemTotal` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '数量', + `productNo` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, + `serviceName` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, + `newStoreId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- Table structure for jd_refund +-- ---------------------------- +DROP TABLE IF EXISTS `jd_refund`; +CREATE TABLE `jd_refund` ( + `id` bigint(0) NOT NULL, + `shop_id` int(0) DEFAULT NULL COMMENT '店铺id', + `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '退款单id', + `buyer_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '客户帐号', + `buyer_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '客户姓名', + `check_time` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '审核日期', + `apply_time` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '申请时间', + `apply_refund_sum` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '退款金额', + `status` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '审核状态: 0代表未审核， 1代表审核通过 2代表审核不通过 3代表京东财务审核通过；4代表京东财务审核不通过', + `check_username` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '审核人', + `order_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '订单号', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; + -- ---------------------------- -- Table structure for sys_menu -- ---------------------------- @@ -157,7 +319,7 @@ CREATE TABLE `sys_user` ( -- ---------------------------- -- Records of sys_user -- ---------------------------- -INSERT INTO `sys_user` VALUES (1, 103, 'admin', '启航oms', '00', '280645618@qq.com', '15888888888', '1', '', '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', '0', '0', '127.0.0.1', '2024-03-04 13:16:35', 'admin', '2023-08-07 19:31:37', '', '2024-03-04 13:16:34', '管理员'); +INSERT INTO `sys_user` VALUES (1, 103, 'admin', '启航oms', '00', '280645618@qq.com', '15888888888', '1', '', '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', '0', '0', '127.0.0.1', '2024-03-05 14:10:19', 'admin', '2023-08-07 19:31:37', '', '2024-03-05 14:10:18', '管理员'); -- ---------------------------- -- Table structure for tao_goods diff --git a/jd-api/src/main/java/com/qihang/jd/controller/GoodsApiController.java b/jd-api/src/main/java/com/qihang/jd/controller/GoodsApiController.java index ab1a7c6a..a88a339f 100644 --- a/jd-api/src/main/java/com/qihang/jd/controller/GoodsApiController.java +++ b/jd-api/src/main/java/com/qihang/jd/controller/GoodsApiController.java @@ -29,8 +29,8 @@ import org.springframework.web.bind.annotation.RestController; @AllArgsConstructor public class GoodsApiController { private final String SERVER_URL = "https://api.jd.com/routerjson"; - @RequestMapping(value = "/pull_goods", method = RequestMethod.POST) - public Object pullGoodsList() throws Exception { + @RequestMapping(value = "/pull_list", method = RequestMethod.POST) + public Object pullList() throws Exception { String accessToken = "8abd974c62c34778935b34b5952e6f68izdk"; String appKey="FB4CC3688E6F9065D4FF510A53BB60FF"; String appSecret="40e8c8b2427f4e6db8f4a39af27d719e"; @@ -62,16 +62,17 @@ public class GoodsApiController { //https://open.jd.com/home/home/#/doc/api?apiCateId=48&apiId=1587&apiName=jingdong.ware.read.searchWare4Valid WareReadSearchWare4ValidRequest request=new WareReadSearchWare4ValidRequest(); - - request.setSearchField("[title]"); + request.setField("jdPrice,wareId,title,spuId,images,shopId,itemNum,outerId,logo"); + request.setWareStatusValue("8"); +// request.setSearchField("[title]"); WareReadSearchWare4ValidResponse response=client.execute(request); //https://open.jd.com/home/home/#/doc/api?apiCateId=48&apiId=1227&apiName=jingdong.sku.read.searchSkuList SkuReadSearchSkuListRequest request1=new SkuReadSearchSkuListRequest(); - request1.setWareId("10223753529"); - request1.setField("skuId,categoryId,stockNum,wareTitle"); +// request1.setWareId("10223753529"); + request1.setField("skuId,categoryId,stockNum,wareTitle,status,multiCateProps,outerId,jdPrice,logo,skuName,parentId,modified,created,saleAttrs,imgTag,currencySpuId"); SkuReadSearchSkuListResponse response1=client.execute(request1); System.out.println(response1); // SpuGetModelOrItemNumListRequest request=new SpuGetModelOrItemNumListRequest(); @@ -87,21 +88,21 @@ public class GoodsApiController { // request.setUserAgent("zhangsan"); // SpuGetModelOrItemNumListResponse response=client.execute(request); - //https://open.jd.com/home/home/#/doc/api?apiCateId=71&apiId=307&apiName=jingdong.pop.afs.refundapply.querylist - PopAfsRefundapplyQuerylistRequest request2=new PopAfsRefundapplyQuerylistRequest(); -// request2.setStatus("1"); -// request2.setId("111"); -// request2.setOrderId("1234"); -// request2.setBuyerId("abc"); -// request2.setBuyerName("abc"); -// request2.setApplyTimeStart("2023-12-01 16:11:40"); -// request2.setApplyTimeEnd("2023-12-31 16:11:40"); -// request2.setCheckTimeStart("2023-12-01 16:11:40"); -// request2.setCheckTimeEnd("2023-12-31 16:11:40"); - request2.setPageIndex(1); - request2.setPageSize(10); - PopAfsRefundapplyQuerylistResponse response2=client.execute(request2); - System.out.println(request2); +// //https://open.jd.com/home/home/#/doc/api?apiCateId=71&apiId=307&apiName=jingdong.pop.afs.refundapply.querylist +// PopAfsRefundapplyQuerylistRequest request2=new PopAfsRefundapplyQuerylistRequest(); +//// request2.setStatus("1"); +//// request2.setId("111"); +//// request2.setOrderId("1234"); +//// request2.setBuyerId("abc"); +//// request2.setBuyerName("abc"); +//// request2.setApplyTimeStart("2023-12-01 16:11:40"); +//// request2.setApplyTimeEnd("2023-12-31 16:11:40"); +//// request2.setCheckTimeStart("2023-12-01 16:11:40"); +//// request2.setCheckTimeEnd("2023-12-31 16:11:40"); +// request2.setPageIndex(1); +// request2.setPageSize(10); +// PopAfsRefundapplyQuerylistResponse response2=client.execute(request2); +// System.out.println(request2); // PopAfsRefundapplyQuerybyidRequest request3=new PopAfsRefundapplyQuerybyidRequest(); // request3.setRaId(23454754437L); diff --git a/jd-api/src/main/java/com/qihang/jd/controller/OrderApiController.java b/jd-api/src/main/java/com/qihang/jd/controller/OrderApiController.java index 1389eab6..bcaec478 100644 --- a/jd-api/src/main/java/com/qihang/jd/controller/OrderApiController.java +++ b/jd-api/src/main/java/com/qihang/jd/controller/OrderApiController.java @@ -25,8 +25,8 @@ import org.springframework.web.bind.annotation.RestController; @AllArgsConstructor public class OrderApiController { private final ApiCommon apiCommon; - @RequestMapping(value = "/pull_order", method = RequestMethod.POST) - public Object pullGoodsList(@RequestBody PullRequest params) throws Exception { + @RequestMapping(value = "/pull_list", method = RequestMethod.POST) + public Object pullList(@RequestBody PullRequest params) throws Exception { if (params.getShopId() == null || params.getShopId() <= 0) { // return ApiResul new ApiResult(HttpStatus.PARAMS_ERROR, "参数错误，没有店铺Id"); return ApiResult.build(HttpStatus.PARAMS_ERROR, "参数错误，没有店铺Id"); @@ -57,15 +57,19 @@ public class OrderApiController { // PopOrderSearchResponse response=client.execute(request); // System.out.println(response); + //https://open.jd.com/home/home/#/doc/api?apiCateId=55&apiId=2388&apiName=jingdong.pop.order.enSearch PopOrderEnSearchRequest request =new PopOrderEnSearchRequest(); - request.setStartDate("2020-04-04 00:20:35"); - request.setEndDate("2020-04-04 00:20:35"); - request.setOrderState("21"); + request.setStartDate("2024-02-06 00:20:35"); + request.setEndDate("2024-03-05 15:20:35"); + request.setOrderState("WAIT_GOODS_RECEIVE_CONFIRM"); // request.setOptionalFields("orderId,venderId"); // request.setSourceId("JOS"); - request.setOptionalFields("itemInfoList,orderId,isShipmenttype,scDT,idSopShipmenttype,orderStartTime,consigneeInfo"); + request.setOptionalFields("venderId,orderId,orderType,payType,orderTotalPrice,orderSellerPrice,orderPayment,freightPrice,sellerDiscount,orderState" + + ",orderStateRemark,deliveryType,invoiceCode,orderRemark,orderStartTime,orderEndTime,venderRemark,balanceUsed,pin,returnOrder,paymentConfirmTime,waybill,logisticsId,modified" + + ",directParentOrderId,parentOrderId,orderSource,storeOrder,realPin,open_id,open_id_buyer" + + ",invoiceInfo,invoiceEasyInfo,itemInfoList,isShipmenttype,scDT,idSopShipmenttype,orderStartTime,consigneeInfo,orderMarkDesc"); request.setPage("1"); - request.setPageSize("10"); + request.setPageSize("100"); request.setSortType(1); request.setDateType(0); PopOrderEnSearchResponse response=client.execute(request); @@ -73,3 +77,5 @@ public class OrderApiController { return response; } } + + diff --git a/jd-api/src/main/java/com/qihang/jd/controller/RefundApiController.java b/jd-api/src/main/java/com/qihang/jd/controller/RefundApiController.java new file mode 100644 index 00000000..404a844c --- /dev/null +++ b/jd-api/src/main/java/com/qihang/jd/controller/RefundApiController.java @@ -0,0 +1,58 @@ +package com.qihang.jd.controller; + +import com.jd.open.api.sdk.DefaultJdClient; +import com.jd.open.api.sdk.JdClient; +import com.jd.open.api.sdk.request.refundapply.PopAfsRefundapplyQuerylistRequest; +import com.jd.open.api.sdk.response.refundapply.PopAfsRefundapplyQuerylistResponse; +import com.qihang.common.common.ApiResult; +import com.qihang.common.enums.HttpStatus; +import com.qihang.jd.common.ApiCommon; +import com.qihang.jd.common.PullRequest; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RestController; + +@RequestMapping("/refund") +@RestController +@AllArgsConstructor +public class RefundApiController { + private final ApiCommon apiCommon; + @RequestMapping(value = "/pull_list", method = RequestMethod.POST) + public Object pullList(@RequestBody PullRequest params) throws Exception { + if (params.getShopId() == null || params.getShopId() <= 0) { +// return ApiResul new ApiResult(HttpStatus.PARAMS_ERROR, "参数错误，没有店铺Id"); + return ApiResult.build(HttpStatus.PARAMS_ERROR, "参数错误，没有店铺Id"); + } + var checkResult = apiCommon.checkBefore(params.getShopId()); + if (checkResult.getCode() != HttpStatus.SUCCESS) { + return ApiResult.build(checkResult.getCode(), checkResult.getMsg(), checkResult.getData()); + } + String accessToken = checkResult.getData().getAccessToken(); + String serverUrl = checkResult.getData().getServerUrl(); + String appKey = checkResult.getData().getAppKey(); + String appSecret = checkResult.getData().getAppSecret(); +// String accessToken = "8abd974c62c34778935b34b5952e6f68izdk"; +// String appKey="FB4CC3688E6F9065D4FF510A53BB60FF"; +// String appSecret="40e8c8b2427f4e6db8f4a39af27d719e"; + + JdClient client = new DefaultJdClient(serverUrl, accessToken, appKey, appSecret); + //https://open.jd.com/home/home/#/doc/api?apiCateId=71&apiId=307&apiName=jingdong.pop.afs.refundapply.querylist + PopAfsRefundapplyQuerylistRequest request2=new PopAfsRefundapplyQuerylistRequest(); +// request2.setStatus("1"); +// request2.setId("111"); +// request2.setOrderId("1234"); +// request2.setBuyerId("abc"); +// request2.setBuyerName("abc"); +// request2.setApplyTimeStart("2023-12-01 16:11:40"); +// request2.setApplyTimeEnd("2023-12-31 16:11:40"); +// request2.setCheckTimeStart("2023-12-01 16:11:40"); +// request2.setCheckTimeEnd("2023-12-31 16:11:40"); + request2.setPageIndex(1); + request2.setPageSize(10); + PopAfsRefundapplyQuerylistResponse response2=client.execute(request2); + System.out.println(request2); + return response2; + } +}