autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-07-16 03:58:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2023-07-10 16:53:16 +08:00
parent d5c4384e33
commit 0c95333234
3 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
jsowell-admin/src/main/java/com/jsowell/api/uniapp/PayController.java
View File

@@ -350,8 +350,8 @@ public class PayController extends BaseController {
public void adapayCallback(HttpServletRequest request) { public void adapayCallback(HttpServletRequest request) {
try { try {
orderService.adapayCallback(request); orderService.adapayCallback(request);
// String type = request.getParameter("type"); String type = request.getParameter("type");
// logger.info("汇付回调type:{}", type); logger.info("汇付回调type:{}", type);
} catch (Exception e) { } catch (Exception e) {
logger.error("汇付支付回调失败 error", e); logger.error("汇付支付回调失败 error", e);
} }

10
jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
View File

@@ -26,6 +26,7 @@ import com.jsowell.common.core.page.PageResponse;
import com.jsowell.common.core.redis.RedisCache; import com.jsowell.common.core.redis.RedisCache;
import com.jsowell.common.enums.InvoiceRecordEnum; import com.jsowell.common.enums.InvoiceRecordEnum;
import com.jsowell.common.enums.MemberWalletEnum; import com.jsowell.common.enums.MemberWalletEnum;
import com.jsowell.common.enums.adapay.AdapayEventEnum;
import com.jsowell.common.enums.ykc.*; import com.jsowell.common.enums.ykc.*;
import com.jsowell.common.exception.BusinessException; import com.jsowell.common.exception.BusinessException;
import com.jsowell.common.util.AdapayUtil; import com.jsowell.common.util.AdapayUtil;
@@ -1325,10 +1326,17 @@ public class OrderService {
return; return;
} }
if (StringUtils.equals("payment.succeeded", type)) { if (StringUtils.equals(AdapayEventEnum.payment_succeeded.getValue(), type)) {
paymentSucceeded(data); paymentSucceeded(data);
} }
// switch (type) {
// case AdapayEventEnum.payment_succeeded.getValue():
//
// }
} }
private void paymentSucceeded(String data) throws JsonProcessingException { private void paymentSucceeded(String data) throws JsonProcessingException {

30
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
View File

@@ -2145,22 +2145,22 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
// 微信支付 // 微信支付
dto.setOrderBasicInfo(orderInfo); dto.setOrderBasicInfo(orderInfo);
Map<String, Object> weixinMap = null; Map<String, Object> weixinMap = adapayPayOrder(dto);
// 从字典中获取使用汇付支付的站点 // 从字典中获取使用汇付支付的站点
List<SysDictData> adapay_station = DictUtils.getDictCache("adapay_station"); // List<SysDictData> adapay_station = DictUtils.getDictCache("adapay_station");
List<String> stationIdList = Lists.newArrayList(); // List<String> stationIdList = Lists.newArrayList();
if (CollectionUtils.isNotEmpty(adapay_station)) { // if (CollectionUtils.isNotEmpty(adapay_station)) {
for (SysDictData sysDictData : adapay_station) { // for (SysDictData sysDictData : adapay_station) {
stationIdList.add(sysDictData.getDictValue()); // stationIdList.add(sysDictData.getDictValue());
} // }
} // }
if (stationIdList.contains(orderInfo.getStationId())) { // if (stationIdList.contains(orderInfo.getStationId())) {
logger.info("该站点:{}在字典中配置了使用汇付支付", orderInfo.getStationId()); // logger.info("该站点:{}在字典中配置了使用汇付支付", orderInfo.getStationId());
weixinMap = adapayPayOrder(dto); // weixinMap = adapayPayOrder(dto);
} else { // } else {
logger.info("该站点:{}使用微信支付", orderInfo.getStationId()); // logger.info("该站点:{}使用微信支付", orderInfo.getStationId());
weixinMap = wechatPayOrder(dto); // weixinMap = wechatPayOrder(dto);
} // }
// 返回微信支付参数 // 返回微信支付参数
resultMap.put("weixinMap", weixinMap); resultMap.put("weixinMap", weixinMap);