|
@@ -79,7 +79,7 @@ public class BankDepositController extends BaseController {
|
|
|
|
|
|
Long[] uids = list.stream().map(BankDeposit::getPpid).toArray(Long[]::new);
|
|
Long[] uids = list.stream().map(BankDeposit::getPpid).toArray(Long[]::new);
|
|
|
|
|
|
- if(uids.length>0){
|
|
|
|
|
|
+ if (uids.length > 0) {
|
|
List<BidNotice> blist = remoteBidNoticeService.selectBidNoticeByUids(uids, SecurityConstants.INNER);
|
|
List<BidNotice> blist = remoteBidNoticeService.selectBidNoticeByUids(uids, SecurityConstants.INNER);
|
|
|
|
|
|
for (int i = 0; i < list.size(); i++) {
|
|
for (int i = 0; i < list.size(); i++) {
|
|
@@ -137,30 +137,40 @@ public class BankDepositController extends BaseController {
|
|
|
|
|
|
private String postBank(BankDeposit bankDeposit) {
|
|
private String postBank(BankDeposit bankDeposit) {
|
|
String host = env.getProperty("BANK.HOST") + ":" + env.getProperty("BANK.PORT");
|
|
String host = env.getProperty("BANK.HOST") + ":" + env.getProperty("BANK.PORT");
|
|
- HttpResponse rep = Unirest.post(host).body("<FOX>\n" +
|
|
|
|
- " <SIGNONMSGSRQV1>\n" +
|
|
|
|
- " <SONRQ>\n" +
|
|
|
|
- " <DTCLIENT>" + DateUtils.getTime() + "</DTCLIENT>\n" +
|
|
|
|
- " <CID>" + env.getProperty("BANK.CID") + "</CID>\n" +
|
|
|
|
- " <USERID>" + env.getProperty("BANK.USERID") + "</USERID>\n" +
|
|
|
|
- " <USERPASS>" + env.getProperty("BANK.USERPASS") + "</USERPASS>\n" +
|
|
|
|
- " <GENUSERKEY>" + env.getProperty("BANK.GENUSERKEY") + "</GENUSERKEY>\n" +
|
|
|
|
- " <APPID>BZJN</APPID>\n" +
|
|
|
|
- " <APPVER>1</APPVER>\n" +
|
|
|
|
- " </SONRQ>\n" +
|
|
|
|
- " </SIGNONMSGSRQV1>\n" +
|
|
|
|
- " <SECURITIES_MSGSRQV1>\n" +
|
|
|
|
- " <QUERYDEPOSITINNUMTRNRQ>\n" +
|
|
|
|
- " <TRNUID>" + bankDeposit.getTrnuid() + "</TRNUID>\n" +
|
|
|
|
- " <RQBODY>\n" +
|
|
|
|
- " <SGTID>" + bankDeposit.getSgtid() + "</SGTID>\n" +
|
|
|
|
- " <SGTNO>" + bankDeposit.getSgtno() + "</SGTNO>\n" +
|
|
|
|
- " <PRJNO>" + bankDeposit.getPrjno() + "</PRJNO>\n" +
|
|
|
|
- " <PLTFMCSTNO>" + bankDeposit.getPltfmcstno() + "</PLTFMCSTNO>\n" +
|
|
|
|
- " </RQBODY>\n" +
|
|
|
|
- " </QUERYDEPOSITINNUMTRNRQ>\n" +
|
|
|
|
- " </SECURITIES_MSGSRQV1>\n" +
|
|
|
|
- "</FOX>").asString();
|
|
|
|
|
|
+
|
|
|
|
+ StringBuffer sb = new StringBuffer();
|
|
|
|
+ sb.append("<FOX>\n");
|
|
|
|
+ sb.append(" <SIGNONMSGSRQV1>\n");
|
|
|
|
+ sb.append(" <SONRQ>\n");
|
|
|
|
+ sb.append(" <DTCLIENT>" + DateUtils.getTime() + "</DTCLIENT>\n");
|
|
|
|
+ sb.append(" <CID>" + env.getProperty("BANK.CID") + "</CID>\n");
|
|
|
|
+ sb.append(" <USERID>" + env.getProperty("BANK.USERID") + "</USERID>\n");
|
|
|
|
+ sb.append(" <USERPASS>" + env.getProperty("BANK.USERPASS") + "</USERPASS>\n");
|
|
|
|
+ sb.append(" <GENUSERKEY>" + env.getProperty("BANK.GENUSERKEY") + "</GENUSERKEY>\n");
|
|
|
|
+ sb.append(" <APPID>BZJN</APPID>\n");
|
|
|
|
+ sb.append(" <APPVER>1</APPVER>\n");
|
|
|
|
+ sb.append(" </SONRQ>\n");
|
|
|
|
+ sb.append(" </SIGNONMSGSRQV1>\n");
|
|
|
|
+ sb.append(" <SECURITIES_MSGSRQV1>\n");
|
|
|
|
+ sb.append(" <QUERYDEPOSITINNUMTRNRQ>\n");
|
|
|
|
+ sb.append(" <TRNUID>" + bankDeposit.getTrnuid() + "</TRNUID>\n");
|
|
|
|
+ sb.append(" <RQBODY>\n");
|
|
|
|
+ sb.append(" <SGTID>" + bankDeposit.getSgtid() + "</SGTID>\n");
|
|
|
|
+ sb.append(" <SGTNO>" + bankDeposit.getSgtno() + "</SGTNO>\n");
|
|
|
|
+ sb.append(" <PRJNO>" + bankDeposit.getPrjno() + "</PRJNO>\n");
|
|
|
|
+ sb.append(" <PLTFMCSTNO>" + bankDeposit.getPltfmcstno() + "</PLTFMCSTNO>\n");
|
|
|
|
+ sb.append(" </RQBODY>\n");
|
|
|
|
+ sb.append(" </QUERYDEPOSITINNUMTRNRQ>\n");
|
|
|
|
+ sb.append(" </SECURITIES_MSGSRQV1>\n");
|
|
|
|
+ sb.append("</FOX>");
|
|
|
|
+
|
|
|
|
+ logger.info("目标主机:'{}', 查询保证金入账数量请求信息:'{}'", host, sb.toString());
|
|
|
|
+
|
|
|
|
+ HttpResponse rep = Unirest.post(host).body(sb.toString()).asString().ifSuccess(response -> {
|
|
|
|
+ logger.info("查询保证金入账数量请求成功信息:'{}'", response.getBody().toString());
|
|
|
|
+ }).ifFailure(response -> {
|
|
|
|
+ logger.info("查询保证金入账数量请求失败信息:'{}', statusCode:'{}'", response.getBody().toString(), response.getStatus());
|
|
|
|
+ });
|
|
|
|
|
|
return rep.getBody().toString();
|
|
return rep.getBody().toString();
|
|
}
|
|
}
|
|
@@ -178,7 +188,7 @@ public class BankDepositController extends BaseController {
|
|
|
|
|
|
@InnerAuth
|
|
@InnerAuth
|
|
@GetMapping("/getDepositByNoticeId")
|
|
@GetMapping("/getDepositByNoticeId")
|
|
- public String getDepositByNoticeId(@RequestParam("noticeId") Long noticeId){
|
|
|
|
|
|
+ public String getDepositByNoticeId(@RequestParam("noticeId") Long noticeId) {
|
|
System.out.println("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA");
|
|
System.out.println("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA");
|
|
Map<String, Object> map = bankTenderpubController.getInfos(String.valueOf(noticeId));
|
|
Map<String, Object> map = bankTenderpubController.getInfos(String.valueOf(noticeId));
|
|
if (map.size() < 2) return "请检查标段发布和标段查询请求数据是否成功!";
|
|
if (map.size() < 2) return "请检查标段发布和标段查询请求数据是否成功!";
|
|
@@ -248,10 +258,10 @@ public class BankDepositController extends BaseController {
|
|
|
|
|
|
@InnerAuth
|
|
@InnerAuth
|
|
@GetMapping("/getDepositList")
|
|
@GetMapping("/getDepositList")
|
|
- public List<com.ruoyi.system.api.domain.BankDepositdesc> getDepositList(){
|
|
|
|
|
|
+ public List<com.ruoyi.system.api.domain.BankDepositdesc> getDepositList() {
|
|
List<BankDepositdesc> bankDepositdescs = bankDepositdescService.selectBankDepositdescList2(new BankDepositdesc());
|
|
List<BankDepositdesc> bankDepositdescs = bankDepositdescService.selectBankDepositdescList2(new BankDepositdesc());
|
|
List<com.ruoyi.system.api.domain.BankDepositdesc> list = new ArrayList<>();
|
|
List<com.ruoyi.system.api.domain.BankDepositdesc> list = new ArrayList<>();
|
|
- for (BankDepositdesc item : bankDepositdescs){
|
|
|
|
|
|
+ for (BankDepositdesc item : bankDepositdescs) {
|
|
com.ruoyi.system.api.domain.BankDepositdesc t = new com.ruoyi.system.api.domain.BankDepositdesc();
|
|
com.ruoyi.system.api.domain.BankDepositdesc t = new com.ruoyi.system.api.domain.BankDepositdesc();
|
|
t.setDepositdescid(item.getDepositdescid());
|
|
t.setDepositdescid(item.getDepositdescid());
|
|
t.setPpid(item.getPpid());
|
|
t.setPpid(item.getPpid());
|
|
@@ -287,7 +297,8 @@ public class BankDepositController extends BaseController {
|
|
t.setRtnTdracctnoccycd(item.getRtnTdracctnoccycd());
|
|
t.setRtnTdracctnoccycd(item.getRtnTdracctnoccycd());
|
|
t.setRtnTdracctnm(item.getRtnTdracctnm());
|
|
t.setRtnTdracctnm(item.getRtnTdracctnm());
|
|
t.setRtnTdracctnobnkno(item.getRtnTdracctnobnkno());
|
|
t.setRtnTdracctnobnkno(item.getRtnTdracctnobnkno());
|
|
- t.setRtnTdracctnobnknm(item.getRtnTdracctnobnknm());;
|
|
|
|
|
|
+ t.setRtnTdracctnobnknm(item.getRtnTdracctnobnknm());
|
|
|
|
+ ;
|
|
t.setRtnTdrnum(item.getRtnTdrnum());
|
|
t.setRtnTdrnum(item.getRtnTdrnum());
|
|
t.setRtnMrgnamt(item.getRtnMrgnamt());
|
|
t.setRtnMrgnamt(item.getRtnMrgnamt());
|
|
t.setRtnTdramt(item.getRtnTdramt());
|
|
t.setRtnTdramt(item.getRtnTdramt());
|
|
@@ -307,7 +318,7 @@ public class BankDepositController extends BaseController {
|
|
|
|
|
|
@InnerAuth
|
|
@InnerAuth
|
|
@PostMapping("/updateDeposit2")
|
|
@PostMapping("/updateDeposit2")
|
|
- public int updateDeposit2(@RequestParam("id") String id){
|
|
|
|
|
|
+ public int updateDeposit2(@RequestParam("id") String id) {
|
|
BankDepositdesc bankDepositdesc = new BankDepositdesc();
|
|
BankDepositdesc bankDepositdesc = new BankDepositdesc();
|
|
bankDepositdesc.setDepositdescid(id);
|
|
bankDepositdesc.setDepositdescid(id);
|
|
bankDepositdesc.setRtnAgncsvcfee(new BigDecimal(2));
|
|
bankDepositdesc.setRtnAgncsvcfee(new BigDecimal(2));
|
|
@@ -316,7 +327,7 @@ public class BankDepositController extends BaseController {
|
|
|
|
|
|
@InnerAuth
|
|
@InnerAuth
|
|
@PostMapping("insertDepositReason")
|
|
@PostMapping("insertDepositReason")
|
|
- public int insertDepositReason(@RequestBody com.ruoyi.system.api.domain.BankDepositdescr bankDepositdescr){
|
|
|
|
|
|
+ public int insertDepositReason(@RequestBody com.ruoyi.system.api.domain.BankDepositdescr bankDepositdescr) {
|
|
BankDepositdescr t = new BankDepositdescr();
|
|
BankDepositdescr t = new BankDepositdescr();
|
|
t.setDepositdescid(bankDepositdescr.getDepositdescid());
|
|
t.setDepositdescid(bankDepositdescr.getDepositdescid());
|
|
t.setPpid(bankDepositdescr.getPpid());
|
|
t.setPpid(bankDepositdescr.getPpid());
|
|
@@ -352,7 +363,8 @@ public class BankDepositController extends BaseController {
|
|
t.setRtnTdracctnoccycd(bankDepositdescr.getRtnTdracctnoccycd());
|
|
t.setRtnTdracctnoccycd(bankDepositdescr.getRtnTdracctnoccycd());
|
|
t.setRtnTdracctnm(bankDepositdescr.getRtnTdracctnm());
|
|
t.setRtnTdracctnm(bankDepositdescr.getRtnTdracctnm());
|
|
t.setRtnTdracctnobnkno(bankDepositdescr.getRtnTdracctnobnkno());
|
|
t.setRtnTdracctnobnkno(bankDepositdescr.getRtnTdracctnobnkno());
|
|
- t.setRtnTdracctnobnknm(bankDepositdescr.getRtnTdracctnobnknm());;
|
|
|
|
|
|
+ t.setRtnTdracctnobnknm(bankDepositdescr.getRtnTdracctnobnknm());
|
|
|
|
+ ;
|
|
t.setRtnTdrnum(bankDepositdescr.getRtnTdrnum());
|
|
t.setRtnTdrnum(bankDepositdescr.getRtnTdrnum());
|
|
t.setRtnMrgnamt(bankDepositdescr.getRtnMrgnamt());
|
|
t.setRtnMrgnamt(bankDepositdescr.getRtnMrgnamt());
|
|
t.setRtnTdramt(bankDepositdescr.getRtnTdramt());
|
|
t.setRtnTdramt(bankDepositdescr.getRtnTdramt());
|
|
@@ -366,7 +378,7 @@ public class BankDepositController extends BaseController {
|
|
t.setRtnSvcfee(bankDepositdescr.getRtnSvcfee());
|
|
t.setRtnSvcfee(bankDepositdescr.getRtnSvcfee());
|
|
t.setRtnRemark(bankDepositdescr.getRtnRemark());
|
|
t.setRtnRemark(bankDepositdescr.getRtnRemark());
|
|
t.setReason(bankDepositdescr.getReason());
|
|
t.setReason(bankDepositdescr.getReason());
|
|
- if(bankDepositdescrService.selectBankDepositdescrList(t).size() == 0){
|
|
|
|
|
|
+ if (bankDepositdescrService.selectBankDepositdescrList(t).size() == 0) {
|
|
bankDepositdescrService.insertBankDepositdescr(t);
|
|
bankDepositdescrService.insertBankDepositdescr(t);
|
|
}
|
|
}
|
|
return 1;
|
|
return 1;
|
|
@@ -374,7 +386,7 @@ public class BankDepositController extends BaseController {
|
|
|
|
|
|
@InnerAuth
|
|
@InnerAuth
|
|
@GetMapping("/getDeposits")
|
|
@GetMapping("/getDeposits")
|
|
- public List<BankDepositdesc> getDeposits(@RequestParam("uid") Long uid,@RequestParam("account") String account){
|
|
|
|
|
|
+ public List<BankDepositdesc> getDeposits(@RequestParam("uid") Long uid, @RequestParam("account") String account) {
|
|
BankDepositdesc bankDepositdesc = new BankDepositdesc();
|
|
BankDepositdesc bankDepositdesc = new BankDepositdesc();
|
|
bankDepositdesc.setPpid(uid);
|
|
bankDepositdesc.setPpid(uid);
|
|
bankDepositdesc.getRtnTdracctno();
|
|
bankDepositdesc.getRtnTdracctno();
|
|
@@ -386,12 +398,12 @@ public class BankDepositController extends BaseController {
|
|
@PostMapping("/refundDeposit")
|
|
@PostMapping("/refundDeposit")
|
|
public int refundDeposit(@RequestParam("depositdescids") String[] depositdescids) {
|
|
public int refundDeposit(@RequestParam("depositdescids") String[] depositdescids) {
|
|
System.out.println(depositdescids.length);
|
|
System.out.println(depositdescids.length);
|
|
- if(depositdescids.length == 0){
|
|
|
|
|
|
+ if (depositdescids.length == 0) {
|
|
depositdescids = new String[1];
|
|
depositdescids = new String[1];
|
|
depositdescids[0] = "1";
|
|
depositdescids[0] = "1";
|
|
}
|
|
}
|
|
List<BankDepositdesc> list = bankDepositdescService.selectByDepositdescids(depositdescids);
|
|
List<BankDepositdesc> list = bankDepositdescService.selectByDepositdescids(depositdescids);
|
|
- if(list.isEmpty()) return 0;
|
|
|
|
|
|
+ if (list.isEmpty()) return 0;
|
|
|
|
|
|
String xml = "";
|
|
String xml = "";
|
|
|
|
|