|
|
|
@ -301,6 +301,7 @@ public class OrderServiceImpl implements OrderService { |
|
|
|
public Map<String,Object> orderInfo(String bathcode) { |
|
|
|
Map retmap =new HashMap(); |
|
|
|
int code=200; |
|
|
|
String msg="成功"; |
|
|
|
|
|
|
|
// 订单基础信息 todo fix
|
|
|
|
Map bsodmap = new HashMap(); |
|
|
|
@ -312,7 +313,7 @@ public class OrderServiceImpl implements OrderService { |
|
|
|
|
|
|
|
if(bsod==null){ |
|
|
|
log.warn("order warn: "+bathcode+" 订单不存在"); |
|
|
|
//throw new ChException("订单不存在");
|
|
|
|
msg="订单不存在"; |
|
|
|
code=400; |
|
|
|
} |
|
|
|
//订单商品详情
|
|
|
|
@ -406,16 +407,9 @@ public class OrderServiceImpl implements OrderService { |
|
|
|
//分账比例
|
|
|
|
AccountRatioSetting acrsetting = accountRatioSettingMapper.getAccRatioSettingById(bsod.getAccountRatioId()); |
|
|
|
List<AccountRatioDetail> acrdetailList = accountRatioDetailMapper.getAccRatioDetailBySettingId(acrsetting.getId()); |
|
|
|
// $entrust_number = 0;
|
|
|
|
// if($entrust_ratio_detail['calculate'] == 1){
|
|
|
|
// $entrust_number = $entrust_ratio_detail['ratio'];
|
|
|
|
// }else{
|
|
|
|
// $entrust_number = $entrust_ratio_detail['amount'];
|
|
|
|
// }
|
|
|
|
retmap.put("ratio_setting",acrdetailList); |
|
|
|
|
|
|
|
// 资金结算表
|
|
|
|
//$closeTable = $this->getCloseTable($order, $order_detail);
|
|
|
|
retmap.put("close",getCloseTable(bsod,odglist)); |
|
|
|
|
|
|
|
// 发票
|
|
|
|
@ -423,6 +417,8 @@ public class OrderServiceImpl implements OrderService { |
|
|
|
//$bill = $this->getBill($batchcode);
|
|
|
|
//$result['bill'] = $bill;
|
|
|
|
retmap.put("bill",bill); |
|
|
|
retmap.put("code",code); |
|
|
|
retmap.put("msg",msg); |
|
|
|
|
|
|
|
return retmap; |
|
|
|
} |
|
|
|
|