Переглянути джерело

fix

release_toaliyun_real
winter 1 рік тому
джерело
коміт
d1025ecc9f
5 змінених файлів з 179 додано та 185 видалено
  1. +160
    -148
      mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java
  2. +1
    -4
      mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java
  3. +4
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxShop.java
  4. +9
    -1
      mallinkService/src/main/java/com/iformall/domain/vo/WxShopBillVo.java
  5. +5
    -32
      mallinkService/src/main/java/com/iformall/service/helper/WxBillAllHelper.java

+ 160
- 148
mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java Переглянути файл

@@ -43,6 +43,8 @@ import com.iformall.service.WxBillActionService;
import com.iformall.service.WxEnergyService;
import com.iformall.service.WxFinancePrintService;
import com.iformall.service.WxFinanceService;
import com.iformall.service.WxMallBuildingService;
import com.iformall.service.WxMallFloorService;
import com.iformall.service.WxMerchantService;
import com.iformall.service.WxPayAccountBillService;
import com.iformall.service.WxShopService;
@@ -108,6 +110,12 @@ public class WxAllBillController extends BillBaseController {
@Autowired
private WxFinancePrintService wxFinancePrintService;
@Autowired
private WxMallBuildingService wxMallBuildingService;
@Autowired
private WxMallFloorService wxMallFloorService;
/**
* 铺位账单汇总计费列表
* @param wxMerchant
@@ -150,16 +158,40 @@ public class WxAllBillController extends BillBaseController {
page.setPageNum(pageNum);
page.setPageSize(pageSize);
if (null != shopPage && null != shopPage.getList() && shopPage.getList().size() > 0 ) {
Map<Long, String> floorMap = wxMallFloorService.getFloorMap(wxShop);
Map<Long, String> buildingMap = wxMallBuildingService.getBuildingMap(wxShop);
WxShopUsers suq = new WxShopUsers();
suq.updateTenantInfo(wxShop);
suq.setStatus(EnumShopUsersStatus.LIVE.getCode());
Map<Long, WxShopUsers> suMap = wxShopSerivce.getShopUserMap(suq);
List<WxShopBillVo> retList = new ArrayList<WxShopBillVo>();
for (int i = 0 ; i < merchantPage.getList().size(); i ++) {
for (int i = 0 ; i < shopPage.getList().size(); i ++) {
WxShopBillVo vo = new WxShopBillVo();
WxMerchant m = merchantPage.getList().get(i);
vo.setMerchantId(m.getId());
vo.setMerchantName(m.getName());
vo.setShopNumber(billAllHelper.getMerchantShopNumber(m));
WxShop s = shopPage.getList().get(i);
vo.setShopId(s.getId());
String budingName = "";
if (null != buildingMap) {
budingName = buildingMap.get(s.getBuilding());
}
String floorName = "";
if (null != floorMap) {
floorName = floorMap.get(s.getFloor());
}
vo.setBuildingName(budingName);
vo.setFloorName(floorName);
vo.setShopNumber(s.getShopNumber());
wxMerchant.setId(m.getId());
WxBillSum rentSum = billAllHelper.getBillSum(wxMerchant,starttime, enttime);
if (null != suMap) {
WxShopUsers su = suMap.get(s.getId());
if (null != su ) {
vo.setCusName(su.getName());
vo.setCusPerson(su.getLinkPerson());
vo.setCusPhone(su.getPhone());
}
}
WxBillSum rentSum = billAllHelper.getBillSum(s,starttime, enttime);
vo.setNeedPay(rentSum.getNeedPay());
vo.setPaid(rentSum.getPaid());
vo.setOwe(rentSum.getOwe());
@@ -169,8 +201,8 @@ public class WxAllBillController extends BillBaseController {
retList.add(vo);
}
page.setPages(merchantPage.getPages());
page.setTotal(merchantPage.getTotal());
page.setPages(shopPage.getPages());
page.setTotal(shopPage.getTotal());
page.setList(retList);
return page;
}else {
@@ -187,29 +219,29 @@ public class WxAllBillController extends BillBaseController {
* @param response
*/
@GetMapping("exportMerchantBillList")
public void exportBill(@ModelAttribute WxMerchant wxMerchant, HttpServletRequest request, HttpServletResponse response) {
wxMerchant.updateTenantInfo(getTenantInfo());
public void exportBill(@ModelAttribute WxShop wxShop, HttpServletRequest request, HttpServletResponse response) {
wxShop.updateTenantInfo(getTenantInfo());
WxUserDataRule dataRule = this.getCurrentDataFloors();
if (null != dataRule) {
wxMerchant.setFloorForRule(dataRule.getFloorIds());
wxMerchant.setBusinessForRule(dataRule.getBussinessIds());
wxMerchant.setShopTypeForRule(dataRule.getShopTypes());
wxShop.setFloorForRule(dataRule.getFloorIds());
wxShop.setBusinessForRule(dataRule.getBussinessIds());
wxShop.setShopTypeForRule(dataRule.getShopTypes());
}
PageInfo<WxShopBillVo> page = getVoPage(wxMerchant, 1, 10000);
excelService.exportExcel(page.getList(), null, "商户账单总览数据", WxShopBillVo.class, "商户账单总览数据.xlsx", response, false);
PageInfo<WxShopBillVo> page = getVoPage(wxShop, 1, 10000);
excelService.exportExcel(page.getList(), null, "商户账单总览数据", WxShopBillVo.class, "铺位账单总览数据.xlsx", response, false);
}
/**
* 商户汇总计费详情
* 铺位汇总计费详情
* @param wxMerchant
* @return
*/
@GetMapping("oneMerchantBillList")
public ResultData oneMerchantBillList(@ModelAttribute WxMerchant wxMerchant) {
if (null == wxMerchant.getId()) {
return new ResultData(Result.ERROR,"请选择商户");
public ResultData oneMerchantBillList(@ModelAttribute WxShop wxShop) {
if (null == wxShop.getId()) {
return new ResultData(Result.ERROR,"请选择店铺");
}
WxShopBillVo vo = getMerchantBillVo(wxMerchant);
WxShopBillVo vo = getMerchantBillVo(wxShop);
if (null == vo) {
return new ResultData();
}
@@ -217,35 +249,34 @@ public class WxAllBillController extends BillBaseController {
return new ResultData(vo);
}
private WxShopBillVo getMerchantBillVo( WxMerchant wxMerchant) {
wxMerchant.updateTenantInfo(getTenantInfo());
Date starttime = wxMerchant.getStarttime();
Date enttime = wxMerchant.getEndtime();
wxMerchant.setStarttime(null);
wxMerchant.setEndtime(null);
WxMerchant m = wxMerchantService.selectById(wxMerchant.getId());
if (null == m) {
private WxShopBillVo getMerchantBillVo( WxShop wxShop) {
wxShop.updateTenantInfo(getTenantInfo());
Date starttime = wxShop.getStarttime();
Date enttime = wxShop.getEndtime();
wxShop.setStarttime(null);
wxShop.setEndtime(null);
WxShop ws = wxShopSerivce.getById(wxShop.getId());
if (null == ws) {
return null;
}
WxShopBillVo vo = new WxShopBillVo();
vo.setMerchantId(m.getId());
vo.setMerchantName(m.getName());
vo.setShopNumber(billAllHelper.getMerchantShopNumber(m));
vo.setRentArea(billAllHelper.getMerchantShopRentArea(m));
vo.setShopId(ws.getId());
vo.setShopNumber(ws.getShopNumber());
vo.setRentArea(ws.getRentArea());
vo.setStarttime(starttime);
vo.setEndtime(enttime);
wxMerchant.setIsPreview(EnumYesOrNo.NO.getCode());
if (null != wxMerchant.getOnlyOwe() && EnumYesOrNo.YES.getCode().intValue() == wxMerchant.getOnlyOwe().intValue()) {
wxMerchant.setOweBillBeforeDays(getOweBillBeforeDays());
wxShop.setIsPreview(EnumYesOrNo.NO.getCode());
if (null != wxShop.getOnlyOwe() && EnumYesOrNo.YES.getCode().intValue() == wxShop.getOnlyOwe().intValue()) {
wxShop.setOweBillBeforeDays(getOweBillBeforeDays());
}
//根据科目来
List<WxBillSum> sumList = billAllHelper.getFeesBillSum(wxMerchant,starttime, enttime);
List<WxBillSum> sumList = billAllHelper.getFeesBillSum(wxShop,starttime, enttime);
if (null == sumList ) {
return null;
}
WxEnergyFees fq = new WxEnergyFees();
fq.updateTenantInfo(wxMerchant);
fq.updateTenantInfo(wxShop);
Map<Long, WxEnergyFees> feesMap = wxEnergyService.getFeesMap(fq);
BigDecimal needpay = new BigDecimal(0);
BigDecimal paid = new BigDecimal(0);
@@ -273,19 +304,20 @@ public class WxAllBillController extends BillBaseController {
@ApiOperation("预览结算单")
@PostMapping("viewSettleTemplate")
@TenantIgnore
public ResultData viewSettleTemplate(@RequestBody WxMerchant merchant) {
if (null == merchant.getId() || null == merchant.getTemplateId() ||null == merchant.getFeesIdList() || merchant.getFeesIdList().size() <= 0 ) {
return new ResultData(Result.ERROR,"清选择商户和科目");
}
merchant.updateTenantInfo(getTenantInfo());
WxPayAccountBill ab = wxPayAccountBillService.getByTenantInfo(merchant);
WxShopBillVo vo = getMerchantBillVo(merchant);
if (null != ab) {
vo.setMallBankAccount(ab.getBankCardId());
vo.setMallBankAccountName(ab.getBankName());
vo.setMallBankName(ab.getBankAccountName());
}
return new ResultData(wxFinancePrintService.parseTemplateData(merchant.getTenantId(),merchant.getTemplateId(),merchant.getFeesIdList(),vo));
public ResultData viewSettleTemplate(@RequestBody WxShop wxShop) {
// if (null == merchant.getId() || null == merchant.getTemplateId() ||null == merchant.getFeesIdList() || merchant.getFeesIdList().size() <= 0 ) {
// return new ResultData(Result.ERROR,"清选择商户和科目");
// }
// merchant.updateTenantInfo(getTenantInfo());
// WxPayAccountBill ab = wxPayAccountBillService.getByTenantInfo(merchant);
// WxShopBillVo vo = getMerchantBillVo(merchant);
// if (null != ab) {
// vo.setMallBankAccount(ab.getBankCardId());
// vo.setMallBankAccountName(ab.getBankName());
// vo.setMallBankName(ab.getBankAccountName());
// }
// return new ResultData(wxFinancePrintService.parseTemplateData(merchant.getTenantId(),merchant.getTemplateId(),merchant.getFeesIdList(),vo));
return new ResultData();
}
/**
@@ -373,32 +405,32 @@ public class WxAllBillController extends BillBaseController {
@ApiImplicitParams({
@ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true),
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)})
public ResultData oweBillList(@ModelAttribute WxMerchant wxMerchant,Integer billType, Integer pageNum, Integer pageSize) {
return new ResultData(getBillList(wxMerchant, true,null, pageNum, pageSize));
public ResultData oweBillList(@ModelAttribute WxShop wxShop,Integer billType, Integer pageNum, Integer pageSize) {
return new ResultData(getBillList(wxShop, true,null, pageNum, pageSize));
}
@GetMapping("nearBillList")
@ApiImplicitParams({
@ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true),
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)})
public ResultData nearBillList(@ModelAttribute WxMerchant wxMerchant,Integer billType, Integer pageNum, Integer pageSize) {
return new ResultData(getBillList(wxMerchant, true,getNearBillBeforeDays(), pageNum, pageSize));
public ResultData nearBillList(@ModelAttribute WxShop wxShop,Integer billType, Integer pageNum, Integer pageSize) {
return new ResultData(getBillList(wxShop, true,getNearBillBeforeDays(), pageNum, pageSize));
}
private PageInfo<WxAllBill> getBillList(WxMerchant wxMerchant,boolean isOwe,Integer nearBillBeforeDays, Integer pageNum, Integer pageSize) {
wxMerchant.updateTenantInfo(getTenantInfo());
private PageInfo<WxAllBill> getBillList(WxShop wxShop,boolean isOwe,Integer nearBillBeforeDays, Integer pageNum, Integer pageSize) {
wxShop.updateTenantInfo(getTenantInfo());
WxUserDataRule dataRule = this.getCurrentDataFloors();
if (null != dataRule) {
wxMerchant.setFloorForRule(dataRule.getFloorIds());
wxMerchant.setBusinessForRule(dataRule.getBussinessIds());
wxMerchant.setShopTypeForRule(dataRule.getShopTypes());
wxShop.setFloorForRule(dataRule.getFloorIds());
wxShop.setBusinessForRule(dataRule.getBussinessIds());
wxShop.setShopTypeForRule(dataRule.getShopTypes());
}
if (isOwe) {
wxMerchant.setOweBillBeforeDays(getOweBillBeforeDays());
wxShop.setOweBillBeforeDays(getOweBillBeforeDays());
}
wxMerchant.setNearBillBeforeDays(nearBillBeforeDays);
wxShop.setNearBillBeforeDays(nearBillBeforeDays);
return billAllHelper.getBillList(wxMerchant,pageNum,pageSize);
return billAllHelper.getBillList(wxShop,pageNum,pageSize);
}
/**
@@ -409,22 +441,22 @@ public class WxAllBillController extends BillBaseController {
* @return
*/
@GetMapping("exportOweBillList")
public void oweBillList(@ModelAttribute WxMerchant wxMerchant,Integer billType, HttpServletRequest request, HttpServletResponse response) {
PageInfo page = getBillList(wxMerchant, true,null, 1, 10000);
public void oweBillList(@ModelAttribute WxShop wxShop,Integer billType, HttpServletRequest request, HttpServletResponse response) {
PageInfo page = getBillList(wxShop, true,null, 1, 10000);
if (null == page) {
return;
}
excelService.exportExcel(page.getList(), null, "逾期账单列表", WxAllBill.class, "商户欠缴账单.xlsx", response, false);
excelService.exportExcel(page.getList(), null, "逾期账单列表", WxAllBill.class, "欠缴账单.xlsx", response, false);
}
//临期
@GetMapping("exportNearBillList")
public void exportNearBillList(@ModelAttribute WxMerchant wxMerchant,Integer billType, HttpServletRequest request, HttpServletResponse response) {
PageInfo page = getBillList(wxMerchant, true,getNearBillBeforeDays(), 1, 10000);
public void exportNearBillList(@ModelAttribute WxShop wxShop,Integer billType, HttpServletRequest request, HttpServletResponse response) {
PageInfo page = getBillList(wxShop, true,getNearBillBeforeDays(), 1, 10000);
if (null == page) {
return;
}
excelService.exportExcel(page.getList(), null, "临期账单列表", WxAllBill.class, "商户临期账单.xlsx", response, false);
excelService.exportExcel(page.getList(), null, "临期账单列表", WxAllBill.class, "临期账单.xlsx", response, false);
}
/**
@@ -446,17 +478,17 @@ public class WxAllBillController extends BillBaseController {
}
private List<WxBillHotNotify> getHots(Integer nearBillBeforeDays) {
WxMerchant wxMerchant = new WxMerchant();
wxMerchant.updateTenantInfo(getTenantInfo());
WxShop wxShop = new WxShop();
wxShop.updateTenantInfo(getTenantInfo());
WxUserDataRule dataRule = this.getCurrentDataFloors();
if (null != dataRule) {
wxMerchant.setFloorForRule(dataRule.getFloorIds());
wxMerchant.setBusinessForRule(dataRule.getBussinessIds());
wxMerchant.setShopTypeForRule(dataRule.getShopTypes());
wxShop.setFloorForRule(dataRule.getFloorIds());
wxShop.setBusinessForRule(dataRule.getBussinessIds());
wxShop.setShopTypeForRule(dataRule.getShopTypes());
}
wxMerchant.setOweBillBeforeDays(getOweBillBeforeDays());
wxMerchant.setNearBillBeforeDays(nearBillBeforeDays);
return billAllHelper.getHotNotify(wxMerchant);
wxShop.setOweBillBeforeDays(getOweBillBeforeDays());
wxShop.setNearBillBeforeDays(nearBillBeforeDays);
return billAllHelper.getHotNotify(wxShop);
}
/**
@@ -467,29 +499,29 @@ public class WxAllBillController extends BillBaseController {
* @return
*/
@GetMapping("oweBillSum")
public ResultData oweBillSum(@ModelAttribute WxMerchant wxMerchant,Integer billType) {
return new ResultData(getBillSum(wxMerchant, null));
public ResultData oweBillSum(@ModelAttribute WxShop wxShop,Integer billType) {
return new ResultData(getBillSum(wxShop, null));
}
//临期账单金额
@GetMapping("nearBillSum")
public ResultData nearBillSum(@ModelAttribute WxMerchant wxMerchant,Integer billType) {
return new ResultData(getBillSum(wxMerchant,getNearBillBeforeDays()));
public ResultData nearBillSum(@ModelAttribute WxShop wxShop,Integer billType) {
return new ResultData(getBillSum(wxShop,getNearBillBeforeDays()));
}
private WxBillSum getBillSum(WxMerchant wxMerchant,Integer nearBillBeforeDays) {
wxMerchant.updateTenantInfo(getTenantInfo());
private WxBillSum getBillSum(WxShop wxShop,Integer nearBillBeforeDays) {
wxShop.updateTenantInfo(getTenantInfo());
WxUserDataRule dataRule = this.getCurrentDataFloors();
if (null != dataRule) {
wxMerchant.setFloorForRule(dataRule.getFloorIds());
wxMerchant.setBusinessForRule(dataRule.getBussinessIds());
wxMerchant.setShopTypeForRule(dataRule.getShopTypes());
wxShop.setFloorForRule(dataRule.getFloorIds());
wxShop.setBusinessForRule(dataRule.getBussinessIds());
wxShop.setShopTypeForRule(dataRule.getShopTypes());
}
wxMerchant.setOweBillBeforeDays(getOweBillBeforeDays());
wxMerchant.setNearBillBeforeDays(nearBillBeforeDays);
Date starttime = wxMerchant.getStarttime();
Date enttime = wxMerchant.getEndtime();
return billAllHelper.getBillSum(wxMerchant,starttime,enttime);
wxShop.setOweBillBeforeDays(getOweBillBeforeDays());
wxShop.setNearBillBeforeDays(nearBillBeforeDays);
Date starttime = wxShop.getStarttime();
Date enttime = wxShop.getEndtime();
return billAllHelper.getBillSum(wxShop,starttime,enttime);
}
/**
@@ -640,16 +672,16 @@ public class WxAllBillController extends BillBaseController {
//商户可以缴费账单,临期账单以内都可以缴费
@GetMapping("merchantPayBills")
public ResultData merchantPayBills(@ModelAttribute WxMerchant wxMerchant) {
if (null == wxMerchant.getId()) {
return new ResultData(Result.ERROR,"请选择商户");
public ResultData merchantPayBills(@ModelAttribute WxShop wxShop) {
if (null == wxShop.getId()) {
return new ResultData(Result.ERROR,"请选择店铺");
}
wxMerchant.setIsPreview(EnumYesOrNo.NO.getCode());
wxMerchant.updateTenantInfo(getTenantInfo());
wxShop.setIsPreview(EnumYesOrNo.NO.getCode());
wxShop.updateTenantInfo(getTenantInfo());
//放开时间
//wxMerchant.setNeedPayPreDays(getNearBillBeforeDays());
if (StringUtils.isNotBlank(wxMerchant.getFeesIdListStr())) {
String[] feesidstrs = wxMerchant.getFeesIdListStr().split(",");
if (StringUtils.isNotBlank(wxShop.getFeesIdListStr())) {
String[] feesidstrs = wxShop.getFeesIdListStr().split(",");
if (null != feesidstrs) {
List<Long> feesidList = new ArrayList<Long>();
for (int i = 0 ; i < feesidstrs.length ; i ++) {
@@ -658,57 +690,44 @@ public class WxAllBillController extends BillBaseController {
feesidList.add(Long.parseLong(s));
}
}
wxMerchant.setFeesIdList(feesidList);
wxShop.setFeesIdList(feesidList);
}
}
wxMerchant.setNeedPayNoDays(EnumYesOrNo.YES.getCode());
List<WxAllBill> list = billAllHelper.getMerchantBillList(wxMerchant);
wxShop.setNeedPayNoDays(EnumYesOrNo.YES.getCode());
WxShop shop = wxShopSerivce.getById(wxShop.getId());
WxShopUsers shopUser = wxShopSerivce.getCurrentShopUser(shop, shop.getId());
List<WxAllBill> list = billAllHelper.getMerchantBillList(wxShop);
if (null != list && list.size() > 0 ) {
List<Long> merchnatIds = new ArrayList<Long>();
merchnatIds.add(wxMerchant.getId());
Map<Long, String> msMap = wxShopSerivce.getMerchantShopNumberMap(wxMerchant, merchnatIds, EnumYesOrNo.NO.getCode());
String shopNumber = "";
if (null != msMap) {
shopNumber = msMap.get(wxMerchant.getId());
}
WxMerchant m = wxMerchantService.selectById(wxMerchant.getId());
WxEnergyFees fq = new WxEnergyFees();
fq.updateTenantInfo(m);
fq.updateTenantInfo(wxShop);
Map<Long, WxEnergyFees> feesMap = wxEnergyService.getFeesMap(fq);
for (int i = 0 ; i < list.size(); i++) {
WxAllBill be = list.get(i);
if (StringUtils.isBlank(be.getShopNumber())) {
be.setShopNumber(shopNumber);
}
be.setShopNumber(shop.getShopNumber());
if (null != feesMap) {
WxEnergyFees fees = feesMap.get(be.getEnergyFeesId());
if (null != fees) {
be.setEnergyFeesName(fees.getName());
}
}
be.setMerchantName(m.getName());
be.setRentName(getBillRentName(be,m));
if (null != shopUser) {
be.setRentName(shopUser.getName());
}
}
}
return new ResultData(list);
}
private String getBillRentName(WxAllBill be,WxMerchant m) {
if (StringUtils.isNotBlank(be.getCusName())) {
return be.getCusName();
}else {
return wxShopSerivce.getRentName(m);
}
}
//待支付给商户的账单
@GetMapping("toPaymerchantBills")
public ResultData toPaymerchantBills(@ModelAttribute WxMerchant wxMerchant) {
if (null == wxMerchant.getId()) {
return new ResultData(Result.ERROR,"请选择商户");
public ResultData toPaymerchantBills(@ModelAttribute WxShop wxShop) {
if (null == wxShop.getId()) {
return new ResultData(Result.ERROR,"请选择店铺");
}
if (StringUtils.isNotBlank(wxMerchant.getFeesIdListStr())) {
String[] feesidstrs = wxMerchant.getFeesIdListStr().split(",");
if (StringUtils.isNotBlank(wxShop.getFeesIdListStr())) {
String[] feesidstrs = wxShop.getFeesIdListStr().split(",");
if (null != feesidstrs) {
List<Long> feesidList = new ArrayList<Long>();
for (int i = 0 ; i < feesidstrs.length ; i ++) {
@@ -717,40 +736,33 @@ public class WxAllBillController extends BillBaseController {
feesidList.add(Long.parseLong(s));
}
}
wxMerchant.setFeesIdList(feesidList);
wxShop.setFeesIdList(feesidList);
}
}
wxMerchant.setIsPreview(EnumYesOrNo.NO.getCode());
wxMerchant.updateTenantInfo(getTenantInfo());
if (null == wxMerchant.getAdvanceHasMoney()) {
wxMerchant.setToPayMerchant(EnumYesOrNo.YES.getCode());
wxShop.setIsPreview(EnumYesOrNo.NO.getCode());
wxShop.updateTenantInfo(getTenantInfo());
if (null == wxShop.getAdvanceHasMoney()) {
wxShop.setToPayMerchant(EnumYesOrNo.YES.getCode());
}
List<WxAllBill> list = billAllHelper.getMerchantBillList(wxMerchant);
List<WxAllBill> list = billAllHelper.getMerchantBillList(wxShop);
WxShop shop = wxShopSerivce.getById(wxShop.getId());
WxShopUsers shopUser = wxShopSerivce.getCurrentShopUser(shop, shop.getId());
if (null != list && list.size() > 0 ) {
List<Long> merchnatIds = new ArrayList<Long>();
merchnatIds.add(wxMerchant.getId());
Map<Long, String> msMap = wxShopSerivce.getMerchantShopNumberMap(wxMerchant, merchnatIds, EnumYesOrNo.NO.getCode());
String shopNumber = "";
if (null != msMap) {
shopNumber = msMap.get(wxMerchant.getId());
}
WxMerchant m = wxMerchantService.selectById(wxMerchant.getId());
WxEnergyFees fq = new WxEnergyFees();
fq.updateTenantInfo(m);
fq.updateTenantInfo(shop);
Map<Long, WxEnergyFees> feesMap = wxEnergyService.getFeesMap(fq);
for (int i = 0 ; i < list.size(); i++) {
WxAllBill be = list.get(i);
if (StringUtils.isBlank(be.getShopNumber())) {
be.setShopNumber(shopNumber);
}
be.setShopNumber(shop.getShopNumber());
if (null != feesMap) {
WxEnergyFees fees = feesMap.get(be.getEnergyFeesId());
if (null != fees) {
be.setEnergyFeesName(fees.getName());
}
}
be.setMerchantName(m.getName());
be.setRentName(getBillRentName(be,m));
if (null != shopUser) {
be.setRentName(shopUser.getName());
}
}
}
return new ResultData(list);


+ 1
- 4
mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java Переглянути файл

@@ -464,14 +464,11 @@ public class WxMerchant extends TenantEntity {
public Long energyFeesId;

@TableField(exist = false)
public List<Long> feesIdList;
@TableField(exist = false)
public Long templateId;
@TableField(exist = false)
public String searchKey;
@TableField(exist = false)
public String feesIdListStr;

@TableField(exist = false)
public Integer isAll;
@TableField(exist = false)


+ 4
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxShop.java Переглянути файл

@@ -226,5 +226,9 @@ public class WxShop extends TenantEntity {
public Integer onlyOweOrNear;
@TableField(exist = false)
private Integer onlyOwe;
@TableField(exist = false)
public String feesIdListStr;
@TableField(exist = false)
public List<Long> feesIdList;
}

+ 9
- 1
mallinkService/src/main/java/com/iformall/domain/vo/WxShopBillVo.java Переглянути файл

@@ -20,9 +20,15 @@ public class WxShopBillVo implements Serializable {
private static final long serialVersionUID = 1L;

private Long shopId;
@Excel(name = "商铺号", width = 20, orderNum = "3")
@Excel(name = "商铺号", width = 20, orderNum = "4")
@TableField(exist = false)
private String shopNumber;
@Excel(name = "楼栋", width = 20, orderNum = "2")
@TableField(exist = false)
private String buildingName;
@Excel(name = "楼层", width = 20, orderNum = "3")
@TableField(exist = false)
private String floorName;
@TableField(exist = false)
private String rentArea;

@@ -79,6 +85,8 @@ public class WxShopBillVo implements Serializable {
private String cusName;
@TableField(exist = false)
private String cusPhone;
@TableField(exist = false)
private String cusPerson;
@TableField(exist = false)
private List<WxBillSum> billSumList;


+ 5
- 32
mallinkService/src/main/java/com/iformall/service/helper/WxBillAllHelper.java Переглянути файл

@@ -83,6 +83,7 @@ public class WxBillAllHelper {
private void updateQueryParm(WxShop wxShop,WxAllBill bill,Date starttime,Date enttime) {
bill.updateTenantInfo(wxShop);
bill.setShopId(wxShop.getId());
bill.setFloorForRule(wxShop.getFloorForRule());
bill.setBusinessForRule(wxShop.getBusinessForRule());
bill.setShopTypeForRule(wxShop.getShopTypeForRule());
@@ -186,34 +187,6 @@ public class WxBillAllHelper {
return null;
}
public String getMerchantShopNumber(WxMerchant merchant) {
List<WxShopVo> shopList = wxShopService.findMerchantShopVoList(merchant, merchant.getId());
if (null != shopList && shopList.size() > 0 ) {
StringBuffer sb = new StringBuffer("");
for (int i = 0 ; i < shopList.size() ; i ++) {
WxShopVo v = shopList.get(i);
sb.append(v.getShopNumber()).append(",");
}
return sb.toString();
}
return null;
}
public String getMerchantShopRentArea(WxMerchant merchant) {
List<WxShopVo> shopList = wxShopService.findMerchantShopVoList(merchant, merchant.getId());
if (null != shopList && shopList.size() > 0 ) {
BigDecimal rs = new BigDecimal(0);
for (int i = 0 ; i < shopList.size() ; i ++) {
WxShopVo v = shopList.get(i);
if (null != v.getOperationArea()) {
rs = rs.add(new BigDecimal(v.getOperationArea()));
}
}
return rs.toPlainString();
}
return "0";
}
public List<Long> getOwdShopIds(WxShop wxShop,Date starttime, Date enttime) {
WxAllBill br = new WxAllBill();
updateQueryParm(wxShop, br,starttime,enttime);
@@ -243,9 +216,9 @@ public class WxBillAllHelper {
return wxAllBillService.listAsPage(wxAllBill, pageNum, pageSize);
}
public List<WxAllBill> getMerchantBillList(WxMerchant wxMerchant) {
public List<WxAllBill> getMerchantBillList(WxShop wxShop) {
WxAllBill wxBillRent = new WxAllBill();
updateQueryParm(wxMerchant, wxBillRent,wxMerchant.getStarttime(),wxMerchant.getEndtime());
updateQueryParm(wxShop, wxBillRent,wxShop.getStarttime(),wxShop.getEndtime());
wxBillRent.setSortColumns("starttime asc");
return wxAllBillService.list(wxBillRent);
}
@@ -335,8 +308,8 @@ public class WxBillAllHelper {
WordUtil.exportWord(templatePath, filepath, filename, exportFileName, result, request, response, null);
}
public List<WxBillHotNotify> getHotNotify(WxMerchant wxMerchant) {
return this.getBillHotNotify(wxMerchant, wxMerchant.getStarttime(), wxMerchant.getEndtime());
public List<WxBillHotNotify> getHotNotify(WxShop wxShop) {
return this.getBillHotNotify( wxShop, wxShop.getStarttime(), wxShop.getEndtime());
}
public void updateReceivePay(WxBillReceiveUpdateDTO dto,MallUserInfo user,boolean forcePaid) {


Завантаження…
Відмінити
Зберегти