|
@@ -254,10 +254,10 @@ public class THuifuMchServiceImpl extends ServiceImpl<THuifuMchMapper, THuifuMch
|
|
|
|
|
|
// settleConfig.put("settle_abstract", "棉花糖机营业收入");
|
|
|
}
|
|
|
- Integer settMode = tHuifuMchCheck.getSettMode();
|
|
|
+ Integer settType = tHuifuMchCheck.getSettType();
|
|
|
settleConfig.put("settle_cycle", "T1");
|
|
|
JSONArray cashConfig = new JSONArray();
|
|
|
- if (settMode == 1) {
|
|
|
+ if (settType == 1) {
|
|
|
// 自动结算
|
|
|
settleConfig.put("settle_status", "1");
|
|
|
JSONObject cashConfigValue = new JSONObject();
|
|
@@ -266,7 +266,7 @@ public class THuifuMchServiceImpl extends ServiceImpl<THuifuMchMapper, THuifuMch
|
|
|
cashConfigValue.put("fee_rate", "0.00");
|
|
|
cashConfig.add(cashConfigValue);
|
|
|
}
|
|
|
- if (settMode == 2) {
|
|
|
+ if (settType == 2) {
|
|
|
// 手动提现
|
|
|
settleConfig.put("settle_status", "0");
|
|
|
JSONObject cashConfigValue = new JSONObject();
|
|
@@ -612,9 +612,9 @@ public class THuifuMchServiceImpl extends ServiceImpl<THuifuMchMapper, THuifuMch
|
|
|
request.put("card_info", cardInfo);
|
|
|
// 结算方式
|
|
|
JSONObject settleConfig = new JSONObject();
|
|
|
- Integer settMode = tHuifuMchCheck.getSettMode();
|
|
|
+ Integer settType = tHuifuMchCheck.getSettType();
|
|
|
JSONArray cashConfig = new JSONArray();
|
|
|
- if (settMode == 1) {
|
|
|
+ if (settType == 1) {
|
|
|
// 自动结算
|
|
|
settleConfig.put("settle_status", 1);
|
|
|
settleConfig.put("settle_cycle", "T1");
|
|
@@ -623,7 +623,7 @@ public class THuifuMchServiceImpl extends ServiceImpl<THuifuMchMapper, THuifuMch
|
|
|
cashConfigValue.put("fee_rate", "0.00");
|
|
|
cashConfig.add(cashConfigValue);
|
|
|
}
|
|
|
- if (settMode == 2) {
|
|
|
+ if (settType == 2) {
|
|
|
// 手动提现
|
|
|
settleConfig.put("settle_status", 0);
|
|
|
settleConfig.put("settle_cycle", "T1");
|
|
@@ -756,9 +756,9 @@ public class THuifuMchServiceImpl extends ServiceImpl<THuifuMchMapper, THuifuMch
|
|
|
}
|
|
|
request.put("card_info", cardInfo);
|
|
|
JSONObject settleConfig = new JSONObject();
|
|
|
- Integer settMode = huifuMchCheck.getSettMode();
|
|
|
+ Integer settType = huifuMchCheck.getSettType();
|
|
|
JSONArray cashConfig = new JSONArray();
|
|
|
- if (settMode == 1) {
|
|
|
+ if (settType == 1) {
|
|
|
// 自动结算
|
|
|
settleConfig.put("settle_status", "1");
|
|
|
settleConfig.put("settle_cycle", "T1");
|
|
@@ -767,7 +767,7 @@ public class THuifuMchServiceImpl extends ServiceImpl<THuifuMchMapper, THuifuMch
|
|
|
cashConfigValue.put("fee_rate", "0.00");
|
|
|
cashConfig.add(cashConfigValue);
|
|
|
}
|
|
|
- if (settMode == 2) {
|
|
|
+ if (settType == 2) {
|
|
|
// 手动提现
|
|
|
settleConfig.put("settle_status", "0");
|
|
|
settleConfig.put("settle_cycle", "T1");
|