Authored by wangshusheng

Merge branch 'dev_180508_联盟红人推广'

... ... @@ -167,7 +167,7 @@ public class UserOrdersServiceImpl implements IUserOrdersService,IBusinessExport
orderRspBO.setCouponAmount(null != ordersCoupons?ordersCoupons.getCouponAmount():new BigDecimal(0));
//防止订单数据没有在ERP中
//订单金额
orderRspBO.setOrderAmount(orders.getAmount());
orderRspBO.setOrderAmount(orders.getOrderAmount());
//礼品卡抵运费--数据较少,暂时就用单个查询把
BigDecimal pay_shipping_amount = ordersGiftCardMapper.selectPayShippingAmount(Long.valueOf(orders.getOrderCode()));
// 免邮券--数据较少,暂时就用单个查询把
... ...