Skip to content

Y
youka-api
Commit c4119e12 by tang
Options

后台添加用户判断等

parent 1ded4996
Showing with 128 additions and 34 deletions
src/main/java/com/thinkgem/jeesite/modules/pay/api/BenefitController.java
......@@ -49,16 +49,16 @@ public class BenefitController{
BenefitEntity entity = new BenefitEntity();
entity.setUserCode(request.getSubMerchantCode());
BalanceEntity balanceEntity = null;
//高级别用户
//1.获取的下线，在成为高级别用户以后的所有收益----即总收益
UserEntity userInfo = userService.getUserInfo(request);
if (userInfo.getLevel().equals("A")||userInfo.getLevel().equals("B")){
//王者、钻石用户
balanceEntity = benefitSevice.getBalanceHighLevel(entity,userInfo);
}else{
// //高级别用户
// //1.获取的下线，在成为高级别用户以后的所有收益----即总收益
// UserEntity userInfo = userService.getUserInfo(request);
// if (userInfo.getLevel().equals("A")||userInfo.getLevel().equals("B")){
// //王者、钻石用户
// balanceEntity = benefitSevice.getBalanceHighLevel(entity,userInfo);
// }else{
//非高级别用户
balanceEntity = benefitSevice.getBalance(entity);
}
// }
response.setData(balanceEntity);
response.setStatus(ComCode.STATUS_CODE_2000);
response.setMessage(ComCode.STATUS_CODE_2000_DESC);
......
src/main/java/com/thinkgem/jeesite/modules/pay/api/PayApiController.java
......@@ -672,12 +672,12 @@ public class PayApiController {
Response resp = new Response();
try {
BalanceEntity balance;
UserEntity userInfo = userApiService.getUserInfo(request);
if (userInfo.getLevel().equals("A") || userInfo.getLevel().equals("B")) {
balance = payService.getPutForwardNumHighLevel(request);
} else {
// UserEntity userInfo = userApiService.getUserInfo(request);
// if (userInfo.getLevel().equals("A") || userInfo.getLevel().equals("B")) {
// balance = payService.getPutForwardNumHighLevel(request);
// } else {
balance = payService.getPutForwardNum(request);
}
// }
String balanceNum = balance.getBalance();
resp.setData(balanceNum);
resp.setMessage(ComCode.STATUS_CODE_2000_DESC);
......
src/main/java/com/thinkgem/jeesite/modules/pay/service/BenefitSevice.java
......@@ -206,23 +206,23 @@ public class BenefitSevice {
request.setEndTime(DateUtils.formatDate(new Date(request.getEndDate()), "yyyy-MM-dd") + " 23:59:59");
}
List<BenefitEntity> benefitList = null;
Request re = new Request();
re.setSubMerchantCode(request.getSubMerchantCode());
UserEntity userInfo = userDao.getUserInfo(re);
if (userInfo.getLevel().equals("A") || userInfo.getLevel().equals("B")) {
//高级用户是否存在推荐用户，存在继续，不存在，则直接返回
UserEntity recomUserEntity = checkRecommend(userInfo.getMobile());
if (recomUserEntity == null) {
return benefitList;
}
//升级前用户信息
UserEntity upgradeUserInfo = userDao.getUpgradeUserInfo(userInfo.getMobile());
request.setSubMerchantCode(upgradeUserInfo.getMobile());
request.setSign(getRateByLevel(userInfo.getLevel()));
benefitList = orderApiDao.getBenefitListHighLevel(request);
} else {
// Request re = new Request();
// re.setSubMerchantCode(request.getSubMerchantCode());
// UserEntity userInfo = userDao.getUserInfo(re);
// if (userInfo.getLevel().equals("A") || userInfo.getLevel().equals("B")) {
// //高级用户是否存在推荐用户，存在继续，不存在，则直接返回
// UserEntity recomUserEntity = checkRecommend(userInfo.getMobile());
// if (recomUserEntity == null) {
// return benefitList;
// }
// //升级前用户信息
// UserEntity upgradeUserInfo = userDao.getUpgradeUserInfo(userInfo.getMobile());
// request.setSubMerchantCode(upgradeUserInfo.getMobile());
// request.setSign(getRateByLevel(userInfo.getLevel()));
// benefitList = orderApiDao.getBenefitListHighLevel(request);
// } else {
benefitList = orderApiDao.getBenefitList(request);
}
// }
return benefitList;
......
src/main/java/com/thinkgem/jeesite/modules/pay/service/PayApiService.java
......@@ -430,6 +430,20 @@ public class PayApiService {
BigDecimal benefitResult = rateResult.multiply(BigDecimal.valueOf(Double.valueOf(amount)));
userBenefit.put(upUser.getUserCode(), benefitResult.toString());
}
//上级是钻石用户，钻石的上级是王者用户也需要进行分润，钻石用户分的是0.2%，王者用户分的是钻石用户的0.2%，也就是0.000004
if (upUser !=null && upUser.getUserLevel().equals("B")){
BigDecimal rate = BigDecimal.valueOf(0.002);
BigDecimal re = rate.multiply(BigDecimal.valueOf(Double.valueOf(amount)));
userBenefit.put(upUser.getUserCode(), re.toString());
//钻石用户上一级王者用户参与分成
UserEntity aUser = userDao.getUpUser(upUser.getUserCode());
if (aUser != null){
BigDecimal aRate = BigDecimal.valueOf(0.000004);
BigDecimal re2 = aRate.multiply(BigDecimal.valueOf(Double.valueOf(amount)));
userBenefit.put(aUser.getCode(), re2.toString());
}
}
}
// EE1C2=(E1-C2)乘以X=(0.55%-0.5%)乘以X
......@@ -480,6 +494,7 @@ public class PayApiService {
}
return userBenefit;
}
......
src/main/java/com/thinkgem/jeesite/modules/user/api/UserApiController.java
......@@ -118,11 +118,20 @@ public class UserApiController {
resp.setMessage(ComCode.STATUS_CODE_4009_DESC);
return resp;
}
// 查询注册手机号是否在后台添加
if (userService.checkMobileAdmin(request) != null) {
resp.setStatus(ComCode.STATUS_CODE_4004);
resp.setMessage("账号已升级，请联系客服");
return resp;
}
// 查询推荐人是否存在
if (userService.checkRecommend(request) == null) {
resp.setStatus(ComCode.STATUS_CODE_4006);
resp.setMessage(ComCode.STATUS_CODE_4006_DESC);
return resp;
if(userService.checkNoUser() > 0){
resp.setStatus(ComCode.STATUS_CODE_4006);
resp.setMessage(ComCode.STATUS_CODE_4006_DESC);
return resp;
}
}
// 查询注册手机号是否存在
if (userService.checkMobile(request) != null) {
......@@ -218,6 +227,12 @@ public class UserApiController {
resp.setMessage(ComCode.STATUS_CODE_4004_DESC);
return resp;
}
// 查询注册手机号是否在后台添加
if (userService.checkMobileAdmin(request) != null) {
resp.setStatus(ComCode.STATUS_CODE_4004);
resp.setMessage("账号已升级，请联系客服");
return resp;
}
UserEntity userEntity = null;
if (!StringUtils.isBlank(request.getMobile()) && !StringUtils.isBlank(request.getPassword())) {
userEntity = userService.getUserInfoByPassword(request);
......
src/main/java/com/thinkgem/jeesite/modules/user/dao/UserApiDao.java
......@@ -21,6 +21,8 @@ public interface UserApiDao {
UserEntity checkMobile(UserRequest request);
UserEntity checkMobileAdmin(UserRequest request);
void signUp(UserEntity userEntity);
void resetPassword(UserEntity request);
......@@ -134,4 +136,7 @@ public interface UserApiDao {
List<LevelDetail> getLevelDetail();
LevelDetail getLevelDetailByLevel(UserRequest request);
//获取上级推荐用户
UserEntity getUpUser(String userCode);
}
src/main/java/com/thinkgem/jeesite/modules/user/service/UserApiService.java
......@@ -20,7 +20,6 @@ import com.thinkgem.jeesite.modules.user.bean.UserRequest;
import com.thinkgem.jeesite.modules.user.dao.UserApiDao;
import com.thinkgem.jeesite.modules.user.entity.*;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.ss.formula.functions.Rate;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -131,10 +130,17 @@ public class UserApiService {
return userDao.checkRecommend(request);
}
public int checkNoUser(){
return userDao.checkNoUser();
}
public UserEntity checkMobile(UserRequest request) {
return userDao.checkMobile(request);
}
public UserEntity checkMobileAdmin(UserRequest request) {
return userDao.checkMobileAdmin(request);
}
public UserEntity checkMobile(String mobile) {
UserRequest request = new UserRequest();
request.setMobile(mobile);
......@@ -146,7 +152,7 @@ public class UserApiService {
// 保存用户信息
String code = IdGen.randomBase62(64);
UserEntity recommend = userDao.checkRecommend(request);
if(recommend==null && userDao.checkNoUser() >0){
if(recommend == null && userDao.checkNoUser() >0){
throw new MyException("推荐人手机号码不存在");
}
UserEntity userEntity = new UserEntity(code, "", request.getMobile(), MD5.sign(request.getNewPassword(), ComCode.signCode, "utf-8"), request.getRecommendedMobile(), recommend==null?"0"+",":recommend.getRecommendedPath() + recommend.getId() + ",", recommend.getBelongTo());
......
src/main/resources/mappings/modules/user/UserDao.xml
......@@ -107,6 +107,32 @@
yu.mobile = #{mobile}
</select>
<select id="checkMobileAdmin" resultType="com.thinkgem.jeesite.modules.user.entity.UserEntity">
SELECT
yu.id,
yu.code,
yu.nickname,
yu.sub_merchant_id AS subMerchantId,
yu.level,
yu.mobile,
yu.password,
yu.avatar,
yu.recommended_mobile AS recommendedMobile,
yu.recommended_path AS recommendedPath,
yu.belong_to AS belongTo,
yu.status,
yu.create_date AS created,
yu.create_by AS createdUser,
yu.update_date AS modified,
yu.update_by AS modifiedUser
FROM
youka_users yu
WHERE
yu.mobile = #{mobile}
AND
yu.status = 5
</select>
<insert id="signUp">
INSERT INTO youka_users (
code,
......@@ -1086,4 +1112,30 @@
y1.sort = 0
AND y1.`level` = "D"
</select>
<select id="getUpUser" resultType="com.thinkgem.jeesite.modules.user.entity.UserEntity">
SELECT
yu.id,
yu.code,
yu.nickname,
yu.sub_merchant_id AS subMerchantId,
yu.level,
yu.mobile,
yu.password,
yu.avatar,
yu.recommended_mobile AS recommendedMobile,
yu.recommended_path AS recommendedPath,
yu.belong_to AS belongTo,
yu.status,
yu.create_date AS created,
yu.create_by AS createdUser,
yu.update_date AS modified,
yu.update_by AS modifiedUser
FROM
youka_users yu
WHERE
yu.mobile = (SELECT y1.recommended_mobile FROM youka_users y1 WHERE y1.code = #{userCode})
AND yu.level = 'A'
</select>
</mapper>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment