diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/retail/sale/controller/service/impl/RetailOrderServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/retail/sale/controller/service/impl/RetailOrderServiceImpl.java index 6776a5ad..37ebf6eb 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/retail/sale/controller/service/impl/RetailOrderServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/retail/sale/controller/service/impl/RetailOrderServiceImpl.java @@ -205,17 +205,18 @@ public class RetailOrderServiceImpl implements IRetailOrderService { // 会员信息 if (null != cuMember) { cuMember.setPkSettleGrade(newGrade.getPkId()); - if (null == cuMember.getPkAwards()) { - // 新会员没有奖衔,则进行赋值 - cuMember.setPkAwards(newGrade.getPkAwards()); - } else { - // 老会员奖衔如果为无,也进行赋值 - BdAwards bdAwards = iAwardsServiceApi.getAwardsOne(cuMember.getPkAwards()).getData(); - if (EAwards.MEMBER.getValue() == bdAwards.getAwardsValue() - && EAwards.MEMBER.getValue() != newGrade.getPkAwards()) { - cuMember.setPkAwards(newGrade.getPkAwards()); - } - } + cuMember.setPkAwards(newGrade.getPkAwards()); +// if (null == cuMember.getPkAwards()) { +// // 新会员没有奖衔,则进行赋值 +// cuMember.setPkAwards(newGrade.getPkAwards()); +// } else { +// // 老会员奖衔如果为无,也进行赋值 +// BdAwards bdAwards = iAwardsServiceApi.getAwardsOne(cuMember.getPkAwards()).getData(); +// if (EAwards.MEMBER.getValue() == bdAwards.getAwardsValue() +// && EAwards.MEMBER.getValue() != newGrade.getPkAwards()) { +// cuMember.setPkAwards(newGrade.getPkAwards()); +// } +// } } }else if(ESpecialArea.RETAIL_REPURCHASE.getValue() == orderParam.getSpecialArea()){ // saOrderExt.setOrderAmount(saOrderExt.getOrderAmount().add(orderParam.getPostage()));