下单前做校验，只筛选出供应链的商品

src/main/java/zs/payment/resp/Result.java

@@ -24,13 +24,13 @@ public class Result {
         return new Result(body);
     }
 
-    public static Result success(String token) {
-        Map<String, Object> body = new HashMap<>();
-        body.put("CODE", 200);
-        body.put("MSG", "SUCCESS");
-        body.put("token", token);
-        return new Result(body);
-    }
+//    public static Result success(String token) {
+//        Map<String, Object> body = new HashMap<>();
+//        body.put("CODE", 200);
+//        body.put("MSG", "SUCCESS");
+//        body.put("token", token);
+//        return new Result(body);
+//    }
 
     public static Result success(Object data) {
         Map<String, Object> body = new HashMap<>();
@@ -54,4 +54,4 @@ public class Result {
     public boolean isSuccess() {
         return Integer.valueOf(200).equals(body.get("CODE"));
     }
-}
+}

src/main/java/zs/payment/service/imseweishoporder/impl/ImsEweiShopOrderServiceImpl.java

@@ -18,6 +18,6 @@ public class ImsEweiShopOrderServiceImpl extends ServiceImpl<ImsEweiShopOrderMap
         return lambdaUpdate().eq(ImsEweiShopOrder::getOrdersn, dto.getOrdersn())
             .set(ImsEweiShopOrder::getExpress, dto.getCompanyCode())
             .set(ImsEweiShopOrder::getExpresscom, dto.getCompanyName())
-            .set(ImsEweiShopOrder::getExpresssn, dto.getOrdersn()).update();
+            .set(ImsEweiShopOrder::getExpresssn, dto.getExpressNo()).update();
     }
 }

src/main/java/zs/payment/service/supply/order/impl/OrderSupplyServiceImpl.java

@@ -52,9 +52,14 @@ public class OrderSupplyServiceImpl implements OrderSupplyService {
         if (headers == null) {
             return Result.fail("获取token失败");
         }
+        log.info("---请求参数为{}---",req.getOrderSn());
+
         List<SpuItem> spuItems = imsEweiShopGoodsMapper.findSpuByOrdersn(req.getOrderSn());
         AddressInfo address = imsEweiShopGoodsMapper.findAddressByOrdersn(req.getOrderSn());
-
+        if (spuItems.isEmpty()) {
+            // 非供应链的订单
+            return Result.success("非供应链的订单");
+        }
 
         Map<String, Object> params = new HashMap<>();
         params.put("spu", spuItems);

src/main/java/zs/payment/service/supply/token/impl/SupplyTokenServiceImpl.java

@@ -68,7 +68,7 @@ public class SupplyTokenServiceImpl implements SupplyTokenService {
             log.error("buildAuthHeaders: 获取token失败, msg={}", tokenResult.getBody().get("MSG"));
             return null;
         }
-        String token = (String) tokenResult.getBody().get("token");
+        String token = (String) tokenResult.getBody().get("data");
         Map<String, String> headers = new HashMap<>();
         headers.put("x-token", token);
         return headers;