|
@@ -246,17 +246,37 @@ public class THuifuMchServiceImpl extends ServiceImpl<THuifuMchMapper, THuifuMch
|
|
cardInfo.put("branch_code", tHuifuMchCheck.getBranchCode());
|
|
cardInfo.put("branch_code", tHuifuMchCheck.getBranchCode());
|
|
}
|
|
}
|
|
request.put("card_info", cardInfo);
|
|
request.put("card_info", cardInfo);
|
|
|
|
+ // 结算方式
|
|
JSONObject settleConfig = new JSONObject();
|
|
JSONObject settleConfig = new JSONObject();
|
|
// 如果是修改接口
|
|
// 如果是修改接口
|
|
if (tHuifuMchCheck.getStatus().equals("4")) {
|
|
if (tHuifuMchCheck.getStatus().equals("4")) {
|
|
url = "https://api.huifu.com/v2/user/busi/modify";
|
|
url = "https://api.huifu.com/v2/user/busi/modify";
|
|
- // 结算周期
|
|
|
|
- settleConfig.put("settle_status", "1");
|
|
|
|
|
|
+
|
|
// settleConfig.put("settle_abstract", "棉花糖机营业收入");
|
|
// settleConfig.put("settle_abstract", "棉花糖机营业收入");
|
|
}
|
|
}
|
|
|
|
+ Integer settMode = tHuifuMchCheck.getSettMode();
|
|
settleConfig.put("settle_cycle", "T1");
|
|
settleConfig.put("settle_cycle", "T1");
|
|
|
|
+ JSONArray cashConfig = new JSONArray();
|
|
|
|
+ if (settMode == 1) {
|
|
|
|
+ // 自动结算
|
|
|
|
+ settleConfig.put("settle_status", "1");
|
|
|
|
+ JSONObject cashConfigValue = new JSONObject();
|
|
|
|
+ cashConfigValue.put("switch_state", "0");
|
|
|
|
+ cashConfigValue.put("cash_type", "T1");
|
|
|
|
+ cashConfigValue.put("fee_rate", "0.00");
|
|
|
|
+ cashConfig.add(cashConfigValue);
|
|
|
|
+ }
|
|
|
|
+ if (settMode == 2) {
|
|
|
|
+ // 手动提现
|
|
|
|
+ settleConfig.put("settle_status", "0");
|
|
|
|
+ JSONObject cashConfigValue = new JSONObject();
|
|
|
|
+ cashConfigValue.put("switch_state", "1");
|
|
|
|
+ cashConfigValue.put("cash_type", "T1");
|
|
|
|
+ cashConfigValue.put("fee_rate", "0.00");
|
|
|
|
+ cashConfig.add(cashConfigValue);
|
|
|
|
+ }
|
|
request.put("settle_config", settleConfig);
|
|
request.put("settle_config", settleConfig);
|
|
-
|
|
|
|
|
|
+ request.put("cash_config", cashConfig.toString());
|
|
// 签名:sign
|
|
// 签名:sign
|
|
String s = JSON.toJSONString(request);
|
|
String s = JSON.toJSONString(request);
|
|
String s1 = JSON.toJSONString(JSONObject.parseObject(s, TreeMap.class));
|
|
String s1 = JSON.toJSONString(JSONObject.parseObject(s, TreeMap.class));
|
|
@@ -269,6 +289,7 @@ public class THuifuMchServiceImpl extends ServiceImpl<THuifuMchMapper, THuifuMch
|
|
requestData.put("product_id", HuifuConstant.PRODUCT_ID);
|
|
requestData.put("product_id", HuifuConstant.PRODUCT_ID);
|
|
requestData.put("sign", sign);
|
|
requestData.put("sign", sign);
|
|
requestData.put("data", request);
|
|
requestData.put("data", request);
|
|
|
|
+ System.out.println("最终请求参数:"+ requestData);
|
|
|
|
|
|
String result = OkHttpClientTools.httpPost(url, requestData.toString(), HuifuConstant.PRODUCT_ID);
|
|
String result = OkHttpClientTools.httpPost(url, requestData.toString(), HuifuConstant.PRODUCT_ID);
|
|
System.out.println("返回的数据:"+ result);
|
|
System.out.println("返回的数据:"+ result);
|
|
@@ -287,6 +308,10 @@ public class THuifuMchServiceImpl extends ServiceImpl<THuifuMchMapper, THuifuMch
|
|
String[] ignoreProperties = {"id", "createDate","adminId"};
|
|
String[] ignoreProperties = {"id", "createDate","adminId"};
|
|
BeanUtil.copyProperties(tHuifuMchCheck, huifuMch, ignoreProperties);
|
|
BeanUtil.copyProperties(tHuifuMchCheck, huifuMch, ignoreProperties);
|
|
huifuMch.setModifyDate(new Date());
|
|
huifuMch.setModifyDate(new Date());
|
|
|
|
+ String tokenNo = dataObject.getString("token_no");
|
|
|
|
+ if (StringUtils.isNotEmpty(tokenNo)) {
|
|
|
|
+ huifuMch.setTokenNo(tokenNo);
|
|
|
|
+ }
|
|
tHuifuMchService.updateById(huifuMch);
|
|
tHuifuMchService.updateById(huifuMch);
|
|
} else {
|
|
} else {
|
|
THuifuMch tHuifuMch = new THuifuMch();
|
|
THuifuMch tHuifuMch = new THuifuMch();
|
|
@@ -299,6 +324,10 @@ public class THuifuMchServiceImpl extends ServiceImpl<THuifuMchMapper, THuifuMch
|
|
} else {
|
|
} else {
|
|
tHuifuMch.setCertDate("长期");
|
|
tHuifuMch.setCertDate("长期");
|
|
}
|
|
}
|
|
|
|
+ String tokenNo = dataObject.getString("token_no");
|
|
|
|
+ if (StringUtils.isNotEmpty(tokenNo)) {
|
|
|
|
+ tHuifuMch.setTokenNo(tokenNo);
|
|
|
|
+ }
|
|
tHuifuMch.setCreateDate(new Date());
|
|
tHuifuMch.setCreateDate(new Date());
|
|
tHuifuMch.setModifyDate(new Date());
|
|
tHuifuMch.setModifyDate(new Date());
|
|
tHuifuMch.setHuifuId(huifuId);
|
|
tHuifuMch.setHuifuId(huifuId);
|
|
@@ -581,12 +610,30 @@ public class THuifuMchServiceImpl extends ServiceImpl<THuifuMchMapper, THuifuMch
|
|
cardInfo.put("mp", tHuifuMchCheck.getMp());
|
|
cardInfo.put("mp", tHuifuMchCheck.getMp());
|
|
}
|
|
}
|
|
request.put("card_info", cardInfo);
|
|
request.put("card_info", cardInfo);
|
|
- // 结算规则配置
|
|
|
|
|
|
+ // 结算方式
|
|
JSONObject settleConfig = new JSONObject();
|
|
JSONObject settleConfig = new JSONObject();
|
|
- // 结算周期
|
|
|
|
- settleConfig.put("settle_cycle", "T1");
|
|
|
|
|
|
+ Integer settMode = tHuifuMchCheck.getSettMode();
|
|
|
|
+ JSONArray cashConfig = new JSONArray();
|
|
|
|
+ if (settMode == 1) {
|
|
|
|
+ // 自动结算
|
|
|
|
+ settleConfig.put("settle_status", 1);
|
|
|
|
+ settleConfig.put("settle_cycle", "T1");
|
|
|
|
+ JSONObject cashConfigValue = new JSONObject();
|
|
|
|
+ cashConfigValue.put("switch_state", "0");
|
|
|
|
+ cashConfigValue.put("fee_rate", "0.00");
|
|
|
|
+ cashConfig.add(cashConfigValue);
|
|
|
|
+ }
|
|
|
|
+ if (settMode == 2) {
|
|
|
|
+ // 手动提现
|
|
|
|
+ settleConfig.put("settle_status", 0);
|
|
|
|
+ settleConfig.put("settle_cycle", "T1");
|
|
|
|
+ JSONObject cashConfigValue = new JSONObject();
|
|
|
|
+ cashConfigValue.put("switch_state", "1");
|
|
|
|
+ cashConfigValue.put("fee_rate", "0.00");
|
|
|
|
+ cashConfig.add(cashConfigValue);
|
|
|
|
+ }
|
|
request.put("settle_config", settleConfig);
|
|
request.put("settle_config", settleConfig);
|
|
-
|
|
|
|
|
|
+ request.put("cash_config", cashConfig.toString());
|
|
// 签名:sign
|
|
// 签名:sign
|
|
String s = JSON.toJSONString(request);
|
|
String s = JSON.toJSONString(request);
|
|
String s1 = JSON.toJSONString(JSONObject.parseObject(s, TreeMap.class));
|
|
String s1 = JSON.toJSONString(JSONObject.parseObject(s, TreeMap.class));
|
|
@@ -618,6 +665,10 @@ public class THuifuMchServiceImpl extends ServiceImpl<THuifuMchMapper, THuifuMch
|
|
} else {
|
|
} else {
|
|
tHuifuMch.setCertDate("长期");
|
|
tHuifuMch.setCertDate("长期");
|
|
}
|
|
}
|
|
|
|
+ String tokenNo = dataObject.getString("token_no");
|
|
|
|
+ if (StringUtils.isNotEmpty(tokenNo)) {
|
|
|
|
+ tHuifuMch.setTokenNo(tokenNo);
|
|
|
|
+ }
|
|
tHuifuMch.setCreateDate(new Date());
|
|
tHuifuMch.setCreateDate(new Date());
|
|
tHuifuMch.setModifyDate(new Date());
|
|
tHuifuMch.setModifyDate(new Date());
|
|
tHuifuMch.setHuifuId(huifuId);
|
|
tHuifuMch.setHuifuId(huifuId);
|
|
@@ -676,8 +727,6 @@ public class THuifuMchServiceImpl extends ServiceImpl<THuifuMchMapper, THuifuMch
|
|
request.put("contact_mobile_no", huifuMchCheck.getPhone());
|
|
request.put("contact_mobile_no", huifuMchCheck.getPhone());
|
|
// 联系人电子邮箱
|
|
// 联系人电子邮箱
|
|
request.put("contact_email", huifuMchCheck.getEmail());
|
|
request.put("contact_email", huifuMchCheck.getEmail());
|
|
-// // 联系人电子邮箱
|
|
|
|
-// request.put("async_return_url", "http://598ef306.r10.cpolar.top/tHuifuMch/auditNotify");
|
|
|
|
// 取现信息配置
|
|
// 取现信息配置
|
|
JSONObject cardInfo = new JSONObject();
|
|
JSONObject cardInfo = new JSONObject();
|
|
cardInfo.put("card_type", huifuMchCheck.getCardType());
|
|
cardInfo.put("card_type", huifuMchCheck.getCardType());
|
|
@@ -706,6 +755,29 @@ public class THuifuMchServiceImpl extends ServiceImpl<THuifuMchMapper, THuifuMch
|
|
cardInfo.put("verify_code", huifuMchCheck.getSms());
|
|
cardInfo.put("verify_code", huifuMchCheck.getSms());
|
|
}
|
|
}
|
|
request.put("card_info", cardInfo);
|
|
request.put("card_info", cardInfo);
|
|
|
|
+ JSONObject settleConfig = new JSONObject();
|
|
|
|
+ Integer settMode = huifuMchCheck.getSettMode();
|
|
|
|
+ JSONArray cashConfig = new JSONArray();
|
|
|
|
+ if (settMode == 1) {
|
|
|
|
+ // 自动结算
|
|
|
|
+ settleConfig.put("settle_status", "1");
|
|
|
|
+ settleConfig.put("settle_cycle", "T1");
|
|
|
|
+ JSONObject cashConfigValue = new JSONObject();
|
|
|
|
+ cashConfigValue.put("switch_state", "0");
|
|
|
|
+ cashConfigValue.put("fee_rate", "0.00");
|
|
|
|
+ cashConfig.add(cashConfigValue);
|
|
|
|
+ }
|
|
|
|
+ if (settMode == 2) {
|
|
|
|
+ // 手动提现
|
|
|
|
+ settleConfig.put("settle_status", "0");
|
|
|
|
+ settleConfig.put("settle_cycle", "T1");
|
|
|
|
+ JSONObject cashConfigValue = new JSONObject();
|
|
|
|
+ cashConfigValue.put("switch_state", "1");
|
|
|
|
+ cashConfigValue.put("fee_rate", "0.00");
|
|
|
|
+ cashConfig.add(cashConfigValue);
|
|
|
|
+ }
|
|
|
|
+ request.put("settle_config", settleConfig);
|
|
|
|
+ request.put("cash_config", cashConfig.toString());
|
|
// 签名:sign
|
|
// 签名:sign
|
|
String s = JSON.toJSONString(request);
|
|
String s = JSON.toJSONString(request);
|
|
String s1 = JSON.toJSONString(JSONObject.parseObject(s, TreeMap.class));
|
|
String s1 = JSON.toJSONString(JSONObject.parseObject(s, TreeMap.class));
|
|
@@ -738,6 +810,10 @@ public class THuifuMchServiceImpl extends ServiceImpl<THuifuMchMapper, THuifuMch
|
|
} else {
|
|
} else {
|
|
tHuifuMch.setCertDate("长期");
|
|
tHuifuMch.setCertDate("长期");
|
|
}
|
|
}
|
|
|
|
+ String tokenNo = dataObject.getString("token_no");
|
|
|
|
+ if (StringUtils.isNotEmpty(tokenNo)) {
|
|
|
|
+ tHuifuMch.setTokenNo(tokenNo);
|
|
|
|
+ }
|
|
tHuifuMch.setModifyDate(new Date());
|
|
tHuifuMch.setModifyDate(new Date());
|
|
huifuMchCheck.setStatus("2");
|
|
huifuMchCheck.setStatus("2");
|
|
huifuMchCheck.setSms(null);
|
|
huifuMchCheck.setSms(null);
|