|
|
|
@@ -19,9 +19,11 @@ import org.springframework.beans.factory.annotation.Autowired; |
|
|
|
import org.springframework.stereotype.Service; |
|
|
|
|
|
|
|
import com.github.pagehelper.PageInfo; |
|
|
|
import com.iformall.common.SysConfigConstant; |
|
|
|
import com.iformall.domain.dto.WxBillPayDTO; |
|
|
|
import com.iformall.domain.dto.WxBillReceiveUpdateDTO; |
|
|
|
import com.iformall.domain.po.MallUserInfo; |
|
|
|
import com.iformall.domain.po.SysConfig; |
|
|
|
import com.iformall.domain.po.WxBillAction; |
|
|
|
import com.iformall.domain.po.WxBillAdvance; |
|
|
|
import com.iformall.domain.po.WxBillDaily; |
|
|
|
@@ -45,6 +47,7 @@ import com.iformall.domain.vo.WxShopVo; |
|
|
|
import com.iformall.enums.EnumBillAction; |
|
|
|
import com.iformall.enums.EnumBillAllType; |
|
|
|
import com.iformall.enums.EnumBillDailyType; |
|
|
|
import com.iformall.enums.EnumBillOweOrNearType; |
|
|
|
import com.iformall.enums.EnumBillStatus; |
|
|
|
import com.iformall.enums.EnumBillType; |
|
|
|
import com.iformall.enums.EnumRentContractManageFeeType; |
|
|
|
@@ -137,7 +140,6 @@ public class WxBillAllHelper { |
|
|
|
if (null != wxMerchant.getNeedPayPreDays()) { |
|
|
|
bill.setNeedPayStartDay(getDateBefore(wxMerchant.getNeedPayPreDays())); |
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
public WxBillSum getBillRentSum(WxMerchant wxMerchant,Date starttime, Date enttime) { |
|
|
|
|