diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleServiceImpl.java index ae0efe323..0b7a9f740 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleServiceImpl.java @@ -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())) { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java index b24812d32..3fb3138ae 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java @@ -320,6 +320,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { merchantSubsidy.setUpdateDate(curDate); merchantSubsidy.setType(EnumMerchantSubsidyType.WECHAT.getCode()); merchantSubsidy.setSource(EnumMerchantSubsidySource.CARD.getCode()); + merchantSubsidy.setStatus(EnumMerchantSubsidyStatus.NOT_SUBSIDY.getCode()); wxMerchantSubsidyMapper.insert(merchantSubsidy); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java index 657b6e9ca..f0cd4dda8 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -39,7 +39,6 @@ import java.math.BigDecimal; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; -import java.util.stream.Collectors; @Service public class WxCouponOrderServiceImpl implements WxCouponOrderService { @@ -492,6 +491,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { merchantSubsidy.setType(EnumMerchantSubsidyType.WECHAT.getCode()); merchantSubsidy.setCreateDate(curDate); merchantSubsidy.setUpdateDate(curDate); + merchantSubsidy.setStatus(EnumMerchantSubsidyStatus.NOT_SUBSIDY.getCode()); wxMerchantSubsidyMapper.insert(merchantSubsidy); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java index 9691bad22..2c363d5e6 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java @@ -1410,6 +1410,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { merchantSubsidy.setRealSubsidy(record.getPayAmount()); merchantSubsidy.setCreateDate(curDate); merchantSubsidy.setUpdateDate(curDate); + merchantSubsidy.setStatus(EnumMerchantSubsidyStatus.NOT_SUBSIDY.getCode()); merchantSubsidy.setType(EnumMerchantSubsidyType.WECHAT.getCode()); merchantSubsidy.setSource(EnumMerchantSubsidySource.CASHIER.getCode()); wxMerchantSubsidyMapper.insert(merchantSubsidy);