src/main/java/project/blockchain/RechargeBlockchainService.java
@@ -46,4 +46,6 @@ public boolean saveReject(RechargeBlockchain recharge); void callback(String timestamp, String nonce, String sign, String body); List<RechargeBlockchain> getByAddressUndone(String channelAddress); } src/main/java/project/blockchain/internal/RechargeBlockchainServiceImpl.java
@@ -379,7 +379,7 @@ * 根据区块地址获取充值订单 */ public RechargeBlockchain getAddress(String address) { List<RechargeBlockchain> list = jdbcTemplate.query("SELECT * FROM T_RECHARGE_BLOCKCHAIN_ORDER WHERE CHANNEL_ADDRESS=?", RecordObjectMapper.newInstance(RechargeBlockchain.class), address); List<RechargeBlockchain> list = jdbcTemplate.query("SELECT * FROM T_RECHARGE_BLOCKCHAIN_ORDER WHERE succeeded = 0 and CHANNEL_ADDRESS=?", RecordObjectMapper.newInstance(RechargeBlockchain.class), address); if (null != list && list.size() > 0) { return list.get(0); } @@ -849,6 +849,17 @@ } } @Override public List<RechargeBlockchain> getByAddressUndone(String channelAddress) { return getUndone(channelAddress); } public List<RechargeBlockchain> getUndone(String channelAddress){ List<RechargeBlockchain> list = jdbcTemplate.query("SELECT * FROM T_RECHARGE_BLOCKCHAIN_ORDER WHERE succeeded = 0 and CHANNEL_ADDRESS=?", RecordObjectMapper.newInstance(RechargeBlockchain.class), channelAddress); return list; } public void insertRechargeBlockchain(RechargeBlockchain rechargeBlockchain) { Object[] jdbcParams = ApplicationUtil.getInsertStatement(rechargeBlockchain); String insertUserSql = (String)jdbcParams[0]; src/main/java/project/web/api/RechargeBlockchainController.java
@@ -7,6 +7,7 @@ import javax.servlet.http.HttpServletRequest; import cn.hutool.core.collection.CollectionUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -144,7 +145,10 @@ } } } List<RechargeBlockchain> rechargeBlockchainList = rechargeBlockchainService.getByAddressUndone( channel_address); if(CollectionUtil.isNotEmpty(rechargeBlockchainList)){ throw new BusinessException("Please wait until the previous recharge is completed!"); } //存储充值申请订单记录 RechargeBlockchain recharge = new RechargeBlockchain(); recharge.setAddress(from); src/main/java/project/web/api/UserWalletAddressController.java
@@ -65,7 +65,7 @@ private final String gateway = "https://sig11.udun.io"; private final String merchantKey = "7fd79e4ed59e7c31e1fa2e13d64f7e6c"; private final String merchantId = "319563"; private final String defaultCallBackUrl = "https://coin.usadeepcoin.com/wap/api/user!rechargeCallback.action"; private final String defaultCallBackUrl = "https://eu.deepcoineu.com/wap/api/user!rechargeCallback.action";