| @@ -2,7 +2,6 @@ package com.iformall.service.impl; | |||||
| import com.github.pagehelper.PageHelper; | import com.github.pagehelper.PageHelper; | ||||
| import com.github.pagehelper.PageInfo; | import com.github.pagehelper.PageInfo; | ||||
| import com.iformall.common.ErrorCode; | |||||
| import com.iformall.common.IdWorker; | import com.iformall.common.IdWorker; | ||||
| import com.iformall.common.ResultData; | import com.iformall.common.ResultData; | ||||
| import com.iformall.domain.po.*; | 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.beans.factory.annotation.Autowired; | ||||
| import org.springframework.stereotype.Service; | import org.springframework.stereotype.Service; | ||||
| import org.springframework.transaction.annotation.Transactional; | import org.springframework.transaction.annotation.Transactional; | ||||
| import javax.servlet.http.HttpServletRequest; | import javax.servlet.http.HttpServletRequest; | ||||
| import javax.servlet.http.HttpServletResponse; | import javax.servlet.http.HttpServletResponse; | ||||
| import java.math.BigDecimal; | import java.math.BigDecimal; | ||||
| import java.util.*; | |||||
| import java.util.ArrayList; | |||||
| import java.util.Date; | |||||
| import java.util.List; | |||||
| /** | /** | ||||
| * @author luozukai | * @author luozukai | ||||
| @@ -341,7 +343,7 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { | |||||
| wxMerchantSubsidy.setId(bill.getBillId()); | wxMerchantSubsidy.setId(bill.getBillId()); | ||||
| if(freezeStatus != null) wxMerchantSubsidy.setFreeze(freezeStatus); | if(freezeStatus != null) wxMerchantSubsidy.setFreeze(freezeStatus); | ||||
| if(status != null){ | if(status != null){ | ||||
| wxMerchantSubsidy.setStatus(status); | |||||
| wxMerchantSubsidy.setStatus(EnumMerchantSubsidyStatus.MANUAL_SUBSIDIED.getCode()); | |||||
| } | } | ||||
| wxMerchantSubsidyMapper.updateById(wxMerchantSubsidy); | wxMerchantSubsidyMapper.updateById(wxMerchantSubsidy); | ||||
| }else if(EnumBillType.OTHER_DEPOSIT.getCode().equals(bill.getBillType())) { | }else if(EnumBillType.OTHER_DEPOSIT.getCode().equals(bill.getBillType())) { | ||||
| @@ -320,6 +320,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { | |||||
| merchantSubsidy.setUpdateDate(curDate); | merchantSubsidy.setUpdateDate(curDate); | ||||
| merchantSubsidy.setType(EnumMerchantSubsidyType.WECHAT.getCode()); | merchantSubsidy.setType(EnumMerchantSubsidyType.WECHAT.getCode()); | ||||
| merchantSubsidy.setSource(EnumMerchantSubsidySource.CARD.getCode()); | merchantSubsidy.setSource(EnumMerchantSubsidySource.CARD.getCode()); | ||||
| merchantSubsidy.setStatus(EnumMerchantSubsidyStatus.NOT_SUBSIDY.getCode()); | |||||
| wxMerchantSubsidyMapper.insert(merchantSubsidy); | wxMerchantSubsidyMapper.insert(merchantSubsidy); | ||||
| } | } | ||||
| @@ -39,7 +39,6 @@ import java.math.BigDecimal; | |||||
| import java.text.ParseException; | import java.text.ParseException; | ||||
| import java.text.SimpleDateFormat; | import java.text.SimpleDateFormat; | ||||
| import java.util.*; | import java.util.*; | ||||
| import java.util.stream.Collectors; | |||||
| @Service | @Service | ||||
| public class WxCouponOrderServiceImpl implements WxCouponOrderService { | public class WxCouponOrderServiceImpl implements WxCouponOrderService { | ||||
| @@ -492,6 +491,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { | |||||
| merchantSubsidy.setType(EnumMerchantSubsidyType.WECHAT.getCode()); | merchantSubsidy.setType(EnumMerchantSubsidyType.WECHAT.getCode()); | ||||
| merchantSubsidy.setCreateDate(curDate); | merchantSubsidy.setCreateDate(curDate); | ||||
| merchantSubsidy.setUpdateDate(curDate); | merchantSubsidy.setUpdateDate(curDate); | ||||
| merchantSubsidy.setStatus(EnumMerchantSubsidyStatus.NOT_SUBSIDY.getCode()); | |||||
| wxMerchantSubsidyMapper.insert(merchantSubsidy); | wxMerchantSubsidyMapper.insert(merchantSubsidy); | ||||
| } | } | ||||
| @@ -1410,6 +1410,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { | |||||
| merchantSubsidy.setRealSubsidy(record.getPayAmount()); | merchantSubsidy.setRealSubsidy(record.getPayAmount()); | ||||
| merchantSubsidy.setCreateDate(curDate); | merchantSubsidy.setCreateDate(curDate); | ||||
| merchantSubsidy.setUpdateDate(curDate); | merchantSubsidy.setUpdateDate(curDate); | ||||
| merchantSubsidy.setStatus(EnumMerchantSubsidyStatus.NOT_SUBSIDY.getCode()); | |||||
| merchantSubsidy.setType(EnumMerchantSubsidyType.WECHAT.getCode()); | merchantSubsidy.setType(EnumMerchantSubsidyType.WECHAT.getCode()); | ||||
| merchantSubsidy.setSource(EnumMerchantSubsidySource.CASHIER.getCode()); | merchantSubsidy.setSource(EnumMerchantSubsidySource.CASHIER.getCode()); | ||||
| wxMerchantSubsidyMapper.insert(merchantSubsidy); | wxMerchantSubsidyMapper.insert(merchantSubsidy); | ||||