ufo / yohoufo-fore · Commits

Go to a project

Authored by mali
Commit 3fc306f4c3f6dbecfb3dbc8e70d3a5fa38bed722 2 parents dd6e3463 c936d150

Merge branch 'test6.8.3' of http://git.yoho.cn/ufo/yohoufo-fore into test6.8.3

Inline Side-by-side
Showing 3 changed files with 3 additions and 3 deletions
@@ -101,7 +101,7 @@ public interface IExpressInfoService { @@ -101,7 +101,7 @@ public interface IExpressInfoService {
101 }else { 101 }else {
102 switch (actor){ 102 switch (actor){
103 case BUY: 103 case BUY:
104 - return getExpressTypeBuyer(status); 104 + return ExpressInfoConstant.EXPRESS_TYPE_2;
105 case SELL: 105 case SELL:
106 return getExpressTypeSeller(status); 106 return getExpressTypeSeller(status);
107 default: 107 default:
@@ -90,7 +90,7 @@ public class BuyerOrderDetailService extends AbsOrderDetailService implements IO @@ -90,7 +90,7 @@ public class BuyerOrderDetailService extends AbsOrderDetailService implements IO
90 if (!ActionStatusHold.getBuyerShowExpressStatusList().contains(orderStatus.getCode())){ 90 if (!ActionStatusHold.getBuyerShowExpressStatusList().contains(orderStatus.getCode())){
91 return null; 91 return null;
92 } 92 }
93 - Integer type = expressInfoService.getExpressType(orderStatus.getCode(), TabType.BUY); 93 + Integer type = expressInfoService.getExpressTypeBuyer(orderStatus.getCode());
94 ExpressInfoDetail lastEID = null; 94 ExpressInfoDetail lastEID = null;
95 ExpressInfoRespBo expressInfoResp = expressInfoService.queryLastExpressDetailInfo(orderCode, type); 95 ExpressInfoRespBo expressInfoResp = expressInfoService.queryLastExpressDetailInfo(orderCode, type);
96 List<ExpressInfoDetail> eidList; 96 List<ExpressInfoDetail> eidList;
@@ -182,7 +182,7 @@ public class SellerOrderDetailService extends AbsOrderDetailService implements I @@ -182,7 +182,7 @@ public class SellerOrderDetailService extends AbsOrderDetailService implements I
182 if (!ActionStatusHold.getSellerShowExpressStatusList().contains(orderStatus.getCode())){ 182 if (!ActionStatusHold.getSellerShowExpressStatusList().contains(orderStatus.getCode())){
183 return null; 183 return null;
184 } 184 }
185 - Integer type = expressInfoService.getExpressType(orderStatus.getCode(), TabType.SELL); 185 + Integer type = expressInfoService.getExpressTypeSeller(orderStatus.getCode());
186 ExpressInfoDetail lastEID = null; 186 ExpressInfoDetail lastEID = null;
187 ExpressInfoRespBo expressInfoResp = expressInfoService.queryLastExpressDetailInfo(orderCode, type); 187 ExpressInfoRespBo expressInfoResp = expressInfoService.queryLastExpressDetailInfo(orderCode, type);
188 List<ExpressInfoDetail> eidList; 188 List<ExpressInfoDetail> eidList;