winter 1 год назад
Родитель
Сommit
bfdc8d561c
10 измененных файлов: 82 добавлений и 44 удалений
  1. +68
    -31
      mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/service/WxMerchantService.java
  3. +2
    -2
      mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java
  4. +2
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxAllBillServiceImpl.java
  5. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java
  6. +4
    -3
      mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java
  7. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java
  8. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java
  9. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java
  10. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxRentPropertyContractServiceImpl.java

mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java → mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java Просмотреть файл

@@ -14,9 +14,11 @@ import com.iformall.domain.po.SysConfig;
import com.iformall.domain.po.WxBillAction;
import com.iformall.domain.po.WxAllBill;
import com.iformall.domain.po.WxBillPayWay;
import com.iformall.domain.po.WxCoupon;
import com.iformall.domain.po.WxEnergyFees;
import com.iformall.domain.po.WxMerchant;
import com.iformall.domain.po.WxUserDataRule;
import com.iformall.domain.po.base.BaseEntity;
import com.iformall.domain.vo.WxBillBad;
import com.iformall.domain.vo.WxBillExcelTemplate;
import com.iformall.domain.vo.WxBillHotNotify;
@@ -26,10 +28,12 @@ import com.iformall.domain.vo.WxMerchantBillVo;
import com.iformall.enums.EnumBillAllType;
import com.iformall.enums.EnumBillOweOrNearType;
import com.iformall.enums.EnumBillStatus;
import com.iformall.enums.EnumCouponType;
import com.iformall.enums.EnumRentContractManageFeeType;
import com.iformall.enums.EnumYesOrNo;
import com.iformall.service.ExcelService;
import com.iformall.service.SysConfigService;
import com.iformall.service.WxAllBillService;
import com.iformall.service.WxBillActionService;
import com.iformall.service.WxEnergyService;
import com.iformall.service.WxFinanceService;
@@ -61,11 +65,11 @@ import java.util.Map;
*/
@RestController
@RequestMapping("wxBillAll")
public class WxBillAllController extends BillBaseController {
public class WxAllBillController extends BillBaseController {
//@Autowired
//private WxBillAllService wxBillAllService;
private Logger logger = LoggerFactory.getLogger(WxBillAllController.class);
private Logger logger = LoggerFactory.getLogger(WxAllBillController.class);

@Autowired
WxPayAccountBillService wxPayAccountBillService;
@@ -91,6 +95,9 @@ public class WxBillAllController extends BillBaseController {
@Autowired
WxEnergyService wxEnergyService;
@Autowired
WxAllBillService wxAllBillService;
/**
* 商户账单汇总计费列表
* @param wxMerchant
@@ -207,35 +214,6 @@ public class WxBillAllController extends BillBaseController {
if (null != wxMerchant.getOnlyOwe() && EnumYesOrNo.YES.getCode().intValue() == wxMerchant.getOnlyOwe().intValue()) {
wxMerchant.setOweBillBeforeDays(getOweBillBeforeDays());
}
// WxBillSum rentSum = billAllHelper.getBillRentSum(wxMerchant,starttime, enttime);
// WxBillSum rentBussinessManageSum = billAllHelper.getBillRentManageSum(wxMerchant, starttime, enttime,EnumRentContractManageFeeType.RENT_BUSSINESS_MANAGE_FEE);
// WxBillSum rentOperationManageSum = billAllHelper.getBillRentManageSum(wxMerchant, starttime, enttime,EnumRentContractManageFeeType.RENT_OPERATING_MANAGE_FEE);
// WxBillSum rentDepositSum = billAllHelper.getBillDepositSum(wxMerchant, starttime, enttime);
// WxBillSum propertySum = billAllHelper.getBillPropertySum(wxMerchant, starttime, enttime);
// WxBillSum propertyDepositSum = billAllHelper.getBillPropertyDepositSum(wxMerchant, starttime, enttime);
// WxBillSum dailySum = billAllHelper.getBillDailySum(wxMerchant, starttime, enttime,null);
// WxBillSum otherSum = billAllHelper.getBillOtherSum(wxMerchant, starttime, enttime);
// WxBillSum otherDepositSum = billAllHelper.getBillOtherDepositSum(wxMerchant, starttime, enttime);
//
// vo.setNeedPay(billAllHelper.calcuteSum(rentSum.getNeedPay(),rentBussinessManageSum.getNeedPay(),rentOperationManageSum.getNeedPay(),rentDepositSum.getNeedPay(),propertySum.getNeedPay(),
// propertyDepositSum.getNeedPay(),dailySum.getNeedPay(),otherSum.getNeedPay(),otherDepositSum.getNeedPay()));
// vo.setPaid(billAllHelper.calcuteSum(rentSum.getPaid(),rentBussinessManageSum.getPaid(),rentOperationManageSum.getPaid(),rentDepositSum.getPaid(),propertySum.getPaid(),
// propertyDepositSum.getPaid(),dailySum.getPaid(),otherSum.getPaid(),otherDepositSum.getPaid()));
// vo.setOwe(billAllHelper.calcuteSum(rentSum.getOwe(),rentBussinessManageSum.getOwe(),rentOperationManageSum.getOwe(),rentDepositSum.getOwe(),propertySum.getOwe(),
// propertyDepositSum.getOwe(),dailySum.getOwe(),otherSum.getOwe(),otherDepositSum.getOwe()));
//
// List<WxBillSum> sumlist = new ArrayList<>();
// sumlist.add(rentSum);
// sumlist.add(rentBussinessManageSum);
// sumlist.add(rentOperationManageSum);
// sumlist.add(rentDepositSum);
// sumlist.add(propertySum);
// sumlist.add(propertyDepositSum);
// sumlist.add(dailySum);
// sumlist.add(otherSum);
// sumlist.add(otherDepositSum);
// vo.setBillSumList(sumlist);
return new ResultData(vo);
}
@@ -278,6 +256,19 @@ public class WxBillAllController extends BillBaseController {
return new ResultData(tmap);
}
@ApiOperation("费用科目列表")
@GetMapping("feesList")
@ApiImplicitParams({
@ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true),
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true),
})
public ResultData feesList(@ModelAttribute WxEnergyFees record, Integer pageNum, Integer pageSize) {
record.updateTenantInfo(getTenantInfo());
record.setSortColumns(BaseEntity.SortField.CreateTime_DESC);
PageInfo<WxEnergyFees> page = wxEnergyService.feesListAsPage(record, pageNum, pageSize,false);
return new ResultData(page);
}
/**
* 欠缴账单列表
@@ -631,5 +622,51 @@ public class WxBillAllController extends BillBaseController {
}
return new ResultData(list);
}
@ApiOperation("分页列表接口")
@GetMapping("list")
@ApiImplicitParams({
@ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true),
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)})
public ResultData list(@ModelAttribute WxAllBill record, Integer pageNum, Integer pageSize,Boolean isList) {
if (record == null) record = new WxAllBill();
record.updateTenantInfo(getTenantInfo());
WxUserDataRule dataRule = this.getCurrentDataFloors();
if (null != dataRule) {
record.setFloorForRule(dataRule.getFloorIds());
record.setBusinessForRule(dataRule.getBussinessIds());
}
if (null != record.getOnlyOweOrNear()) {
if (EnumBillOweOrNearType.OWE.getCode().intValue() == record.getOnlyOweOrNear().intValue()) {
record.setOweBillLastTime(billAllHelper.getDateBefore(getOweBillBeforeDays()));
}else if (EnumBillOweOrNearType.NEAR.getCode().intValue() == record.getOnlyOweOrNear().intValue()) {
record.setOweBillLastTime(billAllHelper.getDateBefore(getOweBillBeforeDays()));
record.setNearBillLastTime(billAllHelper.getDateBefore(getNearBillBeforeDays()));
}
}
record.setSortColumns("status asc, starttime asc , merchant_id desc");
return new ResultData(wxAllBillService.listAsPage(record, pageNum, pageSize));
}
@GetMapping("exportBill")
public void exportBill(@ModelAttribute WxAllBill wxBillRent, HttpServletRequest request, HttpServletResponse response) {
wxBillRent.updateTenantInfo(getTenantInfo());
WxUserDataRule dataRule = this.getCurrentDataFloors();
if (null != dataRule) {
wxBillRent.setFloorForRule(dataRule.getFloorIds());
wxBillRent.setBusinessForRule(dataRule.getBussinessIds());
}
if (null != wxBillRent.getOnlyOweOrNear()) {
if (EnumBillOweOrNearType.OWE.getCode().intValue() == wxBillRent.getOnlyOweOrNear().intValue()) {
wxBillRent.setOweBillLastTime(billAllHelper.getDateBefore(getOweBillBeforeDays()));
}else if (EnumBillOweOrNearType.NEAR.getCode().intValue() == wxBillRent.getOnlyOweOrNear().intValue()) {
wxBillRent.setOweBillLastTime(billAllHelper.getDateBefore(getOweBillBeforeDays()));
wxBillRent.setNearBillLastTime(billAllHelper.getDateBefore(getNearBillBeforeDays()));
}
}
wxAllBillService.exportBill(request, response, wxBillRent);
}

}

+ 1
- 1
mallinkService/src/main/java/com/iformall/service/WxMerchantService.java Просмотреть файл

@@ -202,7 +202,7 @@ public interface WxMerchantService {

Map<String, Object> detailByShopId(TenantEntity tenantInfo, Long shopId);
List<Long> getFloorBuildMerchantIds(TenantEntity tenantEntity,String floorRule,Long building,Long floor,Integer merchantShopDel,Integer shopDel ) ;
List<Long> getFloorBuildMerchantIds(TenantEntity tenantEntity,String floorRule,Long building,Long floor,Integer merchantShopDel,Integer shopDel ,String shopNumber) ;
List<WxMerchantVo> findMerchantListByProduct(TenantEntity tenantEntity,Long productId,boolean hasShop);



+ 2
- 2
mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java Просмотреть файл

@@ -627,7 +627,7 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService {
@Override
public PageInfo<PageMerchantMicroPayVO> pageMerchantMicroPay(PageMerchantMicroPayDTO dto) {
if (null != dto.getFloorForRule()) {
List<Long> mids = wxMerchantService.getFloorBuildMerchantIds(dto, dto.getFloorForRule(), null, null, 0, 0);
List<Long> mids = wxMerchantService.getFloorBuildMerchantIds(dto, dto.getFloorForRule(), null, null, 0, 0,null);
if (null == mids || mids.size() <= 0 ) {
dto.setMerchantId(-1L);
}else {
@@ -649,7 +649,7 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService {
@Override
public void exportMerchantMicroPay(PageMerchantMicroPayDTO dto, HttpServletResponse response) {
if (null != dto.getFloorForRule()) {
List<Long> mids = wxMerchantService.getFloorBuildMerchantIds(dto, dto.getFloorForRule(), null, null, 0, 0);
List<Long> mids = wxMerchantService.getFloorBuildMerchantIds(dto, dto.getFloorForRule(), null, null, 0, 0,null);
if (null == mids || mids.size() <= 0 ) {
dto.setMerchantId(-1L);
}else {


+ 2
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxAllBillServiceImpl.java Просмотреть файл

@@ -106,8 +106,8 @@ public class WxAllBillServiceImpl extends WxBillBaseService implements WxAllBill
WxRentContractMapper wxRentContractMapper;

private void updateQueryParam(WxAllBill wxBillRent) {
if (null != wxBillRent.getFloorForRule() || null != wxBillRent.getFloor() || null != wxBillRent.getBuilding()) {
List<Long> merchantIds = wxMerchantService.getFloorBuildMerchantIds(wxBillRent, wxBillRent.getFloorForRule(), wxBillRent.getBuilding(), wxBillRent.getFloor(), 0, 0);
if (StringUtils.isNotBlank(wxBillRent.getShopNumber()) || null != wxBillRent.getFloorForRule() || null != wxBillRent.getFloor() || null != wxBillRent.getBuilding()) {
List<Long> merchantIds = wxMerchantService.getFloorBuildMerchantIds(wxBillRent, wxBillRent.getFloorForRule(), wxBillRent.getBuilding(), wxBillRent.getFloor(), 0, 0,wxBillRent.getShopNumber());
if (null != merchantIds) {
wxBillRent.setMerchantIdList(merchantIds);
}else {


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java Просмотреть файл

@@ -790,7 +790,7 @@ public class WxChartServiceImpl implements WxChartDataService {
if (!StringUtils.isBlank(floorId)) {
floor = Long.parseLong(floorId);
}
List<Long> merchantIds = wxMerchantService.getFloorBuildMerchantIds(tenantEntity, null, building, floor, 0, 0);
List<Long> merchantIds = wxMerchantService.getFloorBuildMerchantIds(tenantEntity, null, building, floor, 0, 0,null);
if (merchantIds != null) {
query.put("ids", merchantIds);
}


+ 4
- 3
mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java Просмотреть файл

@@ -212,7 +212,7 @@ public class WxMerchantServiceImpl implements WxMerchantService {
@Override
public PageInfo<WxMerchantVo> listAsPageCVo(WxMerchantDto wxMerchantDto, Integer pageIndex, Integer pageSize,boolean hasShop) {
if (null != wxMerchantDto.getBuilding() || null != wxMerchantDto.getFloor()) {
List<Long> merchantIds = getFloorBuildMerchantIds(wxMerchantDto, null, wxMerchantDto.getBuilding(), wxMerchantDto.getFloor(), null, null);
List<Long> merchantIds = getFloorBuildMerchantIds(wxMerchantDto, null, wxMerchantDto.getBuilding(), wxMerchantDto.getFloor(), null, null,null);
wxMerchantDto.setIds(merchantIds);
}
if(wxMerchantDto.getIsAdmin() == null){
@@ -1308,12 +1308,12 @@ public class WxMerchantServiceImpl implements WxMerchantService {
private List<Long> getFloorBuildingMerchantIds(TenantEntity tenantEntity,String floorForRule,Long buildingId,Long floor) {
String floorRule = StringUtils.trimToNull(floorForRule);
List<Long> floorMerchantIds = getFloorBuildMerchantIds(tenantEntity, floorRule, buildingId, floor, 0, 0);
List<Long> floorMerchantIds = getFloorBuildMerchantIds(tenantEntity, floorRule, buildingId, floor, 0, 0,null);
return floorMerchantIds;
}
@Override
public List<Long> getFloorBuildMerchantIds(TenantEntity tenantEntity,String floorRule,Long building,Long floor,Integer merchantShopDel,Integer shopDel ) {
public List<Long> getFloorBuildMerchantIds(TenantEntity tenantEntity,String floorRule,Long building,Long floor,Integer merchantShopDel,Integer shopDel,String shopNumber ) {
if (null != floorRule || null != building || null != floor) {
List<Long> floorMerchantIds = null;
WxShop shopQ = new WxShop();
@@ -1330,6 +1330,7 @@ public class WxMerchantServiceImpl implements WxMerchantService {
if (null != floor) {
shopQ.setFloor(floor);
}
shopQ.setShopNumber(shopNumber);
List<Long> shopIds = wxShopMapper.findIdList(shopQ);
if (null == shopIds || shopIds.size() <= 0) {
floorMerchantIds = new ArrayList<Long>();


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java Просмотреть файл

@@ -185,7 +185,7 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ
private void handleQueryParam(WxMerchantTradeDaily record) {
//楼层楼座
List<Long> floorMids = wxMerchantService.getFloorBuildMerchantIds(record, record.getFloorForRule(), record.getBuildingId(), record.getFloorId(), EnumYesOrNo.NO.getCode(), EnumYesOrNo.NO.getCode());
List<Long> floorMids = wxMerchantService.getFloorBuildMerchantIds(record, record.getFloorForRule(), record.getBuildingId(), record.getFloorId(), EnumYesOrNo.NO.getCode(), EnumYesOrNo.NO.getCode(),null);
if (null != floorMids || StringUtils.isNotBlank(record.getMerchantName())) {
WxMerchant m = new WxMerchant();
m.updateTenantInfo(record);


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java Просмотреть файл

@@ -99,7 +99,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService
@Override
public PageInfo<WxPropertyContract> listAsPage(WxPropertyContract record, Integer pageIndex, Integer pageSize) {
if (StringUtils.isNotBlank(record.getFloorForRule())) {
List<Long> mids = wxMerchantService.getFloorBuildMerchantIds(record, record.getFloorForRule() , null, null, 0, 0);
List<Long> mids = wxMerchantService.getFloorBuildMerchantIds(record, record.getFloorForRule() , null, null, 0, 0,null);
if (null == mids || mids.size() <= 0 ) {
record.setId(-1L);
} else {


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java Просмотреть файл

@@ -1590,7 +1590,7 @@ public class WxRentContractServiceImpl implements WxRentContractService {
@Override
public PageInfo<WxRentContract> getRentContractList(WxRentContract rentContract, Integer pageIndex, Integer pageSize) {
if (StringUtils.isNoneBlank(rentContract.getFloorForRule())) {
List<Long> mids = wxMerchantService.getFloorBuildMerchantIds(rentContract, rentContract.getFloorForRule() , null, null, 0, 0);
List<Long> mids = wxMerchantService.getFloorBuildMerchantIds(rentContract, rentContract.getFloorForRule() , null, null, 0, 0,null);
if (null == mids || mids.size() <= 0 ) {
rentContract.setId(-1L);
} else {


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxRentPropertyContractServiceImpl.java Просмотреть файл

@@ -58,7 +58,7 @@ public class WxRentPropertyContractServiceImpl implements WxRentPropertyContract

@Override
public PageInfo<WxRentPropertyContractVo> listContractVo(WxRentPropertyContractVo record, Integer pageIndex, Integer pageSize) {
List<Long> mids = wxMerchantService.getFloorBuildMerchantIds(record, record.getFloorForRule() , null, null, 0, 0);
List<Long> mids = wxMerchantService.getFloorBuildMerchantIds(record, record.getFloorForRule() , null, null, 0, 0,null);
if (null == mids || mids.size() <= 0 ) {
record.setId(-1L);
} else {


Загрузка…
Отмена
Сохранить