Authored by chenchao

fix bug

@@ -394,7 +394,6 @@ public class SellerOrderDetailService extends AbsOrderDetailService implements I @@ -394,7 +394,6 @@ public class SellerOrderDetailService extends AbsOrderDetailService implements I
394 OrderDetailInfo.StatusDetail statusDetail = getStatusDetail(order, skupStatus); 394 OrderDetailInfo.StatusDetail statusDetail = getStatusDetail(order, skupStatus);
395 395
396 orderDetailInfo.setAttributes(soga); 396 orderDetailInfo.setAttributes(soga);
397 - boolean isAdvance = OrderAssist.skupIsAdvance(soga);  
398 397
399 GoodsInfo goodsInfo = getGoodsInfo(sellerOrderGoods); 398 GoodsInfo goodsInfo = getGoodsInfo(sellerOrderGoods);
400 resetPriceOfProduct(goodsInfo,skupStatus.getCode(), skupType); 399 resetPriceOfProduct(goodsInfo,skupStatus.getCode(), skupType);
@@ -403,7 +402,7 @@ public class SellerOrderDetailService extends AbsOrderDetailService implements I @@ -403,7 +402,7 @@ public class SellerOrderDetailService extends AbsOrderDetailService implements I
403 orderDetailInfo.setGoodsInfo(goodsInfo); 402 orderDetailInfo.setGoodsInfo(goodsInfo);
404 //tips :最低价格时刻在变,不能缓存 403 //tips :最低价格时刻在变,不能缓存
405 boolean pushFlag = OrderAssist.skupPushWhenHasLowerPrice(soga); 404 boolean pushFlag = OrderAssist.skupPushWhenHasLowerPrice(soga);
406 - resetDetailDesc(isAdvance,skupStatus,goodsInfo,statusDetail,appVersion,pushFlag); 405 + resetDetailDesc(skupType,skupStatus,goodsInfo,statusDetail,appVersion,pushFlag);
407 406
408 // 支付状态 407 // 支付状态
409 setPayment(orderDetailInfo, order.getPayment()); 408 setPayment(orderDetailInfo, order.getPayment());
@@ -434,12 +433,15 @@ public class SellerOrderDetailService extends AbsOrderDetailService implements I @@ -434,12 +433,15 @@ public class SellerOrderDetailService extends AbsOrderDetailService implements I
434 } 433 }
435 } 434 }
436 435
437 - private void resetDetailDesc(boolean isAdvance, 436 + private void resetDetailDesc(SkupType skupType,
438 SkupStatus skupStatus, 437 SkupStatus skupStatus,
439 GoodsInfo goodsInfo, 438 GoodsInfo goodsInfo,
440 OrderDetailInfo.StatusDetail statusDetail, 439 OrderDetailInfo.StatusDetail statusDetail,
441 String appVersion,boolean pushWhenHasLowerPriceFlag){ 440 String appVersion,boolean pushWhenHasLowerPriceFlag){
442 - 441 + boolean isImperfect = SellerGoodsHelper.isImperfectGoods(skupType);
  442 + if (isImperfect){
  443 + return;
  444 + }
443 if(pushWhenHasLowerPriceFlag && sellerOrderViewService.showOverFlowPrice(skupStatus.getCode())) { 445 if(pushWhenHasLowerPriceFlag && sellerOrderViewService.showOverFlowPrice(skupStatus.getCode())) {
444 String tips = buildOverPriceTips(goodsInfo,appVersion); 446 String tips = buildOverPriceTips(goodsInfo,appVersion);
445 if (StringUtils.isNotBlank(tips)) { 447 if (StringUtils.isNotBlank(tips)) {
@@ -558,13 +560,12 @@ public class SellerOrderDetailService extends AbsOrderDetailService implements I @@ -558,13 +560,12 @@ public class SellerOrderDetailService extends AbsOrderDetailService implements I
558 Integer skupStatusCode = statusDetail.getStatus(); 560 Integer skupStatusCode = statusDetail.getStatus();
559 SkupStatus skupStatus = SkupStatus.getSkupStatus(skupStatusCode); 561 SkupStatus skupStatus = SkupStatus.getSkupStatus(skupStatusCode);
560 Integer soga = orderDetailInfo.getAttributes(); 562 Integer soga = orderDetailInfo.getAttributes();
561 - boolean isAdvance = OrderAssist.skupIsAdvance(soga);  
562 563
563 SkupType skupType = SkupType.getSkupType(soga); 564 SkupType skupType = SkupType.getSkupType(soga);
564 GoodsInfo goodsInfo = orderDetailInfo.getGoodsInfo(); 565 GoodsInfo goodsInfo = orderDetailInfo.getGoodsInfo();
565 resetPriceOfProduct(goodsInfo, skupStatusCode, skupType); 566 resetPriceOfProduct(goodsInfo, skupStatusCode, skupType);
566 boolean pushFlag = OrderAssist.skupPushWhenHasLowerPrice(soga); 567 boolean pushFlag = OrderAssist.skupPushWhenHasLowerPrice(soga);
567 - resetDetailDesc( isAdvance, skupStatus, goodsInfo, orderDetailInfo.getStatusDetail(),appVersion,pushFlag); 568 + resetDetailDesc( skupType, skupStatus, goodsInfo, orderDetailInfo.getStatusDetail(),appVersion,pushFlag);
568 } 569 }
569 } 570 }
570 } 571 }
@@ -2,3 +2,4 @@ @@ -2,3 +2,4 @@
2 /.settings/ 2 /.settings/
3 .project 3 .project
4 *.iml 4 *.iml
  5 +/build/