|
|
@ -266,20 +266,14 @@ public class OrderServiceImpl implements OrderService { |
|
|
//todo 远程获取图
|
|
|
//todo 远程获取图
|
|
|
} |
|
|
} |
|
|
retmap.put("goods", dv); |
|
|
retmap.put("goods", dv); |
|
|
// 订单用户 ,
|
|
|
// 授权方信息
|
|
|
Map odumap = new HashMap(); |
|
|
JSONObject ujson = SzwhApiUtils.getApiUser(dv.getEntrust_islicode()); |
|
|
OrderUser orderUser = orderUserMapper.getUserOrder(batchcode, dv.getEntrust_islicode()); |
|
|
log.info("gdujson:"+ujson); |
|
|
if(orderUser!=null) { |
|
|
// 抽取出data,
|
|
|
odumap.put("userType", orderUser.getUserType()); |
|
|
String udtjson = ujson.getString("data"); |
|
|
odumap.put("uscc", orderUser.getUscc()); |
|
|
// data字符串 转为map
|
|
|
odumap.put("name", orderUser.getName()); |
|
|
Map userMap =JSON.parseObject(udtjson); |
|
|
odumap.put("islicode", orderUser.getIslicode()); |
|
|
retmap.put("userinfo",userMap); |
|
|
odumap.put("bankAccountName", orderUser.getBankAccountName()); |
|
|
|
|
|
odumap.put("state", orderUser.getState()); |
|
|
|
|
|
retmap.put("userinfo", odumap); |
|
|
|
|
|
}else{ |
|
|
|
|
|
retmap.put("userinfo",null); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
//来源集合
|
|
|
//来源集合
|
|
|
List<OrderGoodsSource> orgslist = orderGoodsSourceMapper.getOrderGoodsSourceList(dv.getSource_id()); |
|
|
List<OrderGoodsSource> orgslist = orderGoodsSourceMapper.getOrderGoodsSourceList(dv.getSource_id()); |
|
|
|