From a3acbca28efd49eee7e58b0fd9625d563abf5ef6 Mon Sep 17 00:00:00 2001 From: hurui <177768073@qq.com> Date: Thu, 31 Aug 2023 11:53:34 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cweb/notify/TianQueController.java | 114 +++++++---- .../main/java/com/hfkj/schedule/Merchant.java | 177 +++++++++--------- .../tianque/service/TianQueMerService.java | 2 + .../com/hfkj/dao/BsMerPlatformNoMapper.java | 17 +- .../hfkj/dao/BsMerPlatformNoSqlProvider.java | 14 ++ .../java/com/hfkj/entity/BsMerPlatformNo.java | 30 +-- .../hfkj/entity/BsMerPlatformNoExample.java | 70 +++++++ .../hfkj/sysenum/MerPlatformNoStatusEnum.java | 51 +++++ 8 files changed, 332 insertions(+), 143 deletions(-) create mode 100644 service/src/main/java/com/hfkj/sysenum/MerPlatformNoStatusEnum.java diff --git a/cweb/src/main/java/com/cweb/notify/TianQueController.java b/cweb/src/main/java/com/cweb/notify/TianQueController.java index e51f0f1..69e99f8 100644 --- a/cweb/src/main/java/com/cweb/notify/TianQueController.java +++ b/cweb/src/main/java/com/cweb/notify/TianQueController.java @@ -3,6 +3,7 @@ package com.cweb.notify; import com.alibaba.fastjson.JSONObject; import com.hfkj.channel.lakala.LaKaLaLedgerService; import com.hfkj.channel.lakala.LaKaLaWalletService; +import com.hfkj.channel.tianque.service.TianQueMerElecSignService; import com.hfkj.config.CommonSysConst; import com.hfkj.entity.*; import com.hfkj.service.*; @@ -22,6 +23,7 @@ import javax.servlet.http.HttpServletResponse; import java.io.BufferedOutputStream; import java.math.BigDecimal; import java.util.HashMap; +import java.util.List; import java.util.Map; /** @@ -37,21 +39,20 @@ public class TianQueController { @Resource private BsTradeOrderService tradeOrderService; - @Resource private BsTradeOrderMsgService tradeOrderMsgService; @Resource - private BsMerLedgerService merLedgerService; + private BsMerService merService; @Resource - private BsMerLedgerApplyService merLedgerApplyService; + private BsMerPlatformNoService merPlatformNoService; @Resource - private BsMerLedgerReceiverService merLedgerReceiverService; + private BsStoreService storeService; @Resource - private BsMerLedgerReceiverApplyService merLedgerReceiverApplyService; + private BsMerContractRecordService merContractRecordService; @Resource - private LaKaLaLedgerService laKaLaLedgerService; + private BsMerContractRecordMsgService merContractRecordMsgService; @Resource - private LaKaLaWalletService laKaLaWalletService; + private TianQueMerElecSignService tianQueMerElecSignService; @RequestMapping(value="/microPay",method = RequestMethod.POST) @ResponseBody @@ -136,47 +137,88 @@ public class TianQueController { @RequestMapping(value="/applyLedgerMer",method = RequestMethod.POST) @ResponseBody @ApiOperation(value = "商户进件通知") - public void merInbound(@RequestBody String reqBody) { + public void merInbound(@RequestBody String reqBody, HttpServletResponse response) { try { log.info("商户进件通知", reqBody); System.out.println(reqBody); JSONObject respData = JSONObject.parseObject(reqBody); - BsMerLedgerApply ledgerApply = merLedgerApplyService.getApplyByApplyId(respData.getString("applicationId")); - if (ledgerApply != null) { - ledgerApply.setNotifyBody(reqBody); - merLedgerApplyService.editMerLedgerApply(ledgerApply); - - // 查询商户分账信息 - BsMerLedger merLedger = merLedgerService.getMerLedgerById(ledgerApply.getMerLedgerId()); - if (merLedger != null) { - // 审核状态 1:通过，2拒绝 - if (respData.getString("auditStatus").equals("1")) { - merLedger.setStatus(MerLedgerStatusEnum.status1.getNumber()); - merLedgerService.editMerLedger(merLedger); - // 延迟3秒 - Thread.sleep(3000); - - // 提现通知地址 - String notifyUrl = CommonSysConst.getSysConfig().getDomainName()+"/crest/merWithdrawal/notify?cupNo="+merLedger.getCupNo(); - - // 配置账户自动结算 - laKaLaWalletService.ewalletSettleProfile(1,merLedger.getCupNo(), "02", "06", notifyUrl); - - // 配置分账接收方账户自动结算 - laKaLaWalletService.ewalletSettleProfile(2,merLedger.getReceiverNo(), "02", "06", notifyUrl); + BsMerContractRecord merContractRecord = merContractRecordService.getRecordByOrderNo(respData.getString("applicationId")); + if (merContractRecord != null) { + // 审核状态，枚举值 取值范围：1 入驻通过 2 入驻驳回 5 商户修改通过 6 商户修改驳回 + if (respData.getString("taskStatus").equals("1") || respData.getString("taskStatus").equals("5")) { + merContractRecord.setStatus(2); + } else { + merContractRecord.setStatus(3); + } + merContractRecordService.updateRecord(merContractRecord); + + BsMerContractRecordMsg merContractRecordMsg = new BsMerContractRecordMsg(); + merContractRecordMsg.setOrderNo(merContractRecord.getOrderNo()); + merContractRecordMsg.setType(1); + merContractRecordMsg.setResponseCode(merContractRecord.getStatus().equals(2)?"SUCCESS":"REJECT"); + merContractRecordMsg.setResponseMsg(respData.getString("suggestion")); + merContractRecordMsgService.insertRecordMsg(merContractRecordMsg); + + // 查询商户 + BsMer mer = merService.getMer(merContractRecord.getMerId()); + if (mer != null && mer.getMerStatus().equals(MerStatusEnum.status3.getNumber())) { + if (merContractRecord.getStatus().equals(2)) { + mer.setMerStatus(MerStatusEnum.status1.getNumber()); + merService.editMer(mer); + + List storeList = storeService.getStoreByMerId(mer.getId(), StoreCreateTypeEnum.type1); + if (storeList.size() > 0) { + BsStore store = storeList.get(0); + store.setStatus(StoreStatusEnum.status2.getNumber()); + storeService.editStore(store); + } + + BsMerPlatformNo merPlatformNo = merPlatformNoService.getPlatformNo(mer.getId(), PlatformTypeEnum.type5); + if (merPlatformNo != null) { + merPlatformNo.setStatus(MerPlatformNoStatusEnum.status1.getNumber()); + merPlatformNoService.editMerPlatformNo(merPlatformNo); + } + + // 签署协议 + tianQueMerElecSignService.openElecSignature(respData.getString("mno")); } else { - merLedger.setStatus(MerLedgerStatusEnum.status3.getNumber()); - merLedger.setRejectReason(respData.getString("remark")); - merLedgerService.editMerLedger(merLedger); - } + mer.setMerStatus(MerStatusEnum.status4.getNumber()); + merService.editMer(mer); + + List storeList = storeService.getStoreByMerId(mer.getId(), StoreCreateTypeEnum.type1); + if (storeList.size() > 0) { + BsStore store = storeList.get(0); + store.setStatus(StoreStatusEnum.status4.getNumber()); + storeService.editStore(store); + } + + BsMerPlatformNo merPlatformNo = merPlatformNoService.getPlatformNo(mer.getId(), PlatformTypeEnum.type5); + if (merPlatformNo != null) { + merPlatformNo.setStatus(MerPlatformNoStatusEnum.status3.getNumber()); + merPlatformNo.setSuggestionReject(respData.getString("suggestion")); + merPlatformNoService.editMerPlatformNo(merPlatformNo); + } + } } } } catch (Exception e) { - log.error("login error!",e); + + } finally { + try { + BufferedOutputStream out = new BufferedOutputStream(response.getOutputStream()); + JSONObject result = new JSONObject(); + result.put("code", "success"); + result.put("msg", "成功"); + out.write(result.toJSONString().getBytes()); + out.flush(); + out.close(); + } catch (Exception e) { + + } } } diff --git a/schedule/src/main/java/com/hfkj/schedule/Merchant.java b/schedule/src/main/java/com/hfkj/schedule/Merchant.java index c1cfd53..fbb6db4 100644 --- a/schedule/src/main/java/com/hfkj/schedule/Merchant.java +++ b/schedule/src/main/java/com/hfkj/schedule/Merchant.java @@ -191,100 +191,99 @@ public class Merchant { List list = merContractRecordService.getContractRecordList(param); for (BsMerContractRecord contractRecord : list) { try { - BsMer mer = merService.getMer(contractRecord.getMerId()); if (mer != null && mer.getMerStatus().equals(MerStatusEnum.status3.getNumber())) { - - BsMerPlatformNo platform = merPlatformNoService.getPlatformNo(mer.getId(), PlatformTypeEnum.type1); - if (platform != null) { - JSONObject merchantInfo = saasMerService.merchantInfo(platform.getPlatformNo()); - // 查询申请记录 - BsMerContractRecordMsg msg = new BsMerContractRecordMsg(); - msg.setOrderNo(contractRecord.getOrderNo()); - msg.setType(1); - msg.setResponseContent(merchantInfo.toJSONString()); - merContractRecordMsgService.insertRecordMsg(msg); - - JSONObject customer = merchantInfo.getJSONObject("customer"); - // 商户状态 OPEN:开通，CLOSE:关闭，LOSS:流失, REJECT：拒绝。可用值:OPEN,ACTIVITY,WAIT_COMMIT,WAIT_AUDI,REJECT, CLOSE,INIT - if (customer.getString("customerStatus").equals("OPEN")) { - contractRecord.setStatus(2); - merContractRecordService.updateRecord(contractRecord); - - mer.setMerStatus(MerStatusEnum.status1.getNumber()); - merService.editMer(mer); - - List storeList = storeService.getStoreByMerId(mer.getId(), StoreCreateTypeEnum.type1); - if (storeList.size() > 0) { - BsStore store = storeList.get(0); - store.setStatus(StoreStatusEnum.status2.getNumber()); - storeService.editStore(store); - } - platform.setCupNo(customer.getString("externalCustomerNo")); - merPlatformNoService.editMerPlatformNo(platform); - - // 终端信息 - BsMerPlatformTerm term = new BsMerPlatformTerm(); - term.setMerPlatformNoId(platform.getId()); - term.setMerId(platform.getMerId()); - term.setActiveNo(customer.getString("activeNo")); - term.setBusiTypeCode(customer.getString("bzPos")); - term.setBusiTypeName("码牌"); - term.setProductCode(customer.getString("bzPos")); - term.setProductName("码牌"); - term.setTermNo(customer.getString("termNo")); - merPlatformTermService.editMerPlatformTerm(term); - - JSONArray terminalList = merchantInfo.getJSONArray("terminalInfo"); - for (Object terminalObj : terminalList) { - JSONObject terminal = (JSONObject) terminalObj; - // 终端编号 - JSONArray termNoList = terminal.getJSONArray("termNoList"); - for (Object termNo : termNoList) { - term = new BsMerPlatformTerm(); - term.setMerPlatformNoId(platform.getId()); - term.setMerId(platform.getMerId()); - term.setActiveNo(customer.getString("activeNo")); - term.setBusiTypeCode(terminal.getString("termTypeCode")); - term.setBusiTypeName(terminal.getString("termTypeName")); - term.setProductCode(terminal.getString("termTypeCode")); - term.setProductName(terminal.getString("termTypeName")); - term.setTermId(terminal.getString("coreTermId")); - term.setTermNo(termNo.toString()); - merPlatformTermService.editMerPlatformTerm(term); + if (contractRecord.getPlatformType().equals(PlatformTypeEnum.type1.getNumber())) { + BsMerPlatformNo platform = merPlatformNoService.getPlatformNo(mer.getId(), PlatformTypeEnum.type1); + if (platform != null) { + JSONObject merchantInfo = saasMerService.merchantInfo(platform.getPlatformNo()); + // 查询申请记录 + BsMerContractRecordMsg msg = new BsMerContractRecordMsg(); + msg.setOrderNo(contractRecord.getOrderNo()); + msg.setType(1); + msg.setResponseContent(merchantInfo.toJSONString()); + merContractRecordMsgService.insertRecordMsg(msg); + + JSONObject customer = merchantInfo.getJSONObject("customer"); + // 商户状态 OPEN:开通，CLOSE:关闭，LOSS:流失, REJECT：拒绝。可用值:OPEN,ACTIVITY,WAIT_COMMIT,WAIT_AUDI,REJECT, CLOSE,INIT + if (customer.getString("customerStatus").equals("OPEN")) { + contractRecord.setStatus(2); + merContractRecordService.updateRecord(contractRecord); + + mer.setMerStatus(MerStatusEnum.status1.getNumber()); + merService.editMer(mer); + + List storeList = storeService.getStoreByMerId(mer.getId(), StoreCreateTypeEnum.type1); + if (storeList.size() > 0) { + BsStore store = storeList.get(0); + store.setStatus(StoreStatusEnum.status2.getNumber()); + storeService.editStore(store); + } + platform.setCupNo(customer.getString("externalCustomerNo")); + merPlatformNoService.editMerPlatformNo(platform); + + // 终端信息 + BsMerPlatformTerm term = new BsMerPlatformTerm(); + term.setMerPlatformNoId(platform.getId()); + term.setMerId(platform.getMerId()); + term.setActiveNo(customer.getString("activeNo")); + term.setBusiTypeCode(customer.getString("bzPos")); + term.setBusiTypeName("码牌"); + term.setProductCode(customer.getString("bzPos")); + term.setProductName("码牌"); + term.setTermNo(customer.getString("termNo")); + merPlatformTermService.editMerPlatformTerm(term); + + JSONArray terminalList = merchantInfo.getJSONArray("terminalInfo"); + for (Object terminalObj : terminalList) { + JSONObject terminal = (JSONObject) terminalObj; + // 终端编号 + JSONArray termNoList = terminal.getJSONArray("termNoList"); + for (Object termNo : termNoList) { + term = new BsMerPlatformTerm(); + term.setMerPlatformNoId(platform.getId()); + term.setMerId(platform.getMerId()); + term.setActiveNo(customer.getString("activeNo")); + term.setBusiTypeCode(terminal.getString("termTypeCode")); + term.setBusiTypeName(terminal.getString("termTypeName")); + term.setProductCode(terminal.getString("termTypeCode")); + term.setProductName(terminal.getString("termTypeName")); + term.setTermId(terminal.getString("coreTermId")); + term.setTermNo(termNo.toString()); + merPlatformTermService.editMerPlatformTerm(term); + } } - } - BsMerPlatformNo merPlatform = merPlatformNoService.getPlatformNo(mer.getId(), PlatformTypeEnum.type1); - - BsMerLedger merLedger = merLedgerService.getMerLedger(mer.getId(), PlatformTypeEnum.type1); - if (merLedger == null) { - merLedger = new BsMerLedger(); - merLedger.setMerId(mer.getId()); - merLedger.setMerName(mer.getMerName()); - merLedger.setPlatformType(merPlatform.getPlatformType()); - merLedger.setPlatformNo(merPlatform.getPlatformNo()); - merLedger.setCupNo(merPlatform.getCupNo()); - merLedger.setStatus(MerLedgerStatusEnum.status4.getNumber()); - merLedger.setReceiverStatus(false); - merLedgerService.editMerLedger(merLedger); - - laKaLaLedgerService.applyLedgerReceiver(merLedger.getMerId()); + BsMerPlatformNo merPlatform = merPlatformNoService.getPlatformNo(mer.getId(), PlatformTypeEnum.type1); + + BsMerLedger merLedger = merLedgerService.getMerLedger(mer.getId(), PlatformTypeEnum.type1); + if (merLedger == null) { + merLedger = new BsMerLedger(); + merLedger.setMerId(mer.getId()); + merLedger.setMerName(mer.getMerName()); + merLedger.setPlatformType(merPlatform.getPlatformType()); + merLedger.setPlatformNo(merPlatform.getPlatformNo()); + merLedger.setCupNo(merPlatform.getCupNo()); + merLedger.setStatus(MerLedgerStatusEnum.status4.getNumber()); + merLedger.setReceiverStatus(false); + merLedgerService.editMerLedger(merLedger); + + laKaLaLedgerService.applyLedgerReceiver(merLedger.getMerId()); + } + } else if (customer.getString("customerStatus").equals("REJECT")) { + contractRecord.setStatus(3); + merContractRecordService.updateRecord(contractRecord); + + mer.setMerStatus(MerStatusEnum.status4.getNumber()); + merService.editMer(mer); + + BsMerContractRecordMsg merContractRecordMsg = new BsMerContractRecordMsg(); + merContractRecordMsg.setOrderNo(contractRecord.getOrderNo()); + merContractRecordMsg.setType(1); + merContractRecordMsg.setResponseCode(customer.getString("customerStatus")); + merContractRecordMsg.setResponseMsg(customer.getString("auditRemark")); + merContractRecordMsgService.insertRecordMsg(merContractRecordMsg); } - } else if (customer.getString("customerStatus").equals("REJECT")) { - contractRecord.setStatus(3); - merContractRecordService.updateRecord(contractRecord); - - mer.setMerStatus(MerStatusEnum.status4.getNumber()); - merService.editMer(mer); - - BsMerContractRecordMsg merContractRecordMsg = new BsMerContractRecordMsg(); - merContractRecordMsg.setOrderNo(contractRecord.getOrderNo()); - merContractRecordMsg.setType(1); - merContractRecordMsg.setResponseCode(customer.getString("customerStatus")); - merContractRecordMsg.setResponseMsg(customer.getString("auditRemark")); - merContractRecordMsg.setResponseMsg(customer.getString("auditRemark")); - merContractRecordMsgService.insertRecordMsg(merContractRecordMsg); } } } diff --git a/service/src/main/java/com/hfkj/channel/tianque/service/TianQueMerService.java b/service/src/main/java/com/hfkj/channel/tianque/service/TianQueMerService.java index 43ced07..42fd14d 100644 --- a/service/src/main/java/com/hfkj/channel/tianque/service/TianQueMerService.java +++ b/service/src/main/java/com/hfkj/channel/tianque/service/TianQueMerService.java @@ -16,6 +16,7 @@ import com.hfkj.service.BsMerContractRecordMsgService; import com.hfkj.service.BsMerContractRecordService; import com.hfkj.service.BsMerPlatformNoService; import com.hfkj.service.BsMerService; +import com.hfkj.sysenum.MerPlatformNoStatusEnum; import com.hfkj.sysenum.MerSettleType; import com.hfkj.sysenum.MerTypeEnum; import com.hfkj.sysenum.PlatformTypeEnum; @@ -212,6 +213,7 @@ public class TianQueMerService { platform.setMerNo(basisModel.getMerNo()); platform.setPlatformType(PlatformTypeEnum.type5.getNumber()); platform.setPlatformNo(response.getString("mno")); + platform.setStatus(MerPlatformNoStatusEnum.status2.getNumber()); merPlatformNoService.editMerPlatformNo(platform); // 增加进件记录 diff --git a/service/src/main/java/com/hfkj/dao/BsMerPlatformNoMapper.java b/service/src/main/java/com/hfkj/dao/BsMerPlatformNoMapper.java index 698c32a..fe7af86 100644 --- a/service/src/main/java/com/hfkj/dao/BsMerPlatformNoMapper.java +++ b/service/src/main/java/com/hfkj/dao/BsMerPlatformNoMapper.java @@ -46,8 +46,9 @@ public interface BsMerPlatformNoMapper extends BsMerPlatformNoMapperExt { "mer_public_key, platform_operator_id, ", "platform_operator_pwd, refund_cert_url, ", "refund_cert_pwd, `status`, ", - "create_time, update_time, ", - "ext_1, ext_2, ext_3)", + "suggestion_reject, create_time, ", + "update_time, ext_1, ", + "ext_2, ext_3)", "values (#{companyId,jdbcType=BIGINT}, #{agentId,jdbcType=BIGINT}, ", "#{merId,jdbcType=BIGINT}, #{merNo,jdbcType=VARCHAR}, #{platformType,jdbcType=INTEGER}, ", "#{platformNo,jdbcType=VARCHAR}, #{cupNo,jdbcType=VARCHAR}, ", @@ -55,8 +56,9 @@ public interface BsMerPlatformNoMapper extends BsMerPlatformNoMapperExt { "#{merPublicKey,jdbcType=VARCHAR}, #{platformOperatorId,jdbcType=VARCHAR}, ", "#{platformOperatorPwd,jdbcType=VARCHAR}, #{refundCertUrl,jdbcType=VARCHAR}, ", "#{refundCertPwd,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, ", - "#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, ", - "#{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})" + "#{suggestionReject,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, ", + "#{updateTime,jdbcType=TIMESTAMP}, #{ext1,jdbcType=VARCHAR}, ", + "#{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})" }) @Options(useGeneratedKeys=true,keyProperty="id") int insert(BsMerPlatformNo record); @@ -83,6 +85,7 @@ public interface BsMerPlatformNoMapper extends BsMerPlatformNoMapperExt { @Result(column="refund_cert_url", property="refundCertUrl", jdbcType=JdbcType.VARCHAR), @Result(column="refund_cert_pwd", property="refundCertPwd", jdbcType=JdbcType.VARCHAR), @Result(column="status", property="status", jdbcType=JdbcType.INTEGER), + @Result(column="suggestion_reject", property="suggestionReject", jdbcType=JdbcType.VARCHAR), @Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP), @Result(column="update_time", property="updateTime", jdbcType=JdbcType.TIMESTAMP), @Result(column="ext_1", property="ext1", jdbcType=JdbcType.VARCHAR), @@ -95,8 +98,8 @@ public interface BsMerPlatformNoMapper extends BsMerPlatformNoMapperExt { "select", "id, company_id, agent_id, mer_id, mer_no, platform_type, platform_no, cup_no, ", "pos_id, branch_id, mer_public_key, platform_operator_id, platform_operator_pwd, ", - "refund_cert_url, refund_cert_pwd, `status`, create_time, update_time, ext_1, ", - "ext_2, ext_3", + "refund_cert_url, refund_cert_pwd, `status`, suggestion_reject, create_time, ", + "update_time, ext_1, ext_2, ext_3", "from bs_mer_platform_no", "where id = #{id,jdbcType=BIGINT}" }) @@ -117,6 +120,7 @@ public interface BsMerPlatformNoMapper extends BsMerPlatformNoMapperExt { @Result(column="refund_cert_url", property="refundCertUrl", jdbcType=JdbcType.VARCHAR), @Result(column="refund_cert_pwd", property="refundCertPwd", jdbcType=JdbcType.VARCHAR), @Result(column="status", property="status", jdbcType=JdbcType.INTEGER), + @Result(column="suggestion_reject", property="suggestionReject", jdbcType=JdbcType.VARCHAR), @Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP), @Result(column="update_time", property="updateTime", jdbcType=JdbcType.TIMESTAMP), @Result(column="ext_1", property="ext1", jdbcType=JdbcType.VARCHAR), @@ -151,6 +155,7 @@ public interface BsMerPlatformNoMapper extends BsMerPlatformNoMapperExt { "refund_cert_url = #{refundCertUrl,jdbcType=VARCHAR},", "refund_cert_pwd = #{refundCertPwd,jdbcType=VARCHAR},", "`status` = #{status,jdbcType=INTEGER},", + "suggestion_reject = #{suggestionReject,jdbcType=VARCHAR},", "create_time = #{createTime,jdbcType=TIMESTAMP},", "update_time = #{updateTime,jdbcType=TIMESTAMP},", "ext_1 = #{ext1,jdbcType=VARCHAR},", diff --git a/service/src/main/java/com/hfkj/dao/BsMerPlatformNoSqlProvider.java b/service/src/main/java/com/hfkj/dao/BsMerPlatformNoSqlProvider.java index 92ca309..c7d1d2a 100644 --- a/service/src/main/java/com/hfkj/dao/BsMerPlatformNoSqlProvider.java +++ b/service/src/main/java/com/hfkj/dao/BsMerPlatformNoSqlProvider.java @@ -88,6 +88,10 @@ public class BsMerPlatformNoSqlProvider { sql.VALUES("`status`", "#{status,jdbcType=INTEGER}"); } + if (record.getSuggestionReject() != null) { + sql.VALUES("suggestion_reject", "#{suggestionReject,jdbcType=VARCHAR}"); + } + if (record.getCreateTime() != null) { sql.VALUES("create_time", "#{createTime,jdbcType=TIMESTAMP}"); } @@ -133,6 +137,7 @@ public class BsMerPlatformNoSqlProvider { sql.SELECT("refund_cert_url"); sql.SELECT("refund_cert_pwd"); sql.SELECT("`status`"); + sql.SELECT("suggestion_reject"); sql.SELECT("create_time"); sql.SELECT("update_time"); sql.SELECT("ext_1"); @@ -219,6 +224,10 @@ public class BsMerPlatformNoSqlProvider { sql.SET("`status` = #{record.status,jdbcType=INTEGER}"); } + if (record.getSuggestionReject() != null) { + sql.SET("suggestion_reject = #{record.suggestionReject,jdbcType=VARCHAR}"); + } + if (record.getCreateTime() != null) { sql.SET("create_time = #{record.createTime,jdbcType=TIMESTAMP}"); } @@ -263,6 +272,7 @@ public class BsMerPlatformNoSqlProvider { sql.SET("refund_cert_url = #{record.refundCertUrl,jdbcType=VARCHAR}"); sql.SET("refund_cert_pwd = #{record.refundCertPwd,jdbcType=VARCHAR}"); sql.SET("`status` = #{record.status,jdbcType=INTEGER}"); + sql.SET("suggestion_reject = #{record.suggestionReject,jdbcType=VARCHAR}"); sql.SET("create_time = #{record.createTime,jdbcType=TIMESTAMP}"); sql.SET("update_time = #{record.updateTime,jdbcType=TIMESTAMP}"); sql.SET("ext_1 = #{record.ext1,jdbcType=VARCHAR}"); @@ -338,6 +348,10 @@ public class BsMerPlatformNoSqlProvider { sql.SET("`status` = #{status,jdbcType=INTEGER}"); } + if (record.getSuggestionReject() != null) { + sql.SET("suggestion_reject = #{suggestionReject,jdbcType=VARCHAR}"); + } + if (record.getCreateTime() != null) { sql.SET("create_time = #{createTime,jdbcType=TIMESTAMP}"); } diff --git a/service/src/main/java/com/hfkj/entity/BsMerPlatformNo.java b/service/src/main/java/com/hfkj/entity/BsMerPlatformNo.java index 95a8b19..4760032 100644 --- a/service/src/main/java/com/hfkj/entity/BsMerPlatformNo.java +++ b/service/src/main/java/com/hfkj/entity/BsMerPlatformNo.java @@ -89,10 +89,15 @@ public class BsMerPlatformNo implements Serializable { private String refundCertPwd; /** - * 状态 0：不可用 1：可用 + * 状态 0：不可用 1：可用 2： 审核中 3：审核驳回 */ private Integer status; + /** + * 审核驳回原因 + */ + private String suggestionReject; + /** * 创建时间 */ @@ -109,16 +114,6 @@ public class BsMerPlatformNo implements Serializable { private String ext3; - BsMerPlatformTerm merPlatformTerm; - - public BsMerPlatformTerm getMerPlatformTerm() { - return merPlatformTerm; - } - - public void setMerPlatformTerm(BsMerPlatformTerm merPlatformTerm) { - this.merPlatformTerm = merPlatformTerm; - } - private static final long serialVersionUID = 1L; public Long getId() { @@ -249,6 +244,14 @@ public class BsMerPlatformNo implements Serializable { this.status = status; } + public String getSuggestionReject() { + return suggestionReject; + } + + public void setSuggestionReject(String suggestionReject) { + this.suggestionReject = suggestionReject; + } + public Date getCreateTime() { return createTime; } @@ -317,6 +320,7 @@ public class BsMerPlatformNo implements Serializable { && (this.getRefundCertUrl() == null ? other.getRefundCertUrl() == null : this.getRefundCertUrl().equals(other.getRefundCertUrl())) && (this.getRefundCertPwd() == null ? other.getRefundCertPwd() == null : this.getRefundCertPwd().equals(other.getRefundCertPwd())) && (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus())) + && (this.getSuggestionReject() == null ? other.getSuggestionReject() == null : this.getSuggestionReject().equals(other.getSuggestionReject())) && (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime())) && (this.getUpdateTime() == null ? other.getUpdateTime() == null : this.getUpdateTime().equals(other.getUpdateTime())) && (this.getExt1() == null ? other.getExt1() == null : this.getExt1().equals(other.getExt1())) @@ -344,6 +348,7 @@ public class BsMerPlatformNo implements Serializable { result = prime * result + ((getRefundCertUrl() == null) ? 0 : getRefundCertUrl().hashCode()); result = prime * result + ((getRefundCertPwd() == null) ? 0 : getRefundCertPwd().hashCode()); result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode()); + result = prime * result + ((getSuggestionReject() == null) ? 0 : getSuggestionReject().hashCode()); result = prime * result + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode()); result = prime * result + ((getUpdateTime() == null) ? 0 : getUpdateTime().hashCode()); result = prime * result + ((getExt1() == null) ? 0 : getExt1().hashCode()); @@ -374,6 +379,7 @@ public class BsMerPlatformNo implements Serializable { sb.append(", refundCertUrl=").append(refundCertUrl); sb.append(", refundCertPwd=").append(refundCertPwd); sb.append(", status=").append(status); + sb.append(", suggestionReject=").append(suggestionReject); sb.append(", createTime=").append(createTime); sb.append(", updateTime=").append(updateTime); sb.append(", ext1=").append(ext1); @@ -383,4 +389,4 @@ public class BsMerPlatformNo implements Serializable { sb.append("]"); return sb.toString(); } -} +} \ No newline at end of file diff --git a/service/src/main/java/com/hfkj/entity/BsMerPlatformNoExample.java b/service/src/main/java/com/hfkj/entity/BsMerPlatformNoExample.java index 4484200..5b19c51 100644 --- a/service/src/main/java/com/hfkj/entity/BsMerPlatformNoExample.java +++ b/service/src/main/java/com/hfkj/entity/BsMerPlatformNoExample.java @@ -1185,6 +1185,76 @@ public class BsMerPlatformNoExample { return (Criteria) this; } + public Criteria andSuggestionRejectIsNull() { + addCriterion("suggestion_reject is null"); + return (Criteria) this; + } + + public Criteria andSuggestionRejectIsNotNull() { + addCriterion("suggestion_reject is not null"); + return (Criteria) this; + } + + public Criteria andSuggestionRejectEqualTo(String value) { + addCriterion("suggestion_reject =", value, "suggestionReject"); + return (Criteria) this; + } + + public Criteria andSuggestionRejectNotEqualTo(String value) { + addCriterion("suggestion_reject <>", value, "suggestionReject"); + return (Criteria) this; + } + + public Criteria andSuggestionRejectGreaterThan(String value) { + addCriterion("suggestion_reject >", value, "suggestionReject"); + return (Criteria) this; + } + + public Criteria andSuggestionRejectGreaterThanOrEqualTo(String value) { + addCriterion("suggestion_reject >=", value, "suggestionReject"); + return (Criteria) this; + } + + public Criteria andSuggestionRejectLessThan(String value) { + addCriterion("suggestion_reject <", value, "suggestionReject"); + return (Criteria) this; + } + + public Criteria andSuggestionRejectLessThanOrEqualTo(String value) { + addCriterion("suggestion_reject <=", value, "suggestionReject"); + return (Criteria) this; + } + + public Criteria andSuggestionRejectLike(String value) { + addCriterion("suggestion_reject like", value, "suggestionReject"); + return (Criteria) this; + } + + public Criteria andSuggestionRejectNotLike(String value) { + addCriterion("suggestion_reject not like", value, "suggestionReject"); + return (Criteria) this; + } + + public Criteria andSuggestionRejectIn(List values) { + addCriterion("suggestion_reject in", values, "suggestionReject"); + return (Criteria) this; + } + + public Criteria andSuggestionRejectNotIn(List values) { + addCriterion("suggestion_reject not in", values, "suggestionReject"); + return (Criteria) this; + } + + public Criteria andSuggestionRejectBetween(String value1, String value2) { + addCriterion("suggestion_reject between", value1, value2, "suggestionReject"); + return (Criteria) this; + } + + public Criteria andSuggestionRejectNotBetween(String value1, String value2) { + addCriterion("suggestion_reject not between", value1, value2, "suggestionReject"); + return (Criteria) this; + } + public Criteria andCreateTimeIsNull() { addCriterion("create_time is null"); return (Criteria) this; diff --git a/service/src/main/java/com/hfkj/sysenum/MerPlatformNoStatusEnum.java b/service/src/main/java/com/hfkj/sysenum/MerPlatformNoStatusEnum.java new file mode 100644 index 0000000..c43da7e --- /dev/null +++ b/service/src/main/java/com/hfkj/sysenum/MerPlatformNoStatusEnum.java @@ -0,0 +1,51 @@ +package com.hfkj.sysenum; + +import java.util.Objects; + +/** + * @className: MerPlatformNoStatus + * @author: HuRui + * @date: 2023/8/30 + **/ +public enum MerPlatformNoStatusEnum { + status0(0, "不可用"), + status1(1, "可用"), + status2(2, "审核中"), + status3(3, "审核驳回"), + ; + + private Integer number; + + private String name; + + + MerPlatformNoStatusEnum(int number, String name) { + this.number = number; + this.name = name; + } + + public static MerPlatformNoStatusEnum getDataByNumber(Integer number) { + for (MerPlatformNoStatusEnum ele : values()) { + if (Objects.equals(number,ele.getNumber())) { + return ele; + } + } + return null; + } + + public Integer getNumber() { + return number; + } + + public void setNumber(Integer number) { + this.number = number; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } +}