From 3b561b0fc7d6aaa1516c62d1fe8e352b9419a1cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8D=92?= Date: Sun, 17 Aug 2025 21:52:18 +0800 Subject: [PATCH] 1 --- .../request/AuthorizeListQueryRequest.java | 7 -- .../van/business/erp/request/ERPAccount.java | 31 ----- .../business/erp/request/ERPRequestBase.java | 59 ---------- .../cn/van/business/erp/request/HttpTest.java | 107 ------------------ .../erp/request/ProductListQueryRequest.java | 7 -- .../cn/van/business/model/erp/Address.java | 24 ---- .../cn/van/business/model/erp/AdventData.java | 25 ---- .../business/model/erp/AdventDataExpire.java | 16 --- .../model/erp/AdventDataProduction.java | 12 -- .../cn/van/business/model/erp/AssumeRule.java | 22 ---- .../van/business/model/erp/BeautyMakeup.java | 34 ------ .../cn/van/business/model/erp/BookData.java | 24 ---- .../cn/van/business/model/erp/BrandData.java | 24 ---- .../business/model/erp/BrandDataExpire.java | 16 --- .../model/erp/BrandDataProduction.java | 12 -- .../cn/van/business/model/erp/Channelpv.java | 26 ----- .../java/cn/van/business/model/erp/Curio.java | 44 ------- .../cn/van/business/model/erp/ERPShop.java | 102 ----------------- .../java/cn/van/business/model/erp/Empty.java | 18 --- .../cn/van/business/model/erp/FluffyUnit.java | 20 ---- .../cn/van/business/model/erp/FoodData.java | 28 ----- .../business/model/erp/FoodDataExpire.java | 16 --- .../model/erp/FoodDataProduction.java | 16 --- .../java/cn/van/business/model/erp/Game.java | 28 ----- .../java/cn/van/business/model/erp/Image.java | 22 ---- .../cn/van/business/model/erp/Jewelry.java | 36 ------ .../van/business/model/erp/PublishShop.java | 45 -------- .../cn/van/business/model/erp/PurpleUnit.java | 24 ---- .../cn/van/business/model/erp/ReportData.java | 35 ------ .../cn/van/business/model/erp/ReportItem.java | 33 ------ .../cn/van/business/model/erp/SkuImage.java | 24 ---- .../cn/van/business/model/erp/SkuItems.java | 24 ---- .../java/cn/van/business/model/erp/The3C.java | 52 --------- .../cn/van/business/model/erp/TradeRule.java | 22 ---- .../cn/van/business/model/erp/UsedCar.java | 34 ------ .../cn/van/business/model/erp/Valuable.java | 32 ------ .../van/business/util/JDProductService.java | 11 +- 37 files changed, 6 insertions(+), 1106 deletions(-) delete mode 100644 src/main/java/cn/van/business/erp/request/AuthorizeListQueryRequest.java delete mode 100644 src/main/java/cn/van/business/erp/request/ERPAccount.java delete mode 100644 src/main/java/cn/van/business/erp/request/ERPRequestBase.java delete mode 100644 src/main/java/cn/van/business/erp/request/HttpTest.java delete mode 100644 src/main/java/cn/van/business/erp/request/ProductListQueryRequest.java delete mode 100644 src/main/java/cn/van/business/model/erp/Address.java delete mode 100644 src/main/java/cn/van/business/model/erp/AdventData.java delete mode 100644 src/main/java/cn/van/business/model/erp/AdventDataExpire.java delete mode 100644 src/main/java/cn/van/business/model/erp/AdventDataProduction.java delete mode 100644 src/main/java/cn/van/business/model/erp/AssumeRule.java delete mode 100644 src/main/java/cn/van/business/model/erp/BeautyMakeup.java delete mode 100644 src/main/java/cn/van/business/model/erp/BookData.java delete mode 100644 src/main/java/cn/van/business/model/erp/BrandData.java delete mode 100644 src/main/java/cn/van/business/model/erp/BrandDataExpire.java delete mode 100644 src/main/java/cn/van/business/model/erp/BrandDataProduction.java delete mode 100644 src/main/java/cn/van/business/model/erp/Channelpv.java delete mode 100644 src/main/java/cn/van/business/model/erp/Curio.java delete mode 100644 src/main/java/cn/van/business/model/erp/ERPShop.java delete mode 100644 src/main/java/cn/van/business/model/erp/Empty.java delete mode 100644 src/main/java/cn/van/business/model/erp/FluffyUnit.java delete mode 100644 src/main/java/cn/van/business/model/erp/FoodData.java delete mode 100644 src/main/java/cn/van/business/model/erp/FoodDataExpire.java delete mode 100644 src/main/java/cn/van/business/model/erp/FoodDataProduction.java delete mode 100644 src/main/java/cn/van/business/model/erp/Game.java delete mode 100644 src/main/java/cn/van/business/model/erp/Image.java delete mode 100644 src/main/java/cn/van/business/model/erp/Jewelry.java delete mode 100644 src/main/java/cn/van/business/model/erp/PublishShop.java delete mode 100644 src/main/java/cn/van/business/model/erp/PurpleUnit.java delete mode 100644 src/main/java/cn/van/business/model/erp/ReportData.java delete mode 100644 src/main/java/cn/van/business/model/erp/ReportItem.java delete mode 100644 src/main/java/cn/van/business/model/erp/SkuImage.java delete mode 100644 src/main/java/cn/van/business/model/erp/SkuItems.java delete mode 100644 src/main/java/cn/van/business/model/erp/The3C.java delete mode 100644 src/main/java/cn/van/business/model/erp/TradeRule.java delete mode 100644 src/main/java/cn/van/business/model/erp/UsedCar.java delete mode 100644 src/main/java/cn/van/business/model/erp/Valuable.java diff --git a/src/main/java/cn/van/business/erp/request/AuthorizeListQueryRequest.java b/src/main/java/cn/van/business/erp/request/AuthorizeListQueryRequest.java deleted file mode 100644 index 3c46515..0000000 --- a/src/main/java/cn/van/business/erp/request/AuthorizeListQueryRequest.java +++ /dev/null @@ -1,7 +0,0 @@ -package cn.van.business.erp.request; - -public class AuthorizeListQueryRequest extends ERPRequestBase { - public AuthorizeListQueryRequest(ERPAccount erpAccount) { - super("https://open.goofish.pro/api/open/user/authorize/list", erpAccount); - } -} diff --git a/src/main/java/cn/van/business/erp/request/ERPAccount.java b/src/main/java/cn/van/business/erp/request/ERPAccount.java deleted file mode 100644 index b548924..0000000 --- a/src/main/java/cn/van/business/erp/request/ERPAccount.java +++ /dev/null @@ -1,31 +0,0 @@ -package cn.van.business.erp.request; - -/** - * @author Leo - * @version 1.0 - * @create 2025/4/10 15:20 - * @description：ERP账户枚举类 - */ -public enum ERPAccount { - // 胡歌1016208368633221 - ACCOUNT_HUGE("1016208368633221", "waLiRMgFcixLbcLjUSSwo370Hp1nBcBu"), - // 刘强东anotherApiKey - ACCOUNT_LQD("anotherApiKey", "anotherApiSecret"); - - private final String apiKey; - private final String apiKeySecret; - - ERPAccount(String apiKey, String apiKeySecret) { - this.apiKey = apiKey; - this.apiKeySecret = apiKeySecret; - } - - public String getApiKey() { - return apiKey; - } - - public String getApiKeySecret() { - return apiKeySecret; - } -} - diff --git a/src/main/java/cn/van/business/erp/request/ERPRequestBase.java b/src/main/java/cn/van/business/erp/request/ERPRequestBase.java deleted file mode 100644 index 7026d92..0000000 --- a/src/main/java/cn/van/business/erp/request/ERPRequestBase.java +++ /dev/null @@ -1,59 +0,0 @@ -package cn.van.business.erp.request; - -import cn.hutool.http.HttpRequest; -import com.alibaba.fastjson2.JSONObject; - -import java.nio.charset.StandardCharsets; -import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; - -public abstract class ERPRequestBase { - protected String url; - protected String sign; - protected ERPAccount erpAccount; - protected JSONObject requestBody; - - public ERPRequestBase(String url, ERPAccount erpAccount) { - this.url = url; - this.erpAccount = erpAccount; - } - - public void setRequestBody(JSONObject requestBody) { - this.requestBody = requestBody; - } - - public String genMd5(String str) { - StringBuilder result = new StringBuilder(); - try { - MessageDigest md = MessageDigest.getInstance("MD5"); - byte[] digest = md.digest(str.getBytes(StandardCharsets.UTF_8)); - for (byte b : digest) { - result.append(String.format("%02x", b & 0xff)); - } - } catch (NoSuchAlgorithmException e) { - throw new RuntimeException(e); - } - return result.toString(); - } - - public void genSign() { - long timestamp = System.currentTimeMillis() / 1000; - String jsonStr = requestBody.toJSONString(); - String data = erpAccount.getApiKey() + "," + genMd5(jsonStr) + "," + timestamp + "," + erpAccount.getApiKeySecret(); - this.sign = genMd5(data); - } - - public String getRequestUrl() { - return url+"?appid="+erpAccount.getApiKey()+"×tamp="+System.currentTimeMillis()/1000+"&sign="+sign; - } - public String getRequestBody() { - return requestBody.toJSONString(); - } - public String getResponseBody() { - genSign(); - HttpRequest post = HttpRequest.post(getRequestUrl()); - post.body(getRequestBody()); - return post.execute().body(); - } - -} diff --git a/src/main/java/cn/van/business/erp/request/HttpTest.java b/src/main/java/cn/van/business/erp/request/HttpTest.java deleted file mode 100644 index 0f30183..0000000 --- a/src/main/java/cn/van/business/erp/request/HttpTest.java +++ /dev/null @@ -1,107 +0,0 @@ -package cn.van.business.erp.request; - -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStreamReader; -import java.io.OutputStream; -import java.net.HttpURLConnection; -import java.net.URL; -import java.nio.charset.StandardCharsets; -import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; - -public class HttpTest { - private static String apiKey = "1016208368633221"; // 开放平台提供的应用KEY - private static String apiKeySecret = "o9wl81dncmvby3ijpq7eur456zhgtaxs"; // 开放平台提供的应用密钥 - private static String domain = "https://open.goofish.pro"; // 域名 - - public static void main(String[] args) { - // 获取当前时间戳 - long timestamp = System.currentTimeMillis() / 1000L; - System.out.println("timestamp: " + timestamp); - - // 请求体JSON字符串 - String productId = "941757976162"; - String jsonBody = "{\"product_id\":" + productId + "}"; - - // 生成签名 - String sign = genSign(timestamp, jsonBody); - System.out.println("sign: " + sign); - - // 拼接请求地址 - String apiUrl = domain + "/api/open/product/detail?appid=" + apiKey + "×tamp=" + timestamp + "&sign=" - + sign; - - try { - // 创建URL对象 - URL url = new URL(apiUrl); - - // 打开连接 - HttpURLConnection connection = (HttpURLConnection) url.openConnection(); - - // 设置请求方法为POST - connection.setRequestMethod("POST"); - - // 设置请求头部 - connection.setRequestProperty("Content-Type", "application/json"); - connection.setRequestProperty("Accept", "application/json"); - - // 启用输出流 - connection.setDoOutput(true); - - // 获取输出流并写入请求体 - OutputStream outputStream = connection.getOutputStream(); - outputStream.write(jsonBody.getBytes(StandardCharsets.UTF_8)); - outputStream.close(); - - // 获取响应状态码 - int responseCode = connection.getResponseCode(); - System.out.println("API Response Code: " + responseCode); - - // 读取响应内容 - BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(connection.getInputStream())); - String line; - StringBuilder response = new StringBuilder(); - while ((line = bufferedReader.readLine()) != null) { - response.append(line); - } - bufferedReader.close(); - - // 关闭连接 - connection.disconnect(); - - System.out.println("API Response: " + response.toString()); - - } catch (IOException e) { - // 在此处处理异常 - e.printStackTrace(); - } - } - - // md5加密 - private static String genMd5(String str) { - StringBuilder result = new StringBuilder(); - try { - MessageDigest md = MessageDigest.getInstance("MD5"); - byte[] digest = md.digest(str.getBytes(StandardCharsets.UTF_8)); - for (byte b : digest) { - result.append(String.format("%02x", b & 0xff)); - } - } catch (NoSuchAlgorithmException e) { - throw new RuntimeException(e); - } - return result.toString(); - } - - // 生成签名 - private static String genSign(long timestamp, String jsonStr) { - // 拼接字符串 - String data = apiKey + "," + genMd5(jsonStr) + "," + timestamp + "," + apiKeySecret; - - // 商务对接模式 拼接字符串 - // String data = apiKey + "," + genMd5(jsonStr) + "," + timestamp + "," + seller_id + "," + apiKeySecret; - - // 生成签名 - return genMd5(data); - } -} diff --git a/src/main/java/cn/van/business/erp/request/ProductListQueryRequest.java b/src/main/java/cn/van/business/erp/request/ProductListQueryRequest.java deleted file mode 100644 index 2632e1e..0000000 --- a/src/main/java/cn/van/business/erp/request/ProductListQueryRequest.java +++ /dev/null @@ -1,7 +0,0 @@ -package cn.van.business.erp.request; - -public class ProductListQueryRequest extends ERPRequestBase { - public ProductListQueryRequest(ERPAccount erpAccount) { - super("https://open.goofish.pro/api/open/product/list", erpAccount); - } -} diff --git a/src/main/java/cn/van/business/model/erp/Address.java b/src/main/java/cn/van/business/model/erp/Address.java deleted file mode 100644 index ea3431e..0000000 --- a/src/main/java/cn/van/business/model/erp/Address.java +++ /dev/null @@ -1,24 +0,0 @@ -package cn.van.business.model.erp; - -/** - * 食品生产地信息 - */ -@lombok.Data -public class Address { - /** - * 生产地城市ID - */ - private long city; - /** - * 详细地址 - */ - private String detail; - /** - * 生产地地区ID - */ - private long district; - /** - * 生产地省份ID - */ - private long province; -} diff --git a/src/main/java/cn/van/business/model/erp/AdventData.java b/src/main/java/cn/van/business/model/erp/AdventData.java deleted file mode 100644 index 3a326ac..0000000 --- a/src/main/java/cn/van/business/model/erp/AdventData.java +++ /dev/null @@ -1,25 +0,0 @@ -package cn.van.business.model.erp; - -/** - * @author Leo - * @version 1.0 - * @create 2025/4/10 15:15 - * @description： - */ - -/** - * 闲鱼特卖信息，闲鱼特卖类型为临期非食品行业时必传 - * - * 闲鱼特卖信息 - */ -@lombok.Data -public class AdventData { - /** - * 有效期信息 - */ - private AdventDataExpire expire; - /** - * 生产信息 - */ - private AdventDataProduction production; -} diff --git a/src/main/java/cn/van/business/model/erp/AdventDataExpire.java b/src/main/java/cn/van/business/model/erp/AdventDataExpire.java deleted file mode 100644 index eb161c9..0000000 --- a/src/main/java/cn/van/business/model/erp/AdventDataExpire.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.van.business.model.erp; - -/** - * 有效期信息 - */ -@lombok.Data -public class AdventDataExpire { - /** - * 保质期 - */ - private long num; - /** - * 单位 - */ - private PurpleUnit unit; -} diff --git a/src/main/java/cn/van/business/model/erp/AdventDataProduction.java b/src/main/java/cn/van/business/model/erp/AdventDataProduction.java deleted file mode 100644 index 13a96da..0000000 --- a/src/main/java/cn/van/business/model/erp/AdventDataProduction.java +++ /dev/null @@ -1,12 +0,0 @@ -package cn.van.business.model.erp; - -/** - * 生产信息 - */ -@lombok.Data -public class AdventDataProduction { - /** - * 生产日期 - */ - private String date; -} diff --git a/src/main/java/cn/van/business/model/erp/AssumeRule.java b/src/main/java/cn/van/business/model/erp/AssumeRule.java deleted file mode 100644 index ec8ce02..0000000 --- a/src/main/java/cn/van/business/model/erp/AssumeRule.java +++ /dev/null @@ -1,22 +0,0 @@ -package cn.van.business.model.erp; - -import java.io.IOException; /** - * 验货费规则 - */ -public enum AssumeRule { - BUYER, SELLER; - - public String toValue() { - switch (this) { - case BUYER: return "buyer"; - case SELLER: return "seller"; - } - return null; - } - - public static AssumeRule forValue(String value) throws IOException { - if (value.equals("buyer")) return BUYER; - if (value.equals("seller")) return SELLER; - throw new IOException("Cannot deserialize AssumeRule"); - } -} diff --git a/src/main/java/cn/van/business/model/erp/BeautyMakeup.java b/src/main/java/cn/van/business/model/erp/BeautyMakeup.java deleted file mode 100644 index fa9d7d3..0000000 --- a/src/main/java/cn/van/business/model/erp/BeautyMakeup.java +++ /dev/null @@ -1,34 +0,0 @@ -package cn.van.business.model.erp; - -import java.util.List; /** - * 美妆信息 - */ -@lombok.Data -public class BeautyMakeup { - /** - * 品牌 - */ - private String brand; - /** - * 验货图片 - */ - private List images; - /** - * 成色 - */ - private String level; - /** - * 检测机构ID，枚举值： - * 181 : 维鉴 - * 182 : 中检科深 - */ - private long orgid; - /** - * 检测机构名称 - */ - private String orgName; - /** - * 规格 - */ - private String spec; -} diff --git a/src/main/java/cn/van/business/model/erp/BookData.java b/src/main/java/cn/van/business/model/erp/BookData.java deleted file mode 100644 index f0c76e0..0000000 --- a/src/main/java/cn/van/business/model/erp/BookData.java +++ /dev/null @@ -1,24 +0,0 @@ -package cn.van.business.model.erp; - -/** - * 图书信息 - */ -@lombok.Data -public class BookData { - /** - * 图书作者 - */ - private String author; - /** - * 图书ISBN码 - */ - private String isbn; - /** - * 图书出版社 - */ - private String publisher; - /** - * 图书标题 - */ - private String title; -} diff --git a/src/main/java/cn/van/business/model/erp/BrandData.java b/src/main/java/cn/van/business/model/erp/BrandData.java deleted file mode 100644 index 4ce3a40..0000000 --- a/src/main/java/cn/van/business/model/erp/BrandData.java +++ /dev/null @@ -1,24 +0,0 @@ -package cn.van.business.model.erp; - -import java.util.List; /** - * 品牌捡漏信息 - */ -@lombok.Data -public class BrandData { - /** - * 有效期信息 - */ - private BrandDataExpire expire; - /** - * 资质证明 - */ - private List images; - /** - * 生产信息 - */ - private BrandDataProduction production; - /** - * 供应商名称 - */ - private String supplier; -} diff --git a/src/main/java/cn/van/business/model/erp/BrandDataExpire.java b/src/main/java/cn/van/business/model/erp/BrandDataExpire.java deleted file mode 100644 index 02b0184..0000000 --- a/src/main/java/cn/van/business/model/erp/BrandDataExpire.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.van.business.model.erp; - -/** - * 有效期信息 - */ -@lombok.Data -public class BrandDataExpire { - /** - * 保质期 - */ - private long num; - /** - * 单位 - */ - private FluffyUnit unit; -} diff --git a/src/main/java/cn/van/business/model/erp/BrandDataProduction.java b/src/main/java/cn/van/business/model/erp/BrandDataProduction.java deleted file mode 100644 index 90c8751..0000000 --- a/src/main/java/cn/van/business/model/erp/BrandDataProduction.java +++ /dev/null @@ -1,12 +0,0 @@ -package cn.van.business.model.erp; - -/** - * 生产信息 - */ -@lombok.Data -public class BrandDataProduction { - /** - * 生产日期 - */ - private String date; -} diff --git a/src/main/java/cn/van/business/model/erp/Channelpv.java b/src/main/java/cn/van/business/model/erp/Channelpv.java deleted file mode 100644 index 67e5395..0000000 --- a/src/main/java/cn/van/business/model/erp/Channelpv.java +++ /dev/null @@ -1,26 +0,0 @@ -package cn.van.business.model.erp; - -/** - * 商品属性，通过`查询商品属性`接口获取属性参数 - * - * 商品属性 - */ -@lombok.Data -public class Channelpv { - /** - * 属性ID - */ - private String propertyid; - /** - * 属性名称 - */ - private String propertyName; - /** - * 属性值ID - */ - private String valueid; - /** - * 属性值名称 - */ - private String valueName; -} diff --git a/src/main/java/cn/van/business/model/erp/Curio.java b/src/main/java/cn/van/business/model/erp/Curio.java deleted file mode 100644 index 8a076a4..0000000 --- a/src/main/java/cn/van/business/model/erp/Curio.java +++ /dev/null @@ -1,44 +0,0 @@ -package cn.van.business.model.erp; - -import java.util.List; /** - * 文玩信息 - */ -@lombok.Data -public class Curio { - /** - * 验货图片 - */ - private List images; - /** - * 材料 - */ - private String material; - /** - * 检测机构ID，枚举值： - * 191 : NGC评级 - * 192 : PMG评级 - * 193 : 公博评级 - * 194 : PCGS评级 - * 195 : 众诚评级 - * 196 : 保粹评级 - * 197 : 华夏评级 - * 198 : 爱藏评级 - * 199 : 华龙盛世 - * 1910 : 国鉴鉴定 - * 1911 : 信泰评级 - * 1912 : 闻德评级 - */ - private long orgid; - /** - * 检测机构名称 - */ - private String orgName; - /** - * 验货编码 - */ - private String qcNo; - /** - * 尺寸 - */ - private String size; -} diff --git a/src/main/java/cn/van/business/model/erp/ERPShop.java b/src/main/java/cn/van/business/model/erp/ERPShop.java deleted file mode 100644 index c6ff709..0000000 --- a/src/main/java/cn/van/business/model/erp/ERPShop.java +++ /dev/null @@ -1,102 +0,0 @@ -package cn.van.business.model.erp; - -/** - * @author Leo - * @version 1.0 - * @create 2025/4/10 15:13 - * @description： - */ -// ERPShop.java - - -import java.util.List; - -@lombok.Data -public class ERPShop { - /** - * 闲鱼特卖信息，闲鱼特卖类型为临期非食品行业时必传 - */ - private AdventData adventData; - /** - * 图书信息 - */ - private BookData bookData; - /** - * 品牌捡漏信息 - */ - private BrandData brandData; - /** - * 商品类目ID，通过`查询商品类目`接口获取类目参数 - */ - private String channelCatid; - /** - * 商品属性，通过`查询商品属性`接口获取属性参数 - */ - private List channelpv; - /** - * 详情图片 - */ - private List detailImages; - /** - * 运费（分） - */ - private long expressFee; - /** - * 闲鱼特卖类型 - */ - private Long flashSaleType; - /** - * 食品信息 - */ - private FoodData foodData; - /** - * 验货宝信息，商品类型为验货宝时必传 - */ - private Empty inspectData; - /** - * 商品类型 - */ - private long itemBizType; - /** - * 商品原价（分），注意：当商品类型是特卖类型，即`item_biz_type`=24时，`original_price`为必填 - */ - private Long originalPrice; - /** - * 商家编码，注意：一个中文按2个字符算 - */ - private String outerid; - /** - * 商品售价（分），注意：多规格商品时，必须是SKU其中一个金额 - */ - private long price; - /** - * 发布店铺 - */ - private List publishShop; - /** - * 验货报告信息，注意：已验货类型的商品按需必填 - */ - private ReportData reportData; - /** - * 规格图片 - */ - private List skuImages; - /** - * 商品多规格信息 - */ - private List skuItems; - /** - * 商品行业 - */ - private long spBizType; - /** - * 商品库存 - */ - private long stock; - /** - * 商品成色 - */ - private Long stuffStatus; -} - - diff --git a/src/main/java/cn/van/business/model/erp/Empty.java b/src/main/java/cn/van/business/model/erp/Empty.java deleted file mode 100644 index 2edf34f..0000000 --- a/src/main/java/cn/van/business/model/erp/Empty.java +++ /dev/null @@ -1,18 +0,0 @@ -package cn.van.business.model.erp; - -/** - * 验货宝信息，商品类型为验货宝时必传 - * - * 验货宝信息 - */ -@lombok.Data -public class Empty { - /** - * 验货费规则 - */ - private AssumeRule assumeRule; - /** - * 交易规则 - */ - private TradeRule tradeRule; -} diff --git a/src/main/java/cn/van/business/model/erp/FluffyUnit.java b/src/main/java/cn/van/business/model/erp/FluffyUnit.java deleted file mode 100644 index e35b1da..0000000 --- a/src/main/java/cn/van/business/model/erp/FluffyUnit.java +++ /dev/null @@ -1,20 +0,0 @@ -package cn.van.business.model.erp; - -import java.io.IOException; /** - * 单位 - */ -public enum FluffyUnit { - EMPTY; - - public String toValue() { - switch (this) { - case EMPTY: return "\u5929"; - } - return null; - } - - public static FluffyUnit forValue(String value) throws IOException { - if (value.equals("\u5929")) return EMPTY; - throw new IOException("Cannot deserialize FluffyUnit"); - } -} diff --git a/src/main/java/cn/van/business/model/erp/FoodData.java b/src/main/java/cn/van/business/model/erp/FoodData.java deleted file mode 100644 index d12f7fe..0000000 --- a/src/main/java/cn/van/business/model/erp/FoodData.java +++ /dev/null @@ -1,28 +0,0 @@ -package cn.van.business.model.erp; - -/** - * 食品信息 - */ -@lombok.Data -public class FoodData { - /** - * 食品品牌 - */ - private String brand; - /** - * 食品有效期信息 - */ - private FoodDataExpire expire; - /** - * 食品包装 - */ - private String pack; - /** - * 食品生产信息 - */ - private FoodDataProduction production; - /** - * 食品规格 - */ - private String spec; -} diff --git a/src/main/java/cn/van/business/model/erp/FoodDataExpire.java b/src/main/java/cn/van/business/model/erp/FoodDataExpire.java deleted file mode 100644 index f5d46df..0000000 --- a/src/main/java/cn/van/business/model/erp/FoodDataExpire.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.van.business.model.erp; - -/** - * 食品有效期信息 - */ -@lombok.Data -public class FoodDataExpire { - /** - * 保质期 - */ - private long num; - /** - * 单位 - */ - private PurpleUnit unit; -} diff --git a/src/main/java/cn/van/business/model/erp/FoodDataProduction.java b/src/main/java/cn/van/business/model/erp/FoodDataProduction.java deleted file mode 100644 index c34c3ef..0000000 --- a/src/main/java/cn/van/business/model/erp/FoodDataProduction.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.van.business.model.erp; - -/** - * 食品生产信息 - */ -@lombok.Data -public class FoodDataProduction { - /** - * 食品生产地信息 - */ - private Address address; - /** - * 食品生产日期 - */ - private String date; -} diff --git a/src/main/java/cn/van/business/model/erp/Game.java b/src/main/java/cn/van/business/model/erp/Game.java deleted file mode 100644 index 10fbcb9..0000000 --- a/src/main/java/cn/van/business/model/erp/Game.java +++ /dev/null @@ -1,28 +0,0 @@ -package cn.van.business.model.erp; - -import java.util.List; /** - * 游戏信息 - */ -@lombok.Data -public class Game { - /** - * 验货图片 - */ - private List images; - /** - * 游戏平台 - */ - private String platform; - /** - * 验货描述 - */ - private String qcDesc; - /** - * 验货编码 - */ - private String qcNo; - /** - * 报告标题 - */ - private String title; -} diff --git a/src/main/java/cn/van/business/model/erp/Image.java b/src/main/java/cn/van/business/model/erp/Image.java deleted file mode 100644 index 40ce7a2..0000000 --- a/src/main/java/cn/van/business/model/erp/Image.java +++ /dev/null @@ -1,22 +0,0 @@ -package cn.van.business.model.erp; - -/** - * 资质证明 - * - * 新图片信息 - */ -@lombok.Data -public class Image { - /** - * 图片高度 - */ - private long height; - /** - * 图片地址 - */ - private String src; - /** - * 图片宽度 - */ - private long width; -} diff --git a/src/main/java/cn/van/business/model/erp/Jewelry.java b/src/main/java/cn/van/business/model/erp/Jewelry.java deleted file mode 100644 index 6ec8301..0000000 --- a/src/main/java/cn/van/business/model/erp/Jewelry.java +++ /dev/null @@ -1,36 +0,0 @@ -package cn.van.business.model.erp; - -import java.util.List; /** - * 珠宝信息 - */ -@lombok.Data -public class Jewelry { - /** - * 颜色 - */ - private String color; - /** - * 验货图片 - */ - private List images; - /** - * 检测机构名称 - */ - private String orgName; - /** - * 验货描述 - */ - private String qcDesc; - /** - * 验货编码 - */ - private String qcNo; - /** - * 形状 - */ - private String shape; - /** - * 重量 - */ - private String weight; -} diff --git a/src/main/java/cn/van/business/model/erp/PublishShop.java b/src/main/java/cn/van/business/model/erp/PublishShop.java deleted file mode 100644 index 98d8555..0000000 --- a/src/main/java/cn/van/business/model/erp/PublishShop.java +++ /dev/null @@ -1,45 +0,0 @@ -package cn.van.business.model.erp; - -import java.util.List; - -@lombok.Data -public class PublishShop { - /** - * 商品发货城市 - */ - private long city; - /** - * 商品描述，注意：一个中文按2个字符算，不支持HTML代码，可使用\n换行 - */ - private String content; - /** - * 商品发货地区 - */ - private long district; - /** - * 商品图片URL，注意：第1张作为商品主图，前9张发布到闲鱼App - */ - private List images; - /** - * 商品发货省份 - */ - private long province; - /** - * 商品服务 - */ - private String serviceSupport; - /** - * 商品标题，注意：一个中文按2个字符算 - */ - private String title; - /** - * 闲鱼会员名 - */ - private String userName; - /** - * 商品白底图URL，注意 ： - * 1：如果传入会在闲鱼商品详情显示，并且无法删除，只能修改 - * 2：当商品类型是特卖类型，即`item_biz_type`=24时，`white_images`为必填 - */ - private String whiteImages; -} diff --git a/src/main/java/cn/van/business/model/erp/PurpleUnit.java b/src/main/java/cn/van/business/model/erp/PurpleUnit.java deleted file mode 100644 index 941b4ba..0000000 --- a/src/main/java/cn/van/business/model/erp/PurpleUnit.java +++ /dev/null @@ -1,24 +0,0 @@ -package cn.van.business.model.erp; - -import java.io.IOException; /** - * 单位 - */ -public enum PurpleUnit { - EMPTY, PURPLE, UNIT; - - public String toValue() { - switch (this) { - case EMPTY: return "\u5929"; - case PURPLE: return "\u5e74"; - case UNIT: return "\u6708"; - } - return null; - } - - public static PurpleUnit forValue(String value) throws IOException { - if (value.equals("\u5929")) return EMPTY; - if (value.equals("\u5e74")) return PURPLE; - if (value.equals("\u6708")) return UNIT; - throw new IOException("Cannot deserialize PurpleUnit"); - } -} diff --git a/src/main/java/cn/van/business/model/erp/ReportData.java b/src/main/java/cn/van/business/model/erp/ReportData.java deleted file mode 100644 index f838521..0000000 --- a/src/main/java/cn/van/business/model/erp/ReportData.java +++ /dev/null @@ -1,35 +0,0 @@ -package cn.van.business.model.erp; - -/** - * 验货报告信息，注意：已验货类型的商品按需必填 - * - * 验货报告信息 - */ -@lombok.Data -public class ReportData { - /** - * 美妆信息 - */ - private BeautyMakeup beautyMakeup; - /** - * 文玩信息 - */ - private Curio curio; - /** - * 游戏信息 - */ - private Game game; - /** - * 珠宝信息 - */ - private Jewelry jewelry; - /** - * 二手车信息 - */ - private UsedCar usedCar; - /** - * 奢品信息 - */ - private Valuable valuable; - private The3C yx3C; -} diff --git a/src/main/java/cn/van/business/model/erp/ReportItem.java b/src/main/java/cn/van/business/model/erp/ReportItem.java deleted file mode 100644 index 3c3e66c..0000000 --- a/src/main/java/cn/van/business/model/erp/ReportItem.java +++ /dev/null @@ -1,33 +0,0 @@ -package cn.van.business.model.erp; - -@lombok.Data -public class ReportItem { - /** - * 选项描述 - */ - private String answerDesc; - /** - * 选项ID - */ - private long answerid; - /** - * 选项名称 - */ - private String answerName; - /** - * 选项类型 - */ - private long answerType; - /** - * 分类名称 - */ - private String categoryName; - /** - * 分组名称 - */ - private String groupName; - /** - * 问题名称 - */ - private String questionName; -} diff --git a/src/main/java/cn/van/business/model/erp/SkuImage.java b/src/main/java/cn/van/business/model/erp/SkuImage.java deleted file mode 100644 index 3e5946f..0000000 --- a/src/main/java/cn/van/business/model/erp/SkuImage.java +++ /dev/null @@ -1,24 +0,0 @@ -package cn.van.business.model.erp; - -/** - * 规格图片 - */ -@lombok.Data -public class SkuImage { - /** - * 图片高度 - */ - private long height; - /** - * 规格属性 - */ - private String skuText; - /** - * 图片地址 - */ - private String src; - /** - * 图片宽度 - */ - private long width; -} diff --git a/src/main/java/cn/van/business/model/erp/SkuItems.java b/src/main/java/cn/van/business/model/erp/SkuItems.java deleted file mode 100644 index d698cfd..0000000 --- a/src/main/java/cn/van/business/model/erp/SkuItems.java +++ /dev/null @@ -1,24 +0,0 @@ -package cn.van.business.model.erp; - -/** - * SKU信息 - */ -@lombok.Data -public class SkuItems { - /** - * SKU商品编码，注意：一个中文按2个字符算 - */ - private String outerid; - /** - * SKU售价（分） - */ - private long price; - /** - * SKU规格，格式 : 规格:属性，多个时使用";"拼接。如:颜色:白色;容量:128G - */ - private String skuText; - /** - * SKU库存 - */ - private long stock; -} diff --git a/src/main/java/cn/van/business/model/erp/The3C.java b/src/main/java/cn/van/business/model/erp/The3C.java deleted file mode 100644 index 4dcb3b7..0000000 --- a/src/main/java/cn/van/business/model/erp/The3C.java +++ /dev/null @@ -1,52 +0,0 @@ -package cn.van.business.model.erp; - -import java.util.List; /** - * 严选3c信息 - */ -@lombok.Data -public class The3C { - /** - * 质检选项ID，内部存储，不对外展示 - */ - private List answerids; - /** - * 品牌ID - */ - private long brandid; - /** - * 品牌名称 - */ - private String brandName; - /** - * 品类ID - */ - private long classid; - /** - * 机型ID - */ - private long modelid; - /** - * 机型名称 - */ - private String modelName; - /** - * IMEI/序列号 - */ - private String modelSn; - /** - * 质检报告项，体现在商品验货报告页 - */ - private List reportItems; - /** - * 质检时间，体现在商品验货报告页 - */ - private String reportTime; - /** - * 质检人，体现在商品验货报告页 - */ - private String reportUser; - /** - * 子类ID - */ - private long subclassid; -} diff --git a/src/main/java/cn/van/business/model/erp/TradeRule.java b/src/main/java/cn/van/business/model/erp/TradeRule.java deleted file mode 100644 index ef4a39e..0000000 --- a/src/main/java/cn/van/business/model/erp/TradeRule.java +++ /dev/null @@ -1,22 +0,0 @@ -package cn.van.business.model.erp; - -import java.io.IOException; /** - * 交易规则 - */ -public enum TradeRule { - YHB_ONLY, YHB_OPTIONAL; - - public String toValue() { - switch (this) { - case YHB_ONLY: return "yhbOnly"; - case YHB_OPTIONAL: return "yhbOptional"; - } - return null; - } - - public static TradeRule forValue(String value) throws IOException { - if (value.equals("yhbOnly")) return YHB_ONLY; - if (value.equals("yhbOptional")) return YHB_OPTIONAL; - throw new IOException("Cannot deserialize TradeRule"); - } -} diff --git a/src/main/java/cn/van/business/model/erp/UsedCar.java b/src/main/java/cn/van/business/model/erp/UsedCar.java deleted file mode 100644 index 096d038..0000000 --- a/src/main/java/cn/van/business/model/erp/UsedCar.java +++ /dev/null @@ -1,34 +0,0 @@ -package cn.van.business.model.erp; - -/** - * 二手车信息 - * - * OpenProductReportUsedCar - */ -@lombok.Data -public class UsedCar { - /** - * 营业执照图片 - */ - private String businessLicenseFront; - /** - * 使用性质 : 营运/非营运 - */ - private String carFunction; - /** - * 车辆识别代码VIN码 - */ - private String carVin; - /** - * 行驶证车辆页图片 - */ - private String drivingLicenseCarPhoto; - /** - * 行驶证主页图片 - */ - private String drivingLicenseInfo; - /** - * 验货报告链接 - */ - private String reporturl; -} diff --git a/src/main/java/cn/van/business/model/erp/Valuable.java b/src/main/java/cn/van/business/model/erp/Valuable.java deleted file mode 100644 index 050bd95..0000000 --- a/src/main/java/cn/van/business/model/erp/Valuable.java +++ /dev/null @@ -1,32 +0,0 @@ -package cn.van.business.model.erp; - -import java.util.List; /** - * 奢品信息 - */ -@lombok.Data -public class Valuable { - /** - * 验货图片 - */ - private List images; - /** - * 检测机构ID，枚举值： - * 161 : 中检 - * 162 : 国检 - * 163 : 华测 - * 164 : 中溯 - */ - private long orgid; - /** - * 检测机构名称 - */ - private String orgName; - /** - * 验货描述 - */ - private String qcDesc; - /** - * 验货编码 - */ - private String qcNo; -} diff --git a/src/main/java/cn/van/business/util/JDProductService.java b/src/main/java/cn/van/business/util/JDProductService.java index c4ba806..9f61c0c 100644 --- a/src/main/java/cn/van/business/util/JDProductService.java +++ b/src/main/java/cn/van/business/util/JDProductService.java @@ -130,6 +130,7 @@ public class JDProductService { itemMap.put("spuid", String.valueOf(productInfo.getData()[0].getSpuid())); itemMap.put("commission", String.valueOf(productInfo.getData()[0].getCommissionInfo().getCommission())); itemMap.put("commissionShare", String.valueOf(productInfo.getData()[0].getCommissionInfo().getCommissionShare())); + itemMap.put("price", String.valueOf(productInfo.getData()[0].getPriceInfo().getPrice())); couponInfo.append("店铺： ").append(itemMap.get("shopName")).append("\n").append("标题： ").append(replaceAll).append("\n").append("自营 POP： ").append(itemMap.get("owner").equals("g") ? " 自营 " : " POP ").append("\n").append("佣金比例： ").append(itemMap.get("commissionShare")).append("\n").append("佣金： ").append(itemMap.get("commission")).append("\n"); @@ -214,7 +215,7 @@ public class JDProductService { */ public synchronized JSONArray generatePromotionContentAsJsonArray(String message) { JSONArray resultArray = new JSONArray(); - + // 提取方案中的所有 u.jd.com 链接 List urls = extractUJDUrls(message); if (urls.isEmpty()) { @@ -231,7 +232,7 @@ public class JDProductService { try { // 新建格式好日期 format = dateFormat.format(new Date()); - + // 查询商品信息 GoodsQueryResult productInfo = queryProductInfoByUJDUrl(url); if (productInfo == null || productInfo.getCode() != 200) { @@ -254,7 +255,7 @@ public class JDProductService { // 创建商品对象 JSONObject productObj = new JSONObject(); productObj.put("url", url); - + // 商品基本信息 productObj.put("materialUrl", productInfo.getData()[0].getMaterialUrl()); productObj.put("oriItemId", productInfo.getData()[0].getOriItemId()); @@ -279,7 +280,7 @@ public class JDProductService { // 文案信息 JSONArray wenanArray = new JSONArray(); - + String title = ""; try { if (!message.equals(url)) { @@ -319,7 +320,7 @@ public class JDProductService { wenanArray.add(wenan4); productObj.put("wenan", wenanArray); - + // 添加通用文案 JSONObject commonWenan = new JSONObject(); commonWenan.put("type", "通用文案");