dcs 3 weeks ago
parent
commit
e117a749b3

+ 6 - 2
virgo.api/src/main/java/com/bosshand/virgo/api/workark/controller/WxPayController.java

@@ -75,7 +75,11 @@ public class WxPayController {
     public Response transfer(@PathVariable String openid, @PathVariable BigDecimal money){
 
         log.info("发起提现请求");
-        return Response.ok(wxTransferService.transfer(openid, money));
+        String packageInfo = wxTransferService.transfer(openid, money);
+        if(packageInfo == null){
+            return Response.fail(20000,"账户余额不足");
+        }
+        return Response.ok(packageInfo);
     }
 
     /**
@@ -244,7 +248,7 @@ public class WxPayController {
 
     /**
      * 转账结果通知
-     * 转账状态改变后,微信会把相关退款结果发送给商户。
+     * 转账状态改变后,微信会把相关转账结果发送给商户。
      */
     @ApiOperation("转账结果通知")
     @PostMapping("/transfer/notify")

+ 7 - 0
virgo.api/src/main/java/com/bosshand/virgo/api/workark/service/WxTransferService.java

@@ -40,6 +40,13 @@ public class WxTransferService {
 
         long userId = ContextUtils.getUserContext().getUserId();
 
+        // 判断提现金额是否大于账户余额
+        AccountBalance accountBalance = accountBalanceDao.getUserId(userId);
+        int r = accountBalance.getTotalFee().compareTo(money);
+        if (r < 0) {
+            return null;
+        }
+
         TransferInfo transferInfo = new TransferInfo();
         transferInfo.setOpenId(openId);
         transferInfo.setUserId(userId);