订单商品类型处理

yujian

2019-07-29 cdd852f8e8eff7eb2e8f7c3fceaa955b9fc3f9d3

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

@@ -269,6 +269,8 @@
                  e.printStackTrace();

               }



               commonGoodsVO.setGoodsType(sourceType2);

					
               String picture = commonGoodsVO.getPicture();

               if (!StringUtil.isNullOrEmpty(picture) && !picture.contains("320x320")) {

                  commonGoodsVO.setPicture(TbImgUtil.getTBSize320Img(picture));

@@ -855,9 +857,9 @@
               commonOrder.getTradeId(), new Date(), commonOrder.getSourceType()));

         return commonOrder;

      } else {// 修改

         // 已经结算或者已经失效的订单不处理

         if (oldCommonOrder.getState() == CommonOrder.STATE_JS

               || oldCommonOrder.getState() == CommonOrder.STATE_SX) {

         // 已经结算，已经失效，状态未改变的订单不处理

         if (oldCommonOrder.getState() == CommonOrder.STATE_JS || oldCommonOrder.getState() == CommonOrder.STATE_SX

               || (oldCommonOrder.getState().intValue() == commonOrder.getState())) {

            return oldCommonOrder;

         }

         // 交易ID一致才修改

@@ -1155,10 +1157,14 @@




   @Override

   public CommonOrderVO getCommonOrderByOrderNo(Long uid, String orderNo, Integer orderState)

   public CommonOrderVO getCommonOrderByOrderNo(Long uid, String orderNo, Integer orderState, Integer sourceType)

         throws CommonOrderException {



      CommonOrderVO commonOrderVO = commonOrderMapper.getCommonOrderByOrderNo(uid, orderNo, orderState);

      if (sourceType == null) {

         sourceType = Constant.SOURCE_TYPE_TAOBAO;

      }

		
      CommonOrderVO commonOrderVO = commonOrderMapper.getCommonOrderByOrderNo(uid, orderNo, orderState, sourceType);

      // 订单信息为空

      if (commonOrderVO == null) {

         return null;

@@ -1183,13 +1189,13 @@
         }



         String orderNo1 = commonOrder.getOrderNo();

         Integer sourceType = commonOrder.getSourceType();

         Integer sourceType1 = commonOrder.getSourceType();



         String orderNo2 = commonOrderVO.getOrderNo();

         Integer sourceType2 = commonOrderVO.getSourceType();



         // 来源、订单号相同

         if (sourceType.equals(sourceType2) && orderNo1.equals(orderNo2)) {

         if (sourceType1.equals(sourceType2) && orderNo1.equals(orderNo2)) {

            // 加入商品信息

            List<CommonOrderGoodsVO> listOrderGoods = commonOrderVO.getListOrderGoods();