Skip to content

Y
youka-api
Commit a16cc3e6 by tang
Options

去除上传照片审核信息

parent 2db32706
Showing with 67 additions and 64 deletions
src/main/java/com/thinkgem/jeesite/modules/pay/service/BenefitSevice.java
...@@ -39,8 +39,6 @@ public class BenefitSevice { ...@@ -39,8 +39,6 @@ public class BenefitSevice {
*/ */
public BalanceEntity getBalance(BenefitEntity entity){ public BalanceEntity getBalance(BenefitEntity entity){
BalanceEntity balanceEntity = new BalanceEntity();
// 总收益 // 总收益
entity.setBenefitType("A"); entity.setBenefitType("A");
BenefitEntity benefitEntityA = payDao.getBenefitSum(entity); BenefitEntity benefitEntityA = payDao.getBenefitSum(entity);
...@@ -50,22 +48,7 @@ public class BenefitSevice { ...@@ -50,22 +48,7 @@ public class BenefitSevice {
BenefitEntity benefitEntityM = payDao.getBenefitSum(entity); BenefitEntity benefitEntityM = payDao.getBenefitSum(entity);
// 余额 = 总收益-总提现 // 余额 = 总收益-总提现
if(benefitEntityA==null){ BalanceEntity balanceEntity = getLastBalance(benefitEntityA, benefitEntityM);
balanceEntity.setBalance("0.00");
}else {
if(benefitEntityA.getAmount() == null){
benefitEntityA.setAmount("0.00");
}
if(benefitEntityM == null){
balanceEntity.setBalance(benefitEntityA.getAmount());
}else{
if(benefitEntityM.getAmount() == null ){
benefitEntityM.setAmount("0.00");
}
DecimalFormat df = new DecimalFormat("######0.00");
balanceEntity.setBalance(df.format(Double.valueOf(benefitEntityA.getAmount()) - Double.valueOf(benefitEntityM.getAmount())));
}
}
// 今日收益 // 今日收益
entity.setBenefitType("A"); entity.setBenefitType("A");
...@@ -165,7 +148,7 @@ public class BenefitSevice { ...@@ -165,7 +148,7 @@ public class BenefitSevice {
* @return * @return
*/ */
public BalanceEntity getBalanceM(BenefitEntity entity){ public BalanceEntity getBalanceM(BenefitEntity entity){
BalanceEntity balanceEntity = new BalanceEntity();
// 总共可以提现的金额 // 总共可以提现的金额
entity.setBenefitType("A"); entity.setBenefitType("A");
...@@ -177,6 +160,14 @@ public class BenefitSevice { ...@@ -177,6 +160,14 @@ public class BenefitSevice {
BenefitEntity benefitEntityM = payDao.getBenefitSum(entity); BenefitEntity benefitEntityM = payDao.getBenefitSum(entity);
// 可以提现的余额 = 总共可以提现的金额-总提现金额 // 可以提现的余额 = 总共可以提现的金额-总提现金额
BalanceEntity balanceEntity = getLastBalance(benefitEntityA, benefitEntityM);
return balanceEntity;
}
public BalanceEntity getLastBalance(BenefitEntity benefitEntityA, BenefitEntity benefitEntityM){
BalanceEntity balanceEntity = new BalanceEntity();
if(benefitEntityA==null){ if(benefitEntityA==null){
balanceEntity.setBalance("0.00"); balanceEntity.setBalance("0.00");
}else { }else {
...@@ -193,9 +184,7 @@ public class BenefitSevice { ...@@ -193,9 +184,7 @@ public class BenefitSevice {
balanceEntity.setBalance(df.format(Double.valueOf(benefitEntityA.getAmount()) - Double.valueOf(benefitEntityM.getAmount()))); balanceEntity.setBalance(df.format(Double.valueOf(benefitEntityA.getAmount()) - Double.valueOf(benefitEntityM.getAmount())));
} }
} }
return balanceEntity; return balanceEntity;
} }
} }
src/main/java/com/thinkgem/jeesite/modules/pay/service/PayApiService.java
...@@ -726,8 +726,9 @@ public class PayApiService { ...@@ -726,8 +726,9 @@ public class PayApiService {
RateEntity gradeRate = getGradeRate(userEntity.getLevel(), request.getPayChannel()); RateEntity gradeRate = getGradeRate(userEntity.getLevel(), request.getPayChannel());
//获取扣除手续费后的金额,已经转换为分 //获取扣除手续费后的金额,已经转换为分
BigDecimal amount = calculationAmount(gradeRate, request.getAmount()); // BigDecimal amount = calculationAmount(gradeRate, request.getAmount());
int amountFen = amount.multiply(BigDecimal.valueOf(100.0)).setScale(2, BigDecimal.ROUND_HALF_UP).intValue(); // int amountFen = amount.multiply(BigDecimal.valueOf(100.0)).setScale(2, BigDecimal.ROUND_HALF_UP).intValue();
int amount = calculationAmount(gradeRate, request.getAmount());
//通过用户code获取user_detail表中数据 //通过用户code获取user_detail表中数据
UserDetailEntity userDetail = userService.getUserDetailByCode(userEntity.getCode()); UserDetailEntity userDetail = userService.getUserDetailByCode(userEntity.getCode());
PayBackDto payBackDto = new PayBackDto(); PayBackDto payBackDto = new PayBackDto();
...@@ -738,14 +739,14 @@ public class PayApiService { ...@@ -738,14 +739,14 @@ public class PayApiService {
dto.setOrderId(MakeOrderNum.makeOrderNum());//非订单号 dto.setOrderId(MakeOrderNum.makeOrderNum());//非订单号
dto.setMerchantId(ComCode.MERCHANT_ID);//商户号 dto.setMerchantId(ComCode.MERCHANT_ID);//商户号
dto.setMerchantKey(ComCode.MERCHANT_KEY); dto.setMerchantKey(ComCode.MERCHANT_KEY);
dto.setAmount(amountFen);//订单金额,单位为分 dto.setAmount(Integer.valueOf(request.getAmount())*100);//订单金额,单位为分
dto.setTrxType(3);//交易类型，默认传3 dto.setTrxType(3);//交易类型，默认传3
dto.setType(cardEntity.getCardType().equals("D")?6:5);//5 借记卡 只能 D0 6 贷记卡 D0 t1 ,表中 银行卡类型 D储蓄卡 C信用卡' dto.setType(cardEntity.getCardType().equals("D")?6:5);//5 借记卡 只能 D0 6 贷记卡 D0 t1 ,表中 银行卡类型 D储蓄卡 C信用卡'
dto.setBankNo(cardEntity.getCardNo());//支付卡号 dto.setBankNo(cardEntity.getCardNo());//支付卡号
dto.setCvn2(request.getCvn2());//安全码 dto.setCvn2(request.getCvn2());//安全码
dto.setPhone(cardEntity.getCardMobile());//支付卡预留手机号 dto.setPhone(cardEntity.getCardMobile());//支付卡预留手机号
dto.setExpired(request.getExpireDate());//信用卡有效期(MMYY) dto.setExpired(request.getExpireDate());//信用卡有效期(MMYY)
dto.setUserFee(Integer.valueOf(ComCode.EXTRA_RATE));//手续费 单位：分 ，D0 业务必传,商家约定 dto.setUserFee(amount<200 ? Integer.valueOf(ComCode.EXTRA_RATE) : amount);//手续费 单位：分 ，D0 业务必传,商家约定
if(cardEntity.getCardType().equals("C")){ if(cardEntity.getCardType().equals("C")){
if(cardEntityDebit == null){ if(cardEntityDebit == null){
throw new MyException("还没有结算卡！"); throw new MyException("还没有结算卡！");
...@@ -1265,18 +1266,20 @@ public class PayApiService { ...@@ -1265,18 +1266,20 @@ public class PayApiService {
} }
/** /**
* 计算扣除费率及每笔交易手续费的差值 * 计算每笔交易手续费的和
* @param gradeRate * @param gradeRate
* @param amount * @param amount
* @return * @return
*/ */
public BigDecimal calculationAmount(RateEntity gradeRate,String amount){ public int calculationAmount(RateEntity gradeRate,String amount){
Double siglePrice = Double.valueOf(gradeRate.getSiglePrice()); Double siglePrice = Double.valueOf(gradeRate.getSiglePrice());
Double rate = Double.valueOf(gradeRate.getRate()); Double rate = Double.valueOf(gradeRate.getRate());
Double amountDouble = Double.valueOf(amount); Double amountDouble = Double.valueOf(amount);
//总共所需手续费
int result = BigDecimal.valueOf(amountDouble * rate).add(BigDecimal.valueOf(siglePrice * 100.0)).intValue();
//扣除费率及手续费后的金额 //扣除费率及手续费后的金额
BigDecimal result = BigDecimal.valueOf(amountDouble).subtract(BigDecimal.valueOf(siglePrice)) // BigDecimal result = BigDecimal.valueOf(amountDouble).subtract(BigDecimal.valueOf(siglePrice))
.subtract(BigDecimal.valueOf(amountDouble * rate)); // .subtract(BigDecimal.valueOf(amountDouble * rate));
return result; return result;
} }
......
src/main/java/com/thinkgem/jeesite/modules/user/api/UserApiController.java
...@@ -14,6 +14,8 @@ import com.thinkgem.jeesite.modules.user.entity.IdentityCodeEntity; ...@@ -14,6 +14,8 @@ import com.thinkgem.jeesite.modules.user.entity.IdentityCodeEntity;
import com.thinkgem.jeesite.modules.user.entity.Level; import com.thinkgem.jeesite.modules.user.entity.Level;
import com.thinkgem.jeesite.modules.user.entity.UserEntity; import com.thinkgem.jeesite.modules.user.entity.UserEntity;
import com.thinkgem.jeesite.modules.user.service.UserApiService; import com.thinkgem.jeesite.modules.user.service.UserApiService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
...@@ -29,6 +31,8 @@ import java.util.Map; ...@@ -29,6 +31,8 @@ import java.util.Map;
@RestController @RestController
@RequestMapping("/api/user") @RequestMapping("/api/user")
public class UserApiController { public class UserApiController {
/** log */
private static Logger logger = LoggerFactory.getLogger(UserApiController.class);
@Autowired @Autowired
private UserApiService userService; private UserApiService userService;
...@@ -418,28 +422,32 @@ public class UserApiController { ...@@ -418,28 +422,32 @@ public class UserApiController {
// 判断业务入参是否为空 // 判断业务入参是否为空
if (StringUtils.isBlank(request.getSubMerchantCode()) if (StringUtils.isBlank(request.getSubMerchantCode())
|| StringUtils.isBlank(request.getFunction()) || StringUtils.isBlank(request.getIdentityCode()) || StringUtils.isBlank(request.getFunction()) || StringUtils.isBlank(request.getIdentityCode())
|| StringUtils.isBlank(request.getRealName()) || StringUtils.isBlank(request.getIdCard()) || StringUtils.isBlank(request.getIdCardPlace()) || StringUtils.isBlank(request.getRealName()) || StringUtils.isBlank(request.getIdCard())
|| StringUtils.isBlank(request.getCardNo()) || StringUtils.isBlank(request.getCardMobile()) || StringUtils.isBlank(request.getBelongBank()) || StringUtils.isBlank(request.getCardPlace()) || StringUtils.isBlank(request.getCardBank()) || StringUtils.isBlank(request.getCardNo()) || StringUtils.isBlank(request.getCardMobile())
|| StringUtils.isBlank(request.getIdCardFront()) || StringUtils.isBlank(request.getIdCardBack()) || StringUtils.isBlank(request.getIdCardHold()) || StringUtils.isBlank(request.getDebitCard()) || StringUtils.isBlank(request.getCardSrc())) { || StringUtils.isBlank(request.getBelongBank())
|| StringUtils.isBlank(request.getCardBank())
) {
// || StringUtils.isBlank(request.getIdCardPlace())|| StringUtils.isBlank(request.getIdCardFront())|| StringUtils.isBlank(request.getIdCardBack())|| StringUtils.isBlank(request.getIdCardBack())
// || StringUtils.isBlank(request.getIdCardHold())|| StringUtils.isBlank(request.getDebitCard())|| StringUtils.isBlank(request.getCardSrc())|| StringUtils.isBlank(request.getCardPlace())
resp.setStatus(ComCode.STATUS_CODE_4001); resp.setStatus(ComCode.STATUS_CODE_4001);
resp.setMessage(ComCode.STATUS_CODE_4001_DESC); resp.setMessage(ComCode.STATUS_CODE_4001_DESC);
return resp; return resp;
} }
// 根据手机号 + 使用场景 + 验证码查询 // // 根据手机号 + 使用场景 + 验证码查询
request.setMobile(request.getCardMobile()); // request.setMobile(request.getCardMobile());
IdentityCodeEntity identityCodeEntity = userService.getIdentifyCode(request); // IdentityCodeEntity identityCodeEntity = userService.getIdentifyCode(request);
// 验证码使用场景 // // 验证码使用场景
if (identityCodeEntity == null) { // if (identityCodeEntity == null) {
resp.setStatus(ComCode.STATUS_CODE_4010); // resp.setStatus(ComCode.STATUS_CODE_4010);
resp.setMessage(ComCode.STATUS_CODE_4010_DESC); // resp.setMessage(ComCode.STATUS_CODE_4010_DESC);
return resp; // return resp;
} // }
// 验证码是否过期 // // 验证码是否过期
if (!userService.checkIdentifyCodeExpired(identityCodeEntity)) { // if (!userService.checkIdentifyCodeExpired(identityCodeEntity)) {
resp.setStatus(ComCode.STATUS_CODE_4009); // resp.setStatus(ComCode.STATUS_CODE_4009);
resp.setMessage(ComCode.STATUS_CODE_4009_DESC); // resp.setMessage(ComCode.STATUS_CODE_4009_DESC);
return resp; // return resp;
} // }
userService.certification(request); userService.certification(request);
resp.setStatus(ComCode.STATUS_CODE_2000); resp.setStatus(ComCode.STATUS_CODE_2000);
resp.setMessage(ComCode.STATUS_CODE_2000_DESC); resp.setMessage(ComCode.STATUS_CODE_2000_DESC);
......
src/main/java/com/thinkgem/jeesite/modules/user/service/UserApiService.java
...@@ -219,7 +219,7 @@ public class UserApiService { ...@@ -219,7 +219,7 @@ public class UserApiService {
if(request.getCardSrc()!= null){ if(request.getCardSrc()!= null){
cardSrc = request.getCardSrc().replace(Global.getConfig("sys.pre.url"), ""); cardSrc = request.getCardSrc().replace(Global.getConfig("sys.pre.url"), "");
} }
CardEntity cardEntity = new CardEntity(code, request.getSubMerchantCode(), request.getCardType(), request.getCardNo(), request.getCardMobile(), request.getBelongBank(), request.getCardBank(), request.getCardPlace(), "N", subMerchantId, cardSrc, type, status, request.getProvince(), request.getCity()); CardEntity cardEntity = new CardEntity(code, request.getSubMerchantCode(), request.getCardType(), request.getCardNo(), request.getCardMobile(), request.getBelongBank(), request.getCardBank(), request.getProvince()+request.getCity(), "N", subMerchantId, cardSrc, type, status, request.getProvince(), request.getCity());
userDao.addNewCard(cardEntity); userDao.addNewCard(cardEntity);
} }
...@@ -238,7 +238,7 @@ public class UserApiService { ...@@ -238,7 +238,7 @@ public class UserApiService {
@Transactional(readOnly = false) @Transactional(readOnly = false)
public void certification(UserRequest request) throws MyException, Exception { public void certification(UserRequest request) throws MyException, Exception {
// 更新用户详情 // 更新用户详情
UserDetailEntity userDetailEntity = new UserDetailEntity(IdGen.randomBase62(64), request.getSubMerchantCode(), request.getRealName(), request.getIdCard(), request.getIdCardPlace(), request.getIdCardFront().replace(Global.getConfig("sys.pre.url"), ""), request.getIdCardBack().replace(Global.getConfig("sys.pre.url"), ""), request.getIdCardHold().replace(Global.getConfig("sys.pre.url"), ""), request.getDebitCard().replace(Global.getConfig("sys.pre.url"), "")); UserDetailEntity userDetailEntity = new UserDetailEntity(IdGen.randomBase62(64), request.getSubMerchantCode(), request.getRealName(), request.getIdCard(), request.getProvince()+request.getCity(), "", "", "", "");
if (userDao.getUserDetailByCode(new UserEntity(request.getSubMerchantCode())) == null) { if (userDao.getUserDetailByCode(new UserEntity(request.getSubMerchantCode())) == null) {
userDao.saveUserDetail(userDetailEntity); userDao.saveUserDetail(userDetailEntity);
} else { } else {
...@@ -255,14 +255,10 @@ public class UserApiService { ...@@ -255,14 +255,10 @@ public class UserApiService {
// 更新银行卡详情 // 更新银行卡详情
CardEntity cardStatusEntity = new CardEntity(request.getSubMerchantCode(), "N"); CardEntity cardStatusEntity = new CardEntity(request.getSubMerchantCode(), "N");
userDao.updateCardStatus(cardStatusEntity); userDao.updateCardStatus(cardStatusEntity);
CardEntity cardEntity = new CardEntity(IdGen.randomBase62(64), request.getSubMerchantCode(), "D", request.getCardNo(), request.getCardMobile(), request.getBelongBank(), request.getCardBank(), request.getCardPlace(), "Y", subMerchantId, request.getCardSrc().replace(Global.getConfig("sys.pre.url"), ""), type, status, request.getProvince(), request.getCity()); CardEntity cardEntity = new CardEntity(IdGen.randomBase62(64), request.getSubMerchantCode(), "D", request.getCardNo(), request.getCardMobile(), request.getBelongBank(), request.getCardBank(), request.getCardPlace(), "Y", subMerchantId, "", type, status, request.getProvince(), request.getCity());
userDao.addNewCard(cardEntity); userDao.addNewCard(cardEntity);
// 更新用户状态
UserEntity userEntity = new UserEntity();
userEntity.setCode(request.getSubMerchantCode());
userEntity.setStatus("1");
userDao.updateUserInfo(userEntity);
// 查询与实名用户相同推荐人的信息 // 查询与实名用户相同推荐人的信息
...@@ -360,20 +356,27 @@ public class UserApiService { ...@@ -360,20 +356,27 @@ public class UserApiService {
userSubMchIdRequest.setUserCode(request.getSubMerchantCode()); userSubMchIdRequest.setUserCode(request.getSubMerchantCode());
// ComCode.PAYCHANNEL_HL3 商户入网 // ComCode.PAYCHANNEL_HL3 商户入网
String inregralSubMchId = this.quickPayHandleJuhezhong(request,"",userEntityRequest.getLevel()); // 关闭HL3通道
userSubMchIdRequest.setPayChannel(ComCode.PAYCHANNEL_HL3); // String inregralSubMchId = this.quickPayHandleJuhezhong(request,"",userEntityRequest.getLevel());
userSubMchIdRequest.setSubmchid(inregralSubMchId); // userSubMchIdRequest.setPayChannel(ComCode.PAYCHANNEL_HL3);
this.addUserSubmchid(userSubMchIdRequest); // userSubMchIdRequest.setSubmchid(inregralSubMchId);
// this.addUserSubmchid(userSubMchIdRequest);
// 加添费率
this.quickPayHandleJuhezhong(request,"",userEntityRequest.getLevel());
// JFen 商户入网 + 添加费率 // JFen 商户入网 + 添加费率
String JFenSubMchId = this.merchantInJFenJuhezhong(request); String JFenSubMchId = this.merchantInJFenJuhezhong(request);
// String JFenSubMchId = "B105377143";
// 更新用户状态
UserEntity userEntity = new UserEntity();
userEntity.setCode(request.getSubMerchantCode());
userEntity.setStatus("2");//根据第三方接口返回信息更改用户状态
userDao.updateUserInfo(userEntity);
userSubMchIdRequest.setPayChannel(ComCode.PAYCHANNEL_HL2); userSubMchIdRequest.setPayChannel(ComCode.PAYCHANNEL_HL2);
userSubMchIdRequest.setSubmchid(inregralSubMchId); userSubMchIdRequest.setSubmchid(JFenSubMchId);
this.addUserSubmchid(userSubMchIdRequest); this.addUserSubmchid(userSubMchIdRequest);
rate.setPayChannel(ComCode.PAYCHANNEL_HL2); rate.setPayChannel(ComCode.PAYCHANNEL_HL2);
rate.setPayMethod("quick");//全部写死是quick
RateEntity rateEntity = this.getRateByLevel(rate); RateEntity rateEntity = this.getRateByLevel(rate);
rateEntity.setServiceType("0"); rateEntity.setServiceType("0");
// 添加费率 // 添加费率
...@@ -525,7 +528,7 @@ public class UserApiService { ...@@ -525,7 +528,7 @@ public class UserApiService {
dto.put("legalPersonName",request.getRealName()); dto.put("legalPersonName",request.getRealName());
dto.put("legalPersonID",request.getIdCard()); dto.put("legalPersonID",request.getIdCard());
dto.put("subMerchantPersonName",request.getRealName()); dto.put("subMerchantPersonName",request.getRealName());
dto.put("subMerchantPersonPhone",request.getMobile()); dto.put("subMerchantPersonPhone",userEntity.getMobile());
dto.put("bankType","TOPRIVATE"); dto.put("bankType","TOPRIVATE");
dto.put("accountName",request.getRealName()); dto.put("accountName",request.getRealName());
...@@ -533,7 +536,7 @@ public class UserApiService { ...@@ -533,7 +536,7 @@ public class UserApiService {
dto.put("bankName",belongBankEntity.getBankName()); dto.put("bankName",belongBankEntity.getBankName());
dto.put("bankProv",request.getProvince()); dto.put("bankProv",request.getProvince());
dto.put("bankCity",request.getCity()); dto.put("bankCity",request.getCity());
dto.put("bankBranch",request.getCardPlace()); dto.put("bankBranch",request.getProvince()+request.getCity());
dto.put("bankCode",request.getBelongBank()); dto.put("bankCode",request.getBelongBank());
dto.put("timestamp",System.currentTimeMillis()); dto.put("timestamp",System.currentTimeMillis());
......
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