Merge remote-tracking branch 'origin/dev' into dev

service/src/main/java/com/hfkj/service/order/impl/BsOrderServiceImpl.java

@@ -273,7 +273,7 @@ public class BsOrderServiceImpl implements BsOrderService {
             }
 
             // 商品订单总优惠
-            childOrder.setTotalDeductionPrice(childOrder.getCouponDiscountPrice().add(new BigDecimal(childOrder.getIntegralDiscountPrice())));
+            childOrder.setTotalDeductionPrice(childOrder.getCouponDiscountPrice().add(new BigDecimal(childOrder.getIntegralDiscountPrice()).divide(new BigDecimal("100"))));
 
             // 可退款金额 产品总价 - 优惠总价
             childOrder.setSurplusRefundPrice(childOrder.getProductTotalPrice().subtract(childOrder.getTotalDeductionPrice()));