moliparty/peko-java
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v1.1 充值去掉青少年模式和实名认证限制

Browse Source
This commit is contained in:
yeungchihang
2022-10-14 19:16:18 +08:00
parent be313b1884
commit a9a8e2b6a6
3 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
accompany-admin/accompany-admin-service/src/main/resources/mapper/ChargeRecordAdminMapper.xml
View File

@@ -7,7 +7,7 @@
<select id="page" resultMap="BaseResultMap">
select * from (
select b.erban_no,b.nick,b.phone,b.channel app_channel,a.uid,a.channel,round(a.amount/100) amount, local_currency_code localCurrencyCode, round(a.local_amount/100) localAmount,
select a.charge_record_id chargeRecordId, b.erban_no,b.nick,b.phone,b.channel app_channel,a.uid,a.channel,round(a.amount/100) amount, local_currency_code localCurrencyCode, round(a.local_amount/100) localAmount,
a.charge_status status,DATE_FORMAT(a.create_time, '%Y-%m-%d %H:%i:%s') createTime,
if(date(a.create_time)=date(b.create_time), 1, 0) as new_user from charge_record
as a

7
accompany-base/accompany-payment/src/main/java/com/accompany/payment/payermax/PayermaxService.java
View File

@@ -3,12 +3,11 @@ package com.accompany.payment.payermax;
import com.accompany.common.status.BusiStatus;
import com.accompany.common.utils.BeanUtil;
import com.accompany.core.exception.ServiceException;
import com.accompany.core.service.SysConfService;
import com.accompany.core.util.OkHttpUtils;
import com.accompany.payment.payermax.config.PayermaxConfig;
import com.accompany.payment.payermax.dto.CreateOrderResDTO;
import com.accompany.payment.payermax.params.CreateOrderParams;
import com.accompany.payment.utils.CommonPayUtils;
import com.accompany.payment.utils.SignMD5Utils;
import com.alibaba.fastjson.JSONObject;
import lombok.extern.slf4j.Slf4j;
@@ -71,12 +70,12 @@ public class PayermaxService {
}
private Map<String, String> toMapCreateOrderParams(CreateOrderParams params) {
Map<String, String> tmpParams = new HashMap<>();
Map<String, Object> tmpParams = BeanUtil.map(params, Map.class);
tmpParams.put("merchantId", payermaxConfig.getMerchantId());
// 印度的bizType固定是IN_CB
tmpParams.put("bizType", AREA_CODE_IN.equalsIgnoreCase(params.getCountryCode())? BIZ_TYPE_IN_CB: BIZ_TYPE_CUSTOMIZE);
tmpParams.put("version", API_VERSION);
tmpParams.put("sign", CommonPayUtils.signParams(tmpParams, "key", payermaxConfig.getSecretKey()));
tmpParams.put("sign", SignMD5Utils.signForMD5(tmpParams, payermaxConfig.getSecretKey()));
tmpParams.put("orderId", params.getOrderId());
tmpParams.put("userId", params.getUserId());
tmpParams.put("subject", params.getSubject());

9
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/ChargeService.java
View File

@@ -195,7 +195,7 @@ public class ChargeService extends BaseService {
try {
//reids 可配置充值限額 開啟家長模式的用戶 充值限額判斷
Users users = usersService.getUsersByUid(uid);
if (users.getParentMode()) {
/*if (users.getParentMode()) {
// 校驗青少年是否可充值
Boolean teenChargeSwitch = usersBaseService.getTeenChargeSwitch();
if(teenChargeSwitch){
@@ -227,7 +227,7 @@ public class ChargeService extends BaseService {
throw new ServiceException(BusiStatus.NEED_CERTIFICATION);
}
}
}
}*/
//統一下單
return payCenterService.createOrder(uid, chargeProdId, channel, clientIp, successUrl, chargeProd,
@@ -678,11 +678,6 @@ public class ChargeService extends BaseService {
throw new ServiceException(BusiStatus.PARAMERROR);
}
// TODO 后续版本下面2句可以去掉
List<ChargeWayInfoVO> chargeWays = genChargeWayList(areaChargeConfig.getChargeWays());
setChargeProdsInChargeWay(countryCode, areaChargeConfig, chargeWays);
////////
List<ChargeWayGroupInfoVO> chargeWayGroups = genChargeWayGroups(areaChargeConfig.getChargeWayGroups(), countryCode, areaChargeConfig);
ChargePageVO pageVO = new ChargePageVO();