Merge remote-tracking branch 'origin/master'

admin

2019-04-12 2406574c36a8c4e8e8ffe7c56a34e25dde107a84

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

@@ -40,6 +40,7 @@
import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.factory.CommonOrderGoodsFactory;

import com.yeshi.fanli.util.taobao.TaoBaoOrderUtil;

import com.yeshi.fanli.util.taobao.TaoBaoUtil;

import com.yeshi.fanli.util.taobao.TaoKeApiUtil;

import com.yeshi.fanli.vo.msg.ClientTextStyleVO;

import com.yeshi.fanli.vo.order.CommonOrderGoodsVO;

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

               }

               // 实付款

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

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



               listOrderGoods.add(commonGoodsVO);



@@ -595,6 +596,7 @@
                  taoBaoGoods = TaoKeApiUtil.getSimpleGoodsInfo(taoBaoOrder.getAuctionId());

               } catch (TaobaoGoodsDownException e) {

                  e.printStackTrace();

                  taoBaoGoods=TaoBaoUtil.getSimpleGoodsBrief(taoBaoOrder.getAuctionId());

               }

               if (taoBaoGoods != null) {

                  goods = CommonOrderGoodsFactory.create(taoBaoGoods);

@@ -628,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;

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

            }

            // 实付款

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

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



            listOrderGoods.add(commonGoodsVO);