ufo / yohoufo-fore · Commits

Go to a project

Authored by chenchao
Commit bd9925c783b3628a807e2320f792b9df7113b645 1 parent 98d63b27

fix bug

Inline Side-by-side
Showing 2 changed files with 9 additions and 7 deletions
... ... @@ -394,7 +394,6 @@ public class SellerOrderDetailService extends AbsOrderDetailService implements I
OrderDetailInfo.StatusDetail statusDetail = getStatusDetail(order, skupStatus);
orderDetailInfo.setAttributes(soga);
boolean isAdvance = OrderAssist.skupIsAdvance(soga);
GoodsInfo goodsInfo = getGoodsInfo(sellerOrderGoods);
resetPriceOfProduct(goodsInfo,skupStatus.getCode(), skupType);
... ... @@ -403,7 +402,7 @@ public class SellerOrderDetailService extends AbsOrderDetailService implements I
orderDetailInfo.setGoodsInfo(goodsInfo);
//tips ：最低价格时刻在变，不能缓存
boolean pushFlag = OrderAssist.skupPushWhenHasLowerPrice(soga);
resetDetailDesc(isAdvance,skupStatus,goodsInfo,statusDetail,appVersion,pushFlag);
resetDetailDesc(skupType,skupStatus,goodsInfo,statusDetail,appVersion,pushFlag);
// 支付状态
setPayment(orderDetailInfo, order.getPayment());
... ... @@ -434,12 +433,15 @@ public class SellerOrderDetailService extends AbsOrderDetailService implements I
}
}
private void resetDetailDesc(boolean isAdvance,
private void resetDetailDesc(SkupType skupType,
SkupStatus skupStatus,
GoodsInfo goodsInfo,
OrderDetailInfo.StatusDetail statusDetail,
String appVersion,boolean pushWhenHasLowerPriceFlag){
boolean isImperfect = SellerGoodsHelper.isImperfectGoods(skupType);
if (isImperfect){
return;
}
if(pushWhenHasLowerPriceFlag && sellerOrderViewService.showOverFlowPrice(skupStatus.getCode())) {
String tips = buildOverPriceTips(goodsInfo,appVersion);
if (StringUtils.isNotBlank(tips)) {
... ... @@ -558,13 +560,12 @@ public class SellerOrderDetailService extends AbsOrderDetailService implements I
Integer skupStatusCode = statusDetail.getStatus();
SkupStatus skupStatus = SkupStatus.getSkupStatus(skupStatusCode);
Integer soga = orderDetailInfo.getAttributes();
boolean isAdvance = OrderAssist.skupIsAdvance(soga);
SkupType skupType = SkupType.getSkupType(soga);
GoodsInfo goodsInfo = orderDetailInfo.getGoodsInfo();
resetPriceOfProduct(goodsInfo, skupStatusCode, skupType);
boolean pushFlag = OrderAssist.skupPushWhenHasLowerPrice(soga);
resetDetailDesc( isAdvance, skupStatus, goodsInfo, orderDetailInfo.getStatusDetail(),appVersion,pushFlag);
resetDetailDesc( skupType, skupStatus, goodsInfo, orderDetailInfo.getStatusDetail(),appVersion,pushFlag);
}
}
}
... ...
/target/
/.settings/
.project
*.iml
\ No newline at end of file
*.iml
/build/
... ...