Merge branch 'master-modify-cutAmount' into dev

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderAccountBiz.java

@@ -195,10 +195,7 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
 
     public BigDecimal calculateDeduction(BigDecimal goodsAmount, Long timeLag, String dicParentKey, StringBuilder refundDescBuilder) {
         BigDecimal refundGoodsAmount = goodsAmount;
-        BigDecimal deductGoodsAmount = goodsAmount;
-//        if(null == orderAccountDetail) {
-//            orderAccountDetail = new OrderAccountDetail();
-//        }
+        BigDecimal deductGoodsAmount = BigDecimal.ZERO;
 
         //根据时间处理goodsAmount
         //获取出发时间 到现在 距离时间
@@ -222,7 +219,8 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
                     //ga : goodsAmount
                     set("ga", goodsAmount);
                 }})+ "").toString());
-                refundDescBuilder = refundDescBuilder.insert(0, names[1]+ ",");
+                refundGoodsAmount = refundGoodsAmount.setScale(2, RoundingMode.HALF_UP);
+                refundDescBuilder = refundDescBuilder.insert(0, names[1]);
                 if(goodsAmount.subtract(refundGoodsAmount).compareTo(BigDecimal.ZERO) > 0) {
                     deductGoodsAmount = goodsAmount.subtract(refundGoodsAmount);
                     //orderAccountDetail.getDeductions().add(initDeduction(goodsAmount.subtract(refundGoodsAmount), names[1], DeductionTypeEnum.VIOLATE_CANCEL, OrderAccountDeduction.ORIGIN_DEPOSIT));