Merge remote-tracking branch 'origin/master'

admin

2019-04-15 debb3a579f798d71072f037f74e3e6b43b5fe0ee

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

@@ -249,7 +249,7 @@
                  totalSettlement = commonOrder.getTotalPayment();

               }

               // 实付款

               commonGoodsVO.setActualPay("实付款：¥" + totalSettlement);

               commonGoodsVO.setActualPay("付款金额：¥" + totalSettlement);



               listOrderGoods.add(commonGoodsVO);



@@ -630,6 +630,7 @@
            updateCommonOrder.setState(newCommonOrder.getState());

            updateCommonOrder.setStateWholeOrder(wholeOrderState);

            updateCommonOrder.setUpdateTime(new Date());

            updateCommonOrder.setTradeId(newCommonOrder.getTradeId());

            commonOrderMapper.updateByPrimaryKeySelective(updateCommonOrder);

            commonOrderList.add(commonOrderMapper.selectByPrimaryKey(updateCommonOrder.getId()));

            continue;

@@ -887,7 +888,7 @@
               totalSettlement = commonOrder.getTotalPayment();

            }

            // 实付款

            commonGoodsVO.setActualPay("实付款：¥" + totalSettlement);

            commonGoodsVO.setActualPay("付款金额：¥" + totalSettlement);



            listOrderGoods.add(commonGoodsVO);