京东API, 代码整理；注意两部分：1、token授权回调地址的域名；2、dev-jdbc.properties中自调用地址问题

watero-rst-web/src/main/java/com/iamberry/rst/controllers/mq/JingdongTask.java

@@ -51,6 +51,9 @@ import org.springframework.stereotype.Component;
 import javax.annotation.PostConstruct;
 import java.util.*;
 
+import static com.iamberry.rst.controllers.mq.TaobaoConfig.DB_JD_PULL_ORDER_LIMIT_TIME;
+import static com.iamberry.rst.controllers.mq.TaobaoConfig.DB_JD_TOKEN_ID;
+
 /**
  * @author root
  */
@@ -97,7 +100,7 @@ public class JingdongTask {
         }
         logger.info("【京东订单】开始抓取数据......");
         // 组装请求数据
-        SysConfig sysConfigTime = sysConfigService.getSysConfigAll(28);
+        SysConfig sysConfigTime = sysConfigService.getSysConfigAll(DB_JD_PULL_ORDER_LIMIT_TIME);
         String startTime = sysConfigTime.getConfigParameter();
         if (StringUtils.isEmpty(startTime)) {
             startTime = DateTimeUtil.format(DateTimeUtil.addDay(-20), "yyyy-MM-dd HH:mm:ss");
@@ -123,29 +126,19 @@ public class JingdongTask {
                 PopOrderEnSearchRequest orderSearchRequest = null;
                 PopOrderEnSearchResponse rsp = null;
                 try {
-                    SysConfig sysConfig = sysConfigService.getSysConfigAll(27);
-                    client = new DefaultJdClient(TaobaoConfig.JINGDONG_API_URL, (String) AdminJingdongAuthController.getToken(sysConfig).get("token"), TaobaoConfig.jd_appkey, TaobaoConfig.jd_secret);
+                    SysConfig sysConfig = sysConfigService.getSysConfigAll(DB_JD_TOKEN_ID);
+                    client = new DefaultJdClient(TaobaoConfig.JINGDONG_API_URL, sysConfig.getConfigParameter(), TaobaoConfig.jd_appkey, TaobaoConfig.jd_secret);
                     orderSearchRequest = new PopOrderEnSearchRequest();
                     orderSearchRequest.setStartDate(startTime);
                     orderSearchRequest.setEndDate(endTime);
                     orderSearchRequest.setOrderState("WAIT_SELLER_STOCK_OUT,WAIT_SELLER_DELIVERY");//待出库和境外待发货, 一般仅存在前者
-                    orderSearchRequest.setOptionalFields("orderId,venderId,orderType,payType,orderTotalPrice,orderSellerPrice,orderPayment,freightPrice,sellerDiscount,orderState,orderStateRemark,deliveryType," +
-                            "invoiceEasyInfo," +
-                            "invoiceCode,invoiceInfo,invoiceCode,orderRemark,orderStartTime,orderEndTime," +
-                            "consigneeInfo," +
-                            "itemInfoList," +
-                            "couponDetailList," +
-                            "venderRemark,balanceUsed,pin,returnOrder,paymentConfirmTime,waybill,logisticsId," +
-                            "vatInfo," +
-                            "modified,directParentOrderId,parentOrderId,customs,customsModel,orderSource,storeOrder,idSopShipmenttype,scDT,serviceFee," +
-                            "pauseBizInfo," +
-                            "taxFee,tuiHuoWuYou,orderSign,storeId,realPin,orderMarkDesc,open_id,xid,open_id_buyer,xid_buyer");
+                    orderSearchRequest.setOptionalFields(initOrderOptionalFields());
                     orderSearchRequest.setPage("" + pageNo);
                     orderSearchRequest.setPageSize("" + 40L);
                     orderSearchRequest.setDateType(0);//按照最后修改时间查询
                     rsp = client.execute(orderSearchRequest);
                 } catch (Exception e) {
-                    logger.error("", e);
+                    logger.error("请求京东服务器异常：{}", e);
                 }
                 if (rsp == null) {
                     logger.error("【京东订单】请求京东服务器失败!");
@@ -228,27 +221,12 @@ public class JingdongTask {
         }
 
         try {
-            JdClient client = null;
-            PopOrderEnGetRequest request = null;
-            PopOrderEnGetResponse rsp = null;
-
-
-            SysConfig sysConfig = sysConfigService.getSysConfigAll(27);
-            client = new DefaultJdClient(TaobaoConfig.JINGDONG_API_URL, (String) AdminJingdongAuthController.getToken(sysConfig).get("token"), TaobaoConfig.jd_appkey, TaobaoConfig.jd_secret);
-            request=new PopOrderEnGetRequest();
+            SysConfig sysConfig = sysConfigService.getSysConfigAll(DB_JD_TOKEN_ID);
+            JdClient client = new DefaultJdClient(TaobaoConfig.JINGDONG_API_URL, sysConfig.getConfigParameter(), TaobaoConfig.jd_appkey, TaobaoConfig.jd_secret);
+            PopOrderEnGetRequest request = new PopOrderEnGetRequest();
             request.setOrderId(tid);
-            request.setOptionalFields("orderId,venderId,orderType,payType,orderTotalPrice,orderSellerPrice,orderPayment,freightPrice,sellerDiscount,orderState,orderStateRemark,deliveryType," +
-                    "invoiceEasyInfo," +
-                    "invoiceCode,invoiceInfo,invoiceCode,orderRemark,orderStartTime,orderEndTime," +
-                    "consigneeInfo," +
-                    "itemInfoList," +
-                    "couponDetailList," +
-                    "venderRemark,balanceUsed,pin,returnOrder,paymentConfirmTime,waybill,logisticsId," +
-                    "vatInfo," +
-                    "modified,directParentOrderId,parentOrderId,customs,customsModel,orderSource,storeOrder,idSopShipmenttype,scDT,serviceFee," +
-                    "pauseBizInfo," +
-                    "taxFee,tuiHuoWuYou,orderSign,storeId,realPin,orderMarkDesc,open_id,xid,open_id_buyer,xid_buyer");
-            rsp = client.execute(request);
+            request.setOptionalFields(initOrderOptionalFields());
+            PopOrderEnGetResponse rsp = client.execute(request);
             String code = rsp.getCode();
             logger.info("查询京东订单详情返回信息：code:{}, msg:{}", rsp.getCode(), rsp.getMsg());
             if ("0".equals(code)) {
@@ -264,6 +242,21 @@ public class JingdongTask {
     }
 
 
+    public String initOrderOptionalFields() {
+        return "orderId,venderId,orderType,payType,orderTotalPrice,orderSellerPrice,orderPayment,freightPrice,sellerDiscount,orderState,orderStateRemark,deliveryType," +
+                "invoiceEasyInfo," +
+                "invoiceCode,invoiceInfo,invoiceCode,orderRemark,orderStartTime,orderEndTime," +
+                "consigneeInfo," +
+                "itemInfoList," +
+                "couponDetailList," +
+                "venderRemark,balanceUsed,pin,returnOrder,paymentConfirmTime,waybill,logisticsId," +
+                "vatInfo," +
+                "modified,directParentOrderId,parentOrderId,customs,customsModel,orderSource,storeOrder,idSopShipmenttype,scDT,serviceFee," +
+                "pauseBizInfo," +
+                "taxFee,tuiHuoWuYou,orderSign,storeId,realPin,orderMarkDesc,open_id,xid,open_id_buyer,xid_buyer";
+    }
+
+
     /**
      * 京东发货
      * @param orderId
@@ -272,21 +265,14 @@ public class JingdongTask {
      */
     public OperatorResult orderShipment(String orderId, String logiCoprId, String logiNo){
 
-        SysConfig sysConfigAll = sysConfigService.getSysConfigAll(27);
-        JdClient client = new DefaultJdClient(JingdongConfig.JINGDONG_API_URL, sysConfigAll.getConfigParameter(), JingdongConfig.jd_appkey, JingdongConfig.jd_secret);
+        SysConfig sysConfig = sysConfigService.getSysConfigAll(DB_JD_TOKEN_ID);
+        JdClient client = new DefaultJdClient(JingdongConfig.JINGDONG_API_URL, sysConfig.getConfigParameter(), JingdongConfig.jd_appkey, JingdongConfig.jd_secret);
         PopOrderShipmentRequest req = new PopOrderShipmentRequest();
         req.setOrderId(Long.parseLong(orderId));
         req.setLogiCoprId(logiCoprId);
         req.setLogiNo(logiNo);
         try {
             PopOrderShipmentResponse rsp = client.execute(req);
-//            PopOrderShipmentResponse rsp = new PopOrderShipmentResponse();
-//            rsp.setCode("0");
-//            rsp.setMsg("伪造成功， 生产放开");
-//            OperatorResult result = new OperatorResult();
-//            result.setSuccess(true);
-//            result.setChineseErrCode("伪造成功,生产放开");
-//            rsp.setSopjosshipmentResult(result);
             logger.info("京东订单发货回录：code:{}, msg:{}", rsp.getCode(), rsp.getMsg());
             if ("0".equals(rsp.getCode())) {
                 OperatorResult sopjosshipmentResult = rsp.getSopjosshipmentResult();
@@ -309,14 +295,10 @@ public class JingdongTask {
         }
 
         try {
-            JdClient client = null;
-            PopOrderGetmobilelistRequest request = null;
+            SysConfig sysConfig = sysConfigService.getSysConfigAll(DB_JD_TOKEN_ID);
             PopOrderGetmobilelistResponse rsp = null;
-
-
-            SysConfig sysConfig = sysConfigService.getSysConfigAll(27);
-            client = new DefaultJdClient(TaobaoConfig.JINGDONG_API_URL, (String) AdminJingdongAuthController.getToken(sysConfig).get("token"), TaobaoConfig.jd_appkey, TaobaoConfig.jd_secret);
-            request = new PopOrderGetmobilelistRequest();
+            JdClient client = new DefaultJdClient(TaobaoConfig.JINGDONG_API_URL, sysConfig.getConfigParameter(), TaobaoConfig.jd_appkey, TaobaoConfig.jd_secret);
+            PopOrderGetmobilelistRequest request = new PopOrderGetmobilelistRequest();
             request.setAppName("爱贝源官方旗航店");
 //            request.setRegion("https://jd.com");
             request.setOrderId(orderId);
@@ -531,89 +513,4 @@ public class JingdongTask {
         return (int)(p * 100);
     }
 
-    private String findZip(String receiverState, String receiverCity, String receiverDistrict, String address) {
-        logger.info("地址数据：{}, {}, {}, {}", receiverState, receiverCity, receiverDistrict, address);
-        //获取省份
-        List<Province> provinceList = addressService.listProvince(new Province());
-        // 没有邮编，从系统开始查找
-        if(provinceList != null && provinceList.size() >0 ){
-            int provinceIdNum = 0;
-            int provinceId = 0;
-            for (Province proiv : provinceList) {
-                int proNum = 0;
-                String newPro = proiv.getProvince().replaceAll("省|自治区|壮族自治区|特别行政区|维吾尔自治区","");
-                if(newPro.contains(receiverState)){
-                    proNum++;
-                }
-                if(receiverState.contains(newPro)){
-                    proNum++;
-                }
-                if(proNum > provinceIdNum){
-                    provinceIdNum = proNum;
-                    provinceId = proiv.getProvinceId();
-                }
-            }
-
-            receiverCity = receiverCity.replaceAll("市|州|地区|自治区|特别行政区","");
-
-            int cityNum = 0;
-            Integer cityId = null;
-
-            City city = new City();
-            city.setProvinceId(provinceId);
-            List<City> cityList = addressService.listCity(city);
-            for (City ci:cityList) {
-                int ciNum = 0;
-                String newCi = ci.getCity().replaceAll("市|州|地区|自治区|特别行政区","");
-                if(receiverCity.contains(newCi)){
-                    ciNum ++;
-                }
-                if(newCi.contains(receiverCity)){
-                    ciNum ++;
-                }
-                if(cityNum < ciNum){
-                    cityNum = ciNum;
-                    cityId = ci.getCityId();
-                }
-            }
-            if(cityId == null){
-                throw new RuntimeException("未查询到该县区："+address);
-            }
-
-            int districtNum = 0;
-            String postcode = null;
-
-            District district = new District();
-            district.setCityId(cityId);
-            List<District> districtList = addressService.listDistrict(district);
-            for (District dis:districtList) {
-                int disNum = 0;
-
-                String newDIs = dis.getDistrict();
-                String newLastNewArea  = newDIs.substring(newDIs.length()-1,newDIs.length());
-                newLastNewArea = newLastNewArea.replaceAll("县|区|镇|乡|市|州|洲","");
-                newDIs = newDIs.substring(0,newDIs.length()-1);
-                newDIs += newLastNewArea;
-
-                if(newDIs.contains(receiverDistrict)){
-                    disNum++;
-                }
-                if(receiverDistrict.contains(newDIs)){
-                    disNum++;
-                }
-                if(districtNum < disNum){
-                    districtNum = disNum;
-                    postcode = dis.getPostcode();
-                }
-            }
-            if(postcode != null){
-                return postcode;
-            }else{
-                throw new RuntimeException("未查询到该县区，原地址："+address);
-            }
-        }else{
-            throw new RuntimeException("未查询到该省份，原地址："+address);
-        }
-    }
-
 }

watero-rst-web/src/main/java/com/iamberry/rst/controllers/mq/TaobaoConfig.java

@@ -16,7 +16,10 @@ public class TaobaoConfig {
     public static final String jd_appkey = "D4D06F60BFFC308ED4B00D985029C5D1";
     public static final String jd_secret = "c6cdaef6c2bb453e96b0762fe2a8d40a";
 
-
+    //京东TOKEN配置 数据库主键ID
+    public static final Integer DB_JD_TOKEN_ID = 27;
+    //京东订单拉取时间间隔配置
+    public static final Integer DB_JD_PULL_ORDER_LIMIT_TIME = 28;
 
 
 }

watero-rst-web/src/main/java/com/iamberry/rst/controllers/order/AdminJingdongAuthController.java

@@ -3,7 +3,6 @@ package com.iamberry.rst.controllers.order;
 import com.alibaba.fastjson.JSONObject;
 import com.iamberry.app.tool.util.AES;
 import com.iamberry.app.tool.util.HttpUtility;
-//import com.iamberry.redis.RedisUtils;
 import com.iamberry.rst.controllers.mq.JingdongTask;
 import com.iamberry.rst.controllers.mq.TaobaoConfig;
 import com.iamberry.rst.core.sys.SysConfig;
@@ -11,23 +10,16 @@ import com.iamberry.rst.faces.sys.SysConfigService;
 import com.iamberry.wechat.tools.DateTimeUtil;
 import com.iamberry.wechat.tools.ResponseJson;
 import com.iamberry.wechat.tools.payUtil.StringUtil;
-import com.iamberry.zk.SpringContextHolder;
-import com.jd.open.api.sdk.DefaultJdClient;
 import com.jd.open.api.sdk.domain.order.OrderQueryJsfService.response.enGet.OrderSearchInfo;
 import com.jd.open.api.sdk.domain.order.OrderShipmentService.response.shipment.OperatorResult;
-import com.jd.open.api.sdk.internal.util.HttpUtil;
-import com.taobao.api.ApiException;
-import com.taobao.api.DefaultTaobaoClient;
-import com.taobao.api.TaobaoClient;
-import com.taobao.api.request.TopAuthTokenCreateRequest;
-import com.taobao.api.response.TopAuthTokenCreateResponse;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
-
 import javax.servlet.http.HttpServletRequest;
 import java.util.Date;
 import java.util.HashMap;
@@ -35,6 +27,8 @@ import java.util.Map;
 import java.util.Random;
 import java.util.concurrent.ConcurrentHashMap;
 
+import static com.iamberry.rst.controllers.mq.TaobaoConfig.DB_JD_TOKEN_ID;
+
 /**
  * @author root
  */
@@ -43,6 +37,9 @@ import java.util.concurrent.ConcurrentHashMap;
 public class AdminJingdongAuthController {
 
 
+    private static final Logger logger = LoggerFactory.getLogger(AdminJingdongAuthController.class);
+
+
     @Autowired
     private SysConfigService sysConfigService;
 
@@ -51,52 +48,20 @@ public class AdminJingdongAuthController {
 
     public static final Map<String, String> HREF_CACHE = new ConcurrentHashMap<>(10);
 
-//    @RequestMapping("/tokenPage")
-//    public ModelAndView tokenPage() {
-//        return new ModelAndView("taobao/token").addObject("data", getToken());
-//    }
-
 
 
-
-    public static Map<String, Object> getToken(SysConfig sysConfig) {
-        if (sysConfig == null || StringUtil.isEmpty(sysConfig.getConfigParameter()) || StringUtil.isEmpty(sysConfig.getConfigRemarks())) {
-            return null;
-        }
-
-
-//        String taobaoSession = RedisUtils.get("JINGDONG_SESSION");
-//        // 判断数据
-//        if (taobaoSession == null) {
-//            return null;
-//        }
-//        JSONObject obj = JSONObject.parseObject(taobaoSession);
-        // 校验时间
-//        Date time = obj.getDate("time");
-        Date time = DateTimeUtil.parse(sysConfig.getConfigRemarks());
-        if (time.getTime() <= System.currentTimeMillis()) {
-            return null;
-        }
-        // 组装
-        Map<String, Object> res = new HashMap<>();
-        res.put("token", sysConfig.getConfigParameter());
-        res.put("time", DateTimeUtil.parse(sysConfig.getConfigRemarks()));
-        return res;
-    }
-
     @ResponseBody
     @RequestMapping("/check")
     public ResponseJson checkToken() {
-        SysConfig sysConfig = sysConfigService.getSysConfigAll(27);
-        Map<String, Object> token = getToken(sysConfig);
-        if (token == null) {
+        SysConfig sysConfig = sysConfigService.getSysConfigAll(DB_JD_TOKEN_ID);
+        if (sysConfig == null || StringUtil.isEmpty(sysConfig.getConfigParameter())) {
             return ResponseJson.getFAILURE();
         }
-        Date time = (Date) token.get("time");
+        Date time = DateTimeUtil.parse(sysConfig.getConfigRemarks());
         if (time.getTime() <= System.currentTimeMillis()) {
             return ResponseJson.getFAILURE();
         }
-        return ResponseJson.getSUCCESS().addResponseKeyValue("token", token);
+        return ResponseJson.getSUCCESS().addResponseKeyValue("token", sysConfig.getConfigParameter());
     }
 
     @ResponseBody
@@ -104,7 +69,7 @@ public class AdminJingdongAuthController {
     public ResponseJson invalid() {
 //        RedisUtils.del("JINGDONG_SESSION");
         SysConfig sysConfig = new SysConfig();
-        sysConfig.setConfigId(27);
+        sysConfig.setConfigId(DB_JD_TOKEN_ID);
         sysConfig.setConfigParameter("");
         sysConfig.setConfigRemarks("");
         sysConfigService.updateSysConfig(sysConfig);
@@ -128,20 +93,14 @@ public class AdminJingdongAuthController {
             params.put("app_secret", TaobaoConfig.jd_secret);
             params.put("grant_type", "authorization_code");
             params.put("code", code);
-//            String s = HttpUtil.doPost(TaobaoConfig.JINGDONG_URL, params, 6000, 6000);
             String s = HttpUtility.httpsGet(authUrl);
-            System.out.println("获取到京东结果：" + s);
+            logger.info("获取到京东结果：" + s);
             JSONObject result = JSONObject.parseObject(s);
-            System.out.println(result);
             String accessToken = result.getString("access_token");
             Integer timeout = result.getInteger("expires_in");//有效期， 单位秒
             // 缓存数据
-//            Map<String, Object> data = new HashMap<>(2);
-//            data.put("token", accessToken);
-//            data.put("time", DateTimeUtil.addMinute(new Date(), (timeout/60)-30));
-//            RedisUtils.put("JINGDONG_SESSION", JSONObject.toJSONString(data));
             SysConfig sysConfig = new SysConfig();
-            sysConfig.setConfigId(27);
+            sysConfig.setConfigId(DB_JD_TOKEN_ID);
             sysConfig.setConfigParameter(accessToken);
             sysConfig.setConfigRemarks(DateTimeUtil.format(DateTimeUtil.addMinute(new Date(), (timeout/60)-30)));
             sysConfigService.updateSysConfig(sysConfig);
@@ -165,9 +124,7 @@ public class AdminJingdongAuthController {
         // 存储跳转前的URL
         int state = new Random(1_000_000).nextInt();
         HREF_CACHE.put(state + "", href);
-        // 跳转  http://liurui.gz2vip.91tunnel.com/watero/jingdong/token
-//        String url = "https://open-oauth.jd.com/oauth2/to_login?response_type=code&client_id=" + TaobaoConfig.jd_appkey + "&redirect_uri=https://rst.iamberry.com/jingdong/token&state=" + state + "&view=web";
-        String url = "https://open-oauth.jd.com/oauth2/to_login?app_key=" + TaobaoConfig.jd_appkey + "&response_type=code&redirect_uri=http://liurui.gz2vip.91tunnel.com/watero/jingdong/token&state=" + state + "&scope=snsapi_base";
+        String url = "https://open-oauth.jd.com/oauth2/to_login?app_key=" + TaobaoConfig.jd_appkey + "&response_type=code&redirect_uri=http://rst.iamberry.com/jingdong/token&state=" + state + "&scope=snsapi_base";
         return new ModelAndView("redirect:" + url);
     }
 
@@ -182,6 +139,7 @@ public class AdminJingdongAuthController {
     public OrderSearchInfo orderEnGet(@RequestParam("orderId") String orderId, @RequestParam("code") String code) {
         String decrypt = AES.decrypt(code);
         if (!orderId.equals(decrypt)) {
+            logger.info("京东订单详情接口，安全风险：{}", "不安全访问！");
             return null;
         }
         OrderSearchInfo orderDetails = jingdongTask.getOrderDetails(Long.parseLong(orderId));
@@ -196,9 +154,11 @@ public class AdminJingdongAuthController {
      */
     @RequestMapping(value = "/orderShipment")
     @ResponseBody
-    public OperatorResult orderShipment(@RequestParam("orderId") String orderId, @RequestParam("logiCoprId") String logiCoprId, @RequestParam("logiNo") String logiNo, @RequestParam("code") String code) {
+    public OperatorResult orderShipment(@RequestParam("orderId") String orderId, @RequestParam("logiCoprId") String logiCoprId,
+                                        @RequestParam("logiNo") String logiNo, @RequestParam("code") String code) {
         String decrypt = AES.decrypt(code);
         if (!orderId.equals(decrypt)) {
+            logger.info("京东订单发货接口，安全风险：{}", "不安全访问！");
             return null;
         }
         OperatorResult operatorResult = jingdongTask.orderShipment(orderId, logiCoprId, logiNo);

watero-rst-web/src/main/java/com/iamberry/rst/controllers/order/AdminTaobaoAuthController.java

@@ -8,6 +8,7 @@ import com.iamberry.rst.core.sys.SysConfig;
 import com.iamberry.rst.faces.sys.SysConfigService;
 import com.iamberry.wechat.tools.DateTimeUtil;
 import com.iamberry.wechat.tools.ResponseJson;
+import com.iamberry.wechat.tools.payUtil.StringUtil;
 import com.taobao.api.ApiException;
 import com.taobao.api.DefaultTaobaoClient;
 import com.taobao.api.TaobaoClient;
@@ -24,6 +25,8 @@ import javax.servlet.http.HttpServletRequest;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 
+import static com.iamberry.rst.controllers.mq.TaobaoConfig.DB_JD_TOKEN_ID;
+
 /**
  * @author root
  */
@@ -47,11 +50,19 @@ public class AdminTaobaoAuthController {
         taobaoToken.put("type", "1");
         reuslt.add(taobaoToken);
 
-        SysConfig sysConfig = sysConfigService.getSysConfigAll(27);
-        Map<String, Object> jingdongToken = AdminJingdongAuthController.getToken(sysConfig);
-        if (jingdongToken == null || jingdongToken.size() == 0) {
-            jingdongToken = new HashMap<>();
+        //京东token
+        SysConfig sysConfig = sysConfigService.getSysConfigAll(DB_JD_TOKEN_ID);
+        if (sysConfig == null || StringUtil.isEmpty(sysConfig.getConfigParameter()) || StringUtil.isEmpty(sysConfig.getConfigRemarks())) {
+            return null;
+        }
+        Date time = DateTimeUtil.parse(sysConfig.getConfigRemarks());
+        if (time.getTime() <= System.currentTimeMillis()) {
+            return null;
         }
+        // 组装
+        Map<String, Object> jingdongToken = new HashMap<>();
+        jingdongToken.put("token", sysConfig.getConfigParameter());
+        jingdongToken.put("time", DateTimeUtil.parse(sysConfig.getConfigRemarks()));
         jingdongToken.put("name", "京东认证");
         jingdongToken.put("type", "2");
         reuslt.add(jingdongToken);

watero-rst-web/src/main/java/com/iamberry/rst/controllers/order/AwaitSendController.java

@@ -258,7 +258,7 @@ public class AwaitSendController {
                     // 校验淘宝订单
                     vaildTaobaoOrder(temp, salesOrderList);
                 } else if (temp.getSalesBatchId().startsWith("JT")) {
-                    // 教研京东订单
+                    // 校验京东订单
                     vaildJdOrder(temp, salesOrderList);
                 } else if (temp.getSalesBatchId().startsWith("SX")) {
                     // 校验小亚通订单