Commit ac418c19 authored by shiyu's avatar shiyu

完成订单结款计算2

parent 6ff04b0d
...@@ -237,8 +237,8 @@ public class SysFinanceServiceImpl implements SysFinanceService { ...@@ -237,8 +237,8 @@ public class SysFinanceServiceImpl implements SysFinanceService {
public Result exportUserBillDetail(UserAccountDetailRequestDto dto) { public Result exportUserBillDetail(UserAccountDetailRequestDto dto) {
try { try {
UserBillRequestDto userBillRequestDto = new UserBillRequestDto(); UserBillRequestDto userBillRequestDto = new UserBillRequestDto();
dto.setUserId(dto.getUserId()); userBillRequestDto.setUserId(dto.getUserId());
dto.setAccountPeriod(dto.getAccountPeriod()); userBillRequestDto.setAccountPeriod(dto.getAccountPeriod());
//查询某一个藏家的账单 //查询某一个藏家的账单
Result result = findUserBill(userBillRequestDto); Result result = findUserBill(userBillRequestDto);
if (!result.getSuccess()) { if (!result.getSuccess()) {
......
...@@ -16,6 +16,7 @@ import org.slf4j.Logger; ...@@ -16,6 +16,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport; import org.springframework.transaction.interceptor.TransactionAspectSupport;
...@@ -39,6 +40,7 @@ public class SysUserBillServiceImpl implements SysUserBillService { ...@@ -39,6 +40,7 @@ public class SysUserBillServiceImpl implements SysUserBillService {
@Autowired @Autowired
DistributorProfitDao distributorProfitDao; DistributorProfitDao distributorProfitDao;
@Transactional(propagation = Propagation.REQUIRES_NEW)
@Override @Override
public Result finishCalculate(DistributionOrder distributionOrder) throws Exception{ public Result finishCalculate(DistributionOrder distributionOrder) throws Exception{
SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM"); SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment