Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang...

huliguo

3 天以前 db7f0be6a4f8d3e76ddd726fd2f3648d0e0a2e6e

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java

@@ -3221,7 +3221,7 @@
        order.setOrderFrom(4);
        order.setShopId(shopId);
        order.setUserId(userId);
        order.setOrderMoney(BigDecimal.ZERO);
        order.setOrderMoney(goods.getSalesPrice());
        order.setCouponMoney(BigDecimal.ZERO);
        order.setDiscountMoney(BigDecimal.ZERO);
        order.setReceivableMoney(BigDecimal.ZERO);