Merge branch 'master' of https://gitee.com/wjl2008_admin/nuttyreading-java into zcc

src/main/java/com/peanut/modules/book/service/impl/BuyOrderServiceImpl.java

@@ -719,6 +719,8 @@ public class BuyOrderServiceImpl extends ServiceImpl<BuyOrderDao, BuyOrder> impl
         responseVo.setRealPrice(buyOrder.getRealMoney());
         responseVo.setShippingPrice(buyOrder.getShippingMoney());
         responseVo.setDistrictPrice(buyOrder.getDistrictMoney());
+        responseVo.setJfDeduction(buyOrder.getJfDeduction());
+        responseVo.setAddressId(buyOrder.getAddressId());
         responseVo.setOrderType(buyOrder.getOrderType());
         BeanUtil.copyProperties(buyOrder, responseVo);
 

src/main/java/com/peanut/modules/book/vo/response/BuyOrderResponseVo.java

@@ -59,6 +59,10 @@ public class BuyOrderResponseVo {
      * 运费
      */
     private BigDecimal shippingPrice;
+    /**
+     * 积分抵扣
+     */
+    private BigDecimal jfDeduction;
     /**
      * 商品列表
      */
@@ -89,6 +93,10 @@ public class BuyOrderResponseVo {
      * 发货时间
      */
     private Date shippingTime;
+    /**
+     * 收货地址
+     */
+    private Integer addressId;
     /**
      * 快递包裹
      */