From 69226bb87cf0b6238eb708ab89539f89339e181e Mon Sep 17 00:00:00 2001 From: xyiege Date: Thu, 11 May 2023 20:41:23 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85=E7=9A=84?= =?UTF-8?q?=E5=A7=94=E6=89=98=E6=96=B9=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../szwh/service/impl/OrderServiceImpl.java | 22 +++++++------------ 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/src/main/java/cn/chjyj/szwh/service/impl/OrderServiceImpl.java b/src/main/java/cn/chjyj/szwh/service/impl/OrderServiceImpl.java index 861c8c4..5d54fa9 100644 --- a/src/main/java/cn/chjyj/szwh/service/impl/OrderServiceImpl.java +++ b/src/main/java/cn/chjyj/szwh/service/impl/OrderServiceImpl.java @@ -266,20 +266,14 @@ public class OrderServiceImpl implements OrderService { //todo 远程获取图 } retmap.put("goods", dv); - // 订单用户 , - Map odumap = new HashMap(); - OrderUser orderUser = orderUserMapper.getUserOrder(batchcode, dv.getEntrust_islicode()); - if(orderUser!=null) { - odumap.put("userType", orderUser.getUserType()); - odumap.put("uscc", orderUser.getUscc()); - odumap.put("name", orderUser.getName()); - odumap.put("islicode", orderUser.getIslicode()); - odumap.put("bankAccountName", orderUser.getBankAccountName()); - odumap.put("state", orderUser.getState()); - retmap.put("userinfo", odumap); - }else{ - retmap.put("userinfo",null); - } + // 授权方信息 + JSONObject ujson = SzwhApiUtils.getApiUser(dv.getEntrust_islicode()); + log.info("gdujson:"+ujson); + // 抽取出data, + String udtjson = ujson.getString("data"); + // data字符串 转为map + Map userMap =JSON.parseObject(udtjson); + retmap.put("userinfo",userMap); //来源集合 List orgslist = orderGoodsSourceMapper.getOrderGoodsSourceList(dv.getSource_id());