From cdd852f8e8eff7eb2e8f7c3fceaa955b9fc3f9d3 Mon Sep 17 00:00:00 2001 From: yujian <yujian@123.com> Date: 星期一, 29 七月 2019 10:46:32 +0800 Subject: [PATCH] 订单商品类型处理 --- fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java index 33e4af3..de252c8 100644 --- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java +++ b/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)); @@ -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(); -- Gitblit v1.8.0