mirror of
https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git
synced 2026-04-20 11:05:18 +08:00
Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev
This commit is contained in:
@@ -16,6 +16,7 @@ import com.jsowell.JsowellApplication;
|
|||||||
import com.jsowell.adapay.common.DivMember;
|
import com.jsowell.adapay.common.DivMember;
|
||||||
import com.jsowell.adapay.config.AbstractAdapayConfig;
|
import com.jsowell.adapay.config.AbstractAdapayConfig;
|
||||||
import com.jsowell.adapay.dto.QueryAcctFlowDTO;
|
import com.jsowell.adapay.dto.QueryAcctFlowDTO;
|
||||||
|
import com.jsowell.adapay.dto.SettleAccountDTO;
|
||||||
import com.jsowell.adapay.factory.AdapayConfigFactory;
|
import com.jsowell.adapay.factory.AdapayConfigFactory;
|
||||||
import com.jsowell.adapay.service.AdapayService;
|
import com.jsowell.adapay.service.AdapayService;
|
||||||
import com.jsowell.adapay.vo.DrawCashDetailVO;
|
import com.jsowell.adapay.vo.DrawCashDetailVO;
|
||||||
@@ -198,6 +199,24 @@ public class SpringBootTestController {
|
|||||||
@Autowired
|
@Autowired
|
||||||
private OrderPileOccupyService orderPileOccupyService;
|
private OrderPileOccupyService orderPileOccupyService;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 手动变更银行卡信息
|
||||||
|
*/
|
||||||
|
@Test
|
||||||
|
public void createSettleAccountRequestTest() throws BaseAdaPayException {
|
||||||
|
SettleAccountDTO dto = new SettleAccountDTO();
|
||||||
|
dto.setCardId("662214020754200010");
|
||||||
|
dto.setCardName("景泰昌运汽车运输有限公司");
|
||||||
|
dto.setTelNo("13893002888");
|
||||||
|
dto.setBankCode("05818200");
|
||||||
|
dto.setBankAcctType("1");
|
||||||
|
dto.setProvCode("0062");
|
||||||
|
dto.setAreaCode("6202");
|
||||||
|
String adapayMemberId = "ACM69424215";
|
||||||
|
String wechatAppId = "wxbb3e0d474569481d";
|
||||||
|
adapayService.createSettleAccountRequest(dto, adapayMemberId, wechatAppId);
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void createDeleteSettleAccountRequestTest() throws BaseAdaPayException {
|
public void createDeleteSettleAccountRequestTest() throws BaseAdaPayException {
|
||||||
String adapayMemberId = "ACM69424215";
|
String adapayMemberId = "ACM69424215";
|
||||||
|
|||||||
@@ -60,9 +60,6 @@ public class AdapayService {
|
|||||||
@Autowired
|
@Autowired
|
||||||
private RedisCache redisCache;
|
private RedisCache redisCache;
|
||||||
|
|
||||||
@Value("${adapay.jsowell.appId}")
|
|
||||||
private String ADAPAY_APP_ID;
|
|
||||||
|
|
||||||
@Value("${adapay.callback}")
|
@Value("${adapay.callback}")
|
||||||
private String ADAPAY_CALLBACK_URL;
|
private String ADAPAY_CALLBACK_URL;
|
||||||
|
|
||||||
@@ -469,7 +466,7 @@ public class AdapayService {
|
|||||||
settleCountParams.put("settle_account_id", settleAccountId);
|
settleCountParams.put("settle_account_id", settleAccountId);
|
||||||
settleCountParams.put("member_id", adapayMemberId);
|
settleCountParams.put("member_id", adapayMemberId);
|
||||||
settleCountParams.put("app_id", config.getAdapayAppId());
|
settleCountParams.put("app_id", config.getAdapayAppId());
|
||||||
Map<String, Object> settleCount = SettleAccount.delete(settleCountParams);
|
Map<String, Object> settleCount = SettleAccount.delete(settleCountParams, wechatAppId);
|
||||||
log.info("创建删除结算账户请求param:{}, result:{}", JSON.toJSONString(settleCountParams), JSON.toJSONString(settleCount));
|
log.info("创建删除结算账户请求param:{}, result:{}", JSON.toJSONString(settleCountParams), JSON.toJSONString(settleCount));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user