## 0元会员不能分享;0元会员不能做为推荐人、安置人;
This commit is contained in:
parent
10c66db86a
commit
0b5494e21d
|
@ -16,6 +16,7 @@ import com.hzs.common.core.utils.sign.Base64Util;
|
|||
import com.hzs.common.core.utils.uuid.IdUtils;
|
||||
import com.hzs.common.core.web.domain.AjaxResult;
|
||||
import com.hzs.common.domain.member.base.CuMember;
|
||||
import com.hzs.common.domain.member.ext.CuMemberExt;
|
||||
import com.hzs.common.security.utils.SecurityUtils;
|
||||
import com.hzs.member.base.service.ICuMemberService;
|
||||
import com.hzs.member.base.vo.MemberShare;
|
||||
|
@ -54,12 +55,17 @@ public class ApiShareController {
|
|||
|
||||
/**
|
||||
* 获取188分享码(H5)
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@GetMapping("/fans-code-h5")
|
||||
public AjaxResult fansCodeH5() {
|
||||
Long userId = SecurityUtils.getUserId();
|
||||
|
||||
// 0元会员不涌进行分享
|
||||
CuMemberExt cuMemberExt = iCuMemberService.getMemberById(userId);
|
||||
if (null == cuMemberExt.getPkPlaceParent()) {
|
||||
return AjaxResult.error("当前会员无权进行个人推广");
|
||||
}
|
||||
|
||||
// 188注册分享人就是自己
|
||||
R<String> resultR = iShareServiceApi.queryShareCode(ShareServiceDTO.builder()
|
||||
.eShareType(EShareType.FANS)
|
||||
|
@ -85,7 +91,6 @@ public class ApiShareController {
|
|||
* 分享查询推荐人编号 -- 不需要登录
|
||||
*
|
||||
* @param parentCode 推荐人(加密)
|
||||
* @return
|
||||
*/
|
||||
@GetMapping("/find-share-code/{parentCode}")
|
||||
public AjaxResult findShareCode(@PathVariable("parentCode") String parentCode) {
|
||||
|
@ -100,7 +105,6 @@ public class ApiShareController {
|
|||
* 分享注册 -- 不需要登录
|
||||
*
|
||||
* @param registerParam 分享注册入参
|
||||
* @return
|
||||
*/
|
||||
@RepeatSubmitSimple
|
||||
@PostMapping("/share-register")
|
||||
|
|
|
@ -33,8 +33,6 @@ import com.hzs.sale.shopping.vo.ProductGroup;
|
|||
import com.hzs.sale.shopping.vo.ShoppingCartRedis;
|
||||
import com.hzs.sale.shopping.vo.ShoppingCartVO;
|
||||
import com.hzs.system.base.IAreaServiceApi;
|
||||
import com.hzs.system.base.ICurrencyServiceApi;
|
||||
import com.hzs.system.base.dto.CurrencyDTO;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.apache.dubbo.config.annotation.DubboReference;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
|
@ -49,8 +47,6 @@ public abstract class ParentOrderController extends BaseController {
|
|||
@DubboReference
|
||||
IAreaServiceApi iAreaServiceApi;
|
||||
@DubboReference
|
||||
ICurrencyServiceApi iCurrencyServiceApi;
|
||||
@DubboReference
|
||||
IMemberServiceApi iMemberServiceApi;
|
||||
|
||||
@Autowired
|
||||
|
@ -257,25 +253,23 @@ public abstract class ParentOrderController extends BaseController {
|
|||
if (parentMember == null) {
|
||||
return AjaxResult.error(TransactionUtils.getContent(MemberMsgConstants.PARENT_NOT_EXISTS));
|
||||
}
|
||||
orderParam.setParent(CommonUtil.getMemberCode(parentMember.getMemberCode(), parentMember.getServiceCode()));
|
||||
if (SecurityUtils.getUserId().equals(parentMember.getPkId())) {
|
||||
orderParam.setParentName(parentMember.getMemberName());
|
||||
} else {
|
||||
orderParam.setParentName(CommonUtil.getMemberName(parentMember.getPkVertex(), parentMember.getMemberName(), parentMember.getNickName()));
|
||||
if (null == parentMember.getPkPlaceParent()) {
|
||||
return AjaxResult.error("当前推荐编号不能成为推荐人");
|
||||
}
|
||||
orderParam.setParent(CommonUtil.getMemberCode(parentMember.getMemberCode(), parentMember.getServiceCode()));
|
||||
orderParam.setParentName(parentMember.getMemberName());
|
||||
|
||||
CuMember placeMember = getCuMemberByCode(orderParam.getPlaceParent());
|
||||
if (placeMember == null) {
|
||||
return AjaxResult.error(TransactionUtils.getContent(MemberMsgConstants.PLACE_PARENT_NOT_EXISTS));
|
||||
}
|
||||
orderParam.setPlaceParentId(placeMember.getPkId());
|
||||
orderParam.setPlaceParent(CommonUtil.getMemberCode(placeMember.getMemberCode(), placeMember.getServiceCode()));
|
||||
|
||||
if (SecurityUtils.getUserId().equals(placeMember.getPkId())) {
|
||||
orderParam.setPlaceParentName(placeMember.getMemberName());
|
||||
} else {
|
||||
orderParam.setPlaceParentName(CommonUtil.getMemberName(placeMember.getPkVertex(), placeMember.getMemberName(), placeMember.getNickName()));
|
||||
if (null == placeMember.getPkPlaceParent()) {
|
||||
return AjaxResult.error("当前安置编号不能成为安置人");
|
||||
}
|
||||
orderParam.setPlaceParentId(placeMember.getPkId());
|
||||
orderParam.setPlaceParent(placeMember.getMemberCode());
|
||||
orderParam.setPlaceParentName(placeMember.getMemberName());
|
||||
|
||||
// 当安置人跟安置位置都有值是需要验证 需要验证安置位置
|
||||
if (orderParam.getPlaceDept() != null && orderParam.getPlaceDept() > 0) {
|
||||
// 安置人在推荐人伞下,含自己。 推荐人在报单中心伞下,含自己,在推荐那边验证
|
||||
|
|
|
@ -498,24 +498,14 @@ public class ApiRegSaOrderController extends ParentOrderController {
|
|||
if (StringUtils.isEmpty(orderParam.getParent())) {
|
||||
orderParam.setParentId(SecurityUtils.getUserId());
|
||||
parentCuMember = getOrderService().getCuMemberByKey(orderParam.getParentId());
|
||||
if (SecurityUtils.getUserId().equals(orderParam.getParentId())) {
|
||||
// 如果是自己,则不需要处理昵称
|
||||
orderParam.setParentName(parentCuMember.getMemberName());
|
||||
} else {
|
||||
orderParam.setParentName(CommonUtil.getMemberName(parentCuMember.getPkVertex(), parentCuMember.getMemberName(), parentCuMember.getNickName()));
|
||||
}
|
||||
orderParam.setParentName(parentCuMember.getMemberName());
|
||||
} else {
|
||||
parentCuMember = getCuMemberByCode(orderParam.getParent());
|
||||
if (parentCuMember == null) {
|
||||
return AjaxResult.error(TransactionUtils.getContent(MemberMsgConstants.PARENT_NOT_EXISTS));
|
||||
}
|
||||
orderParam.setParentId(parentCuMember.getPkId());
|
||||
if (SecurityUtils.getUserId().equals(orderParam.getParentId())) {
|
||||
// 如果是自己,则不需要处理昵称
|
||||
orderParam.setParentName(parentCuMember.getMemberName());
|
||||
} else {
|
||||
orderParam.setParentName(CommonUtil.getMemberName(parentCuMember.getPkVertex(), parentCuMember.getMemberName(), parentCuMember.getNickName()));
|
||||
}
|
||||
orderParam.setParentName(parentCuMember.getMemberName());
|
||||
}
|
||||
|
||||
CuMember cuMember = CuMember.builder()
|
||||
|
@ -527,20 +517,7 @@ public class ApiRegSaOrderController extends ParentOrderController {
|
|||
boolean isFirst = getOrderService().validateFirstOrder(cuMember.getPkParent(), cuMember.getPkSettleCountry());
|
||||
cuMember = getOrderService().obtainLastResettleByRecommend(cuMember, Boolean.TRUE, isFirst);
|
||||
|
||||
String placeParentName;
|
||||
if (null == cuMember.getPkPlaceParent()) {
|
||||
if (SecurityUtils.getUserId().equals(parentCuMember.getPkId())) {
|
||||
placeParentName = cuMember.getMemberName();
|
||||
} else {
|
||||
placeParentName = CommonUtil.getMemberName(parentCuMember.getPkVertex(), cuMember.getMemberName(), cuMember.getNickName());
|
||||
}
|
||||
} else {
|
||||
if (SecurityUtils.getUserId().equals(cuMember.getPkId())) {
|
||||
placeParentName = cuMember.getMemberName();
|
||||
} else {
|
||||
placeParentName = CommonUtil.getMemberName(cuMember.getPkVertex(), cuMember.getMemberName(), cuMember.getNickName());
|
||||
}
|
||||
}
|
||||
String placeParentName = cuMember.getMemberName();
|
||||
|
||||
return AjaxResult.success(OrderReturn.builder()
|
||||
.isFirst(isFirst)
|
||||
|
|
Loading…
Reference in New Issue