## Opt - 注册奖衔
This commit is contained in:
parent
1a4357ba26
commit
3bf75a5fb6
|
@ -205,17 +205,18 @@ public class RetailOrderServiceImpl implements IRetailOrderService {
|
||||||
// 会员信息
|
// 会员信息
|
||||||
if (null != cuMember) {
|
if (null != cuMember) {
|
||||||
cuMember.setPkSettleGrade(newGrade.getPkId());
|
cuMember.setPkSettleGrade(newGrade.getPkId());
|
||||||
if (null == cuMember.getPkAwards()) {
|
cuMember.setPkAwards(newGrade.getPkAwards());
|
||||||
// 新会员没有奖衔,则进行赋值
|
// if (null == cuMember.getPkAwards()) {
|
||||||
cuMember.setPkAwards(newGrade.getPkAwards());
|
// // 新会员没有奖衔,则进行赋值
|
||||||
} else {
|
// cuMember.setPkAwards(newGrade.getPkAwards());
|
||||||
// 老会员奖衔如果为无,也进行赋值
|
// } else {
|
||||||
BdAwards bdAwards = iAwardsServiceApi.getAwardsOne(cuMember.getPkAwards()).getData();
|
// // 老会员奖衔如果为无,也进行赋值
|
||||||
if (EAwards.MEMBER.getValue() == bdAwards.getAwardsValue()
|
// BdAwards bdAwards = iAwardsServiceApi.getAwardsOne(cuMember.getPkAwards()).getData();
|
||||||
&& EAwards.MEMBER.getValue() != newGrade.getPkAwards()) {
|
// if (EAwards.MEMBER.getValue() == bdAwards.getAwardsValue()
|
||||||
cuMember.setPkAwards(newGrade.getPkAwards());
|
// && EAwards.MEMBER.getValue() != newGrade.getPkAwards()) {
|
||||||
}
|
// cuMember.setPkAwards(newGrade.getPkAwards());
|
||||||
}
|
// }
|
||||||
|
// }
|
||||||
}
|
}
|
||||||
}else if(ESpecialArea.RETAIL_REPURCHASE.getValue() == orderParam.getSpecialArea()){
|
}else if(ESpecialArea.RETAIL_REPURCHASE.getValue() == orderParam.getSpecialArea()){
|
||||||
// saOrderExt.setOrderAmount(saOrderExt.getOrderAmount().add(orderParam.getPostage()));
|
// saOrderExt.setOrderAmount(saOrderExt.getOrderAmount().add(orderParam.getPostage()));
|
||||||
|
|
Loading…
Reference in New Issue