|
@@ -877,14 +877,14 @@ public class BidTenderController extends BaseController {
|
|
param.put("hid",hid);
|
|
param.put("hid",hid);
|
|
BidQuote bidQuote = bidQuoteService.selectQuoteBySupplier(param);
|
|
BidQuote bidQuote = bidQuoteService.selectQuoteBySupplier(param);
|
|
if(bidQuote != null){
|
|
if(bidQuote != null){
|
|
- System.out.println("ggggggggggggggggggggggggggggggggg");
|
|
|
|
|
|
+ logger.info("报价状态更新");
|
|
bidQuote.setStatus(6L);
|
|
bidQuote.setStatus(6L);
|
|
bidQuoteService.updateBidQuote(bidQuote);
|
|
bidQuoteService.updateBidQuote(bidQuote);
|
|
}
|
|
}
|
|
|
|
|
|
//TODO 冗余执行
|
|
//TODO 冗余执行
|
|
// 更新公告退款状态
|
|
// 更新公告退款状态
|
|
- System.out.println("iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii");
|
|
|
|
|
|
+ logger.info("退款状态更新");
|
|
bidNotice.setIsRefund(bidNotice.getIsRefund() == null?1:bidNotice.getIsRefund()+1);
|
|
bidNotice.setIsRefund(bidNotice.getIsRefund() == null?1:bidNotice.getIsRefund()+1);
|
|
bidNoticeService.updateBidNotice(bidNotice);
|
|
bidNoticeService.updateBidNotice(bidNotice);
|
|
}
|
|
}
|
|
@@ -902,48 +902,6 @@ public class BidTenderController extends BaseController {
|
|
}
|
|
}
|
|
|
|
|
|
// 项目流标保证金退还
|
|
// 项目流标保证金退还
|
|
- @InnerAuth
|
|
|
|
- @Transactional
|
|
|
|
- @PostMapping("/refundFailBid")
|
|
|
|
- public int refundFailBid(){
|
|
|
|
- List<String> ids = new ArrayList<>();
|
|
|
|
- BidNotice bidNotice = new BidNotice();
|
|
|
|
- bidNotice.setFjType(4L);
|
|
|
|
- List<BidNotice> list = new ArrayList<>();
|
|
|
|
- List<BidNotice> bidNotices = bidNoticeService.selectBidNoticeList(bidNotice);
|
|
|
|
-
|
|
|
|
- // 获取项目流标公告对应的中标公告
|
|
|
|
- for(BidNotice item : bidNotices){
|
|
|
|
- BidNotice param = bidNoticeService.selectBidNoticeBySid(item.getSid());
|
|
|
|
- list.add(param);
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- for(BidNotice item : list){
|
|
|
|
- Long uid = item.getUid();
|
|
|
|
- Long sid = item.getSid();
|
|
|
|
- List<BidQuote> bidQuotes = bidQuoteService.selectQuoteListBySid(sid);
|
|
|
|
-
|
|
|
|
- for(BidQuote bidQuote : bidQuotes){
|
|
|
|
- Long hid = bidQuote.getHid();
|
|
|
|
- String account = bidWinningResultsService.getAccountByHid(hid);
|
|
|
|
- List<BankDepositdesc> depositList = remoteDepositService.getDeposits(uid, account, SecurityConstants.INNER);
|
|
|
|
- if(CollectionUtils.isEmpty(depositList)){
|
|
|
|
- System.out.println(account + "-1" + "uid:" + uid);
|
|
|
|
- continue;
|
|
|
|
- }
|
|
|
|
- BankDepositdesc bankDepositdesc = depositList.get(0);
|
|
|
|
- ids.add(bankDepositdesc.getDepositdescid());
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
- String[] depositdescids = new String[ids.size()];
|
|
|
|
- for (int i = 0; i < ids.size(); i++){
|
|
|
|
- depositdescids[i] = ids.get(i);
|
|
|
|
- }
|
|
|
|
- logger.info("depositdescids:{}",depositdescids);
|
|
|
|
- int i = remoteDepositService.refundDeposit(depositdescids, SecurityConstants.INNER);
|
|
|
|
- return i;
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
@InnerAuth
|
|
@InnerAuth
|
|
@Transactional
|
|
@Transactional
|
|
@PostMapping("/refundFailBidNew")
|
|
@PostMapping("/refundFailBidNew")
|
|
@@ -972,7 +930,7 @@ public class BidTenderController extends BaseController {
|
|
bidQuote.setStatus(6L);
|
|
bidQuote.setStatus(6L);
|
|
bidQuoteService.updateBidQuote(bidQuote);
|
|
bidQuoteService.updateBidQuote(bidQuote);
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+ logger.info("流标状态更新");
|
|
bidNotice.setIsRefund(bidNotice.getIsRefund() == null?1:bidNotice.getIsRefund()+1);
|
|
bidNotice.setIsRefund(bidNotice.getIsRefund() == null?1:bidNotice.getIsRefund()+1);
|
|
bidNoticeService.updateBidNotice(bidNotice);
|
|
bidNoticeService.updateBidNotice(bidNotice);
|
|
}
|
|
}
|
|
@@ -989,48 +947,6 @@ public class BidTenderController extends BaseController {
|
|
}
|
|
}
|
|
|
|
|
|
// 采购终止保证金退还
|
|
// 采购终止保证金退还
|
|
- @InnerAuth
|
|
|
|
- @Transactional
|
|
|
|
- @PostMapping("/refundStopBid")
|
|
|
|
- public int refundStopBid(){
|
|
|
|
- List<String> ids = new ArrayList<>();
|
|
|
|
- BidNotice bidNotice = new BidNotice();
|
|
|
|
- bidNotice.setFjType(3L);
|
|
|
|
- List<BidNotice> list = new ArrayList<>();
|
|
|
|
- List<BidNotice> bidNotices = bidNoticeService.selectBidNoticeList(bidNotice);
|
|
|
|
-
|
|
|
|
- // 获取项目终止公告对应的中标公告
|
|
|
|
- for(BidNotice item : bidNotices){
|
|
|
|
- BidNotice param = bidNoticeService.selectBidNoticeBySid(item.getSid());
|
|
|
|
- list.add(param);
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- for(BidNotice item : bidNotices){
|
|
|
|
- Long uid = item.getUid();
|
|
|
|
- Long sid = item.getSid();
|
|
|
|
- List<BidQuote> bidQuotes = bidQuoteService.selectQuoteListBySid(sid);
|
|
|
|
-
|
|
|
|
- for(BidQuote bidQuote : bidQuotes){
|
|
|
|
- Long hid = bidQuote.getHid();
|
|
|
|
- String account = bidWinningResultsService.getAccountByHid(hid);
|
|
|
|
- List<BankDepositdesc> depositList = remoteDepositService.getDeposits(uid, account, SecurityConstants.INNER);
|
|
|
|
- if(CollectionUtils.isEmpty(depositList)){
|
|
|
|
- System.out.println(account + "-1" + "uid:" + uid);
|
|
|
|
- continue;
|
|
|
|
- }
|
|
|
|
- BankDepositdesc bankDepositdesc = depositList.get(0);
|
|
|
|
- ids.add(bankDepositdesc.getDepositdescid());
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
- String[] depositdescids = new String[ids.size()];
|
|
|
|
- for (int i = 0; i < ids.size(); i++){
|
|
|
|
- depositdescids[i] = ids.get(i);
|
|
|
|
- }
|
|
|
|
- logger.info("depositdescids:{}",depositdescids);
|
|
|
|
- int i = remoteDepositService.refundDeposit(depositdescids, SecurityConstants.INNER);
|
|
|
|
- return i;
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
@InnerAuth
|
|
@InnerAuth
|
|
@Transactional
|
|
@Transactional
|
|
@PostMapping("/refundStopBidNew")
|
|
@PostMapping("/refundStopBidNew")
|
|
@@ -1053,8 +969,7 @@ public class BidTenderController extends BaseController {
|
|
map.put("account",item.getRtnTdracctno());
|
|
map.put("account",item.getRtnTdracctno());
|
|
map.put("company",item.getRtnTdracctnm());
|
|
map.put("company",item.getRtnTdracctnm());
|
|
Long hid = bidTenderService.selectHidByAccount(map);
|
|
Long hid = bidTenderService.selectHidByAccount(map);
|
|
- System.out.println(whid);
|
|
|
|
- System.out.println(hid);
|
|
|
|
|
|
+ logger.info("终止项目中标人:{}",whid);
|
|
if(whid.equals(hid) == false){
|
|
if(whid.equals(hid) == false){
|
|
ids.add(item.getDepositdescid());
|
|
ids.add(item.getDepositdescid());
|
|
|
|
|
|
@@ -1066,12 +981,12 @@ public class BidTenderController extends BaseController {
|
|
bidQuote.setStatus(6L);
|
|
bidQuote.setStatus(6L);
|
|
bidQuoteService.updateBidQuote(bidQuote);
|
|
bidQuoteService.updateBidQuote(bidQuote);
|
|
}
|
|
}
|
|
- }
|
|
|
|
|
|
|
|
- bidNotice.setIsRefund(bidNotice.getIsRefund() == null?1:bidNotice.getIsRefund()+1);
|
|
|
|
- bidNoticeService.updateBidNotice(bidNotice);
|
|
|
|
|
|
+ logger.info("终止退款状态更新:sid:{},",sid);
|
|
|
|
+ bidNotice.setIsRefund(bidNotice.getIsRefund() == null?1:bidNotice.getIsRefund()+1);
|
|
|
|
+ bidNoticeService.updateBidNotice(bidNotice);
|
|
|
|
+ }
|
|
}
|
|
}
|
|
-
|
|
|
|
}
|
|
}
|
|
|
|
|
|
String[] depositdescids = new String[ids.size()];
|
|
String[] depositdescids = new String[ids.size()];
|
|
@@ -1091,7 +1006,8 @@ public class BidTenderController extends BaseController {
|
|
public int refundWinner(){
|
|
public int refundWinner(){
|
|
BidContract bidContract = new BidContract();
|
|
BidContract bidContract = new BidContract();
|
|
bidContract.setExamine(4L);
|
|
bidContract.setExamine(4L);
|
|
- // TODO 限制根据时间查询100条数据
|
|
|
|
|
|
+
|
|
|
|
+ // 查询30条数据退款
|
|
List<BidContract> bidContracts = bidContractService.selectBidContractList(bidContract);
|
|
List<BidContract> bidContracts = bidContractService.selectBidContractList(bidContract);
|
|
List<String> ids = new ArrayList<>();
|
|
List<String> ids = new ArrayList<>();
|
|
|
|
|