diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java
index 3e9f6a5df..75e6cadca 100644
--- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java
+++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java
@@ -1,10 +1,14 @@
package com.iformall.controller.contract;
import com.iformall.annotation.SystemControllerLog;
+import com.iformall.annotation.UserDataRuleAnnotation;
import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
-import com.iformall.domain.po.*;
+import com.iformall.domain.po.MallUserInfo;
+import com.iformall.domain.po.WxBillProperty;
+import com.iformall.domain.po.WxMerchant;
+import com.iformall.domain.po.WxPropertyContract;
import com.iformall.enums.EnumIsPreview;
import com.iformall.enums.EnumRentStartType;
import com.iformall.exception.MallinkException;
@@ -38,7 +42,8 @@ public class WxPropertyContractController extends BaseController {
private Logger logger = LoggerFactory.getLogger(WxPropertyContractController.class);
- @GetMapping("list")
+ @UserDataRuleAnnotation("property_contract_list")
+ @GetMapping("/list")
@ApiImplicitParams({
@ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true),
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)})
diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java
index be88a5490..74650727f 100644
--- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java
+++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java
@@ -1,22 +1,23 @@
package com.iformall.controller.contract;
import com.iformall.annotation.SystemControllerLog;
+import com.iformall.annotation.UserDataRuleAnnotation;
import com.iformall.common.ErrorCode;
-import com.iformall.common.IdWorker;
import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.*;
-import com.iformall.enums.EnumBillAction;
import com.iformall.enums.EnumFromType;
import com.iformall.enums.EnumIsPreview;
import com.iformall.enums.EnumRentStartType;
import com.iformall.exception.MallinkException;
-import com.iformall.mapper.WxBillActionMapper;
import com.iformall.mapper.WxBillPropertyMapper;
import com.iformall.mapper.WxBillRentMapper;
import com.iformall.mapper.WxRentContractMapper;
-import com.iformall.service.*;
+import com.iformall.service.WxBillRentService;
+import com.iformall.service.WxMerchantService;
+import com.iformall.service.WxPayAccountBillService;
+import com.iformall.service.WxRentContractService;
import com.iformall.utils.DateUtils;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -28,9 +29,11 @@ import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import java.math.BigDecimal;
import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
/**
* @author gongbiao
@@ -88,7 +91,8 @@ public class WxRentContractController extends BaseController {
return new ResultData(map);
}
- @GetMapping("list")
+ @UserDataRuleAnnotation("rent_contract_list")
+ @GetMapping("/list")
@ApiImplicitParams({
@ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true),
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)})
diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentPropertyContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentPropertyContractController.java
index ab9f2b1fb..e0094fd36 100644
--- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentPropertyContractController.java
+++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentPropertyContractController.java
@@ -2,6 +2,7 @@ package com.iformall.controller.contract;
import com.github.pagehelper.PageInfo;
import com.iformall.annotation.SystemControllerLog;
+import com.iformall.annotation.UserDataRuleAnnotation;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.MallUserInfo;
@@ -27,7 +28,8 @@ public class WxRentPropertyContractController extends BaseController {
@Autowired
private WxRentPropertyContractService wxRentPropertyContractService;
- @GetMapping("list")
+ @UserDataRuleAnnotation("rent_property_contract_list")
+ @GetMapping("/list")
@ApiImplicitParams({
@ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true),
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)})
diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxMerchantTradeDailyController.java b/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxMerchantTradeDailyController.java
index 69318c152..c3474daaa 100644
--- a/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxMerchantTradeDailyController.java
+++ b/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxMerchantTradeDailyController.java
@@ -2,6 +2,7 @@ package com.iformall.controller.datatower;
import com.github.pagehelper.PageInfo;
import com.iformall.annotation.SystemControllerLog;
+import com.iformall.annotation.UserDataRuleAnnotation;
import com.iformall.common.ErrorCode;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
@@ -31,6 +32,7 @@ public class WxMerchantTradeDailyController extends BaseController {
private WxMerchantTradeDailyService wxMerchantTradeDailyService;
+ @UserDataRuleAnnotation("merchant_trade")
@ApiOperation("获得解单列表")
@GetMapping("/list")
@ApiImplicitParams({
diff --git a/mallinkAdmin/src/main/java/com/iformall/log/UserDataRuleAspect.java b/mallinkAdmin/src/main/java/com/iformall/log/UserDataRuleAspect.java
index 2f4db7cd2..fe75bcfb3 100644
--- a/mallinkAdmin/src/main/java/com/iformall/log/UserDataRuleAspect.java
+++ b/mallinkAdmin/src/main/java/com/iformall/log/UserDataRuleAspect.java
@@ -93,9 +93,11 @@ public class UserDataRuleAspect {
if (targetSet.contains(value)) {
//得到方法的参数
Object[] args = joinPoint.getArgs();
- BaseEntity baseEntity = (BaseEntity) args[0];
- baseEntity.setFloorForRule(buildingFloor);
- baseEntity.setBusinessForRule(businessForRule);
+ if (args[0] instanceof BaseEntity) {
+ BaseEntity baseEntity = (BaseEntity) args[0];
+ baseEntity.setFloorForRule(buildingFloor);
+ baseEntity.setBusinessForRule(businessForRule);
+ }
}
}
diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumUserDataRuleType.java b/mallinkService/src/main/java/com/iformall/enums/EnumUserDataRuleType.java
new file mode 100644
index 000000000..6a611601d
--- /dev/null
+++ b/mallinkService/src/main/java/com/iformall/enums/EnumUserDataRuleType.java
@@ -0,0 +1,36 @@
+package com.iformall.enums;
+
+
+/**
+ * @author gongbiao
+ */
+public enum EnumUserDataRuleType {
+
+ ALL(1, "系统全部数据"),
+ FLOOR_BUSINESS(2, "楼层及业态数据"),;
+
+ public static EnumUserDataRuleType getEnum(Integer code) {
+ for (EnumUserDataRuleType value : values()) {
+ if (value.getCode().equals(code)) {
+ return value;
+ }
+ }
+ return null;
+ }
+
+ private Integer code;
+ private String message;
+
+ EnumUserDataRuleType(Integer code, String message) {
+ this.code = code;
+ this.message = message;
+ }
+
+ public Integer getCode() {
+ return code;
+ }
+
+ public String getMessage() {
+ return message;
+ }
+}
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxUserDataRuleServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxUserDataRuleServiceImpl.java
index 6cfbc9e26..3aca66254 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxUserDataRuleServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxUserDataRuleServiceImpl.java
@@ -2,6 +2,7 @@ package com.iformall.service.impl;
import com.iformall.common.IdWorker;
import com.iformall.domain.po.WxUserDataRule;
+import com.iformall.enums.EnumUserDataRuleType;
import com.iformall.mapper.WxUserDataRuleMapper;
import com.iformall.service.WxUserDataRuleService;
import org.slf4j.Logger;
@@ -31,8 +32,13 @@ public class WxUserDataRuleServiceImpl implements WxUserDataRuleService {
record.setUpdateTime(date);
wxUserDataRuleMapper.insertSelective(record);
} else {
- record.setUpdateTime(date);
- wxUserDataRuleMapper.updateByPrimaryKeySelective(record);
+ if (EnumUserDataRuleType.ALL.getCode().equals(record.getType())) {
+ wxUserDataRuleMapper.deleteByPrimaryKey(record.getId());
+ } else {
+ record.setUpdateTime(date);
+ wxUserDataRuleMapper.updateByPrimaryKeySelective(record);
+ }
+
}
}
diff --git a/mallinkService/src/main/resources/mapper/WxMerchantTradeDailyMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantTradeDailyMapper.xml
index 7f1e667ed..157d7c007 100644
--- a/mallinkService/src/main/resources/mapper/WxMerchantTradeDailyMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxMerchantTradeDailyMapper.xml
@@ -63,6 +63,7 @@
#{idItem}
+
order by ${sortColumns}
order by report_date desc
@@ -142,7 +143,22 @@
and mtd.report_date >= date_format(#{startTime},'%Y-%m-%d')
and mtd.report_date <= date_format(#{endTime},'%Y-%m-%d')
-
+
+
+ and mtd.merchant_id in(
+ select ms.merchant_id from (select merchant_id,shop_id from wx_merchant_shop where is_del=0) ms
+ inner join wx_merchant m on ms.merchant_id = m.id
+ inner join wx_shop s on s.id=ms.shop_id
+ where m.tenant_id=#{tenantId} and s.is_del=0
+
+ and m.business_id in (${businessForRule})
+
+
+ and s.`floor` in (${floorForRule})
+
+ )
+
+
order by ${sortColumns}
diff --git a/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml b/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml
index 48a91e3c4..17fa3c140 100644
--- a/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml
@@ -143,6 +143,20 @@
and b.id = #{building}
and f.id = #{floor}
and `operation_type` = #{operationType}
+
+ and rc.merchant_id in(
+ select ms.merchant_id from (select merchant_id,shop_id from wx_merchant_shop where is_del=0) ms
+ inner join wx_merchant m on ms.merchant_id = m.id
+ inner join wx_shop s on s.id=ms.shop_id
+ where m.tenant_id=#{tenantId} and s.is_del=0
+
+ and m.business_id in (${businessForRule})
+
+
+ and s.`floor` in (${floorForRule})
+
+ )
+
order by ${sortColumns}
diff --git a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml
index d10c567d4..42321f244 100644
--- a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml
@@ -171,6 +171,20 @@
and b.id = #{building}
and f.id = #{floor}
and `operation_type` = #{operationType}
+
+ and rc.merchant_id in(
+ select ms.merchant_id from (select merchant_id,shop_id from wx_merchant_shop where is_del=0) ms
+ inner join wx_merchant m on ms.merchant_id = m.id
+ inner join wx_shop s on s.id=ms.shop_id
+ where m.tenant_id=#{tenantId} and s.is_del=0
+
+ and m.business_id in (${businessForRule})
+
+
+ and s.`floor` in (${floorForRule})
+
+ )
+
order by ${sortColumns}
order by rc.createtime desc,rc.id desc