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

admin

2019-08-05 1cb3ee82ab49b221be2c4ec65bc70bc354fc8d8b

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

 fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java

@@ -442,8 +442,8 @@
                                weiQuanInfo.setWqHongBao("维权：-¥" + wqHongbao.setScale(2, BigDecimal.ROUND_DOWN).toString());

                                hongBao = MoneyBigDecimalUtil.sub(hongBao, wqHongbao);

                            } else {

                                hongBao = new BigDecimal(0);

                                weiQuanInfo.setWqHongBao("维权：-¥" + hongBao.setScale(2, BigDecimal.ROUND_DOWN).toString());

                                hongBao = new BigDecimal(0);

                            }

                            order.setWeiQuanInfo(weiQuanInfo);

                        }