Skip to content

Y
youka-api
Commit 7b7041fd by tang
Options

关闭HL2通道相关

parent 5d25985a
Showing with 45 additions and 40 deletions
src/main/java/com/thinkgem/jeesite/modules/pay/api/PayApiController.java
......@@ -99,6 +99,7 @@ public class PayApiController {
public Response aliPay(JuHeZhongPayRequest request) {
Response resp = new Response();
try {
logger.debug("支付宝升级等级level: {}",request.getLevel());
if("B".equals(request.getLevel())){
if(StringUtils.isBlank(request.getAfterMobile())){
resp.setStatus(ComCode.STATUS_CODE_4001);
......
src/main/java/com/thinkgem/jeesite/modules/pay/service/PayApiService.java
......@@ -983,7 +983,7 @@ public class PayApiService {
if (list != null && list.size() > 0) {
amount = list.get(0).getValue();
}
logger.debug("支付宝支付金额: {}",amount);
// 创建订单保存
if ("D".equals(request.getLevel())) {
request.setSubject("升级成白银会员");
......@@ -1183,25 +1183,26 @@ public class PayApiService {
upgradeUserEntity.setStatus("1");
upgradeUserEntity.setOrderCode(orderEntity.getPayCode());
userService.updateUpgradeUser(upgradeUserEntity);
} else {
//支付宝升级成功后，对应的HL2通道需要修改费率
userService.updateUserLevelByCode(userEntity);
UserSubMchId userSubMchId = new UserSubMchId();
userSubMchId.setUserCode(orderEntity.getUserCode());
userSubMchId.setPayChannel("quick_jfen");
UserSubMchId userSubMchIdQuery = userDao.getUserSubmchid(userSubMchId);
if (userSubMchIdQuery != null){
logger.debug("支付宝升级后，开始进行修改HL2费率");
//修改费率
RateEntity rateEntity = new RateEntity();
rateEntity.setPayChannel("quick_jfen");
rateEntity.setPayMethod("quick");
rateEntity.setUserLevel(userEntity.getLevel());
RateEntity rateByLevel = userDao.getRateByLevel(rateEntity);
rateByLevel.setServiceType("1");//修改的标识
userService.merchantFeelJFen(userSubMchIdQuery.getSubmchid(),rateByLevel);
}
}
// else {
// //支付宝升级成功后，对应的HL2通道需要修改费率
// userService.updateUserLevelByCode(userEntity);
// UserSubMchId userSubMchId = new UserSubMchId();
// userSubMchId.setUserCode(orderEntity.getUserCode());
// userSubMchId.setPayChannel("quick_jfen");
// UserSubMchId userSubMchIdQuery = userDao.getUserSubmchid(userSubMchId);
// if (userSubMchIdQuery != null){
// logger.debug("支付宝升级后，开始进行修改HL2费率");
// //修改费率
// RateEntity rateEntity = new RateEntity();
// rateEntity.setPayChannel("quick_jfen");
// rateEntity.setPayMethod("quick");
// rateEntity.setUserLevel(userEntity.getLevel());
// RateEntity rateByLevel = userDao.getRateByLevel(rateEntity);
// rateByLevel.setServiceType("1");//修改的标识
// userService.merchantFeelJFen(userSubMchIdQuery.getSubmchid(),rateByLevel);
// }
// }
}
} else {
orderEntity.setPayStatus("4");
......
src/main/java/com/thinkgem/jeesite/modules/pay/service/TimingService.java
......@@ -41,7 +41,7 @@ public class TimingService {
payApiService.updateOrders();
}
@Scheduled(cron = "0 0/15 * * * ? ")
@Scheduled(cron = "0 0/5 * * * ? ")
public void updateUserGrade(){
userApiService.updateUserLevel();
}
......
src/main/java/com/thinkgem/jeesite/modules/user/service/UserApiService.java
......@@ -420,16 +420,16 @@ public class UserApiService {
userSubMchIdRequest.setSubmchid(JFenSubMchId);
this.addUserSubmchid(userSubMchIdRequest);
logger.debug("添加用户submchid完成");
//添加费率部分暂时不在认证处进行
RateEntity rate = new RateEntity();
rate.setUserLevel(userEntityRequest.getLevel());
rate.setPayChannel(ComCode.PAYCHANNEL_HL2);
rate.setPayMethod("quick");//全部写死是quick
RateEntity rateEntity = this.getRateByLevel(rate);
rateEntity.setServiceType("0");
Thread.sleep(2000);
// 添加费率
this.merchantFeelJFen(JFenSubMchId,rateEntity);
//添加费率部分暂时关闭，HL2通道不稳定
// RateEntity rate = new RateEntity();
// rate.setUserLevel(userEntityRequest.getLevel());
// rate.setPayChannel(ComCode.PAYCHANNEL_HL2);
// rate.setPayMethod("quick");//全部写死是quick
// RateEntity rateEntity = this.getRateByLevel(rate);
// rateEntity.setServiceType("0");
// Thread.sleep(2000);
// // 添加费率
// this.merchantFeelJFen(JFenSubMchId,rateEntity);
/* 实名认证用户 商户入网 和 添加对应的费率 结束*/
......@@ -458,9 +458,9 @@ public class UserApiService {
// 设置结算卡
userDao.updateCardDebit(request);
// 获取结算卡信息
CardEntity cardEntity = userDao.getDebitCard(new CardEntity(request.getDebitCardCode()));
// CardEntity cardEntity = userDao.getDebitCard(new CardEntity(request.getDebitCardCode()));
// 修改用户的结算卡
updateSettleJuHeZhongPay(cardEntity);
// updateSettleJuHeZhongPay(cardEntity);
}
/*
* 以下为类内使用方法
......@@ -822,7 +822,7 @@ public class UserApiService {
//获取邀请的好友列表
public List<UserEntity> getMyInviting(UserRequest request) {
List<UserEntity> list = userDao.getMyInviting(request);
// List<UserEntity> list = userDao.getMyInviting(request);
return userDao.getMyInviting(request);
}
......@@ -845,13 +845,14 @@ public class UserApiService {
// 修改等级，青铜（E）到白银（D）
entity.setLevel("D");
userDao.updateUserLevelByCode(entity);
// HL2通道不稳定，暂时关闭
// 关系到HL2通道，修改费率
try {
timeUpdateRateHL2(entity);
} catch (Exception e) {
e.printStackTrace();
logger.debug("定时修改费率出错！");
}
// try {
// timeUpdateRateHL2(entity);
// } catch (Exception e) {
// e.printStackTrace();
// logger.debug("定时修改费率出错！");
// }
}
}
......
src/main/resources/mappings/modules/user/UserDao.xml
......@@ -909,6 +909,7 @@
SELECT
id,
nickname,
mobile,
IF(`status`=2,"已激活","未激活") status
FROM
youka_users
......@@ -1040,6 +1041,6 @@
user_code
) a
WHERE
a.amountSum >= 10000;
a.amountSum >= 500;
</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