|
|
|
@ -324,7 +324,7 @@ public class OrderServiceImpl implements OrderService { |
|
|
|
String goodsType="";//产品类型
|
|
|
|
List<String> goodsEntrust=new ArrayList<>(); |
|
|
|
String goodsOwnerShipStr=""; |
|
|
|
BigDecimal price=new BigDecimal(0); // 订单金额
|
|
|
|
BigDecimal goodsPrice=new BigDecimal(0); // 订单金额
|
|
|
|
int transactionCount=0;// 交易次数
|
|
|
|
BigDecimal earnestMoney= new BigDecimal(0); |
|
|
|
BigDecimal serviceCharge=new BigDecimal(0);//服务
|
|
|
|
@ -346,9 +346,11 @@ public class OrderServiceImpl implements OrderService { |
|
|
|
//
|
|
|
|
goodsOwnerShipStr += odg.getGoodsOwnershipStr()+","; |
|
|
|
// 用字符串形式保持精度
|
|
|
|
BigDecimal gprice = new BigDecimal(odg.getPrice().toString()); |
|
|
|
price = price.add(gprice); |
|
|
|
//
|
|
|
|
// BigDecimal gprice = new BigDecimal(odg.getPrice().toString());
|
|
|
|
// price = price.add(gprice);
|
|
|
|
// 订单总额
|
|
|
|
goodsPrice=goodsPrice.add(odg.getGoodsPrice()); |
|
|
|
// 交易数量
|
|
|
|
transactionCount+=odg.getTransactionCount(); |
|
|
|
//
|
|
|
|
BigDecimal gear=new BigDecimal(odg.getEarnestMoney().toString()); |
|
|
|
@ -387,10 +389,13 @@ public class OrderServiceImpl implements OrderService { |
|
|
|
odinfoMap.put("goods_entrust",gestr.substring(0,gestr.length()-1)); |
|
|
|
//
|
|
|
|
odinfoMap.put("goods_ownership_str",goodsOwnerShipStr.substring(0,goodsOwnerShipStr.length()-1)); |
|
|
|
odinfoMap.put("price",price); |
|
|
|
//标的价格
|
|
|
|
|
|
|
|
odinfoMap.put("price",goodsPrice); |
|
|
|
odinfoMap.put("transaction_count",transactionCount); |
|
|
|
odinfoMap.put("earnest_money",earnestMoney); |
|
|
|
odinfoMap.put("service_charge",serviceCharge); |
|
|
|
//订单金额总额
|
|
|
|
odinfoMap.put("total_money",bsod.getTotalMoney()); |
|
|
|
retmap.put("order_info",odinfoMap); |
|
|
|
|
|
|
|
|