angelo
/
java-retail-app
3
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: angelo:07d9dcc558676a293d810c573b6739dd4c091888
Branches Tags
angelo:master
angelo:test
angelo:dev
angelo:online
angelo:feat_shared_reg
..
compare: angelo:b0cc64ade4d3eb3d21057e5d8562ba102fb22556
Branches Tags
angelo:test
angelo:dev
angelo:online
angelo:feat_shared_reg
angelo:master

No commits in common. "07d9dcc558676a293d810c573b6739dd4c091888" and "b0cc64ade4d3eb3d21057e5d8562ba102fb22556" have entirely different histories.
07d9dcc558 ... b0cc64ade4

1 changed files with 10 additions and 27 deletions
Show Stats Expand all files Collapse all files

31
bd-business/bd-business-sale/src/main/java/com/hzs/retail/sale/controller/service/impl/RetailOrderServiceImpl.java
View File

@ -957,35 +957,18 @@ public class RetailOrderServiceImpl implements IRetailOrderService {
* @return * @return
*/ */
private Boolean handleMemberActivate(CuMember cuMember, SaOrderExt saOrder) { private Boolean handleMemberActivate(CuMember cuMember, SaOrderExt saOrder) {
if (EYesNo.YES.getIntValue() != cuMember.getIsActivate() if (null == cuMember.getIsActivate()) {
&& (EOrderType.RETAIL_REGISTER.getValue() == saOrder.getOrderType() // // 会员激活状态为空，按未激活处理
|| EOrderType.RETAIL_UPGRADE.getValue() == saOrder.getOrderType()) // cuMember.setIsActivate(EYesNo.NO.getIntValue());
) {
// 会员未激活，并且是 注册、升级 订单，判断会员是否激活 // TODO new 暂时不处理激活，只要是会员就按激活处理，有订单就有支付状态和时间
if (saOrder.getBoxNum() > 0) {
// 存在指定盒数商品
cuMember.setIsActivate(EYesNo.YES.getIntValue()); cuMember.setIsActivate(EYesNo.YES.getIntValue());
if (EPayStatus.UNPAID.getValue() == cuMember.getPayStatus()) { if (null != saOrder) {
cuMember.setPayTime(saOrder.getPayTime()); cuMember.setPayTime(saOrder.getPayTime());
cuMember.setPayStatus(EPayStatus.PAID.getValue()); cuMember.setPayStatus(EPayStatus.PAID.getValue());
} }
}
return true; return true;
}
}
return false;
// if (null == cuMember.getIsActivate()) {
//// // 会员激活状态为空，按未激活处理
//// cuMember.setIsActivate(EYesNo.NO.getIntValue());
//
// // TODO new 暂时不处理激活，只要是会员就按激活处理，有订单就有支付状态和时间
// cuMember.setIsActivate(EYesNo.YES.getIntValue());
// if (null != saOrder) {
// cuMember.setPayTime(saOrder.getPayTime());
// cuMember.setPayStatus(EPayStatus.PAID.getValue());
// }
// }
// return true;
// if (EYesNo.YES.getIntValue() != cuMember.getIsActivate() // if (EYesNo.YES.getIntValue() != cuMember.getIsActivate()
// && (EOrderType.RETAIL_REGISTER.getValue() == saOrder.getOrderType() // && (EOrderType.RETAIL_REGISTER.getValue() == saOrder.getOrderType()