|
|
|
@ -204,11 +204,15 @@ public class OrderServiceImpl implements OrderService { |
|
|
|
} |
|
|
|
retmap.put("goods",dv); |
|
|
|
// 订单用户 ,
|
|
|
|
Map odumap=new HashMap(); |
|
|
|
OrderUser orderUser = orderUserMapper.getUserOrder(batchcode,dv.getEntrust_islicode()); |
|
|
|
// 显示时候取出ID,
|
|
|
|
orderUser.setId(null); |
|
|
|
orderUser.setBatchcode(null); |
|
|
|
retmap.put("userinfo",orderUser); |
|
|
|
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); |
|
|
|
|
|
|
|
//来源集合
|
|
|
|
List<OrderGoodsSource> orgslist = orderGoodsSourceMapper.getOrderGoodsSourceList(dv.getSource_id()); |
|
|
|
@ -371,8 +375,10 @@ public class OrderServiceImpl implements OrderService { |
|
|
|
retmap.put("order_info",odinfoMap); |
|
|
|
|
|
|
|
//购买者
|
|
|
|
Map buymap =new HashMap(); |
|
|
|
OrderUser buyuser= orderUserMapper.getUserOrder(bathcode,bsod.getBuyIslicode()); |
|
|
|
retmap.put("buyuser",buyuser); |
|
|
|
buymap.put("userType",buyuser.getUsertype()); |
|
|
|
retmap.put("buyuser",buymap); |
|
|
|
|
|
|
|
//分账比例
|
|
|
|
AccountRatioSetting acrsetting = accountRatioSettingMapper.getAccRatioSettingById(bsod.getAccountRatioId()); |
|
|
|
@ -384,9 +390,10 @@ public class OrderServiceImpl implements OrderService { |
|
|
|
retmap.put("close",getCloseTable(bsod,odglist)); |
|
|
|
|
|
|
|
// 发票
|
|
|
|
List<Ticket> bill = new ArrayList<>(); |
|
|
|
//$bill = $this->getBill($batchcode);
|
|
|
|
//$result['bill'] = $bill;
|
|
|
|
retmap.put("bill",null); |
|
|
|
retmap.put("bill",bill); |
|
|
|
|
|
|
|
return retmap; |
|
|
|
} |
|
|
|
|