|
|
|
@@ -20,6 +20,7 @@ import com.iformall.domain.po.WxFinanceReceive; |
|
|
|
import com.iformall.domain.po.WxFinanceReceiveBill; |
|
|
|
import com.iformall.domain.po.WxMerchant; |
|
|
|
import com.iformall.domain.po.WxShop; |
|
|
|
import com.iformall.domain.po.WxShopUsers; |
|
|
|
import com.iformall.domain.po.WxShopUsersInfo; |
|
|
|
import com.iformall.domain.po.base.BaseEntity; |
|
|
|
import com.iformall.domain.vo.PrintVo; |
|
|
|
@@ -260,10 +261,10 @@ public class WxFinancePrintServiceImpl implements WxFinancePrintService { |
|
|
|
shopq.setTenantId(tenantId); |
|
|
|
shopq.setIsDel(EnumYesOrNo.NO.getCode()); |
|
|
|
Map<Long, WxShop> shopMap = wxShopService.findShopMap(shopq); |
|
|
|
WxShopUsersInfo suq = new WxShopUsersInfo(); |
|
|
|
WxShopUsers suq = new WxShopUsers(); |
|
|
|
suq.setTenantId(tenantId); |
|
|
|
suq.setStatus(EnumShopUsersStatus.LIVE.getCode()); |
|
|
|
Map<Long, WxShopUsersInfo> shopUserMap = wxShopService.getShopUserMap(suq); |
|
|
|
Map<Long, WxShopUsers> shopUserMap = wxShopService.getShopUserMap(suq); |
|
|
|
WxEnergyFees feq = new WxEnergyFees(); |
|
|
|
feq.setTenantId(tenantId); |
|
|
|
Map<Long, WxEnergyFees> feesMap = wxEnergyService.getFeesMap(feq); |
|
|
|
@@ -339,7 +340,7 @@ public class WxFinancePrintServiceImpl implements WxFinancePrintService { |
|
|
|
bq.setOwe(oweTotal.toPlainString()); |
|
|
|
bq.setCurrentTime(new Date()); |
|
|
|
if (null != shopUserMap && null != bq.getShopId()) { |
|
|
|
WxShopUsersInfo su = shopUserMap.get(bq.getShopId()); |
|
|
|
WxShopUsers su = shopUserMap.get(bq.getShopId()); |
|
|
|
if (null != su) { |
|
|
|
bq.setCusName(su.getName()); |
|
|
|
bq.setCusPhone(su.getPhone()); |
|
|
|
|