yujian
2019-01-08 85b08b045c79180a81abd43be0ac7fd2ae50cd46
fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java
@@ -183,10 +183,16 @@
                  commonGoodsVO.setGoodsTitle(titleMap);
               }
               // 购买数量
               commonGoodsVO.setActualCount(commonOrder.getTotalCount() + "件");
               String settlement = commonOrder.getTotalSettlement().setScale(2, BigDecimal.ROUND_DOWN).toString();
               commonGoodsVO.setActualPay("实付款:¥" + settlement);
               BigDecimal totalSettlement = commonOrder.getTotalSettlement();
               if (totalSettlement == null || totalSettlement.compareTo(new BigDecimal(0)) <= 0) {
                  totalSettlement = commonOrder.getTotalPayment();
               }
               // 实付款
               commonGoodsVO.setActualPay("实付款:¥" + totalSettlement);
               listOrderGoods.add(commonGoodsVO);
               Integer orderType = commonOrder.getOrderType();
@@ -393,6 +399,8 @@
         commonOrder.setUserInfo(new UserInfo(uid));
         commonOrder.setCreateTime(new Date());
         commonOrderMapper.insertSelective(commonOrder);
         return commonOrder;
      } else {// 修改
         // 已经结算或者已经失效的订单不处理