|
|
@@ -355,6 +355,8 @@ public class HlgPaymentServiceImpl extends ServiceImpl<HlgPaymentMapper, HlgPaym
|
|
|
String agpseq = jsonObjectBody.getString("agpseq");
|
|
|
//银行处理返回成功
|
|
|
if ("SUC".equals(reqsta)) {
|
|
|
+ //获取当前登录用户
|
|
|
+ LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
|
|
for (int i = 0; i < hlgPaymentDetailList.size(); i++) {
|
|
|
HlgPaymentDetail hlgPaymentDetail = hlgPaymentDetailList.get(i);
|
|
|
//状态改为付款中
|
|
|
@@ -362,6 +364,7 @@ public class HlgPaymentServiceImpl extends ServiceImpl<HlgPaymentMapper, HlgPaym
|
|
|
hlgPaymentDetail.setStatus(1);
|
|
|
}
|
|
|
hlgPaymentDetail.setPaymentTime(new Date());
|
|
|
+ hlgPaymentDetail.setPaymentBy(sysUser.getUsername());
|
|
|
hlgPaymentDetail.setUpdateTime(new Date());
|
|
|
hlgPaymentDetailService.updateById(hlgPaymentDetail);
|
|
|
}
|
|
|
@@ -610,6 +613,8 @@ public class HlgPaymentServiceImpl extends ServiceImpl<HlgPaymentMapper, HlgPaym
|
|
|
String agpseq = jsonObjectBody.getString("agpseq");
|
|
|
//银行处理返回成功
|
|
|
if ("SUC".equals(reqsta)) {
|
|
|
+ //获取当前登录用户
|
|
|
+ LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
|
|
for (int i = 0; i < hlgPaymentDetailList.size(); i++) {
|
|
|
HlgPaymentDetail hlgPaymentDetail = hlgPaymentDetailList.get(i);
|
|
|
//状态改为付款中
|
|
|
@@ -617,6 +622,7 @@ public class HlgPaymentServiceImpl extends ServiceImpl<HlgPaymentMapper, HlgPaym
|
|
|
hlgPaymentDetail.setStatus(1);
|
|
|
}
|
|
|
hlgPaymentDetail.setPaymentTime(new Date());
|
|
|
+ hlgPaymentDetail.setPaymentBy(sysUser.getUsername());
|
|
|
hlgPaymentDetail.setUpdateTime(new Date());
|
|
|
hlgPaymentDetailService.updateById(hlgPaymentDetail);
|
|
|
}
|
|
|
@@ -787,7 +793,7 @@ public class HlgPaymentServiceImpl extends ServiceImpl<HlgPaymentMapper, HlgPaym
|
|
|
continue;
|
|
|
}
|
|
|
}
|
|
|
- hlgPaymentDetailList=hlgPaymentDetailList1;
|
|
|
+ hlgPaymentDetailList = hlgPaymentDetailList1;
|
|
|
List<HlgPaymentDetailExport> list1 = new ArrayList<HlgPaymentDetailExport>();
|
|
|
list1.addAll(hlgPaymentDetailList);
|
|
|
Set<HlgPaymentDetailExport> set1 = new TreeSet<HlgPaymentDetailExport>((hwPaymentDetailExport1, hwPaymentDetailExport2) -> hwPaymentDetailExport1.idcardNumber.compareTo(hwPaymentDetailExport2.idcardNumber));
|