Merge branch 'dev' of http://139.159.177.244:3000/hurui/hai-server into dev

hai-service/src/main/java/com/hai/service/impl/HighOrderServiceImpl.java

@@ -105,7 +105,7 @@ public class HighOrderServiceImpl implements HighOrderService {
                                 highChildOrder.setGoodsSpecName("默认");
                                 highChildOrder.setGoodsPrice(new BigDecimal(0));
                                 highChildOrder.setSaleCount(1);
-                                highChildOrder.setTotalPrice(childOrder.getGoodsPrice().multiply(new BigDecimal(childOrder.getSaleCount().toString())));
+                                highChildOrder.setTotalPrice(new BigDecimal(0));
                                 highChildOrder.setGiveawayType(true);  // 是否是赠品  0：否   1：是
                                 highChildOrder.setChildOrdeStatus(1);   // 1 待支付  2 已支付  3.已完成  4. 已退款  5.已取消
                                 highChildOrder.setPraiseStatus(0);