| @@ -8,19 +8,15 @@ import com.iformall.common.ResultData; | |||||
| import com.iformall.domain.po.*; | import com.iformall.domain.po.*; | ||||
| import com.iformall.domain.vo.WxBillSettleVo; | import com.iformall.domain.vo.WxBillSettleVo; | ||||
| import com.iformall.enums.*; | import com.iformall.enums.*; | ||||
| import com.iformall.exception.MallinkException; | |||||
| import com.iformall.mapper.*; | import com.iformall.mapper.*; | ||||
| import com.iformall.service.ExcelService; | import com.iformall.service.ExcelService; | ||||
| import com.iformall.service.WxBillSettleService; | import com.iformall.service.WxBillSettleService; | ||||
| import com.iformall.service.WxFlowService; | import com.iformall.service.WxFlowService; | ||||
| import com.iformall.utils.DateUtils; | import com.iformall.utils.DateUtils; | ||||
| import io.swagger.models.auth.In; | |||||
| import org.apache.commons.collections.CollectionUtils; | 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.mail.search.SearchTerm; | |||||
| 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; | ||||
| @@ -192,6 +188,7 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { | |||||
| if(dbBill!=null) { | if(dbBill!=null) { | ||||
| wxBillRent.setPay(dbBill.getReceivePay()); //押金是ReceivePay | wxBillRent.setPay(dbBill.getReceivePay()); //押金是ReceivePay | ||||
| wxBillRent.setPayDate(new Date()); | wxBillRent.setPayDate(new Date()); | ||||
| wxBillRent.setStatus(EnumBillRentStatus.RETURN.getCode()); | |||||
| addBillAction(bill.getBillId(), dbBill.getOwe()); | addBillAction(bill.getBillId(), dbBill.getOwe()); | ||||
| } | } | ||||
| } | } | ||||
| @@ -209,6 +206,7 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { | |||||
| if(dbBill!=null) { | if(dbBill!=null) { | ||||
| wxBillOtherDeposit.setPay(dbBill.getReceivePay()); | wxBillOtherDeposit.setPay(dbBill.getReceivePay()); | ||||
| wxBillOtherDeposit.setPayDate(new Date()); | wxBillOtherDeposit.setPayDate(new Date()); | ||||
| wxBillOtherDeposit.setStatus(EnumBillRentStatus.RETURN.getCode()); | |||||
| addBillAction(bill.getBillId(), dbBill.getOwe()); | addBillAction(bill.getBillId(), dbBill.getOwe()); | ||||
| } | } | ||||
| } | } | ||||
| @@ -226,6 +224,7 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { | |||||
| if(dbBill!=null) { | if(dbBill!=null) { | ||||
| propertyDeposit.setPay(dbBill.getReceivePay()); | propertyDeposit.setPay(dbBill.getReceivePay()); | ||||
| propertyDeposit.setPayDate(new Date()); | propertyDeposit.setPayDate(new Date()); | ||||
| propertyDeposit.setStatus(EnumBillRentStatus.RETURN.getCode()); | |||||
| addBillAction(bill.getBillId(), dbBill.getOwe()); | addBillAction(bill.getBillId(), dbBill.getOwe()); | ||||
| } | } | ||||
| } | } | ||||
| @@ -261,6 +260,7 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { | |||||
| if(dbBill!=null) { | if(dbBill!=null) { | ||||
| propertyDeposit.setPay(dbBill.getReceivePay()); | propertyDeposit.setPay(dbBill.getReceivePay()); | ||||
| propertyDeposit.setPayDate(new Date()); | propertyDeposit.setPayDate(new Date()); | ||||
| propertyDeposit.setStatus(EnumBillRentStatus.RETURN.getCode()); | |||||
| addBillAction(bill.getBillId(), dbBill.getOwe()); | addBillAction(bill.getBillId(), dbBill.getOwe()); | ||||
| } | } | ||||
| } | } | ||||
| @@ -295,6 +295,7 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { | |||||
| if(dbBill!=null) { | if(dbBill!=null) { | ||||
| wxBillRent.setPay(dbBill.getReceivePay()); | wxBillRent.setPay(dbBill.getReceivePay()); | ||||
| wxBillRent.setPayDate(new Date()); | wxBillRent.setPayDate(new Date()); | ||||
| wxBillRent.setStatus(EnumBillRentStatus.RETURN.getCode()); | |||||
| addBillAction(bill.getBillId(), dbBill.getOwe()); | addBillAction(bill.getBillId(), dbBill.getOwe()); | ||||
| } | } | ||||
| } | } | ||||
| @@ -320,6 +321,7 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { | |||||
| if(dbBill!=null) { | if(dbBill!=null) { | ||||
| wxBillRent.setPay(dbBill.getReceivePay()); | wxBillRent.setPay(dbBill.getReceivePay()); | ||||
| wxBillRent.setPayDate(new Date()); | wxBillRent.setPayDate(new Date()); | ||||
| wxBillRent.setStatus(EnumBillRentStatus.RETURN.getCode()); | |||||
| addBillAction(bill.getBillId(), dbBill.getOwe()); | addBillAction(bill.getBillId(), dbBill.getOwe()); | ||||
| } | } | ||||
| } | } | ||||