autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-04-26 14:05:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'adapay' into merge_adapay

Browse Source 
# Conflicts:
#	jsowell-admin/src/main/java/com/jsowell/api/uniapp/PayController.java
#	jsowell-admin/src/main/java/com/jsowell/api/uniapp/TempController.java
This commit is contained in:
autumn.g@foxmail.com
2023-09-08 15:50:51 +08:00
parent aa345ee629 de3fe081f8
commit 1d88617168
6 changed files with 56 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,6 +14,9 @@ import com.jsowell.common.util.id.IdUtils;
import com.jsowell.pile.domain.MemberBasicInfo;
import com.jsowell.pile.dto.*;
import com.jsowell.pile.service.IMemberBasicInfoService;
import com.jsowell.pile.service.IPileMerchantInfoService;
import com.jsowell.pile.service.orderlogic.AbstractOrderLogic;
import com.jsowell.pile.service.orderlogic.OrderLogicFactory;
import com.jsowell.pile.vo.uniapp.PayModeVO;
import com.jsowell.service.MemberService;
import com.jsowell.service.OrderService;
@@ -49,6 +52,9 @@ public class PayController extends BaseController {
@Autowired
private MemberService memberService;
@Autowired
private IPileMerchantInfoService pileMerchantInfoService;
/**
* 充值余额支付/微信余额充值
* 提供给小程序使用
@@ -273,7 +279,13 @@ public class PayController extends BaseController {
// }
dto.setOpenId(memberBasicInfo.getOpenId());
// 充值余额 附加参数
Map<String, Object> weixinMap = memberService.rechargeBalanceWithAdapay(dto);
// Map<String, Object> weixinMap = memberService.rechargeBalanceWithAdapay(dto);
String mode = pileMerchantInfoService.getDelayModeByWechatAppId(dto.getWechatAppId());
// 获取处理逻辑
AbstractOrderLogic orderLogic = OrderLogicFactory.getOrderLogic(mode);
Map<String, Object> weixinMap = orderLogic.rechargeBalance(dto);
response = new RestApiResponse<>(ImmutableMap.of("weixinMap", weixinMap));
} catch (BusinessException e) {
logger.error("汇付余额充值接口 error", e);
@@ -304,7 +316,14 @@ public class PayController extends BaseController {
String appId = request.getHeader("appId");
dto.setWechatAppId(appId);
dto.setRefundType("2");
orderService.adapayRefund(dto);
// orderService.adapayRefund(dto);
String mode = pileMerchantInfoService.getDelayModeByWechatAppId(dto.getWechatAppId());
// 获取处理逻辑
AbstractOrderLogic orderLogic = OrderLogicFactory.getOrderLogic(mode);
orderLogic.refundBalance(dto);
response = new RestApiResponse<>();
} catch (BusinessException e) {
logger.warn("汇付支付退款接口 warn", e);

12
jsowell-admin/src/test/java/SpringBootTestController.java
View File

@@ -442,14 +442,14 @@ public class SpringBootTestController {
@Test
public void createSettleAccountRequestTest() throws BaseAdaPayException {
SettleAccountDTO dto = new SettleAccountDTO();
dto.setCardId("408060100100034609");
dto.setCardName("江苏敦顺建设工程有限公司");
dto.setCardId("31050180460000002469");
dto.setCardName("上海擎昆物业管理有限公司");
dto.setTelNo("18021373333");
dto.setBankCode("03090000");
dto.setBankCode("01050000");
dto.setBankAcctType("1");
dto.setProvCode("0032");
dto.setAreaCode("3210");
String adapayMemberId = "ACM40991242";
dto.setProvCode("0031");
dto.setAreaCode("3100");
String adapayMemberId = "ACM80899105";
String wechatAppId = "wxbb3e0d474569481d";
adapayService.createSettleAccountRequest(dto, adapayMemberId, wechatAppId);
}