Przeglądaj źródła

fix

release_toaliyun_real
winter 1 rok temu
rodzic
commit
922b7cdfa8
12 zmienionych plików z 34 dodań i 26 usunięć
  1. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMallBuildingController.java
  2. +3
    -3
      mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java
  3. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/basic/WxShopController.java
  4. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java
  5. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java
  6. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentPropertyContractController.java
  7. +3
    -3
      mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxMerchantTradeDailyController.java
  8. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxEnergyController.java
  9. +2
    -2
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantMicroPayController.java
  10. +9
    -9
      mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java
  11. +3
    -3
      mallinkBApi/src/main/java/com/iformall/controller/WxMallAdminController.java
  12. +8
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxUserDataRule.java

+ 1
- 1
mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMallBuildingController.java Wyświetl plik

@@ -41,7 +41,7 @@ public class WxMallBuildingController extends BaseController {
if (null != dataRule) {
wxMallBuilding.setFloorForRule(dataRule.getFloorIds());
wxMallBuilding.setBusinessForRule(dataRule.getBussinessIds());
wxMallBuilding.setShopTypeForRule(dataRule.getShopType());
wxMallBuilding.setShopTypeForRule(dataRule.getShopTypes());
}
return wxMallBuildingService.getBuildingFloorList(wxMallBuilding,this.getUser());
}


+ 3
- 3
mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java Wyświetl plik

@@ -79,7 +79,7 @@ public class WxMerchantController extends BaseController {
if (null != dataRule) {
wxMerchant.setFloorForRule(dataRule.getFloorIds());
wxMerchant.setBusinessForRule(dataRule.getBussinessIds());
wxMerchant.setShopTypeForRule(dataRule.getShopType());
wxMerchant.setShopTypeForRule(dataRule.getShopTypes());
}
final PageInfo<WxMerchant> page = wxMerchantService.listVoAsPage(wxMerchant, pageNum, pageSize,false);
return new ResultData(page);
@@ -107,7 +107,7 @@ public class WxMerchantController extends BaseController {
if (null != dataRule) {
wxMerchant.setFloorForRule(dataRule.getFloorIds());
//wxMerchant.setBusinessForRule(dataRule.getBussinessIds());
wxMerchant.setShopTypeForRule(dataRule.getShopType());
wxMerchant.setShopTypeForRule(dataRule.getShopTypes());
}
final PageInfo<WxMerchant> page = wxMerchantService.listVoAsPage(wxMerchant, pageNum, pageSize,false);
return new ResultData(page);
@@ -379,7 +379,7 @@ public class WxMerchantController extends BaseController {
if (null != dataRule) {
wxMerchant.setFloorForRule(dataRule.getFloorIds());
wxMerchant.setBusinessForRule(dataRule.getBussinessIds());
wxMerchant.setShopTypeForRule(dataRule.getShopType());
wxMerchant.setShopTypeForRule(dataRule.getShopTypes());
}
wxMerchantService.exportData(wxMerchant,request,response);
}


+ 1
- 1
mallinkAdmin/src/main/java/com/iformall/controller/basic/WxShopController.java Wyświetl plik

@@ -39,7 +39,7 @@ public class WxShopController extends BaseController {
if (null != dataRule) {
wxShop.setFloorForRule(dataRule.getFloorIds());
wxShop.setBusinessForRule(dataRule.getBussinessIds());
wxShop.setShopTypeForRule(dataRule.getShopType());
wxShop.setShopTypeForRule(dataRule.getShopTypes());
}
}


+ 1
- 1
mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java Wyświetl plik

@@ -79,7 +79,7 @@ public class WxPropertyContractController extends WxContractBaseController {
if (null != dataRule) {
wxPropertyContract.setFloorForRule(dataRule.getFloorIds());
wxPropertyContract.setBusinessForRule(dataRule.getBussinessIds());
wxPropertyContract.setShopTypeForRule(dataRule.getShopType());
wxPropertyContract.setShopTypeForRule(dataRule.getShopTypes());
}
PageInfo<WxPropertyContract> pageInfo = wxPropertyContractService.listAsPage(wxPropertyContract, pageNum, pageSize);
Integer hasFlow = null;


+ 1
- 1
mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java Wyświetl plik

@@ -76,7 +76,7 @@ public class WxRentContractController extends WxContractBaseController {
if (null != dataRule) {
wxRentContract.setFloorForRule(dataRule.getFloorIds());
wxRentContract.setBusinessForRule(dataRule.getBussinessIds());
wxRentContract.setShopTypeForRule(dataRule.getShopType());
wxRentContract.setShopTypeForRule(dataRule.getShopTypes());
}
PageInfo<WxRentContract> page = wxRentContractService.getRentContractList(wxRentContract, pageNum, pageSize);
Integer hasFlow = null;


+ 1
- 1
mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentPropertyContractController.java Wyświetl plik

@@ -56,7 +56,7 @@ public class WxRentPropertyContractController extends WxContractBaseController {
if (null != dataRule) {
wxRentPropertyContractVo.setFloorForRule(dataRule.getFloorIds());
wxRentPropertyContractVo.setBusinessForRule(dataRule.getBussinessIds());
wxRentPropertyContractVo.setShopTypeForRule(dataRule.getShopType());
wxRentPropertyContractVo.setShopTypeForRule(dataRule.getShopTypes());
}
PageInfo<WxRentPropertyContractVo> page = wxRentPropertyContractService.listContractVo(wxRentPropertyContractVo, pageNum, pageSize);
Integer hasFlow = null;


+ 3
- 3
mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxMerchantTradeDailyController.java Wyświetl plik

@@ -52,7 +52,7 @@ public class WxMerchantTradeDailyController extends BaseController {
if (null != dataRule) {
wxMerchantTradeDaily.setFloorForRule(dataRule.getFloorIds());
//wxMerchantTradeDaily.setBusinessForRule(dataRule.getBussinessIds());
wxMerchantTradeDaily.setShopTypeForRule(dataRule.getShopType());
wxMerchantTradeDaily.setShopTypeForRule(dataRule.getShopTypes());
}
wxMerchantTradeDaily.setSortColumns(BaseEntity.SortField.ReportDate_DESC,BaseEntity.SortField.CreateDate_DESC);
PageInfo<WxMerchantTradeDailyVo> page = wxMerchantTradeDailyService.listAsPageVo(wxMerchantTradeDaily, pageNum, pageSize);
@@ -69,7 +69,7 @@ public class WxMerchantTradeDailyController extends BaseController {
if (null != dataRule) {
wxMerchantTradeDaily.setFloorForRule(dataRule.getFloorIds());
wxMerchantTradeDaily.setBusinessForRule(dataRule.getBussinessIds());
wxMerchantTradeDaily.setShopTypeForRule(dataRule.getShopType());
wxMerchantTradeDaily.setShopTypeForRule(dataRule.getShopTypes());
}
return wxMerchantTradeDailyService.summary(wxMerchantTradeDaily);
}
@@ -163,7 +163,7 @@ public class WxMerchantTradeDailyController extends BaseController {
if (null != dataRule) {
wxMerchantTradeDaily.setFloorForRule(dataRule.getFloorIds());
//wxMerchantTradeDaily.setBusinessForRule(dataRule.getBussinessIds());
wxMerchantTradeDaily.setShopTypeForRule(dataRule.getShopType());
wxMerchantTradeDaily.setShopTypeForRule(dataRule.getShopTypes());
}
wxMerchantTradeDailyService.exportData(wxMerchantTradeDaily, request, response);
}


+ 1
- 1
mallinkAdmin/src/main/java/com/iformall/controller/market/WxEnergyController.java Wyświetl plik

@@ -83,7 +83,7 @@ public class WxEnergyController extends BaseController {
if (null != dataRule) {
record.setFloorForRule(dataRule.getFloorIds());
record.setBusinessForRule(dataRule.getBussinessIds());
record.setShopTypeForRule(dataRule.getShopType());
record.setShopTypeForRule(dataRule.getShopTypes());
}
record.updateTenantInfo(getTenantInfo());
record.setSortColumns(BaseEntity.SortField.CreateTime_DESC);


+ 2
- 2
mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantMicroPayController.java Wyświetl plik

@@ -82,7 +82,7 @@ public class WxMerchantMicroPayController extends BaseController {
if (null != dataRule) {
dto.setFloorForRule(dataRule.getFloorIds());
dto.setBusinessForRule(dataRule.getBussinessIds());
dto.setShopTypeForRule(dataRule.getShopType());
dto.setShopTypeForRule(dataRule.getShopTypes());
}
PageInfo<PageMerchantMicroPayVO> page = markingDataReportService.pageMerchantMicroPay(dto);
return new ResultData(page);
@@ -97,7 +97,7 @@ public class WxMerchantMicroPayController extends BaseController {
if (null != dataRule) {
dto.setFloorForRule(dataRule.getFloorIds());
dto.setBusinessForRule(dataRule.getBussinessIds());
dto.setShopTypeForRule(dataRule.getShopType());
dto.setShopTypeForRule(dataRule.getShopTypes());
}
markingDataReportService.exportMerchantMicroPay(dto, response);
}


+ 9
- 9
mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java Wyświetl plik

@@ -121,7 +121,7 @@ public class WxAllBillController extends BillBaseController {
if (null != dataRule) {
wxMerchant.setFloorForRule(dataRule.getFloorIds());
wxMerchant.setBusinessForRule(dataRule.getBussinessIds());
wxMerchant.setShopTypeForRule(dataRule.getShopType());
wxMerchant.setShopTypeForRule(dataRule.getShopTypes());
}
return new ResultData(getVoPage(wxMerchant, pageNum, pageSize,null));
}
@@ -190,7 +190,7 @@ public class WxAllBillController extends BillBaseController {
if (null != dataRule) {
wxMerchant.setFloorForRule(dataRule.getFloorIds());
wxMerchant.setBusinessForRule(dataRule.getBussinessIds());
wxMerchant.setShopTypeForRule(dataRule.getShopType());
wxMerchant.setShopTypeForRule(dataRule.getShopTypes());
}
PageInfo<WxMerchantBillVo> page = getVoPage(wxMerchant, 1, 10000,null);
excelService.exportExcel(page.getList(), null, "商户账单总览数据", WxMerchantBillVo.class, "商户账单总览数据.xlsx", response, false);
@@ -359,7 +359,7 @@ public class WxAllBillController extends BillBaseController {
if (null != dataRule) {
wxMerchant.setFloorForRule(dataRule.getFloorIds());
wxMerchant.setBusinessForRule(dataRule.getBussinessIds());
wxMerchant.setShopTypeForRule(dataRule.getShopType());
wxMerchant.setShopTypeForRule(dataRule.getShopTypes());
}
if (isOwe) {
wxMerchant.setOweBillBeforeDays(getOweBillBeforeDays());
@@ -420,7 +420,7 @@ public class WxAllBillController extends BillBaseController {
if (null != dataRule) {
wxMerchant.setFloorForRule(dataRule.getFloorIds());
wxMerchant.setBusinessForRule(dataRule.getBussinessIds());
wxMerchant.setShopTypeForRule(dataRule.getShopType());
wxMerchant.setShopTypeForRule(dataRule.getShopTypes());
}
wxMerchant.setOweBillBeforeDays(getOweBillBeforeDays());
wxMerchant.setNearBillBeforeDays(nearBillBeforeDays);
@@ -451,7 +451,7 @@ public class WxAllBillController extends BillBaseController {
if (null != dataRule) {
wxMerchant.setFloorForRule(dataRule.getFloorIds());
wxMerchant.setBusinessForRule(dataRule.getBussinessIds());
wxMerchant.setShopTypeForRule(dataRule.getShopType());
wxMerchant.setShopTypeForRule(dataRule.getShopTypes());
}
wxMerchant.setOweBillBeforeDays(getOweBillBeforeDays());
wxMerchant.setNearBillBeforeDays(nearBillBeforeDays);
@@ -617,7 +617,7 @@ public class WxAllBillController extends BillBaseController {
if (null != dataRule) {
wxMerchant.setFloorForRule(dataRule.getFloorIds());
wxMerchant.setBusinessForRule(dataRule.getBussinessIds());
wxMerchant.setShopTypeForRule(dataRule.getShopType());
wxMerchant.setShopTypeForRule(dataRule.getShopTypes());
}
return new ResultData(getVoPage(wxMerchant, pageNum, pageSize,EnumBillStatus.STOP_TO_SETTLE.getCode()));
}
@@ -729,7 +729,7 @@ public class WxAllBillController extends BillBaseController {
if (null != dataRule) {
record.setFloorForRule(dataRule.getFloorIds());
record.setBusinessForRule(dataRule.getBussinessIds());
record.setShopTypeForRule(dataRule.getShopType());
record.setShopTypeForRule(dataRule.getShopTypes());
}
if (null != record.getOnlyOweOrNear()) {
if (EnumBillOweOrNearType.OWE.getCode().intValue() == record.getOnlyOweOrNear().intValue()) {
@@ -752,7 +752,7 @@ public class WxAllBillController extends BillBaseController {
if (null != dataRule) {
wxBillRent.setFloorForRule(dataRule.getFloorIds());
wxBillRent.setBusinessForRule(dataRule.getBussinessIds());
wxBillRent.setShopTypeForRule(dataRule.getShopType());
wxBillRent.setShopTypeForRule(dataRule.getShopTypes());
}
if (null != wxBillRent.getOnlyOweOrNear()) {
if (EnumBillOweOrNearType.OWE.getCode().intValue() == wxBillRent.getOnlyOweOrNear().intValue()) {
@@ -775,7 +775,7 @@ public class WxAllBillController extends BillBaseController {
if (null != dataRule) {
record.setFloorForRule(dataRule.getFloorIds());
record.setBusinessForRule(dataRule.getBussinessIds());
record.setShopTypeForRule(dataRule.getShopType());
record.setShopTypeForRule(dataRule.getShopTypes());
}
if (null != record.getOnlyOweOrNear()) {
if (EnumBillOweOrNearType.OWE.getCode().intValue() == record.getOnlyOweOrNear().intValue()) {


+ 3
- 3
mallinkBApi/src/main/java/com/iformall/controller/WxMallAdminController.java Wyświetl plik

@@ -135,7 +135,7 @@ public class WxMallAdminController extends BaseController {
if (null != dataRule) {
tenantEntity.setFloorForRule(dataRule.getFloorIds());
tenantEntity.setBusinessForRule(dataRule.getBussinessIds());
tenantEntity.setShopTypeForRule(dataRule.getShopType());
tenantEntity.setShopTypeForRule(dataRule.getShopTypes());
}
}
@@ -382,8 +382,8 @@ public class WxMallAdminController extends BaseController {
@ApiOperation("抄表数据分页列表接口")
@GetMapping("readingList")
public ResultData readingList(@ModelAttribute WxEnergyMeterReading record) {
record.updateTenantInfo(getTenantInfo());
record.setIsDel(EnumYesOrNo.NO.getCode());
setQueryDataRule(record);
record.setSortColumns(BaseEntity.SortField.CreateTime_DESC);
PageInfo<WxEnergyMeterReading> page = wxEnergyService.readingListAsPage(record, 1, 1000);
return new ResultData(page);
@@ -392,7 +392,7 @@ public class WxMallAdminController extends BaseController {
//能源抄表费用
@PostMapping("commitEnergyReading")
public ResultData commitEnergyReading(@RequestBody WxEnergyMeterReading record) {
record.updateTenantInfo(getTenantInfo());
setQueryDataRule(record);
wxEnergyService.commitReading(record,this.getLoginMallUserInfo());
return new ResultData();
}


+ 8
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxUserDataRule.java Wyświetl plik

@@ -51,5 +51,13 @@ public class WxUserDataRule extends TenantEntity {
}*/
return null;
}
public String getShopTypes() {
if (StringUtils.isNotEmpty(shopType)) {
Object[] data = JSONArray.parseArray(shopType).toArray();
return StringUtils.join(data, ",");
}
return null;
}

}

Ładowanie…
Anuluj
Zapisz