|
|
|
@@ -2,7 +2,6 @@ package com.iformall.service.impl; |
|
|
|
|
|
|
|
import com.github.pagehelper.PageHelper; |
|
|
|
import com.github.pagehelper.PageInfo; |
|
|
|
import com.iformall.common.ErrorCode; |
|
|
|
import com.iformall.common.IdWorker; |
|
|
|
import com.iformall.common.ResultData; |
|
|
|
import com.iformall.domain.po.*; |
|
|
|
@@ -17,10 +16,13 @@ import org.apache.commons.collections.CollectionUtils; |
|
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
|
import org.springframework.stereotype.Service; |
|
|
|
import org.springframework.transaction.annotation.Transactional; |
|
|
|
|
|
|
|
import javax.servlet.http.HttpServletRequest; |
|
|
|
import javax.servlet.http.HttpServletResponse; |
|
|
|
import java.math.BigDecimal; |
|
|
|
import java.util.*; |
|
|
|
import java.util.ArrayList; |
|
|
|
import java.util.Date; |
|
|
|
import java.util.List; |
|
|
|
|
|
|
|
/** |
|
|
|
* @author luozukai |
|
|
|
@@ -341,7 +343,7 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { |
|
|
|
wxMerchantSubsidy.setId(bill.getBillId()); |
|
|
|
if(freezeStatus != null) wxMerchantSubsidy.setFreeze(freezeStatus); |
|
|
|
if(status != null){ |
|
|
|
wxMerchantSubsidy.setStatus(status); |
|
|
|
wxMerchantSubsidy.setStatus(EnumMerchantSubsidyStatus.MANUAL_SUBSIDIED.getCode()); |
|
|
|
} |
|
|
|
wxMerchantSubsidyMapper.updateById(wxMerchantSubsidy); |
|
|
|
}else if(EnumBillType.OTHER_DEPOSIT.getCode().equals(bill.getBillType())) { |
|
|
|
|