fanli/src/main/java/com/yeshi/fanli/entity/bus/user/ExtractWeiXinRecord.java
@@ -16,6 +16,9 @@ @Table("yeshi_ec_extract_weixin_record") public class ExtractWeiXinRecord { public static int TYPE_MANUAL = 1;// 手动 public static int TYPE_AUTO = 2; // 自动 public static String SENDING = "SENDING";// 发放中 public static String SENT = "SENT"; // 已发放待领取 public static String FAILED = "FAILED"; // 发放失败 @@ -75,6 +78,10 @@ @Column(name = "aer_total_num") private Integer totalNum; // 发送方式:1手动 2自动 @Column(name = "aer_type") private Integer type; @Column(name = "aer_create_time") private Date createTime; @@ -202,5 +209,13 @@ public void setTotalNum(Integer totalNum) { this.totalNum = totalNum; } public Integer getType() { return type; } public void setType(Integer type) { this.type = type; } } fanli/src/main/java/com/yeshi/fanli/service/impl/money/extract/ExtractServiceImpl.java
@@ -1,5 +1,6 @@ package com.yeshi.fanli.service.impl.money.extract; import java.io.IOException; import java.io.InputStream; import java.math.BigDecimal; import java.util.ArrayList; @@ -791,7 +792,7 @@ redPackParams.setMoney(money); redPackParams.setTotalNum(1); redPackParams.setWishing("账户中剩余余额请在本App内完成提现"); redPackParams.setClientIp("106.80.118.211"); redPackParams.setClientIp("106.80.118.163"); redPackParams.setActName("自动提现"); redPackParams.setKey(key); redPackParams.setRemark("微信自动提现"); @@ -823,6 +824,11 @@ updeteRecord = parseDTO(redPackRecord); } LogHelper.errorDetailInfo(e); } try { cert.close(); } catch (IOException e1) { e1.printStackTrace(); } // 更新信息 @@ -943,4 +949,13 @@ return null; } public void downAutoOpenIdFile() { } } utils/src/main/java/org/yeshi/utils/wx/WXPayUtil.java
@@ -57,7 +57,6 @@ Map<String, String> map = new HashMap<>(); map.put("nonce_str", StringUtil.getRandomCode(32)); map.put("sign", WXUtil.getSignMD5(map, params.getKey())); map.put("mch_billno", params.getBillno()); map.put("mch_id", params.getMchId()); map.put("wxappid", params.getWxappId()); @@ -69,8 +68,14 @@ map.put("client_ip", params.getClientIp()); map.put("act_name", params.getActName()); map.put("remark", params.getRemark()); map.put("scene_id", params.getSceneId()); map.put("risk_info", params.getRiskInfo()); if (!StringUtil.isNullOrEmpty(params.getSceneId())) map.put("scene_id", params.getSceneId()); if (!StringUtil.isNullOrEmpty(params.getRiskInfo())) map.put("risk_info", params.getRiskInfo()); map.put("sign", WXUtil.getSignMD5(map, params.getKey())); String entity = WXUtil.loadWXMessage(map); try { String result = HttpUtil.httpsPost("https://api.mch.weixin.qq.com/mmpaymkttransfers/sendredpack",