angelo
/
java-store-retail-app
forked from angelo/java-retail-app
3
0
Fork 0
Code Pull Requests Activity

## 注册升级购买指定商品，则会员为激活；

This commit is contained in:
cabbage 2025-06-10 17:58:23 +08:00
parent 46488c8128
commit ee155ff59b
1 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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