|
@ -27,6 +27,7 @@ import io.swagger.annotations.ApiOperation;
|
|
import io.swagger.annotations.ApiParam;
|
|
import io.swagger.annotations.ApiParam;
|
|
import org.apache.commons.lang3.BooleanUtils;
|
|
import org.apache.commons.lang3.BooleanUtils;
|
|
import org.apache.commons.lang3.StringUtils;
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
|
import org.json.JSONException;
|
|
import org.json.JSONObject;
|
|
import org.json.JSONObject;
|
|
import org.slf4j.Logger;
|
|
import org.slf4j.Logger;
|
|
import org.slf4j.LoggerFactory;
|
|
import org.slf4j.LoggerFactory;
|
|
@ -293,8 +294,6 @@ public class OnePayController extends WeixinBaseController {
|
|
WlyyCharge charge = chargeDao.getUploadStatus(outChargeNo);
|
|
WlyyCharge charge = chargeDao.getUploadStatus(outChargeNo);
|
|
String result = pay.chargeQuery(outChargeNo, getAccessToken());//业务出参
|
|
String result = pay.chargeQuery(outChargeNo, getAccessToken());//业务出参
|
|
JSONObject param = new JSONObject(result);
|
|
JSONObject param = new JSONObject(result);
|
|
String requestParam = param.getString("responseContent");
|
|
|
|
JSONObject responseContents = new JSONObject(requestParam);//医保结构体
|
|
|
|
|
|
|
|
charge.setChargeNo(chargeNo);
|
|
charge.setChargeNo(chargeNo);
|
|
charge.setChargeTime(chargeTime);
|
|
charge.setChargeTime(chargeTime);
|
|
@ -311,47 +310,73 @@ public class OnePayController extends WeixinBaseController {
|
|
charge.setIdNo(idNo);
|
|
charge.setIdNo(idNo);
|
|
charge.setTradeStatus(chargeStatus);
|
|
charge.setTradeStatus(chargeStatus);
|
|
|
|
|
|
String miRegisterNo = "";
|
|
|
|
String miCollectDate = "";
|
|
|
|
String miCollectTime = "";
|
|
|
|
String miSettleNo = "";
|
|
|
|
String miCollectStatus = "";
|
|
|
|
String miRegisterStatus = "";
|
|
|
|
String cadresPay = "";
|
|
|
|
String miTotalFee = "";
|
|
|
|
String healthCarePay = "";
|
|
|
|
String heathPay = "";
|
|
|
|
String accountPay = "";
|
|
|
|
String selfPay = "";
|
|
|
|
String civilPay = "";
|
|
|
|
if (responseContents != null) {
|
|
|
|
miRegisterNo = responseContents.getString("miRegisterNo");//医保签约号
|
|
|
|
miCollectDate = responseContents.getString("miCollectDate");//扣费日期
|
|
|
|
miCollectTime = responseContents.getString("miCollectTime");//扣费时间
|
|
|
|
miSettleNo = responseContents.getString("miSettleNo");//扣费单据号
|
|
|
|
miCollectStatus = responseContents.getString("miCollectStatus");//扣费状态
|
|
|
|
miRegisterStatus = responseContents.getString("miRegisterStatus");//登记状态
|
|
|
|
cadresPay = responseContents.getString("cadresPay");//政府补贴支付
|
|
|
|
miTotalFee = responseContents.getString("miTotalFee");//扣费总额
|
|
|
|
healthCarePay = responseContents.getString("healthCarePay");//医保统筹支付
|
|
|
|
heathPay = responseContents.getString("heathPay");//健康账户支付
|
|
|
|
accountPay = responseContents.getString("accountPay");//医保账户支付
|
|
|
|
selfPay = responseContents.getString("selfPay");//个人现金支付
|
|
|
|
civilPay = responseContents.getString("civilPay");//基本卫生服务支付
|
|
|
|
|
|
|
|
charge.setMiRegisterNo(miRegisterNo);
|
|
|
|
charge.setMiCollectDate(miCollectDate);
|
|
|
|
charge.setMiCollectTime(miCollectTime);
|
|
|
|
charge.setMiSettleNo(miSettleNo);
|
|
|
|
charge.setMiCollectStatus(miCollectStatus);
|
|
|
|
charge.setMiRegisterStatus(miRegisterStatus);
|
|
|
|
charge.setCadresPay(cadresPay);
|
|
|
|
charge.setMiTotalFee(miTotalFee);
|
|
|
|
charge.setHealthCarePay(healthCarePay);
|
|
|
|
charge.setHeathPay(heathPay);
|
|
|
|
charge.setAccountPay(accountPay);
|
|
|
|
charge.setSelfPay(selfPay);
|
|
|
|
charge.setCivilPay(civilPay);
|
|
|
|
|
|
if (param.has("responseContent") && (param.getJSONObject("responseContent") != null)) {
|
|
|
|
String requestParam = param.getString("responseContent");
|
|
|
|
JSONObject responseContents = new JSONObject(requestParam);//医保结构体
|
|
|
|
String miRegisterNo = "";
|
|
|
|
String miCollectDate = "";
|
|
|
|
String miCollectTime = "";
|
|
|
|
String miSettleNo = "";
|
|
|
|
String miCollectStatus = "";
|
|
|
|
String miRegisterStatus = "";
|
|
|
|
String cadresPay = "";
|
|
|
|
String miTotalFee = "";
|
|
|
|
String healthCarePay = "";
|
|
|
|
String heathPay = "";
|
|
|
|
String accountPay = "";
|
|
|
|
String selfPay = "";
|
|
|
|
String civilPay = "";
|
|
|
|
if (responseContents != null) {
|
|
|
|
if (responseContents.has("miRegisterNo")) {
|
|
|
|
miRegisterNo = responseContents.getString("miRegisterNo");//医保签约号
|
|
|
|
}
|
|
|
|
if (responseContents.has("miCollectDate")) {
|
|
|
|
miCollectDate = responseContents.getString("miCollectDate");//扣费日期
|
|
|
|
}
|
|
|
|
if (responseContents.has("miCollectTime")) {
|
|
|
|
miCollectTime = responseContents.getString("miCollectTime");//扣费时间
|
|
|
|
}
|
|
|
|
if (responseContents.has("miSettleNo")) {
|
|
|
|
miSettleNo = responseContents.getString("miSettleNo");//扣费单据号
|
|
|
|
}
|
|
|
|
if (responseContents.has("miCollectStatus")) {
|
|
|
|
miCollectStatus = responseContents.getString("miCollectStatus");//扣费状态
|
|
|
|
}
|
|
|
|
if (responseContents.has("miRegisterStatus")) {
|
|
|
|
miRegisterStatus = responseContents.getString("miRegisterStatus");//登记状态
|
|
|
|
}
|
|
|
|
if (responseContents.has("cadresPay")) {
|
|
|
|
cadresPay = responseContents.getString("cadresPay");//政府补贴支付
|
|
|
|
}
|
|
|
|
if (responseContents.has("miTotalFee")) {
|
|
|
|
miTotalFee = responseContents.getString("miTotalFee");//扣费总额
|
|
|
|
}
|
|
|
|
if (responseContents.has("healthCarePay")) {
|
|
|
|
healthCarePay = responseContents.getString("healthCarePay");//医保统筹支付
|
|
|
|
}
|
|
|
|
if (responseContents.has("accountPay")) {
|
|
|
|
accountPay = responseContents.getString("accountPay");//医保账户支付
|
|
|
|
}
|
|
|
|
if (responseContents.has("selfPay")) {
|
|
|
|
selfPay = responseContents.getString("selfPay");//个人现金支付
|
|
|
|
}
|
|
|
|
if (responseContents.has("civilPay")) {
|
|
|
|
civilPay = responseContents.getString("civilPay");//基本卫生服务支付
|
|
|
|
}
|
|
|
|
charge.setMiRegisterNo(miRegisterNo);
|
|
|
|
charge.setMiCollectDate(miCollectDate);
|
|
|
|
charge.setMiCollectTime(miCollectTime);
|
|
|
|
charge.setMiSettleNo(miSettleNo);
|
|
|
|
charge.setMiCollectStatus(miCollectStatus);
|
|
|
|
charge.setMiRegisterStatus(miRegisterStatus);
|
|
|
|
charge.setCadresPay(cadresPay);
|
|
|
|
charge.setMiTotalFee(miTotalFee);
|
|
|
|
charge.setHealthCarePay(healthCarePay);
|
|
|
|
charge.setHeathPay(heathPay);
|
|
|
|
charge.setAccountPay(accountPay);
|
|
|
|
charge.setSelfPay(selfPay);
|
|
|
|
charge.setCivilPay(civilPay);
|
|
|
|
}
|
|
}
|
|
}
|
|
// 判断是否需要更新数据 needUpload为0不需要更新
|
|
// 判断是否需要更新数据 needUpload为0不需要更新
|
|
LOGGER.info("before goto " + charge.getNeedUpload() + " == " + outChargeNo);
|
|
LOGGER.info("before goto " + charge.getNeedUpload() + " == " + outChargeNo);
|
|
@ -457,19 +482,58 @@ public class OnePayController extends WeixinBaseController {
|
|
String miRegisterNo = "";//医保签约号
|
|
String miRegisterNo = "";//医保签约号
|
|
if (requestParams.has("responseContent") && (requestParams.getJSONObject("responseContent") != null)) {
|
|
if (requestParams.has("responseContent") && (requestParams.getJSONObject("responseContent") != null)) {
|
|
JSONObject responseContents = requestParams.getJSONObject("responseContent");//医保结构体
|
|
JSONObject responseContents = requestParams.getJSONObject("responseContent");//医保结构体
|
|
miRegisterNo = responseContents.getString("miRegisterNo");//医保签约号
|
|
|
|
String miCollectDate = responseContents.getString("miCollectDate");//扣费日期
|
|
|
|
String miCollectTime = responseContents.getString("miCollectTime");//扣费时间
|
|
|
|
String miSettleNo = responseContents.getString("miSettleNo");//扣费单据号
|
|
|
|
String miCollectStatus = responseContents.getString("miCollectStatus");//扣费状态
|
|
|
|
String miRegisterStatus = responseContents.getString("miRegisterStatus");//登记状态
|
|
|
|
String cadresPay = responseContents.getString("cadresPay");//政府补贴支付
|
|
|
|
String miTotalFee = responseContents.getString("miTotalFee");//扣费总额
|
|
|
|
String healthCarePay = responseContents.getString("healthCarePay");//医保统筹支付
|
|
|
|
String heathPay = responseContents.getString("heathPay");//健康账户支付
|
|
|
|
String accountPay = responseContents.getString("accountPay");//医保账户支付
|
|
|
|
String selfPay = responseContents.getString("selfPay");//个人现金支付
|
|
|
|
String civilPay = responseContents.getString("civilPay");//基本卫生服务支付
|
|
|
|
|
|
String miCollectDate = null;//扣费日期
|
|
|
|
String miCollectTime = null;//扣费时间
|
|
|
|
String miSettleNo = null;//扣费单据号
|
|
|
|
String miCollectStatus = null;//扣费状态
|
|
|
|
String miRegisterStatus = null;//登记状态
|
|
|
|
String cadresPay = "0";//政府补贴支付
|
|
|
|
String miTotalFee = "0";//扣费总额
|
|
|
|
String healthCarePay = "0";//医保统筹支付
|
|
|
|
String heathPay = "0";//健康账户支付
|
|
|
|
String accountPay = "0";//医保账户支付
|
|
|
|
String selfPay = "0";//个人现金支付
|
|
|
|
String civilPay = "0";//基本卫生服务支付
|
|
|
|
|
|
|
|
if (responseContents.has("miRegisterNo")) {
|
|
|
|
miRegisterNo = responseContents.getString("miRegisterNo");//医保签约号
|
|
|
|
}
|
|
|
|
if (responseContents.has("miCollectDate")) {
|
|
|
|
miCollectDate = responseContents.getString("miCollectDate");
|
|
|
|
}
|
|
|
|
if (responseContents.has("miCollectTime")) {
|
|
|
|
miCollectTime = responseContents.getString("miCollectTime");
|
|
|
|
}
|
|
|
|
if (responseContents.has("miSettleNo")) {
|
|
|
|
miSettleNo = responseContents.getString("miSettleNo");
|
|
|
|
}
|
|
|
|
if (responseContents.has("miCollectStatus")) {
|
|
|
|
miCollectStatus = responseContents.getString("miCollectStatus");
|
|
|
|
}
|
|
|
|
if (responseContents.has("miRegisterStatus")) {
|
|
|
|
miRegisterStatus = responseContents.getString("miRegisterStatus");
|
|
|
|
}
|
|
|
|
if (responseContents.has("cadresPay")) {
|
|
|
|
cadresPay = responseContents.getString("cadresPay");
|
|
|
|
}
|
|
|
|
if (responseContents.has("miTotalFee")) {
|
|
|
|
miTotalFee = responseContents.getString("miTotalFee");
|
|
|
|
}
|
|
|
|
if (responseContents.has("healthCarePay")) {
|
|
|
|
healthCarePay = responseContents.getString("healthCarePay");
|
|
|
|
}
|
|
|
|
if (responseContents.has("heathPay")) {
|
|
|
|
heathPay = responseContents.getString("heathPay");
|
|
|
|
}
|
|
|
|
if (responseContents.has("accountPay")) {
|
|
|
|
accountPay = responseContents.getString("accountPay");
|
|
|
|
}
|
|
|
|
if (responseContents.has("selfPay")) {
|
|
|
|
selfPay = responseContents.getString("selfPay");
|
|
|
|
}
|
|
|
|
if (responseContents.has("civilPay")) {
|
|
|
|
civilPay = responseContents.getString("civilPay");
|
|
|
|
}
|
|
|
|
|
|
charge.setMiRegisterNo(miRegisterNo);
|
|
charge.setMiRegisterNo(miRegisterNo);
|
|
charge.setMiCollectDate(miCollectDate);
|
|
charge.setMiCollectDate(miCollectDate);
|