ruoyi-modules/hh-basic/src/main/java/com/hh/pms/sae/controller/BsSupplierController.java

@@ -580,4 +580,11 @@ public class BsSupplierController extends BaseController {
         }
         return toAjax(i);
     }
+
+    // 供应商接收短信状态更新
+    @Log(title = "供应商短信接收",businessType = BusinessType.UPDATE)
+    @PutMapping("/updateSupplierSms")
+    public AjaxResult updateSupplierSms(BsSupplier bsSupplier){
+        return toAjax(bsSupplierService.updateSupplierSms(bsSupplier));
+    }
 }

ruoyi-modules/hh-basic/src/main/java/com/hh/pms/sae/mapper/BsSupplierMapper.java

@@ -130,4 +130,6 @@ public interface BsSupplierMapper {
     // 根据名称获取供应商信息
     public BsSupplier getSupplierByName(String company);
 
+    // 更新供应商接收短信状态
+    public int updateSupplierSms(BsSupplier bsSupplier);
 }

ruoyi-modules/hh-basic/src/main/java/com/hh/pms/sae/service/IBsSupplierService.java

@@ -130,4 +130,6 @@ public interface IBsSupplierService {
 
     // 根据名称获取供应商信息
     public BsSupplier getSupplierByName(String company);
+
+    public int updateSupplierSms(BsSupplier bsSupplier);
 }

ruoyi-modules/hh-basic/src/main/java/com/hh/pms/sae/service/impl/BsSupplierServiceImpl.java

@@ -164,4 +164,9 @@ public class BsSupplierServiceImpl implements IBsSupplierService {
     public BsSupplier getSupplierByName(String company) {
         return bsSupplierMapper.getSupplierByName(company);
     }
+
+    @Override
+    public int updateSupplierSms(BsSupplier bsSupplier) {
+        return bsSupplierMapper.updateSupplierSms(bsSupplier);
+    }
 }

ruoyi-modules/hh-basic/src/main/resources/mapper/BsSupplierMapper.xml

@@ -489,4 +489,8 @@
         select * from bs_supplier where h_name like concat('%', #{company}, '%')
     </select>
 
+    <update id="updateSupplierSms">
+        update bs_supplier set h_sms = #{hSms} where hid = #{hid}
+    </update>
+
 </mapper>

ruoyi-modules/hh-bidding/src/main/java/com/hh/bidding/controller/BidCommitteeController.java

@@ -232,4 +232,12 @@ public class BidCommitteeController extends BaseController
 
         return success(bidCommittees.size());
     }
+
+
+    // 更新专家到场状态
+    @Log(title = "更新专家到场状态",businessType = BusinessType.UPDATE)
+    @PutMapping("/updateExpertStatus")
+    public AjaxResult updateExpertStatus(@RequestBody BidCommittee bidCommittee){
+        return toAjax(bidCommitteeService.updateBidCommittee(bidCommittee));
+    }
 }

ruoyi-modules/hh-bidding/src/main/java/com/hh/bidding/controller/BidIvrController.java

@@ -241,137 +241,6 @@ public class BidIvrController extends BaseController
         bidMessageService.insertBidMessage(bidMessage);
     }
 
-    // 短信发送接口(专家）
-    @PostMapping("/sendSmsExpert")
-    public AjaxResult sendSmsExpert(SmsParam smsParam) throws UnsupportedEncodingException, NoSuchAlgorithmException {
-        String[] param = new String[8];
-        param[1] = smsParam.getYear();
-        param[2] = smsParam.getMonth();
-        param[3] = smsParam.getDay();
-        param[4] = smsParam.getHour();
-        param[5] = smsParam.getMinute();
-        param[6] = smsParam.getPosition();
-
-        List<String> list = smsParam.getjNameList();
-        List<String> phoneList = smsParam.getPhoneList();
-        List<BsExpert> expertList = smsParam.getExpertList();
-        SubmitTemplateReq submitTemplateReq = new SubmitTemplateReq();
-
-        for (int i = 0; i < expertList.size(); i++) {
-            param[0] = expertList.get(i).getjName();
-            submitTemplateReq.setApId("gm_bz");
-            submitTemplateReq.setEcName("黑龙江省国辰工程项目管理有限责任公司");
-            submitTemplateReq.setSecretKey("8Q@@Xmiu6");
-            submitTemplateReq.setParams(JSON.toJSONString(param));
-            submitTemplateReq.setMobiles(expertList.get(i).getjPhone());
-            submitTemplateReq.setAddSerial("");
-            submitTemplateReq.setSign("mQiMiDjdG");
-            submitTemplateReq.setTemplateId("278bcc53103241acac4b0f787a31c275");
-            StringBuffer stringBuffer = new StringBuffer();
-            stringBuffer.append(submitTemplateReq.getEcName());
-            stringBuffer.append(submitTemplateReq.getApId());
-            stringBuffer.append(submitTemplateReq.getSecretKey());
-            stringBuffer.append(submitTemplateReq.getTemplateId());
-            stringBuffer.append(submitTemplateReq.getMobiles());
-            stringBuffer.append(submitTemplateReq.getParams());
-            stringBuffer.append(submitTemplateReq.getSign());
-            stringBuffer.append(submitTemplateReq.getAddSerial());
-            submitTemplateReq.setMac(MD5Utils.md5Hex(stringBuffer.toString().getBytes("UTF-8")).toLowerCase());
-            String reqText = JSON.toJSONString(submitTemplateReq);
-            String encode = Base64.encodeBase64String(reqText.getBytes());
-            Map<String,String> map = new HashMap<>();
-            map.put("encode",encode);
-
-            // 向远程地址发送短信发送请求
-            try {
-                URL url = new URL("http://112.33.46.17:37891/sms/tmpsubmit");
-                HttpURLConnection conn = (HttpURLConnection) url.openConnection();
-                conn.setRequestMethod("POST");
-                conn.setDoOutput(true);
-                String postParams = encode;
-                byte[] outputInBytes = postParams.getBytes("UTF-8");
-                OutputStream os = conn.getOutputStream();
-                os.write(outputInBytes);
-                os.close();
-                int responseCode = conn.getResponseCode();
-                System.out.println("POST Response Code :: " + responseCode);
-                if (responseCode == HttpURLConnection.HTTP_OK) {
-                    // 处理服务器响应
-                    System.out.println("POST request succeeded");
-                } else {
-                    System.out.println("POST request failed");
-                }
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        }
-        return toAjax(expertList.size());
-    }
-
-    // 短信发送接口 (供应商)
-    @PostMapping("/sendSmsSupplier")
-    public AjaxResult sendSmsSupplier(@RequestBody SmsParam smsParam) throws UnsupportedEncodingException, NoSuchAlgorithmException {
-        String[] param = new String[6];
-        param[0] = smsParam.getCompany();
-        param[1] = smsParam.getYear();
-        param[2] = smsParam.getMonth();
-        param[3] = smsParam.getDay();
-        param[4] = smsParam.getMaterialName();
-
-        List<String> phoneList = smsParam.getPhoneList();
-        String mobiles = StringUtils.join(phoneList,",");
-
-        SubmitTemplateReq submitTemplateReq = new SubmitTemplateReq();
-        submitTemplateReq.setApId("gm_bz");
-        submitTemplateReq.setEcName("黑龙江省国辰工程项目管理有限责任公司");
-        submitTemplateReq.setSecretKey("8Q@@Xmiu6");
-        submitTemplateReq.setParams(JSON.toJSONString(param));
-        submitTemplateReq.setMobiles(mobiles);
-        submitTemplateReq.setAddSerial("");
-        submitTemplateReq.setSign("mQiMiDjdG");
-        submitTemplateReq.setTemplateId("9ec1d4578ad6451ebec1486f229c92c4");
-        StringBuffer stringBuffer = new StringBuffer();
-        stringBuffer.append(submitTemplateReq.getEcName());
-        stringBuffer.append(submitTemplateReq.getApId());
-        stringBuffer.append(submitTemplateReq.getSecretKey());
-        stringBuffer.append(submitTemplateReq.getTemplateId());
-        stringBuffer.append(submitTemplateReq.getMobiles());
-        stringBuffer.append(submitTemplateReq.getParams());
-        stringBuffer.append(submitTemplateReq.getSign());
-        stringBuffer.append(submitTemplateReq.getAddSerial());
-        submitTemplateReq.setMac(MD5Utils.md5Hex(stringBuffer.toString().getBytes("UTF-8")).toLowerCase());
-        String reqText = JSON.toJSONString(submitTemplateReq);
-        String encode = Base64.encodeBase64String(reqText.getBytes());
-
-        Map<String,String> map = new HashMap<>();
-        map.put("encode",encode);
-
-        // 向远程地址发送短信发送请求
-        try {
-            URL url = new URL("http://112.33.46.17:37891/sms/tmpsubmit");
-            HttpURLConnection conn = (HttpURLConnection) url.openConnection();
-            conn.setRequestMethod("POST");
-            conn.setDoOutput(true);
-            String postParams = encode;
-            byte[] outputInBytes = postParams.getBytes("UTF-8");
-            OutputStream os = conn.getOutputStream();
-            os.write(outputInBytes);
-            os.close();
-            int responseCode = conn.getResponseCode();
-            System.out.println("POST Response Code :: " + responseCode);
-            if (responseCode == HttpURLConnection.HTTP_OK) {
-                // 处理服务器响应
-                System.out.println("POST request succeeded");
-            } else {
-                System.out.println("POST request failed");
-            }
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-
-        return toAjax(phoneList.size());
-    }
-
     // 短信发送方法
     public static void main(String[] args) throws Exception {
         DyvmsUtil dyvmsUtil = new DyvmsUtil();

ruoyi-modules/hh-bidding/src/main/java/com/hh/bidding/controller/BidNoticeController.java

@@ -537,4 +537,20 @@ public class BidNoticeController extends BaseController {
         return error("获取虚拟子账户失败");
     }
 
+    @Log(title = "延后开标时间",businessType = BusinessType.UPDATE)
+    @PutMapping("/updateOpenTime")
+    public AjaxResult updateOpenTime(@RequestBody BidNotice bidNotice){
+        Long uid = bidNotice.getUid();
+        Date date = bidNotice.getuKaiTime();
+
+        BidNotice bidNotice1 = bidNoticeService.selectBidNoticeByUid(uid);
+        Date uKaiTime = bidNotice1.getuKaiTime();
+
+
+        if(date.compareTo(uKaiTime) < 0){
+            return toAjax(0);
+        }
+        return toAjax(bidNoticeService.updateOpenTime(bidNotice));
+    }
+
 }

ruoyi-modules/hh-bidding/src/main/java/com/hh/bidding/controller/BidTenderController.java

@@ -877,14 +877,14 @@ public class BidTenderController extends BaseController {
                     param.put("hid",hid);
                     BidQuote bidQuote = bidQuoteService.selectQuoteBySupplier(param);
                     if(bidQuote != null){
-                        System.out.println("ggggggggggggggggggggggggggggggggg");
+                        logger.info("报价状态更新");
                         bidQuote.setStatus(6L);
                         bidQuoteService.updateBidQuote(bidQuote);
                     }
 
                     //TODO 冗余执行
                     // 更新公告退款状态
-                    System.out.println("iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii");
+                    logger.info("退款状态更新");
                     bidNotice.setIsRefund(bidNotice.getIsRefund() == null?1:bidNotice.getIsRefund()+1);
                     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
     @Transactional
     @PostMapping("/refundFailBidNew")
@@ -972,7 +930,7 @@ public class BidTenderController extends BaseController {
                     bidQuote.setStatus(6L);
                     bidQuoteService.updateBidQuote(bidQuote);
                 }
-
+                logger.info("流标状态更新");
                 bidNotice.setIsRefund(bidNotice.getIsRefund() == null?1:bidNotice.getIsRefund()+1);
                 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
     @Transactional
     @PostMapping("/refundStopBidNew")
@@ -1053,8 +969,7 @@ public class BidTenderController extends BaseController {
                 map.put("account",item.getRtnTdracctno());
                 map.put("company",item.getRtnTdracctnm());
                 Long hid = bidTenderService.selectHidByAccount(map);
-                System.out.println(whid);
-                System.out.println(hid);
+                logger.info("终止项目中标人：{}",whid);
                 if(whid.equals(hid) == false){
                     ids.add(item.getDepositdescid());
 
@@ -1066,12 +981,12 @@ public class BidTenderController extends BaseController {
                         bidQuote.setStatus(6L);
                         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()];
@@ -1091,7 +1006,8 @@ public class BidTenderController extends BaseController {
     public int refundWinner(){
         BidContract bidContract = new BidContract();
         bidContract.setExamine(4L);
-        // TODO 限制根据时间查询100条数据
+
+        // 查询30条数据退款
         List<BidContract> bidContracts = bidContractService.selectBidContractList(bidContract);
         List<String> ids = new ArrayList<>();
 

ruoyi-modules/hh-bidding/src/main/java/com/hh/bidding/mapper/BidCommitteeMapper.java

@@ -69,4 +69,7 @@ public interface BidCommitteeMapper
     // 确定组长
     public int updateLeader(Long pbId);
 
+    // 专家确认能到场
+    public int updateExpertStatus(BidCommittee bidCommittee);
+
 }

ruoyi-modules/hh-bidding/src/main/java/com/hh/bidding/mapper/BidNoticeMapper.java

@@ -168,4 +168,7 @@ public interface BidNoticeMapper
     // 查询定标前的公告
     public List<BidNotice> selectNoticeByState();
 
+    // 调整开标时间
+    public int updateOpenTime(BidNotice bidNotice);
+
 }

ruoyi-modules/hh-bidding/src/main/java/com/hh/bidding/service/IBidCommitteeService.java

@@ -68,4 +68,6 @@ public interface IBidCommitteeService
 
     // 确定组长
     public int updateLeader(Long pbId);
+
+    public int updateExpertStatus(BidCommittee bidCommittee);
 }

ruoyi-modules/hh-bidding/src/main/java/com/hh/bidding/service/IBidNoticeService.java

@@ -164,4 +164,7 @@ public interface IBidNoticeService
 
     // 查询定标前的公告
     public List<BidNotice> selectNoticeByState();
+
+    // 调整开标时间
+    public int updateOpenTime(BidNotice bidNotice);
 }

ruoyi-modules/hh-bidding/src/main/java/com/hh/bidding/service/impl/BidCommitteeServiceImpl.java

@@ -112,4 +112,9 @@ public class BidCommitteeServiceImpl implements IBidCommitteeService
     public int updateLeader(Long pbId) {
         return bidCommitteeMapper.updateLeader(pbId);
     }
+
+    @Override
+    public int updateExpertStatus(BidCommittee bidCommittee) {
+        return bidCommitteeMapper.updateExpertStatus(bidCommittee);
+    }
 }

ruoyi-modules/hh-bidding/src/main/java/com/hh/bidding/service/impl/BidNoticeServiceImpl.java

@@ -214,4 +214,9 @@ public class BidNoticeServiceImpl implements IBidNoticeService
     public List<BidNotice> selectNoticeByState() {
         return bidNoticeMapper.selectNoticeByState();
     }
+
+    @Override
+    public int updateOpenTime(BidNotice bidNotice) {
+        return bidNoticeMapper.updateOpenTime(bidNotice);
+    }
 }

ruoyi-modules/hh-bidding/src/main/resources/mapper/BidCommitteeMapper.xml

@@ -131,4 +131,8 @@
         update bid_committee set is_leader = 1
         where pb_id = #{pbId}
     </update>
+
+    <update id="updateExpertStatus" parameterType="com.hh.bidding.domain.BidCommittee">
+        update bid_committee set status = #{status} where pb_id = #{pbId}
+    </update>
 </mapper>

ruoyi-modules/hh-bidding/src/main/resources/mapper/BidContractMapper.xml

@@ -26,6 +26,7 @@
             <if test="examineOption != null  and examineOption != ''"> and examine_option = #{examineOption}</if>
             <if test="wid != null "> and wid = #{wid}</if>
         </where>
+        order by update_time desc limit 30
     </select>
 
     <select id="selectBidContractByCid" parameterType="Long" resultMap="BidContractResult">

ruoyi-modules/hh-bidding/src/main/resources/mapper/BidNoticeMapper.xml

@@ -397,4 +397,8 @@
         from bid_notice n inner join bid_tender t on n.sid = t.sid where t.s_project_state < 7
     </select>
 
+    <update id="updateOpenTime">
+        update bid_notice set u_kai_time = #{uKaiTime} where uid = #{uid}
+    </update>
+
 </mapper>

ruoyi-modules/hh-bidding/src/main/resources/mapper/BidTenderMapper.xml

@@ -490,7 +490,7 @@
     </select>
 
     <select id="selectSupplier" parameterType="String">
-        select hid from bs_supplier where material like concat('%[', #{materialId}, ',%') or material like concat('%,', #{materialId}, ',%') or material like concat('%,', #{materialId}, ']%') or material like concat('%[', #{materialId}, ']%')
+        select hid from bs_supplier where h_sms != 1 and (material like concat('%[', #{materialId}, ',%') or material like concat('%,', #{materialId}, ',%') or material like concat('%,', #{materialId}, ']%') or material like concat('%[', #{materialId}, ']%'))
     </select>
 
     <select id="selectPhones" parameterType="Integer">

ruoyi-modules/hh-mast/src/main/java/com/ruoyi/mast/bank/controller/BankDepositController.java

@@ -11,15 +11,15 @@ import com.ruoyi.common.core.utils.DateUtils;
 import com.ruoyi.common.core.utils.uuid.UUID;
 import com.ruoyi.common.security.annotation.InnerAuth;
 import com.ruoyi.mast.bank.domain.*;
-import com.ruoyi.mast.bank.service.IBankDepositdescService;
-import com.ruoyi.mast.bank.service.IBankDepositdescrService;
-import com.ruoyi.mast.bank.service.IBankUncleardepositService;
+import com.ruoyi.mast.bank.service.*;
 import com.ruoyi.mast.bank.utils.JsonUtils;
 import com.ruoyi.system.api.RemoteBidNoticeService;
 import com.ruoyi.system.api.RemotePlanService;
 import com.ruoyi.system.api.domain.BidNotice;
 import kong.unirest.core.HttpResponse;
 import kong.unirest.core.Unirest;
+import org.apache.poi.hssf.eventusermodel.AbortableHSSFListener;
+import org.aspectj.weaver.loadtime.Aj;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;
@@ -28,7 +28,6 @@ import org.springframework.web.bind.annotation.*;
 import com.ruoyi.common.log.annotation.Log;
 import com.ruoyi.common.log.enums.BusinessType;
 import com.ruoyi.common.security.annotation.RequiresPermissions;
-import com.ruoyi.mast.bank.service.IBankDepositService;
 import com.ruoyi.common.core.web.controller.BaseController;
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.core.utils.poi.ExcelUtil;
@@ -70,6 +69,9 @@ public class BankDepositController extends BaseController {
     @Autowired
     private IBankUncleardepositService bankUncleardepositService;
 
+    @Autowired
+    private IBankRefundService bankRefundService;
+
     @Autowired
     private RemoteBidNoticeService remoteBidNoticeService;
 
@@ -576,4 +578,44 @@ public class BankDepositController extends BaseController {
             bankUncleardepositController.getInfo(bankUncleardeposit.getUncleardepositid());
         }
     }
+
+    /**
+     *  获取未退款的不明保证金列表
+     *
+     * @return
+     */
+    @GetMapping("/refundBankUnclearList")
+    public AjaxResult refundBankUnclearList(){
+        return success(bankUncleardepositService.refundBankUnclearList());
+    }
+
+    @GetMapping("/refundBankUnclearInfo")
+    public AjaxResult refundBankUnclearInfo(){
+        List<BankUncleardeposit> list = new ArrayList<>();
+
+        List<BankUncleardeposit> bankUncleardeposits = bankUncleardepositService.refundBankUnclearInfo();
+        for(BankUncleardeposit item : bankUncleardeposits){
+            String company = item.getRtnOppassetname();
+            String bankAccount = item.getRtnOppbankno();
+            BigDecimal amount = item.getRtnAmt();
+
+            BankRefund bankRefund = new BankRefund();
+            bankRefund.setRtnTdracctnm(company);
+            bankRefund.setRtnTdracctno(bankAccount);
+            bankRefund.setRtnRfndamt(amount);
+            List<BankRefund> bankRefunds = bankRefundService.selectBankRefundList(bankRefund);
+            if(bankRefunds.size() == 0){
+                list.add(item);
+            }
+        }
+        return success(list);
+    }
+
+    // 线下退款状态更新
+    @Log(title = "更新不明保证金退款")
+    @PutMapping("/updateUnclearInfo")
+    public AjaxResult updateUnclearInfo(BankUncleardeposit bankUncleardeposit){
+        return toAjax(bankUncleardepositService.updateBankUncleardeposit(bankUncleardeposit));
+    }
+
 }

ruoyi-modules/hh-mast/src/main/java/com/ruoyi/mast/bank/mapper/BankUncleardepositMapper.java

@@ -66,4 +66,8 @@ public interface BankUncleardepositMapper
 
     //  查询不是服务费的不明保证金
     public List<BankUncleardeposit> refundBankUnclearList();
+
+    // 查询退款款申请表中不存在的退款内容（）
+    public List<BankUncleardeposit> refundBankUnclearInfo();
+
 }

ruoyi-modules/hh-mast/src/main/java/com/ruoyi/mast/bank/service/IBankUncleardepositService.java

@@ -66,4 +66,7 @@ public interface IBankUncleardepositService
 
     //  查询不是服务费的不明保证金
     public List<BankUncleardeposit> refundBankUnclearList();
+
+    // 查询退款款申请表中不存在的退款内容（）
+    public List<BankUncleardeposit> refundBankUnclearInfo();
 }

ruoyi-modules/hh-mast/src/main/java/com/ruoyi/mast/bank/service/impl/BankUncleardepositServiceImpl.java

@@ -102,4 +102,9 @@ public class BankUncleardepositServiceImpl implements IBankUncleardepositService
     public List<BankUncleardeposit> refundBankUnclearList() {
         return bankUncleardepositMapper.refundBankUnclearList();
     }
+
+    @Override
+    public List<BankUncleardeposit> refundBankUnclearInfo() {
+        return bankUncleardepositMapper.refundBankUnclearInfo();
+    }
 }

ruoyi-modules/hh-mast/src/main/resources/bootstrap.yml

@@ -31,3 +31,4 @@ spring:
         shared-configs:
           - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
 
+

ruoyi-modules/hh-mast/src/main/resources/mapper/bank/BankRefundMapper.xml

@@ -105,7 +105,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="rtnRfndst != null  and rtnRfndst != ''"> and rtn_rfndst = #{rtnRfndst}</if>
             <if test="rtnTdracctno != null  and rtnTdracctno != ''"> and rtn_tdracctno = #{rtnTdracctno}</if>
             <if test="rtnTdracctnoccycd != null  and rtnTdracctnoccycd != ''"> and rtn_tdracctnoccycd = #{rtnTdracctnoccycd}</if>
-            <if test="rtnTdracctnm != null  and rtnTdracctnm != ''"> and rtn_tdracctnm = #{rtnTdracctnm}</if>
+            <if test="rtnTdracctnm != null  and rtnTdracctnm != ''"> and rtn_tdracctnm like concat('%',#{rtnTdracctnm},'%')</if>
             <if test="rtnTdracctnobnkno != null  and rtnTdracctnobnkno != ''"> and rtn_tdracctnobnkno = #{rtnTdracctnobnkno}</if>
             <if test="rtnTdracctnobnknm != null  and rtnTdracctnobnknm != ''"> and rtn_tdracctnobnknm = #{rtnTdracctnobnknm}</if>
             <if test="rtnTdrnum != null  and rtnTdrnum != ''"> and rtn_tdrnum = #{rtnTdrnum}</if>

ruoyi-modules/hh-mast/src/main/resources/mapper/bank/BankUncleardepositMapper.xml

@@ -214,6 +214,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select u.uncleardepositid, u.ppid, u.trnuid, u.rqbody, u.acctno, u.ccycd, u.begdt, u.enddt, u.rtn_trnuid, u.rtn_status, u.rtn_code, u.rtn_severity, u.rtn_message, u.rtn_rsbody, u.rtn_rcrdtotnum, u.rtn_crnpgno, u.rtn_pgrcrdnum, u.rtn_totpgnum, u.rtn_content, u.rtn_tradedate, u.rtn_serialno, u.rtn_assetno, u.rtn_assetname, u.rtn_oppassetno, u.rtn_oppassetname, u.rtn_oppbankno, u.rtn_oppbankname, u.rtn_amt, u.rtn_selfbal, u.rtn_summary,
                u.rtn_adjustreason,r.rtn_xferprccode,u.is_apply
         from bank_uncleardeposit u left join bank_uncleardepositrfnd r on u.rtn_serialno = r.serialno
-        where u.rtn_summary not like CONCAT('%','服务费','%') and u.rtn_adjustreason not like CONCAT('%','进入不明 原虚户=999999','%') and r.rtn_xferprccode is null and u.is_apply != 3
+        where u.rtn_summary not like CONCAT('%','服务费','%') and u.rtn_adjustreason not like CONCAT('%','进入不明 原虚户=999999','%') and r.rtn_xferprccode is null and u.is_apply < 3
+    </select>
+
+    <select id="refundBankUnclearInfo">
+        select u.uncleardepositid, u.ppid, u.trnuid, u.rqbody, u.acctno, u.ccycd, u.begdt, u.enddt, u.rtn_trnuid, u.rtn_status, u.rtn_code, u.rtn_severity, u.rtn_message, u.rtn_rsbody, u.rtn_rcrdtotnum, u.rtn_crnpgno, u.rtn_pgrcrdnum, u.rtn_totpgnum, u.rtn_content, u.rtn_tradedate, u.rtn_serialno, u.rtn_assetno, u.rtn_assetname, u.rtn_oppassetno, u.rtn_oppassetname, u.rtn_oppbankno, u.rtn_oppbankname, u.rtn_amt, u.rtn_selfbal, u.rtn_summary,
+               u.rtn_adjustreason,r.rtn_xferprccode,u.is_apply
+        from bank_uncleardeposit u left join bank_uncleardepositrfnd r on u.rtn_serialno = r.serialno
+        where u.rtn_summary not like CONCAT('%','服务费','%') and u.rtn_adjustreason not like CONCAT('%','进入不明 原虚户=999999','%') and r.rtn_xferprccode is null and u.is_apply = 3
     </select>
 </mapper>