diff --git a/src/main/java/com/peanut/modules/book/controller/BuyOrderController.java b/src/main/java/com/peanut/modules/book/controller/BuyOrderController.java index 32f2194..3518470 100644 --- a/src/main/java/com/peanut/modules/book/controller/BuyOrderController.java +++ b/src/main/java/com/peanut/modules/book/controller/BuyOrderController.java @@ -41,6 +41,7 @@ import com.peanut.modules.pay.weChatPay.service.WxpayService; import com.peanut.modules.sys.entity.SysConfigEntity; import com.peanut.modules.sys.service.SysConfigService; import lombok.extern.slf4j.Slf4j; +import org.apache.http.HttpException; import org.apache.poi.ss.usermodel.Row; import org.apache.poi.ss.usermodel.Sheet; import org.apache.poi.xssf.usermodel.XSSFWorkbook; @@ -676,6 +677,7 @@ public class BuyOrderController { } //设置状态为已退款 buyOrder.setOrderStatus(Constants.ORDER_STATUS_REFUNDING); + buyOrderService.updateById(buyOrder); BigDecimal refundFee = buyOrder.getRealMoney(); BigDecimal shippingMoney = buyOrder.getShippingMoney()==null?BigDecimal.ZERO:buyOrder.getShippingMoney(); @@ -742,7 +744,11 @@ public class BuyOrderController { } else if (buyOrder.getCome()==4) { weChatRefundInfo.setAppName("thyy"); } - wxpayService.refund(weChatRefundInfo); + try { + wxpayService.refund(weChatRefundInfo); + } catch (Exception e) { + System.out.println("msg=" + e.getMessage()); // 👈 关键 + } } } // else if (Constants.PAYMENT_METHOD_ALI_PAY.equals(buyOrder.getPaymentMethod())) { diff --git a/src/main/java/com/peanut/modules/pay/refund/entity/PayRefundOrder.java b/src/main/java/com/peanut/modules/pay/refund/entity/PayRefundOrder.java index 0116285..eb79ff8 100644 --- a/src/main/java/com/peanut/modules/pay/refund/entity/PayRefundOrder.java +++ b/src/main/java/com/peanut/modules/pay/refund/entity/PayRefundOrder.java @@ -19,7 +19,9 @@ public class PayRefundOrder implements Serializable { @TableId - private Integer refundId; + private Integer id; + + private String refundId; /** * 支付方式 1微信,2支付宝,3虚拟币 @@ -29,8 +31,9 @@ public class PayRefundOrder implements Serializable { /** * BuyOrder */ - private Integer orderId; + private String orderSn; + private Integer orderId; /** * 微信支付宝订单号 */ diff --git a/src/main/java/com/peanut/modules/pay/weChatPay/service/impl/WxpayServiceImpl.java b/src/main/java/com/peanut/modules/pay/weChatPay/service/impl/WxpayServiceImpl.java index 88b2cff..7d7a316 100644 --- a/src/main/java/com/peanut/modules/pay/weChatPay/service/impl/WxpayServiceImpl.java +++ b/src/main/java/com/peanut/modules/pay/weChatPay/service/impl/WxpayServiceImpl.java @@ -369,7 +369,7 @@ public class WxpayServiceImpl extends ServiceImpl amountMap = new HashMap<>(); - amountMap.put("refund", refund.multiply(hand)); + amountMap.put("refund", refund.multiply(hand).intValue()); amountMap.put("total", total.multiply(hand).intValue()); amountMap.put("currency", "CNY"); paramMap.put("amount", amountMap); @@ -392,14 +392,18 @@ public class WxpayServiceImpl extends ServiceImpl - + +