|
|
|
@@ -15,6 +15,7 @@ import com.iformall.domain.po.WxBillPayWay; |
|
|
|
import com.iformall.domain.po.WxMerchant; |
|
|
|
import com.iformall.domain.po.WxMerchantBUser; |
|
|
|
import com.iformall.domain.po.WxPayAccountBill; |
|
|
|
import com.iformall.domain.po.WxShop; |
|
|
|
import com.iformall.domain.po.base.TenantEntity; |
|
|
|
import com.iformall.domain.vo.WxBillDailyExportVo; |
|
|
|
import com.iformall.domain.vo.WxBillDailyVo; |
|
|
|
@@ -35,6 +36,7 @@ import com.iformall.service.WxBillDailyService; |
|
|
|
import com.iformall.service.WxFinanceService; |
|
|
|
import com.iformall.service.WxMerchantService; |
|
|
|
import com.iformall.service.WxPayAccountBillService; |
|
|
|
import com.iformall.service.WxShopService; |
|
|
|
import com.iformall.service.helper.WxBillAllHelper; |
|
|
|
import com.iformall.utils.Constant; |
|
|
|
import com.iformall.utils.DateUtils; |
|
|
|
@@ -90,6 +92,10 @@ public class WxBillDailyServiceImpl extends WxBillBaseService implements WxBillD |
|
|
|
@Lazy |
|
|
|
@Autowired |
|
|
|
WxFinanceService wxFinanceService; |
|
|
|
|
|
|
|
@Lazy |
|
|
|
@Autowired |
|
|
|
WxShopService wxShopService; |
|
|
|
|
|
|
|
@Override |
|
|
|
public PageInfo<WxBillDaily> listAsPage(WxBillDaily record, Integer pageIndex, Integer pageSize) { |
|
|
|
@@ -152,7 +158,7 @@ public class WxBillDailyServiceImpl extends WxBillBaseService implements WxBillD |
|
|
|
//手续费 = 合同应收+手续费+滞纳金 |
|
|
|
computeTotalMoney(wxPayAccountBill, e); |
|
|
|
|
|
|
|
if (null != e.getMerchantId()) { |
|
|
|
if (null != e.getMerchantId() && null != merchantMap ) { |
|
|
|
WxMerchant m = merchantMap.get(e.getMerchantId()); |
|
|
|
if (null != m ) { |
|
|
|
e.setMerchantName(m.getName()); |
|
|
|
|