xiongzhu 3 anni fa
parent
commit
7dc3ae0ea0

+ 4 - 4
src/main/java/com/izouma/nineth/service/OrderPayService.java

@@ -492,7 +492,7 @@ public class OrderPayService {
                 order.getUserId().toString(), bindCardId, Constants.OrderNotifyType.RECHARGE);
     }
 
-    public String rechargeQuick(Long userId, BigDecimal amount) {
+    public String rechargeQuick(Long userId, BigDecimal amount, Long companyId) {
         BigDecimal minAmount = sysConfigService.getBigDecimal("min_recharge_amount");
         if (amount.compareTo(minAmount) < 0) {
             throw new BusinessException("充值金额不能小于" + minAmount);
@@ -509,10 +509,10 @@ public class OrderPayService {
         rechargeOrderRepo.save(order);
         return sandPayService.payQuick(order.getId() + "", "余额充值",
                 order.getAmount(), LocalDateTime.now().plusMinutes(3), Constants.OrderNotifyType.RECHARGE,
-                generalProperties.resolveFrontUrl(getCompanyId(), "/home"));
+                generalProperties.resolveFrontUrl(companyId, "/home"));
     }
 
-    public String rechargeQuickBind(Long userId, BigDecimal amount) {
+    public String rechargeQuickBind(Long userId, BigDecimal amount, Long companyId) {
         BigDecimal minAmount = sysConfigService.getBigDecimal("min_recharge_amount");
         if (amount.compareTo(minAmount) < 0) {
             throw new BusinessException("充值金额不能小于" + minAmount);
@@ -531,7 +531,7 @@ public class OrderPayService {
         rechargeOrderRepo.save(order);
         return sandPayService.payQuickBind(order.getId() + "", "余额充值",
                 order.getAmount(), LocalDateTime.now().plusMinutes(3), Constants.OrderNotifyType.RECHARGE,
-                generalProperties.resolveFrontUrl(getCompanyId(), "/home"),
+                generalProperties.resolveFrontUrl(companyId, "/home"),
                 userId, identityAuth.getRealName(), identityAuth.getIdNo());
     }
 

+ 6 - 4
src/main/java/com/izouma/nineth/web/OrderPayControllerV2.java

@@ -199,14 +199,16 @@ public class OrderPayControllerV2 {
 
     @RequestMapping(value = "/recharge/sandQuick", produces = "text/html")
     @ResponseBody
-    public String payRechargeQuick(@RequestParam Long userId, @RequestParam BigDecimal amount) {
-        return orderPayService.rechargeQuick(userId, amount);
+    public String payRechargeQuick(@RequestParam Long userId, @RequestParam BigDecimal amount,
+                                   @RequestParam(defaultValue = "1") Long companyId) {
+        return orderPayService.rechargeQuick(userId, amount, companyId);
     }
 
     @RequestMapping("/recharge/sandQuickBind")
     @ResponseBody
-    public String payRechargeQuickBind(@RequestParam Long userId, @RequestParam BigDecimal amount) {
-        return orderPayService.rechargeQuickBind(userId, amount);
+    public String payRechargeQuickBind(@RequestParam Long userId, @RequestParam BigDecimal amount,
+                                       @RequestParam(defaultValue = "1") Long companyId) {
+        return orderPayService.rechargeQuickBind(userId, amount, companyId);
     }
 
     @RequestMapping(value = "/auction/alipay", method = RequestMethod.GET)