Просмотр исходного кода

fix cashout

release_toaliyun_real
xiaohanzi 5 лет назад
Родитель
Сommit
87aa1aa4ec
2 измененных файлов: 8 добавлений и 2 удалений
  1. +5
    -0
      mallinkBApi/src/main/java/com/iformall/controller/WxCashOutController.java
  2. +3
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxCashOutServiceImpl.java

+ 5
- 0
mallinkBApi/src/main/java/com/iformall/controller/WxCashOutController.java Просмотреть файл

@@ -15,6 +15,11 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;


/**
* 提现。微信需要小程序开通“企业付款到零钱”功能。
* @author alascor
*
*/
@RestController @RestController
@RequestMapping("/api/cashout") @RequestMapping("/api/cashout")
@Api(description = "提现相关接口") @Api(description = "提现相关接口")


+ 3
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxCashOutServiceImpl.java Просмотреть файл

@@ -120,6 +120,7 @@ public class WxCashOutServiceImpl implements WxCashOutService {
//扣掉账户金额 //扣掉账户金额
//此处需要加锁,防止并发设置 //此处需要加锁,防止并发设置
Integer olderCashOutNumber = merchant.getCashOutNumber();
long time = System.currentTimeMillis() + RedisLock.TIMEOUT; long time = System.currentTimeMillis() + RedisLock.TIMEOUT;
String timeStr = String.valueOf(time); String timeStr = String.valueOf(time);
boolean cashsetlock = redisLock.lock("merchantLockReduceCashSet_"+merchant.getId(), timeStr); boolean cashsetlock = redisLock.lock("merchantLockReduceCashSet_"+merchant.getId(), timeStr);
@@ -173,13 +174,13 @@ public class WxCashOutServiceImpl implements WxCashOutService {
map.put("variables", variablesList); map.put("variables", variablesList);
wxFlowService.start(map, buser.getId(), buser.getName(), buser); wxFlowService.start(map, buser.getId(), buser.getName(), buser);
return new ResultData(Result.SUCCESS,"提现提交审批成功");
return new ResultData(Result.SUCCESS,"提现提交审批成功",olderCashOutNumber-record.getTotalFee());
}else { }else {
//没有审批则发送消息 //没有审批则发送消息
sendCashOutMsg(merchant, cashout.getId(),payWay); sendCashOutMsg(merchant, cashout.getId(),payWay);
} }
return new ResultData("提现提交成功。");
return new ResultData(Result.SUCCESS,"提现提交成功。",olderCashOutNumber-record.getTotalFee());
} }
protected boolean hasWorkFlow(TenantEntity tenantEntity) { protected boolean hasWorkFlow(TenantEntity tenantEntity) {


Загрузка…
Отмена
Сохранить