|
|
|
@@ -97,8 +97,8 @@ public class WxPayBillServiceImpl implements WxPayBillService { |
|
|
|
} |
|
|
|
//获取账单数据 |
|
|
|
Map<String, Object> bill = bills.get(0); |
|
|
|
Integer owe = (Integer)bill.get("owe"); |
|
|
|
if(owe.intValue()<=0){ |
|
|
|
Long owe = (Long) bill.get("owe"); |
|
|
|
if (owe.longValue() <= 0) { |
|
|
|
logger.info("账单欠缴为0"); |
|
|
|
return new ResultData(ErrorCode.BILL_OWE_ZERO); |
|
|
|
} |
|
|
|
@@ -124,7 +124,7 @@ public class WxPayBillServiceImpl implements WxPayBillService { |
|
|
|
record.setPayTimeEnd(new Date(endtime)); |
|
|
|
// 支付单号 |
|
|
|
record.setPayBillNo(payBillNo); |
|
|
|
record.setPayAmount((Integer) bill.get("owe")); |
|
|
|
record.setPayAmount((Long) bill.get("owe")); |
|
|
|
record.setPayVendor(EnumPayWay.PAY_WAY_WEAPP.getCode()); |
|
|
|
record.setPayBillStatus(EnumPayStatus.PAY_STATUS_WAIT.getCode()); |
|
|
|
record.setShare(isShare.getCode()); |
|
|
|
@@ -165,7 +165,7 @@ public class WxPayBillServiceImpl implements WxPayBillService { |
|
|
|
long endtime = currentDate.getTime() + 120 * 60 * 1000; |
|
|
|
record.setPayTimeEnd(new Date(endtime)); |
|
|
|
record.setPayBillNo(payBillNo); |
|
|
|
record.setPayAmount((Integer) bill.get("owe")); |
|
|
|
record.setPayAmount((Long) bill.get("owe")); |
|
|
|
record.setUpdateTime(currentDate); |
|
|
|
sqlRow = wxPayBillMapper.updateByPrimaryKeySelective(record); |
|
|
|
if (sqlRow != 1) { |
|
|
|
@@ -208,7 +208,7 @@ public class WxPayBillServiceImpl implements WxPayBillService { |
|
|
|
long endtime = currentDate.getTime() + 120 * 60 * 1000; |
|
|
|
record.setPayTimeEnd(new Date(endtime)); |
|
|
|
record.setPayBillNo(payBillNo); |
|
|
|
record.setPayAmount((Integer) bill.get("owe")); |
|
|
|
record.setPayAmount((Long) bill.get("owe")); |
|
|
|
record.setUpdateTime(currentDate); |
|
|
|
sqlRow = wxPayBillMapper.updateByPrimaryKeySelective(record); |
|
|
|
if (sqlRow != 1) { |
|
|
|
@@ -233,7 +233,7 @@ public class WxPayBillServiceImpl implements WxPayBillService { |
|
|
|
wxPayBillSP.setNonce_str(noncestr); |
|
|
|
wxPayBillSP.setBody(bill.get("billType").toString()); |
|
|
|
wxPayBillSP.setOut_trade_no(record.getPayBillNo()); |
|
|
|
wxPayBillSP.setTotal_fee((Integer) bill.get("owe")); |
|
|
|
wxPayBillSP.setTotal_fee(bill.get("owe").toString()); |
|
|
|
// 终端IP |
|
|
|
wxPayBillSP.setSpbill_create_ip(record.getIp()); |
|
|
|
wxPayBillSP.setNotify_url(payAccount.getPayNotifyUrl()); |
|
|
|
|