diff --git a/.idea/CoolRequestCommonStatePersistent.xml b/.idea/CoolRequestCommonStatePersistent.xml deleted file mode 100644 index de15b00..0000000 --- a/.idea/CoolRequestCommonStatePersistent.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/main/java/com/guahao/api/walkinto/service/WxPayService.java b/src/main/java/com/guahao/api/walkinto/service/WxPayService.java index 3d36255..0af7708 100644 --- a/src/main/java/com/guahao/api/walkinto/service/WxPayService.java +++ b/src/main/java/com/guahao/api/walkinto/service/WxPayService.java @@ -185,6 +185,10 @@ public class WxPayService { UserVo userVo = userService.queryUserInfoDetails(uo.getUser_id()); String openid = userVo.getOpenid(); txSendMsg.SendNotifyYJJ(uo,openid); + }else { + //写入his失败,执行退款处理 + refundOrder(uo.getCode(),AmountUtil.doubleToStr(uo.getMoney())); + } } }else if (wxResult.getOut_trade_no().startsWith("BA")){ diff --git a/src/main/java/com/guahao/common/util/AmountUtil.java b/src/main/java/com/guahao/common/util/AmountUtil.java index 98747c7..e573e1c 100644 --- a/src/main/java/com/guahao/common/util/AmountUtil.java +++ b/src/main/java/com/guahao/common/util/AmountUtil.java @@ -68,4 +68,8 @@ public final class AmountUtil { BigDecimal amountB = parseAmount(b, BigDecimal.ZERO); return amountA.compareTo(amountB); } + // Double金额转为String金额 + public static String doubleToStr(Double amount) { + return String.format("%.2f", amount); + } } \ No newline at end of file diff --git a/src/main/java/com/guahao/h5/user/service/UserOrderService.java b/src/main/java/com/guahao/h5/user/service/UserOrderService.java index 12d3ad7..62f406c 100644 --- a/src/main/java/com/guahao/h5/user/service/UserOrderService.java +++ b/src/main/java/com/guahao/h5/user/service/UserOrderService.java @@ -509,7 +509,7 @@ public class UserOrderService { str.append(""); str.append(""); - str.append("wx"); + str.append("微信"); str.append(""); str.append("");