|
|
@@ -1224,6 +1224,25 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
|
|
|
// 计算已服务时长
|
|
|
Long serviceDuration = calculateServiceDuration(orders);
|
|
|
orders.setServiceDuration(String.valueOf(serviceDuration));
|
|
|
+
|
|
|
+ //项目名称
|
|
|
+ orders.setProjectNames(getProjectNames(orders));
|
|
|
+ //订单金额
|
|
|
+ orders.setOrderPrice(String.valueOf(orders.getTotalPrice()));
|
|
|
+ //优惠券补贴
|
|
|
+ orders.setCouponPrice(String.valueOf(orders.getPreferential()));
|
|
|
+ //实付金额
|
|
|
+ orders.setRealPayPrice(String.valueOf(orders.getTotalPrice()));
|
|
|
+ //平台佣金比例
|
|
|
+ orders.setPercent(percent.substring(percent.length() - 1)+"%");
|
|
|
+ //商户应收金额 不进行四舍五入
|
|
|
+ BigDecimal rp = orders.getTotalPrice().multiply(new BigDecimal(hPercent)).
|
|
|
+ setScale(2, RoundingMode.DOWN);
|
|
|
+ orders.setrPrice(String.valueOf(rp));
|
|
|
+ //平台佣金
|
|
|
+ BigDecimal cp = orders.getTotalPrice().subtract(rp).
|
|
|
+ setScale(2, RoundingMode.DOWN);
|
|
|
+ orders.setyPrice(String.valueOf(cp));
|
|
|
ordersList.add(orders);
|
|
|
|
|
|
});
|