|
@@ -664,6 +664,7 @@ public class BidTenderController extends BaseController {
|
|
|
public int getDeposit(){
|
|
|
List<BidNotice> bidNotices = bidNoticeService.selectBidNoticeList(new BidNotice());
|
|
|
int i = 0;
|
|
|
+ //TODO
|
|
|
// 优化,通知公告查询 不用同步当前时间大于开标时间的
|
|
|
System.out.println("22222222222222222222");
|
|
|
for(BidNotice bidNotice : bidNotices){
|
|
@@ -696,6 +697,12 @@ public class BidTenderController extends BaseController {
|
|
|
BigDecimal earnestMoney = plan.getEarnestMoney();
|
|
|
Long hid = bidTenderService.selectHidByAccount(map);
|
|
|
|
|
|
+ Map<String,String> dmap = new HashMap<>();
|
|
|
+ dmap.put("uid",item.getPpid().toString());
|
|
|
+ dmap.put("account",item.getRtnTdracctno());
|
|
|
+ dmap.put("date",item.getRtnTdrdt());
|
|
|
+ dmap.put("time",item.getRtnTdrtm());
|
|
|
+
|
|
|
if(hid == null){
|
|
|
com.ruoyi.system.api.domain.BankDepositdescr bankDepositdescr = new com.ruoyi.system.api.domain.BankDepositdescr();
|
|
|
bankDepositdescr.setDepositdescid(item.getDepositdescid());
|
|
@@ -804,6 +811,60 @@ public class BidTenderController extends BaseController {
|
|
|
continue;
|
|
|
}
|
|
|
|
|
|
+ if(bidTenderService.selectDespositCount(dmap) > 0){
|
|
|
+ com.ruoyi.system.api.domain.BankDepositdescr bankDepositdescr = new com.ruoyi.system.api.domain.BankDepositdescr();
|
|
|
+ bankDepositdescr.setDepositdescid(item.getDepositdescid());
|
|
|
+ bankDepositdescr.setPpid(item.getPpid());
|
|
|
+ bankDepositdescr.setTrnuid(item.getTrnuid());
|
|
|
+ bankDepositdescr.setRqbody(item.getRqbody());
|
|
|
+ bankDepositdescr.setSgtid(item.getSgtid());
|
|
|
+ bankDepositdescr.setSgtno(item.getSgtno());
|
|
|
+ bankDepositdescr.setPrjno(item.getPrjno());
|
|
|
+ bankDepositdescr.setPltfmcstno(item.getPltfmcstno());
|
|
|
+ bankDepositdescr.setEntpnm(item.getEntpnm());
|
|
|
+ bankDepositdescr.setPgno(item.getPgno());
|
|
|
+ bankDepositdescr.setVersion(item.getVersion());
|
|
|
+ bankDepositdescr.setRtnTrnuid(item.getRtnTrnuid());
|
|
|
+ bankDepositdescr.setRtnStatus(item.getRtnStatus());
|
|
|
+ bankDepositdescr.setRtnCode(item.getRtnCode());
|
|
|
+ bankDepositdescr.setRtnSeverity(item.getRtnSeverity());
|
|
|
+ bankDepositdescr.setRtnMessage(item.getRtnMessage());
|
|
|
+ bankDepositdescr.setRtnRsbody(item.getRtnRsbody());
|
|
|
+ bankDepositdescr.setRtnRcrdtotnum(item.getRtnRcrdtotnum());
|
|
|
+ bankDepositdescr.setRtnCrnpgno(item.getRtnCrnpgno());
|
|
|
+ bankDepositdescr.setRtnPgrcrdnum(item.getRtnPgrcrdnum());
|
|
|
+ bankDepositdescr.setRtnTotpgnum(item.getRtnTotpgnum());
|
|
|
+ bankDepositdescr.setRtnContent(item.getRtnContent());
|
|
|
+ bankDepositdescr.setRtnLescstno(item.getRtnLescstno());
|
|
|
+ bankDepositdescr.setRtnTdrno(item.getRtnTdrno());
|
|
|
+ bankDepositdescr.setRtnCstno(item.getRtnCstno());
|
|
|
+ bankDepositdescr.setRtnPrjno(item.getRtnPrjno());
|
|
|
+ bankDepositdescr.setRtnPrjnm(item.getRtnPrjnm());
|
|
|
+ bankDepositdescr.setRtnSgtno(item.getRtnSgtno());
|
|
|
+ bankDepositdescr.setRtnSgtst(item.getRtnSgtst());
|
|
|
+ bankDepositdescr.setRtnMrgnst(item.getRtnMrgnst());
|
|
|
+ bankDepositdescr.setRtnTdracctno(item.getRtnTdracctno());
|
|
|
+ bankDepositdescr.setRtnTdracctnoccycd(item.getRtnTdracctnoccycd());
|
|
|
+ bankDepositdescr.setRtnTdracctnm(item.getRtnTdracctnm());
|
|
|
+ bankDepositdescr.setRtnTdracctnobnkno(item.getRtnTdracctnobnkno());
|
|
|
+ bankDepositdescr.setRtnTdracctnobnknm(item.getRtnTdracctnobnknm());;
|
|
|
+ bankDepositdescr.setRtnTdrnum(item.getRtnTdrnum());
|
|
|
+ bankDepositdescr.setRtnMrgnamt(item.getRtnMrgnamt());
|
|
|
+ bankDepositdescr.setRtnTdramt(item.getRtnTdramt());
|
|
|
+ bankDepositdescr.setRtnAgncsvcfee(item.getRtnAgncsvcfee());
|
|
|
+ bankDepositdescr.setRtnFrzamt(item.getRtnFrzamt());
|
|
|
+ bankDepositdescr.setRtnFineamt(item.getRtnFineamt());
|
|
|
+ bankDepositdescr.setRtnTdrdt(item.getRtnTdrdt());
|
|
|
+ bankDepositdescr.setRtnTdrtm(item.getRtnTdrtm());
|
|
|
+ bankDepositdescr.setRtnDuetp(item.getRtnDuetp());
|
|
|
+ bankDepositdescr.setRtnMbrshpno(item.getRtnMbrshpno());
|
|
|
+ bankDepositdescr.setRtnSvcfee(item.getRtnSvcfee());
|
|
|
+ bankDepositdescr.setRtnRemark(item.getRtnRemark());
|
|
|
+ bankDepositdescr.setReason("供应商修改信息异常");
|
|
|
+ remoteDepositService.insertDepositReason(bankDepositdescr,SecurityConstants.INNER);
|
|
|
+ continue;
|
|
|
+ }
|
|
|
+
|
|
|
BidQuote bidQuote = new BidQuote();
|
|
|
bidQuote.setSid(sid);
|
|
|
bidQuote.setHid(hid);
|
|
@@ -826,6 +887,8 @@ public class BidTenderController extends BaseController {
|
|
|
@Transactional
|
|
|
@PostMapping("/refund")
|
|
|
public int refund(){
|
|
|
+ //TODO
|
|
|
+ // 筛选条件优化
|
|
|
List<BidQuote> bidQuotes = bidQuoteService.selectQuoteList2(new BidQuote());
|
|
|
List<String> ids = new ArrayList<>();
|
|
|
for(BidQuote item : bidQuotes){
|