diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestBaseController.java b/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestBaseController.java index 5a069ca28..a22acd703 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestBaseController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestBaseController.java @@ -30,6 +30,7 @@ public class InvestBaseController extends BaseController { super.InitBinder(dataBinder); registerEnumEditor(dataBinder, EnumCustomerType.class, "customerType") ; registerEnumEditor(dataBinder, EnumCustomerRatingType.class, "customerRatingType") ; + registerEnumEditor(dataBinder, EnumCustomerRatingType.class, "rating") ; registerEnumEditor(dataBinder, EnumTaskStatus.class, "taskStatus") ; registerEnumEditor(dataBinder, EnumFollowType.class, "type") ; } diff --git a/mallinkAdmin/src/main/resources/db/migration/V201910231900__W_INVEST_CREATE.sql b/mallinkAdmin/src/main/resources/db/migration/V201910231900__W_INVEST_CREATE.sql index 2ad38c8a0..eee489e89 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V201910231900__W_INVEST_CREATE.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V201910231900__W_INVEST_CREATE.sql @@ -40,6 +40,7 @@ CREATE TABLE `invest_customer` ( `type` TINYINT(6) NOT NULL DEFAULT '0' COMMENT '客户分类:0-潜在客户;1-意向客户;2-合作客户;3-谈判失败', `rating` TINYINT(6) NOT NULL DEFAULT '0' COMMENT '客户预评级:0-无;1-主力店;2-次主力店;3-甲;4-乙;5-丙' , `invest_channel` VARCHAR(10) NOT NULL COMMENT '招商渠道:0-无;1-电视;2-广播;3-报纸;4-刊物;5-物联网;6-招商活动;7-中介机构;8-自定义渠道', + `contract_no` VARCHAR(100) NOT NULL COMMENT '合同编号', `create_date` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', `update_date` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', PRIMARY KEY (`id`), diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxBLogController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxBLogController.java deleted file mode 100644 index 36f9f82c1..000000000 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxBLogController.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.iformall.controller; - -import com.github.pagehelper.PageInfo; -import com.iformall.common.Result; -import com.iformall.common.ResultData; -import com.iformall.domain.po.WxBLog; -import com.iformall.service.WxBLogService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -@RestController -@RequestMapping("wxBLog") -@Api(description = "B端埋点相关接口") -public class WxBLogController extends BaseController { - private final Logger logger = LoggerFactory.getLogger(this.getClass()); - - @Autowired - private WxBLogService wxBLogService; - - @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 WxBLog wxBLog, Integer pageNum, Integer pageSize) { - if (null == wxBLog) wxBLog = new WxBLog(); - final PageInfo page = wxBLogService.listAsPage(wxBLog, pageNum, pageSize); - return new ResultData(page); - } - - @ApiOperation("新增接口") - @PostMapping("add") - public ResultData add(@RequestBody WxBLog wxBLog) { - //Assert.notNull(wxBLog.getName(), "角色名不能为空"); - //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); - wxBLogService.saveOrUpdate(wxBLog); - return new ResultData(); - } - - @ApiOperation("根据id更新接口") - @PostMapping("update") - public ResultData update(@RequestBody WxBLog wxBLog) { - wxBLogService.saveOrUpdate(wxBLog); - return new ResultData(); - } - - @ApiOperation("根据id删除接口") - @GetMapping("/del") - @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) - public ResultData delete(Long id) { - wxBLogService.deleteById(id); - return new ResultData(Result.SUCCESS, "删除成功", null); - } - - @ApiOperation("根据id查询接口") - @GetMapping("/findById") - @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) - public ResultData findById(Long id) { - return new ResultData(Result.SUCCESS, "查询成功", wxBLogService.getById(id)); - } - - -} diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java index f957c6422..29bc0ef41 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java @@ -22,7 +22,6 @@ import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; -import org.apache.tomcat.jni.Error; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/mallinkService/src/main/java/com/iformall/domain/dto/KwMerchantMeterDto.java b/mallinkService/src/main/java/com/iformall/domain/dto/KwMerchantMeterDto.java index c63d9bbc8..5c8e17620 100644 --- a/mallinkService/src/main/java/com/iformall/domain/dto/KwMerchantMeterDto.java +++ b/mallinkService/src/main/java/com/iformall/domain/dto/KwMerchantMeterDto.java @@ -1,6 +1,6 @@ package com.iformall.domain.dto; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -9,9 +9,7 @@ import lombok.EqualsAndHashCode; */ @Data @EqualsAndHashCode(callSuper = true) -public class KwMerchantMeterDto extends BaseEntity { - - private String tenantId; +public class KwMerchantMeterDto extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value="商户名",name="name") private String merchantName; diff --git a/mallinkService/src/main/java/com/iformall/domain/dto/KwMeterDataDto.java b/mallinkService/src/main/java/com/iformall/domain/dto/KwMeterDataDto.java index 7a11c7833..63cbca64d 100644 --- a/mallinkService/src/main/java/com/iformall/domain/dto/KwMeterDataDto.java +++ b/mallinkService/src/main/java/com/iformall/domain/dto/KwMeterDataDto.java @@ -1,6 +1,6 @@ package com.iformall.domain.dto; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -11,10 +11,7 @@ import java.util.Date; */ @Data @EqualsAndHashCode(callSuper = true) -public class KwMeterDataDto extends BaseEntity { - - @io.swagger.annotations.ApiModelProperty(value = "tenantId", name = "tenantId") - private String tenantId; +public class KwMeterDataDto extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value = "电表ID", name = "meterId") private Long meterId; diff --git a/mallinkService/src/main/java/com/iformall/domain/dto/MarkingCouponDataReportDto.java b/mallinkService/src/main/java/com/iformall/domain/dto/MarkingCouponDataReportDto.java index 61ecfd4ce..de3d9593d 100644 --- a/mallinkService/src/main/java/com/iformall/domain/dto/MarkingCouponDataReportDto.java +++ b/mallinkService/src/main/java/com/iformall/domain/dto/MarkingCouponDataReportDto.java @@ -2,7 +2,7 @@ package com.iformall.domain.dto; import com.baomidou.mybatisplus.annotation.TableField; import com.iformall.common.SortColumn; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -15,14 +15,13 @@ import java.util.Date; @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) -public class MarkingCouponDataReportDto extends BaseEntity { +public class MarkingCouponDataReportDto extends TenantEntity { private Date startTime; private Date endTime; private Integer type; private Integer couponType; private String couponTitle; - private String tenantId; private Integer channelType; @TableField(exist = false) diff --git a/mallinkService/src/main/java/com/iformall/domain/dto/WxCUserBasicInfoDto.java b/mallinkService/src/main/java/com/iformall/domain/dto/WxCUserBasicInfoDto.java index 269e9fe0a..394de169d 100644 --- a/mallinkService/src/main/java/com/iformall/domain/dto/WxCUserBasicInfoDto.java +++ b/mallinkService/src/main/java/com/iformall/domain/dto/WxCUserBasicInfoDto.java @@ -1,7 +1,7 @@ package com.iformall.domain.dto; import com.baomidou.mybatisplus.annotation.TableField; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.BaseTenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -15,13 +15,7 @@ import java.util.List; */ @Data @EqualsAndHashCode(callSuper = true) -public class WxCUserBasicInfoDto extends BaseEntity { - - /** - * - */ - private static final long serialVersionUID = -1116465873573690766L; - +public class WxCUserBasicInfoDto extends BaseTenantEntity { protected Long id; @@ -36,10 +30,6 @@ public class WxCUserBasicInfoDto extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="姓名",name="name") private String name; - - @TableField(exist = false) - @io.swagger.annotations.ApiModelProperty(value="租户id",name="tenantId") - private String tenantId; @TableField(exist = false) private Integer reportType; diff --git a/mallinkService/src/main/java/com/iformall/domain/dto/WxMallBuildingFloorDto.java b/mallinkService/src/main/java/com/iformall/domain/dto/WxMallBuildingFloorDto.java index 041775e20..149f7acbb 100644 --- a/mallinkService/src/main/java/com/iformall/domain/dto/WxMallBuildingFloorDto.java +++ b/mallinkService/src/main/java/com/iformall/domain/dto/WxMallBuildingFloorDto.java @@ -1,21 +1,19 @@ package com.iformall.domain.dto; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; - -import java.io.Serializable; +import lombok.EqualsAndHashCode; /** * Created by Stormeye on 2018/8/10. * mall 楼座,楼层 */ @Data -public class WxMallBuildingFloorDto implements Serializable { - private static final long serialVersionUID = 1L; +@EqualsAndHashCode(callSuper = true) +public class WxMallBuildingFloorDto extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value="mallId",name="mallId") private Long mallId; - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") - private String tenantId; @io.swagger.annotations.ApiModelProperty(value="楼座",name="building") private String building; @io.swagger.annotations.ApiModelProperty(value="楼座",name="floors") diff --git a/mallinkService/src/main/java/com/iformall/domain/dto/WxMerchantDto.java b/mallinkService/src/main/java/com/iformall/domain/dto/WxMerchantDto.java index 975c8d8fc..6f7f54491 100644 --- a/mallinkService/src/main/java/com/iformall/domain/dto/WxMerchantDto.java +++ b/mallinkService/src/main/java/com/iformall/domain/dto/WxMerchantDto.java @@ -1,15 +1,15 @@ package com.iformall.domain.dto; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; +import lombok.EqualsAndHashCode; @Data -public class WxMerchantDto { - private static final long serialVersionUID = 6687964942922444531L; +@EqualsAndHashCode(callSuper = true) +public class WxMerchantDto extends TenantEntity { protected Long id; - /** 发券商户信息 */ - @io.swagger.annotations.ApiModelProperty(value="商户名",name="name") private String merchantName; diff --git a/mallinkService/src/main/java/com/iformall/domain/dto/WxOrderReportDto.java b/mallinkService/src/main/java/com/iformall/domain/dto/WxOrderReportDto.java index 3a75c27cf..8593e8671 100644 --- a/mallinkService/src/main/java/com/iformall/domain/dto/WxOrderReportDto.java +++ b/mallinkService/src/main/java/com/iformall/domain/dto/WxOrderReportDto.java @@ -1,6 +1,6 @@ package com.iformall.domain.dto; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -13,8 +13,7 @@ import java.util.Date; @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) -public class WxOrderReportDto extends BaseEntity { - private String tenantId; +public class WxOrderReportDto extends TenantEntity { private Long merchantId; private String merchantName; private Date startTime; diff --git a/mallinkService/src/main/java/com/iformall/domain/dto/WxSharingOrderDto.java b/mallinkService/src/main/java/com/iformall/domain/dto/WxSharingOrderDto.java index 75987746d..eb8eaa2be 100644 --- a/mallinkService/src/main/java/com/iformall/domain/dto/WxSharingOrderDto.java +++ b/mallinkService/src/main/java/com/iformall/domain/dto/WxSharingOrderDto.java @@ -1,16 +1,15 @@ package com.iformall.domain.dto; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; +import lombok.EqualsAndHashCode; -import java.io.Serializable; import java.util.Date; @Data -public class WxSharingOrderDto implements Serializable { - private static final long serialVersionUID = 1L; +@EqualsAndHashCode(callSuper = true) +public class WxSharingOrderDto extends TenantEntity { - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") - private String tenantId; @io.swagger.annotations.ApiModelProperty(value="订单ID",name="orderId") private Long orderId; @io.swagger.annotations.ApiModelProperty(value="c用户ID",name="cUserId") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/KwBox.java b/mallinkService/src/main/java/com/iformall/domain/po/KwBox.java index 5a053eb7e..6ec195ad6 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/KwBox.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/KwBox.java @@ -3,7 +3,7 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -17,14 +17,10 @@ import java.util.List; @Data @JsonIgnoreProperties(value = {"handler"}) @EqualsAndHashCode(callSuper = true) -public class KwBox extends BaseEntity { +public class KwBox extends TenantEntity { protected Long id; - - @io.swagger.annotations.ApiModelProperty(value = "tenantId", name = "tenantId") - private String tenantId; - @io.swagger.annotations.ApiModelProperty(value = "设备编号", name = "imei") private String imei; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/KwBoxCmdHistory.java b/mallinkService/src/main/java/com/iformall/domain/po/KwBoxCmdHistory.java index 4afc93328..a20cad3a5 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/KwBoxCmdHistory.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/KwBoxCmdHistory.java @@ -1,7 +1,7 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -15,13 +15,10 @@ import java.util.Date; @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) -public class KwBoxCmdHistory extends BaseEntity { +public class KwBoxCmdHistory extends TenantEntity { protected Long id; - @io.swagger.annotations.ApiModelProperty(value = "tenantId", name = "tenantId") - private String tenantId; - @io.swagger.annotations.ApiModelProperty(value = "设备编号", name = "imei") private String imei; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/KwMerchantMeter.java b/mallinkService/src/main/java/com/iformall/domain/po/KwMerchantMeter.java index e66c132ed..1caae931b 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/KwMerchantMeter.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/KwMerchantMeter.java @@ -1,7 +1,7 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -16,13 +16,10 @@ import java.util.Date; @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) -public class KwMerchantMeter extends BaseEntity { +public class KwMerchantMeter extends TenantEntity { protected Long id; - @io.swagger.annotations.ApiModelProperty(value = "tenantId", name = "tenantId") - private String tenantId; - @io.swagger.annotations.ApiModelProperty(value = "电表ID", name = "meterId") private Long meterId; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/KwMeter.java b/mallinkService/src/main/java/com/iformall/domain/po/KwMeter.java index c2672bfae..18ca344d6 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/KwMeter.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/KwMeter.java @@ -4,7 +4,7 @@ import cn.afterturn.easypoi.excel.annotation.Excel; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -17,13 +17,10 @@ import java.util.Date; @Data @JsonIgnoreProperties(value = {"handler"}) @EqualsAndHashCode(callSuper = true) -public class KwMeter extends BaseEntity { +public class KwMeter extends TenantEntity { protected Long id; - @io.swagger.annotations.ApiModelProperty(value = "tenantId", name = "tenantId") - private String tenantId; - @Excel(name = "电表编号 *", width = 20, orderNum = "1") @io.swagger.annotations.ApiModelProperty(value = "电表编号", name = "address") private String address; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/KwMeterData.java b/mallinkService/src/main/java/com/iformall/domain/po/KwMeterData.java index af695c6ae..71cdfbd48 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/KwMeterData.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/KwMeterData.java @@ -1,7 +1,7 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -15,15 +15,12 @@ import java.util.Date; @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) -public class KwMeterData extends BaseEntity { +public class KwMeterData extends TenantEntity { protected Long id; protected Long fake_id; - @io.swagger.annotations.ApiModelProperty(value = "tenantId", name = "tenantId") - private String tenantId; - @io.swagger.annotations.ApiModelProperty(value = "电表ID", name = "meterId") private Long meterId; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/MallResource.java b/mallinkService/src/main/java/com/iformall/domain/po/MallResource.java index ecce91e28..5a9128407 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/MallResource.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/MallResource.java @@ -1,22 +1,17 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; @TableName(value = "mall_resource") @Data @EqualsAndHashCode(callSuper = true) -public class MallResource extends BaseEntity { - private static final long serialVersionUID = 1L; - +public class MallResource extends TenantEntity { protected Long id; - - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") - private String tenantId; @io.swagger.annotations.ApiModelProperty(value="bucket名称",name="bucket") private String bucket; @io.swagger.annotations.ApiModelProperty(value="s3 key",name="s3Key") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/MallRole.java b/mallinkService/src/main/java/com/iformall/domain/po/MallRole.java index a61fcccc0..4e77f99d7 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/MallRole.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/MallRole.java @@ -2,21 +2,17 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; @TableName(value = "mall_role") @Data @EqualsAndHashCode(callSuper = true) -public class MallRole extends BaseEntity { - private static final long serialVersionUID = 1L; +public class MallRole extends TenantEntity { protected Long id; - - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") - private String tenantId; @io.swagger.annotations.ApiModelProperty(value="角色名称",name="name") private String name; @io.swagger.annotations.ApiModelProperty(value="是否可用 0可用 1不可用",name="available") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/MallRolePermission.java b/mallinkService/src/main/java/com/iformall/domain/po/MallRolePermission.java index 48cffab38..6d53dd475 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/MallRolePermission.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/MallRolePermission.java @@ -2,7 +2,7 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -11,16 +11,13 @@ import java.util.List; @TableName(value = "mall_role_permission") @Data @EqualsAndHashCode(callSuper = true) -public class MallRolePermission extends BaseEntity { - private static final long serialVersionUID = 1L; +public class MallRolePermission extends TenantEntity { protected Long id; @TableField(exist = false) protected List permissionIds; - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") - private String tenantId; @io.swagger.annotations.ApiModelProperty(value="角色ID",name="roleId") private Long roleId; @io.swagger.annotations.ApiModelProperty(value="权限ID",name="permissionId") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/MallUserAction.java b/mallinkService/src/main/java/com/iformall/domain/po/MallUserAction.java index 83909f44d..4ef283113 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/MallUserAction.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/MallUserAction.java @@ -1,7 +1,7 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -10,12 +10,10 @@ import java.util.*; @TableName(value = "mall_user_action") @Data @EqualsAndHashCode(callSuper = true) -public class MallUserAction extends BaseEntity { +public class MallUserAction extends TenantEntity { protected Long id; - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") - private String tenantId; @io.swagger.annotations.ApiModelProperty(value="用户ID",name="userId") private Long userId; @io.swagger.annotations.ApiModelProperty(value="类型 0-controller, 1-service",name="type") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/MallUserInfo.java b/mallinkService/src/main/java/com/iformall/domain/po/MallUserInfo.java index b0e7a2299..7a260ed83 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/MallUserInfo.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/MallUserInfo.java @@ -2,7 +2,7 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.enums.EnumUserAdmin; import com.iformall.enums.EnumUserWechat; import com.iformall.utils.Constant; @@ -19,14 +19,10 @@ import java.util.List; @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) -public class MallUserInfo extends BaseEntity { - +public class MallUserInfo extends TenantEntity { protected Long id; - - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") - private String tenantId; @io.swagger.annotations.ApiModelProperty(value="登录用户名",name="username") private String username; @io.swagger.annotations.ApiModelProperty(value="用户名称",name="name") @@ -108,11 +104,15 @@ public class MallUserInfo extends BaseEntity { } } - public boolean isFmSuperAdmin() { - if(StringUtils.isBlank(tenantId)) { + /** + * 富茂超管 + * @return + */ + public boolean isFmSuperAdmin() { + if(StringUtils.isBlank(getTenantId())) { return false; } - if(tenantId.equalsIgnoreCase(Constant.FM_SYS_ADMIN)) { + if(getTenantId().equalsIgnoreCase(Constant.FM_SYS_ADMIN)) { if(id.equals(Constant.SUPER_ADMIN) || isAdmin.equals(EnumUserAdmin.ADMIN.getCode())) { return true; } @@ -120,4 +120,19 @@ public class MallUserInfo extends BaseEntity { return false; } + /** + * 是否系统管理员 + * @return + */ + public boolean checkAdmin() { + if(StringUtils.isBlank(getTenantId())) { + return false; + } + if(isAdmin.equals(EnumUserAdmin.ADMIN.getCode())) { + return true; + } + return false; + } + + } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/PosCouponOrderVerify.java b/mallinkService/src/main/java/com/iformall/domain/po/PosCouponOrderVerify.java index f54522d65..7ca32bc40 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/PosCouponOrderVerify.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/PosCouponOrderVerify.java @@ -1,7 +1,7 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -10,12 +10,10 @@ import java.util.Date; @TableName(value = "pos_coupon_order_verify") @Data @EqualsAndHashCode(callSuper = true) -public class PosCouponOrderVerify extends BaseEntity { +public class PosCouponOrderVerify extends TenantEntity { protected Long id; - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") - private String tenantId; @io.swagger.annotations.ApiModelProperty(value="券包ID",name="couponOrderId") private Long couponOrderId; @io.swagger.annotations.ApiModelProperty(value="POS订单ID",name="posOrderId") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/PosMallConfig.java b/mallinkService/src/main/java/com/iformall/domain/po/PosMallConfig.java index 0c6a1042d..dd0358f6e 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/PosMallConfig.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/PosMallConfig.java @@ -1,7 +1,7 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -10,13 +10,10 @@ import java.util.*; @TableName(value = "pos_mall_config") @Data @EqualsAndHashCode(callSuper = true) -public class PosMallConfig extends BaseEntity { - private static final long serialVersionUID = 1L; +public class PosMallConfig extends TenantEntity { protected Long id; - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") - private String tenantId; @io.swagger.annotations.ApiModelProperty(value="会员折扣是否开启,0-禁用,1-可用",name="discount") private Integer discount; @io.swagger.annotations.ApiModelProperty(value="会员优惠券是否开启,0-禁用,1-单选可用,2-多选可用,",name="coupon") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/PosOrder.java b/mallinkService/src/main/java/com/iformall/domain/po/PosOrder.java index b39a5ad2a..bc90058fc 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/PosOrder.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/PosOrder.java @@ -1,21 +1,19 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableName; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; +import lombok.EqualsAndHashCode; + import java.util.*; -import java.io.Serializable; @TableName(value = "pos_order") @Data -public class PosOrder implements Serializable { - private static final long serialVersionUID = 1L; - +@EqualsAndHashCode(callSuper = true) +public class PosOrder extends TenantEntity { protected Long id; - - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") - private String tenantId; @io.swagger.annotations.ApiModelProperty(value="POS订单ID",name="posOrderNo") private String posOrderNo; @io.swagger.annotations.ApiModelProperty(value="支付类型(1: 独立核销, 2:支付)",name="type") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/PosPayOrder.java b/mallinkService/src/main/java/com/iformall/domain/po/PosPayOrder.java index 737d58ab0..9a8179e97 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/PosPayOrder.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/PosPayOrder.java @@ -1,19 +1,19 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableName; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; +import lombok.EqualsAndHashCode; + import java.util.*; -import java.io.Serializable; @TableName(value = "pos_pay_order") @Data -public class PosPayOrder implements Serializable { - private static final long serialVersionUID = 1L; +@EqualsAndHashCode(callSuper = true) +public class PosPayOrder extends TenantEntity { protected Long id; - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") - private String tenantId; @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createTime") private Date createTime; @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateTime") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/PushLimit.java b/mallinkService/src/main/java/com/iformall/domain/po/PushLimit.java index 04983bdfd..c4fd85cb1 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/PushLimit.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/PushLimit.java @@ -1,27 +1,19 @@ package com.iformall.domain.po; -import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; import java.util.*; -import java.util.List; @TableName(value = "push_limit") @Data @EqualsAndHashCode(callSuper = true) -public class PushLimit extends BaseEntity { - private static final long serialVersionUID = 1L; +public class PushLimit extends TenantEntity { protected Long id; - @TableField(exist = false) - protected List ids; - - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") - private String tenantId; @io.swagger.annotations.ApiModelProperty(value="每人每天可接收短信数",name="msgAmount") private Integer msgAmount; @io.swagger.annotations.ApiModelProperty(value="每人每周可接收发券数",name="couponAmount") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxActivity.java b/mallinkService/src/main/java/com/iformall/domain/po/WxActivity.java index 64baa0488..872a6ed78 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxActivity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxActivity.java @@ -2,7 +2,8 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; +import com.iformall.utils.Constant; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -16,13 +17,10 @@ import java.util.Date; @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) -public class WxActivity extends BaseEntity { +public class WxActivity extends TenantEntity { protected Long id; - - @io.swagger.annotations.ApiModelProperty(value = "租户", name = "tenantId") - private String tenantId; @io.swagger.annotations.ApiModelProperty(value = "封面图", name = "coverImg") private String coverImg; @io.swagger.annotations.ApiModelProperty(value = "主标题", name = "title") @@ -90,7 +88,7 @@ public class WxActivity extends BaseEntity { protected String weappSceneForJoin; public String getWeappPath() { - return "pages/index/index?type=ra&id=" + id; + return Constant.mainPageUrl + "?type=ra&id=" + id; } public String getWeappSceneForJoin() { @@ -107,7 +105,7 @@ public class WxActivity extends BaseEntity { protected String weappSceneForSign; public String getWeappPathForSign() { - return "pages/index/index?type=si&id=" + id; + return Constant.mainPageUrl + "?type=si&id=" + id; } public String getWeappSceneForSign() { diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxActivityJoin.java b/mallinkService/src/main/java/com/iformall/domain/po/WxActivityJoin.java index 88b6ead71..1da64aa54 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxActivityJoin.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxActivityJoin.java @@ -3,7 +3,7 @@ package com.iformall.domain.po; import cn.afterturn.easypoi.excel.annotation.Excel; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -17,13 +17,10 @@ import java.util.Date; @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) -public class WxActivityJoin extends BaseEntity { +public class WxActivityJoin extends TenantEntity { protected Long id; - @io.swagger.annotations.ApiModelProperty(value = "租户ID", name = "tenantId") - private String tenantId; - @io.swagger.annotations.ApiModelProperty(value = "C端用户ID", name = "userId") private Long userId; @io.swagger.annotations.ApiModelProperty(value = "活动ID", name = "activityId") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxAdminLog.java b/mallinkService/src/main/java/com/iformall/domain/po/WxAdminLog.java index 546ac1f4a..be8dc7953 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxAdminLog.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxAdminLog.java @@ -1,19 +1,17 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; @TableName(value = "wx_admin_log") @Data @EqualsAndHashCode(callSuper = true) -public class WxAdminLog extends BaseEntity { +public class WxAdminLog extends TenantEntity { protected Long id; - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") - private String tenantId; @io.swagger.annotations.ApiModelProperty(value="网址",name="url") private String url; @io.swagger.annotations.ApiModelProperty(value="时间",name="actionDate") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxAppinfo.java b/mallinkService/src/main/java/com/iformall/domain/po/WxAppinfo.java index dc975b23e..a395e7bd4 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxAppinfo.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxAppinfo.java @@ -1,7 +1,7 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.BaseTenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -10,14 +10,10 @@ import java.util.Date; @TableName(value = "wx_appinfo") @Data @EqualsAndHashCode(callSuper = true) -public class WxAppinfo extends BaseEntity { - +public class WxAppinfo extends BaseTenantEntity { protected Long id; - - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") - private String tenantId; @io.swagger.annotations.ApiModelProperty(value="小程序ID",name="appId") private String appId; @io.swagger.annotations.ApiModelProperty(value="公众号ID",name="parentAppId") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxAuthorizerInfo.java b/mallinkService/src/main/java/com/iformall/domain/po/WxAuthorizerInfo.java index ebc33ad77..a1c7e3ce4 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxAuthorizerInfo.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxAuthorizerInfo.java @@ -1,7 +1,7 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.BaseTenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -11,12 +11,10 @@ import java.util.Date; @TableName(value = "wx_authorizer_info") @Data @EqualsAndHashCode(callSuper = true) -public class WxAuthorizerInfo extends BaseEntity { +public class WxAuthorizerInfo extends BaseTenantEntity { protected Long id; - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") - private String tenantId; @io.swagger.annotations.ApiModelProperty(value="1B端2C端",name="type") private Integer type; @io.swagger.annotations.ApiModelProperty(value="授权方appid",name="authorizerAppid") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBLog.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBLog.java deleted file mode 100644 index 78c9233fa..000000000 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBLog.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.iformall.domain.po; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.base.BaseEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.util.Date; - -@TableName(value = "wx_b_log") -@Data -@EqualsAndHashCode(callSuper = true) -public class WxBLog extends BaseEntity { - private static final long serialVersionUID = 1L; - - - protected Long id; - - - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") - private String tenantId; - @io.swagger.annotations.ApiModelProperty(value="",name="data") - private String data; - @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") - private Date createDate; -} diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillAction.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillAction.java index a5d815502..af44a4de0 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillAction.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillAction.java @@ -2,7 +2,7 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -14,13 +14,10 @@ import java.util.Date; @TableName(value = "wx_bill_action") @Data @EqualsAndHashCode(callSuper = true) -public class WxBillAction extends BaseEntity { +public class WxBillAction extends TenantEntity { protected Long id; - @io.swagger.annotations.ApiModelProperty(value = "租户ID", name = "tenantId") - private String tenantId; - @io.swagger.annotations.ApiModelProperty(value = "账单ID", name = "billId") private Long billId; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java index e4fae0b6c..35411a06e 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java @@ -4,7 +4,7 @@ import cn.afterturn.easypoi.excel.annotation.Excel; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.iformall.common.SortColumn; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -21,7 +21,7 @@ import java.util.Map; @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) -public class WxBillDaily extends BaseEntity { +public class WxBillDaily extends TenantEntity { protected Long id; @@ -52,8 +52,7 @@ public class WxBillDaily extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="逾期天数",name="expiredDay") private Long expiredDay; - @io.swagger.annotations.ApiModelProperty(value="租户",name="tenantId") - private String tenantId; + @io.swagger.annotations.ApiModelProperty(value="欠缴",name="owe") private Long owe; @io.swagger.annotations.ApiModelProperty(value = "账单状态1欠缴2待缴3已结清4未到期", name = "status") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillDeposit.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillDeposit.java index 925ff8cf5..8bb93cd2a 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillDeposit.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillDeposit.java @@ -2,7 +2,7 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -14,12 +14,10 @@ import java.util.Date; @TableName(value = "wx_bill_rent_deposit") @Data @EqualsAndHashCode(callSuper = true) -public class WxBillDeposit extends BaseEntity { - +public class WxBillDeposit extends TenantEntity { protected Long id; - @TableField(exist = false) private String merchantName; @@ -40,8 +38,7 @@ public class WxBillDeposit extends BaseEntity { private Date createtime; @io.swagger.annotations.ApiModelProperty(value="逾期天数",name="expiredDay") private Long expiredDay; - @io.swagger.annotations.ApiModelProperty(value="租户",name="tenantId") - private String tenantId; + @io.swagger.annotations.ApiModelProperty(value="欠缴",name="owe") private Long owe; @io.swagger.annotations.ApiModelProperty(value = "账单状态1欠缴2待缴3已结清4未到期5已退还", name = "status") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillOther.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillOther.java index 717bf482d..93ba7be84 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillOther.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillOther.java @@ -4,7 +4,7 @@ import cn.afterturn.easypoi.excel.annotation.Excel; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.iformall.common.SortColumn; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -21,11 +21,10 @@ import java.util.Map; @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) -public class WxBillOther extends BaseEntity { +public class WxBillOther extends TenantEntity { protected Long id; - @Excel(name = "商户名称", width = 20, orderNum = "2") @TableField(exist = false) private String merchantName; @@ -57,8 +56,7 @@ public class WxBillOther extends BaseEntity { @Excel(name = "逾期(天)", orderNum = "10", width = 20) @io.swagger.annotations.ApiModelProperty(value="逾期天数",name="expiredDay") private Long expiredDay; - @io.swagger.annotations.ApiModelProperty(value="租户",name="tenantId") - private String tenantId; + @io.swagger.annotations.ApiModelProperty(value="欠缴",name="owe") private Long owe; @Excel(name = "状态", replace = {"欠缴_1", "待缴_2", "已结清_3", "未到期_4", "已退还_5", "失效_6"}, width = 20, orderNum = "9") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillOtherDeposit.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillOtherDeposit.java index 8c2858839..d426b09c2 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillOtherDeposit.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillOtherDeposit.java @@ -4,7 +4,7 @@ import cn.afterturn.easypoi.excel.annotation.Excel; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.iformall.common.SortColumn; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -22,11 +22,10 @@ import java.util.Map; @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) -public class WxBillOtherDeposit extends BaseEntity { +public class WxBillOtherDeposit extends TenantEntity { protected Long id; - @Excel(name = "商户名称", width = 20, orderNum = "2") @TableField(exist = false) private String merchantName; @@ -57,9 +56,6 @@ public class WxBillOtherDeposit extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "逾期天数", name = "expiredDay") private Long expiredDay; - @io.swagger.annotations.ApiModelProperty(value = "租户", name = "tenantId") - private String tenantId; - @io.swagger.annotations.ApiModelProperty(value = "欠缴", name = "owe") private Long owe; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java index 1014118e9..dcac97cef 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java @@ -4,7 +4,7 @@ import cn.afterturn.easypoi.excel.annotation.Excel; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.iformall.common.SortColumn; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -19,12 +19,10 @@ import java.util.Date; @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) -public class WxBillProperty extends BaseEntity { - +public class WxBillProperty extends TenantEntity { protected Long id; - @Excel(name = "商户名称", width = 20, orderNum = "2") @TableField(exist = false) private String merchantName; @@ -69,8 +67,7 @@ public class WxBillProperty extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="逾期天数",name="expiredDay") private Long expiredDay; - @io.swagger.annotations.ApiModelProperty(value="租户",name="tenantId") - private String tenantId; + @io.swagger.annotations.ApiModelProperty(value="欠缴",name="owe") private Long owe; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillPropertyDeposit.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillPropertyDeposit.java index 1b1434b1c..4722238e5 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillPropertyDeposit.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillPropertyDeposit.java @@ -2,7 +2,7 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -14,7 +14,7 @@ import java.util.Date; @TableName(value = "wx_bill_property_deposit") @Data @EqualsAndHashCode(callSuper = true) -public class WxBillPropertyDeposit extends BaseEntity { +public class WxBillPropertyDeposit extends TenantEntity { protected Long id; @@ -38,8 +38,6 @@ public class WxBillPropertyDeposit extends BaseEntity { private Date createtime; @io.swagger.annotations.ApiModelProperty(value="逾期天数",name="expiredDay") private Long expiredDay; - @io.swagger.annotations.ApiModelProperty(value="租户",name="tenantId") - private String tenantId; @io.swagger.annotations.ApiModelProperty(value="欠缴",name="owe") private Long owe; @io.swagger.annotations.ApiModelProperty(value = "账单状态1欠缴2待缴3已结清4未到期5已退还", name = "status") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java index c4202c4ad..12e2ffc63 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java @@ -4,10 +4,11 @@ import cn.afterturn.easypoi.excel.annotation.Excel; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.iformall.common.SortColumn; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; + import java.math.BigDecimal; import java.util.Date; @@ -18,8 +19,7 @@ import java.util.Date; @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) -public class WxBillRent extends BaseEntity { - +public class WxBillRent extends TenantEntity { protected Long id; @@ -34,7 +34,6 @@ public class WxBillRent extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="应收金额",name="receivePay") private Long receivePay; - public String getReceivePayStr() { return new BigDecimal(receivePay == null ? 0 : receivePay).divide(new BigDecimal(100)).toPlainString(); } @@ -68,9 +67,6 @@ public class WxBillRent extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="逾期天数",name="expiredDay") private Long expiredDay; - @io.swagger.annotations.ApiModelProperty(value="租户",name="tenantId") - private String tenantId; - @io.swagger.annotations.ApiModelProperty(value="欠缴",name="owe") private Long owe; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillSettle.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillSettle.java index 9141c6939..6643e2b7f 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillSettle.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillSettle.java @@ -3,7 +3,7 @@ package com.iformall.domain.po; import cn.afterturn.easypoi.excel.annotation.Excel; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -18,15 +18,10 @@ import java.util.Map; @TableName(value = "wx_bill_settle") @Data @EqualsAndHashCode(callSuper = true) -public class WxBillSettle extends BaseEntity { - private static final long serialVersionUID = 1L; - +public class WxBillSettle extends TenantEntity { protected Long id; - - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") - private String tenantId; @io.swagger.annotations.ApiModelProperty(value="结算单号",name="settleNumber") @Excel(name="结算单号",width = 20,orderNum = "1") private String settleNumber; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillSettleBill.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillSettleBill.java index 1f9442c50..a8dae7db4 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillSettleBill.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillSettleBill.java @@ -2,7 +2,7 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -14,14 +14,10 @@ import java.util.Date; @TableName(value = "wx_bill_settle_bill") @Data @EqualsAndHashCode(callSuper = true) -public class WxBillSettleBill extends BaseEntity { +public class WxBillSettleBill extends TenantEntity { public WxBillSettleBill(){} - private static final long serialVersionUID = 1L; - protected Long id; - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") - private String tenantId; @io.swagger.annotations.ApiModelProperty(value="结算单id",name="settleId") private Long settleId; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillSettleRecord.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillSettleRecord.java index 4e0d3db19..9b99a65e6 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillSettleRecord.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillSettleRecord.java @@ -1,7 +1,7 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -13,13 +13,10 @@ import java.util.Date; @TableName(value = "wx_bill_settle_record") @Data @EqualsAndHashCode(callSuper = true) -public class WxBillSettleRecord extends BaseEntity { - private static final long serialVersionUID = 1L; +public class WxBillSettleRecord extends TenantEntity { protected Long id; - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") - private String tenantId; @io.swagger.annotations.ApiModelProperty(value="结算单id",name="settleId") private Long settleId; @io.swagger.annotations.ApiModelProperty(value="操作人id",name="userid") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBrand.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBrand.java index d8f53371f..f287f6ed9 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBrand.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBrand.java @@ -1,7 +1,7 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -15,13 +15,9 @@ import java.util.Date; @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) -public class WxBrand extends BaseEntity { +public class WxBrand extends TenantEntity { protected Long id; - - - @io.swagger.annotations.ApiModelProperty(value="tenantId",name="tenantId") - private String tenantId; @io.swagger.annotations.ApiModelProperty(value="名称",name="name") private String name; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBuser.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBuser.java index a43c18c92..53df7b843 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBuser.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBuser.java @@ -3,7 +3,7 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.BaseTenantEntity; import com.iformall.utils.Constant; import lombok.Data; import lombok.EqualsAndHashCode; @@ -22,12 +22,10 @@ import java.util.UUID; @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) -public class WxBuser extends BaseEntity { +public class WxBuser extends BaseTenantEntity { protected Long id; - @io.swagger.annotations.ApiModelProperty(value = "租户ID", name = "tenantId") - private String tenantId; @io.swagger.annotations.ApiModelProperty(value = "微信openId", name = "openId") private String openId; @io.swagger.annotations.ApiModelProperty(value = "微信unionId", name = "unionId") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCLog.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCLog.java deleted file mode 100644 index 7f3019b13..000000000 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCLog.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.iformall.domain.po; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.base.BaseEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.util.*; - -@TableName(value = "wx_c_log") -@Data -@EqualsAndHashCode(callSuper = true) -public class WxCLog extends BaseEntity { - private static final long serialVersionUID = 1L; - - protected Long id; - - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") - private String tenantId; - @io.swagger.annotations.ApiModelProperty(value="",name="data") - private String data; - @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") - private Date createDate; - -} diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCUser.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCUser.java index 745ebc014..d28ea195d 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCUser.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCUser.java @@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.BaseTenantEntity; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.utils.Constant; import lombok.Data; import lombok.EqualsAndHashCode; @@ -20,14 +22,10 @@ import java.util.UUID; @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) -public class WxCUser extends BaseEntity { - +public class WxCUser extends TenantEntity { protected Long id; - - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") - private String tenantId; @io.swagger.annotations.ApiModelProperty(value="微信openId",name="openId") private String openId; @io.swagger.annotations.ApiModelProperty(value="微信unionId",name="unionId") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java index 6a9a0f07d..d6be8e8ea 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java @@ -5,7 +5,7 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.BaseTenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -19,7 +19,7 @@ import java.util.Objects; @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) -public class WxCUserBasicInfo extends BaseEntity { +public class WxCUserBasicInfo extends BaseTenantEntity { protected Long id; @@ -83,9 +83,6 @@ public class WxCUserBasicInfo extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="用户标签",name="tagId") private Long tagId; - @io.swagger.annotations.ApiModelProperty(value="租户id",name="tenantId") - private String tenantId; - @io.swagger.annotations.ApiModelProperty(value="会员等级",name="level") private String level; @@ -96,6 +93,9 @@ public class WxCUserBasicInfo extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="活动记录",name="actRecord") private Integer actRecord; + @io.swagger.annotations.ApiModelProperty(value = "状态0正常1锁定", name = "status") + private Integer status; + @TableField(exist = false) @Excel(name="标签",width = 50,orderNum = "10") private String tagNames; @@ -132,7 +132,6 @@ public class WxCUserBasicInfo extends BaseEntity { return addressStr; } - @Override public boolean equals(final Object obj) { @@ -148,13 +147,8 @@ public class WxCUserBasicInfo extends BaseEntity { } @Override - public int hashCode() { return Objects.hash(this.phone); } - - @io.swagger.annotations.ApiModelProperty(value = "状态0正常1锁定", name = "status") - private Integer status; - } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCUserCar.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCUserCar.java index f5328a673..1c7462c88 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCUserCar.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCUserCar.java @@ -1,7 +1,7 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.BaseTenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -10,13 +10,10 @@ import java.util.*; @TableName(value = "wx_c_user_car") @Data @EqualsAndHashCode(callSuper = true) -public class WxCUserCar extends BaseEntity { - private static final long serialVersionUID = 1L; +public class WxCUserCar extends BaseTenantEntity { protected Long id; - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") - private String tenantId; @io.swagger.annotations.ApiModelProperty(value="c端用户id",name="cUserId") private Long cUserId; @io.swagger.annotations.ApiModelProperty(value="车牌号",name="carNumber") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCUserFromB.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCUserFromB.java index c8f4162a4..4f2e5940b 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCUserFromB.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCUserFromB.java @@ -1,7 +1,7 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -10,13 +10,11 @@ import java.util.Date; @TableName(value = "wx_c_user_from_b") @Data @EqualsAndHashCode(callSuper = true) -public class WxCUserFromB extends BaseEntity { +public class WxCUserFromB extends TenantEntity { private static final long serialVersionUID = 1L; protected Long id; - @io.swagger.annotations.ApiModelProperty(value="",name="tenantId") - private String tenantId; @io.swagger.annotations.ApiModelProperty(value="商户ID",name="merchantId") private Long merchantId; @io.swagger.annotations.ApiModelProperty(value="b_user_id",name="bUserId") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCUserTags.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCUserTags.java index dd2b3845c..17ab259a0 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCUserTags.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCUserTags.java @@ -1,7 +1,7 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.BaseTenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -10,15 +10,10 @@ import java.util.*; @TableName(value = "wx_c_user_tags") @Data @EqualsAndHashCode(callSuper = true) -public class WxCUserTags extends BaseEntity { - private static final long serialVersionUID = 1L; - +public class WxCUserTags extends BaseTenantEntity { protected Long id; - - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") - private String tenantId; @io.swagger.annotations.ApiModelProperty(value="c端用户id",name="userId") private Long userId; @io.swagger.annotations.ApiModelProperty(value="",name="tags") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCampaign.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCampaign.java index 1d89b5eb3..9cdf94a36 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCampaign.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCampaign.java @@ -2,9 +2,10 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.WxCouponChannelVo; import com.iformall.enums.EnumCampaignType; +import com.iformall.utils.Constant; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -16,7 +17,7 @@ import java.util.List; @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) -public class WxCampaign extends BaseEntity { +public class WxCampaign extends TenantEntity { protected Long id; @@ -25,8 +26,6 @@ public class WxCampaign extends BaseEntity { @TableField(exist = false) protected List coupons; - @io.swagger.annotations.ApiModelProperty(value="",name="tenantId") - private String tenantId; @io.swagger.annotations.ApiModelProperty(value="封面图",name="coverImg") private String coverImg; @io.swagger.annotations.ApiModelProperty(value="多封面图",name="coverPicture") @@ -85,11 +84,11 @@ public class WxCampaign extends BaseEntity { public String getWeappPath() { if(type == null) - return "pages/index/index"; + return Constant.mainPageUrl; if(type.equals(EnumCampaignType.PAGEPATH.getCode())) { return pagePath; } - return "pages/index/index?type=bd&bt="+type+"&id="+id; + return Constant.mainPageUrl + "?type=bd&bt="+type+"&id="+id; } public String getWeappScene() { diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCarCmdLog.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCarCmdLog.java index e396bb838..b05d90f27 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCarCmdLog.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCarCmdLog.java @@ -1,7 +1,7 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -10,12 +10,10 @@ import java.util.Date; @TableName(value = "wx_car_cmd_log") @Data @EqualsAndHashCode(callSuper = true) -public class WxCarCmdLog extends BaseEntity { +public class WxCarCmdLog extends TenantEntity { protected Long id; - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") - private String tenantId; @io.swagger.annotations.ApiModelProperty(value="停车厂家,1. ETCP,2.停简单",name="vendorType") private Integer vendorType; @io.swagger.annotations.ApiModelProperty(value="停车厂家命令",name="cmdType") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCarPayRecord.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCarPayRecord.java index 9e3e6b71d..6b0a17933 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCarPayRecord.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCarPayRecord.java @@ -3,7 +3,7 @@ package com.iformall.domain.po; import cn.afterturn.easypoi.excel.annotation.Excel; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -15,7 +15,7 @@ import java.util.Date; @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) -public class WxCarPayRecord extends BaseEntity { +public class WxCarPayRecord extends TenantEntity { private Long id; @@ -32,7 +32,6 @@ public class WxCarPayRecord extends BaseEntity { @Excel(name="缴费金额(元)",width = 20,orderNum = "6") private String fee; - private String tenantId; private Integer vendorType; private String synId; private String parkId; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCardInfo.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCardInfo.java index 479c27dc5..172354dd6 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCardInfo.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCardInfo.java @@ -3,7 +3,7 @@ package com.iformall.domain.po; import cn.afterturn.easypoi.excel.annotation.Excel; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -14,16 +14,12 @@ import java.util.Date; @TableName(value = "wx_card_info") @Data @EqualsAndHashCode(callSuper = true) -public class WxCardInfo extends BaseEntity { - private static final long serialVersionUID = 1L; +public class WxCardInfo extends TenantEntity { @Excel(name = "卡号", width = 20, orderNum = "1") + @io.swagger.annotations.ApiModelProperty(value="主键ID-与coupon_order_id一致",name="id") + protected Long id; - protected Long id; /**主键ID-与coupon_order_id一致*/ - - - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") - private String tenantId; @io.swagger.annotations.ApiModelProperty(value = "券ID", name = "couponId") private Long couponId; @io.swagger.annotations.ApiModelProperty(value="微信订单号-购买类储值卡时的订单号",name="transactionId") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCardSpend.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCardSpend.java index d6bf725e6..b444d4577 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCardSpend.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCardSpend.java @@ -3,7 +3,7 @@ package com.iformall.domain.po; import cn.afterturn.easypoi.excel.annotation.Excel; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -15,13 +15,10 @@ import java.util.List; @TableName(value = "wx_card_spend") @Data @EqualsAndHashCode(callSuper = true) -public class WxCardSpend extends BaseEntity { - private static final long serialVersionUID = 1L; +public class WxCardSpend extends TenantEntity { protected Long id; - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") - private String tenantId; @io.swagger.annotations.ApiModelProperty(value="储值卡ID",name="cardId") private Long cardId; @io.swagger.annotations.ApiModelProperty(value="持有人ID",name="ownerId") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCardTransferInfo.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCardTransferInfo.java index e93786c34..e5bffcbf3 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCardTransferInfo.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCardTransferInfo.java @@ -1,7 +1,7 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -10,7 +10,7 @@ import java.util.Date; @TableName(value = "wx_card_transfer_info") @Data @EqualsAndHashCode(callSuper = true) -public class WxCardTransferInfo extends BaseEntity { +public class WxCardTransferInfo extends TenantEntity { protected Long id; @@ -19,9 +19,6 @@ public class WxCardTransferInfo extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "卡与订单关联ID", name = "couponOrderId") private Long couponOrderId; - @io.swagger.annotations.ApiModelProperty(value = "租户ID", name = "tenantId") - private String tenantId; - @io.swagger.annotations.ApiModelProperty(value = "卡名称", name = "title") private String title; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxChannel.java b/mallinkService/src/main/java/com/iformall/domain/po/WxChannel.java deleted file mode 100644 index f087e42d1..000000000 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxChannel.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.iformall.domain.po; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.base.BaseEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; - - -@TableName(value = "wx_channel") -@Data -@EqualsAndHashCode(callSuper = true) -public class WxChannel extends BaseEntity { - - protected Long id; - - @io.swagger.annotations.ApiModelProperty(value = "渠道ID", name = "channelId") - private Integer channelId; - @io.swagger.annotations.ApiModelProperty(value = "渠道名", name = "title") - private String title; - @io.swagger.annotations.ApiModelProperty(value = "图片url", name = "img") - private String img; - @io.swagger.annotations.ApiModelProperty(value = "是否支持批量投放0:不支持,1:支持", name = "batch") - private Integer batch; - -} diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxChartDataEntity.java b/mallinkService/src/main/java/com/iformall/domain/po/WxChartDataEntity.java index 996dac252..d3a309c65 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxChartDataEntity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxChartDataEntity.java @@ -1,7 +1,7 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -10,12 +10,9 @@ import java.util.Date; @TableName(value = "wx_chart_data") @Data @EqualsAndHashCode(callSuper = true) -public class WxChartDataEntity extends BaseEntity { - - private static final long serialVersionUID = 1L; +public class WxChartDataEntity extends TenantEntity { protected Long id; - private String tenantId; private Integer type; private String result; private Date querytime; @@ -23,13 +20,15 @@ public class WxChartDataEntity extends BaseEntity { @Override public String toString() { - return "WxChartDataEntity{" + - "id=" + id + - ", tenantId='" + tenantId + '\'' + - ", type=" + type + - ", result='" + result + '\'' + - ", querytime=" + querytime + - ", createtime=" + createtime + - '}'; + StringBuilder sb = new StringBuilder(); + sb.append("WxChartDataEntity{") + .append("id=").append(id) + .append(", tenantId='").append(getTenantId()).append('\''); + sb.append(", type=").append(type) + .append(", result='").append(result).append('\'') + .append(", querytime=").append(querytime) + .append(", createtime=").append(createtime) + .append('}'); + return sb.toString(); } } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java index e65fbe2ba..af0cede67 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java @@ -3,7 +3,7 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.iformall.common.SortColumn; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.WxCouponStatisVo; import com.iformall.enums.EnumCouponType; import lombok.Data; @@ -20,7 +20,7 @@ import java.util.Map; @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) -public class WxCoupon extends BaseEntity { +public class WxCoupon extends TenantEntity { protected Long id; @@ -58,8 +58,6 @@ public class WxCoupon extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="查询-结束时间",name="enddate") private Date enddate; - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") - private String tenantId; @io.swagger.annotations.ApiModelProperty(value="券类型(1.满减券,2.代金券,3.团购券,4.礼品券,5.停车券,6.多商户券,8.砍价券,9.团购券,50.积分券,51.积分停车券,100.消费卡)",name="type") private Integer type; @io.swagger.annotations.ApiModelProperty(value="封面图",name="coverImg") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponActionLog.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponActionLog.java index a84792348..37f666986 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponActionLog.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponActionLog.java @@ -2,7 +2,7 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -12,9 +12,7 @@ import java.util.List; @TableName(value = "wx_coupon_action_log") @Data @EqualsAndHashCode(callSuper = true) -public class WxCouponActionLog extends BaseEntity { - private static final long serialVersionUID = 1L; - +public class WxCouponActionLog extends TenantEntity { protected Long id; @@ -25,8 +23,6 @@ public class WxCouponActionLog extends BaseEntity { @TableField(exist = false) protected Date endTime; - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") - private String tenantId; @io.swagger.annotations.ApiModelProperty(value="券id",name="couponId") private Long couponId; @io.swagger.annotations.ApiModelProperty(value="券包ID",name="couponOrderId") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponCar.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponCar.java index 762420881..28222f54c 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponCar.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponCar.java @@ -2,7 +2,7 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -11,13 +11,10 @@ import java.util.*; @TableName(value = "wx_coupon_car") @Data @EqualsAndHashCode(callSuper = true) -public class WxCouponCar extends BaseEntity { - private static final long serialVersionUID = 1L; +public class WxCouponCar extends TenantEntity { protected Long id; - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") - private String tenantId; @io.swagger.annotations.ApiModelProperty(value="停车场ID",name="parkId") private Long parkId; @io.swagger.annotations.ApiModelProperty(value="车场服务商类型(1: ETCP,2:停简单)",name="vendorType") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponChannel.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponChannel.java index 9cd9818c6..5bffcbb45 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponChannel.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponChannel.java @@ -3,8 +3,9 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.iformall.common.SortColumn; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.enums.EnumCouponType; +import com.iformall.utils.Constant; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -16,7 +17,7 @@ import java.util.List; @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) -public class WxCouponChannel extends BaseEntity { +public class WxCouponChannel extends TenantEntity { protected Long id; @@ -35,8 +36,6 @@ public class WxCouponChannel extends BaseEntity { @TableField(exist = false) protected List couponIds; - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") - private String tenantId; @io.swagger.annotations.ApiModelProperty(value="卡券id",name="couponId") private Long couponId; @@ -94,11 +93,11 @@ public class WxCouponChannel extends BaseEntity { public String getWeappPath() { if(type == null) - return "pages/index/index"; + return Constant.mainPageUrl; if(!type.equals(EnumCouponType.COUPON_GROUP.getCode())) { - return "pages/index/index?type=cd&couponChannelId=" + id; + return Constant.mainPageUrl + "?type=cd&couponChannelId=" + id; } else { - return "pages/index/index?type=sd&couponChannelId=" + id; + return Constant.mainPageUrl + "?type=sd&couponChannelId=" + id; } } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponInject.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponInject.java index e3f8f1812..dc81e9bba 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponInject.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponInject.java @@ -3,7 +3,7 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.iformall.domain.dto.WxCUserBasicInfoFilterListDto; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -15,7 +15,7 @@ import java.util.List; @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) -public class WxCouponInject extends BaseEntity { +public class WxCouponInject extends TenantEntity { protected Long id; @@ -31,9 +31,6 @@ public class WxCouponInject extends BaseEntity { @TableField(exist = false) protected Date sendTimeEnd; - - @io.swagger.annotations.ApiModelProperty(value="",name="tenantId") - private String tenantId; @io.swagger.annotations.ApiModelProperty(value="任务名称",name="name") private String name; @io.swagger.annotations.ApiModelProperty(value="",name="mUserId") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponMerchant.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponMerchant.java index 471f60da7..618fa729e 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponMerchant.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponMerchant.java @@ -1,7 +1,7 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -10,15 +10,10 @@ import java.util.Date; @TableName(value = "wx_coupon_merchant") @Data @EqualsAndHashCode(callSuper = true) -public class WxCouponMerchant extends BaseEntity { - private static final long serialVersionUID = 1L; - +public class WxCouponMerchant extends TenantEntity { protected Long id; - - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") - private String tenantId; @io.swagger.annotations.ApiModelProperty(value="",name="productId") private Long productId; @io.swagger.annotations.ApiModelProperty(value="",name="merchantId") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponOrder.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponOrder.java index 541c2178e..91963e9eb 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponOrder.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponOrder.java @@ -2,7 +2,7 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -14,13 +14,10 @@ import java.util.Date; @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) -public class WxCouponOrder extends BaseEntity { +public class WxCouponOrder extends TenantEntity { protected Long id; - - @io.swagger.annotations.ApiModelProperty(value = "租户ID", name = "tenantId") - private String tenantId; @io.swagger.annotations.ApiModelProperty(value = "卡券ID", name = "couponId") private Long couponId; @io.swagger.annotations.ApiModelProperty(value = "券类型(1.满减券,2.代金券,3.团购券,4.礼品券,5.停车券,6.多商户券,8.砍价券,9.团购券,100.消费卡)", name = "couponType") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponPassword.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponPassword.java index f5090db3c..12d30c1fc 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponPassword.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponPassword.java @@ -4,7 +4,7 @@ import cn.afterturn.easypoi.excel.annotation.Excel; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -13,13 +13,11 @@ import java.util.Date; @TableName(value = "wx_coupon_password") @Data @EqualsAndHashCode(callSuper = true) -public class WxCouponPassword extends BaseEntity { +public class WxCouponPassword extends TenantEntity { @Excel(name = "ID", width = 20, orderNum = "1") protected Long id; - - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") - private String tenantId; + @io.swagger.annotations.ApiModelProperty(value="卡券ID",name="couponId") private Long couponId; @io.swagger.annotations.ApiModelProperty(value="卡券短ID",name="couponShort") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponPresent.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponPresent.java index 8d7ab89a2..146864873 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponPresent.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponPresent.java @@ -2,7 +2,7 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -12,12 +12,10 @@ import java.util.Date; @TableName(value = "wx_coupon_present") @Data @EqualsAndHashCode(callSuper = true) -public class WxCouponPresent extends BaseEntity { +public class WxCouponPresent extends TenantEntity { protected Long id; - @ApiModelProperty(value = "租户ID", name = "tenantId") - private String tenantId; @ApiModelProperty(value = "用户ID", name = "userId") private Long userId; @ApiModelProperty(value = "卡券ID", name = "couponId") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponSend.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponSend.java index 3cd83552d..9dc4aa793 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponSend.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponSend.java @@ -3,7 +3,7 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -16,7 +16,7 @@ import java.util.List; @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) -public class WxCouponSend extends BaseEntity { +public class WxCouponSend extends TenantEntity { /** * 卡券ids @@ -100,8 +100,6 @@ public class WxCouponSend extends BaseEntity { @TableField(exist = false) private Long merchantId; - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") - private String tenantId; @io.swagger.annotations.ApiModelProperty(value="卡券id",name="couponId") private Long couponId; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponSendConfig.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponSendConfig.java index 813f33de3..a8a3c619c 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponSendConfig.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponSendConfig.java @@ -1,7 +1,7 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -10,14 +10,10 @@ import java.util.*; @TableName(value = "wx_coupon_send_config") @Data @EqualsAndHashCode(callSuper = true) -public class WxCouponSendConfig extends BaseEntity { - private static final long serialVersionUID = 1L; +public class WxCouponSendConfig extends TenantEntity { protected Long id; - - @io.swagger.annotations.ApiModelProperty(value="租户id",name="tenantId") - private String tenantId; @io.swagger.annotations.ApiModelProperty(value="配置(2:停车发券 3:核销发券 4: B端刷卡发券)",name="sendType") private Integer sendType; @io.swagger.annotations.ApiModelProperty(value="0:启用 1:停用",name="value") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponType.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponType.java index a8c06af15..40c6e5b8b 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponType.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponType.java @@ -9,7 +9,6 @@ import lombok.EqualsAndHashCode; @Data @EqualsAndHashCode(callSuper = true) public class WxCouponType extends BaseEntity { - private static final long serialVersionUID = 1L; protected Long id; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCreditHistory.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCreditHistory.java index b4c95c00c..fc8efeecd 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCreditHistory.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCreditHistory.java @@ -2,7 +2,7 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -12,8 +12,7 @@ import java.util.List; @TableName(value = "wx_credit_history") @Data @EqualsAndHashCode(callSuper = true) -public class WxCreditHistory extends BaseEntity { - private static final long serialVersionUID = 1L; +public class WxCreditHistory extends TenantEntity { protected Long id; @@ -37,8 +36,6 @@ public class WxCreditHistory extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="花费Str",name="spendStr") private String spendStr; - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") - private String tenantId; @io.swagger.annotations.ApiModelProperty(value="用户ID",name="cUserId") private Long cUserId; @io.swagger.annotations.ApiModelProperty(value="总积分",name="creditAmount") @@ -76,7 +73,8 @@ public class WxCreditHistory extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "B端微信用户", name = "buserId") private Long buserId; + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value = "标签", name = "tags") - private transient List tags; + private List tags; } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCuserFloatingLayer.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCuserFloatingLayer.java index 5e0fd4c63..62db6a0a3 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCuserFloatingLayer.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCuserFloatingLayer.java @@ -1,7 +1,7 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.BaseTenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -10,14 +10,10 @@ import java.util.Date; @TableName(value = "wx_cuser_floating_layer") @Data @EqualsAndHashCode(callSuper = true) -public class WxCuserFloatingLayer extends BaseEntity { - private static final long serialVersionUID = 1L; +public class WxCuserFloatingLayer extends BaseTenantEntity { protected Long id; - @io.swagger.annotations.ApiModelProperty(value = "租户ID", name = "tenantId") - private String tenantId; - @io.swagger.annotations.ApiModelProperty(value = "C端用户ID", name = "userId") private Long userId; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxDataRuleTarget.java b/mallinkService/src/main/java/com/iformall/domain/po/WxDataRuleTarget.java index efcb4af89..02d47e195 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxDataRuleTarget.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxDataRuleTarget.java @@ -2,7 +2,7 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -16,8 +16,7 @@ import java.util.List; @TableName(value = "wx_data_rule_target") @Data @EqualsAndHashCode(callSuper = true) -public class WxDataRuleTarget extends BaseEntity { - private static final long serialVersionUID = 1L; +public class WxDataRuleTarget extends TenantEntity { protected Long id; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxDateAmountRecord.java b/mallinkService/src/main/java/com/iformall/domain/po/WxDateAmountRecord.java index d37bc13e5..ae6eb862a 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxDateAmountRecord.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxDateAmountRecord.java @@ -1,7 +1,7 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -10,13 +10,10 @@ import java.util.*; @TableName(value = "wx_date_amount_record") @Data @EqualsAndHashCode(callSuper = true) -public class WxDateAmountRecord extends BaseEntity { - private static final long serialVersionUID = 1L; - +public class WxDateAmountRecord extends TenantEntity { protected Long id; - @io.swagger.annotations.ApiModelProperty(value="日期",name="date") private Date date; @io.swagger.annotations.ApiModelProperty(value="周几 从1开始",name="dayOfWeek") @@ -25,8 +22,6 @@ public class WxDateAmountRecord extends BaseEntity { private Integer weekOfYear; @io.swagger.annotations.ApiModelProperty(value="金额",name="payPrice") private Integer payPrice; - @io.swagger.annotations.ApiModelProperty(value="租户id",name="tenantId") - private String tenantId; @io.swagger.annotations.ApiModelProperty(value="月份",name="month") private Integer month; @io.swagger.annotations.ApiModelProperty(value="商户id",name="merchantId") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxDevice.java b/mallinkService/src/main/java/com/iformall/domain/po/WxDevice.java index 5b1aa6b89..8198af3a4 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxDevice.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxDevice.java @@ -1,7 +1,7 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -12,13 +12,10 @@ import java.util.Date; @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) -public class WxDevice extends BaseEntity { +public class WxDevice extends TenantEntity { protected Long id; - @io.swagger.annotations.ApiModelProperty(value="租户id",name="tenantId") - private String tenantId; - @io.swagger.annotations.ApiModelProperty(value="设备id",name="deviceId") private String deviceId; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxFloatingLayer.java b/mallinkService/src/main/java/com/iformall/domain/po/WxFloatingLayer.java index a852958d2..137735dad 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxFloatingLayer.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxFloatingLayer.java @@ -1,7 +1,7 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -10,14 +10,10 @@ import java.util.Date; @TableName(value = "wx_floating_layer") @Data @EqualsAndHashCode(callSuper = true) -public class WxFloatingLayer extends BaseEntity { - private static final long serialVersionUID = 1L; +public class WxFloatingLayer extends TenantEntity { protected Long id; - @io.swagger.annotations.ApiModelProperty(value = "租户ID", name = "tenantId") - private String tenantId; - @io.swagger.annotations.ApiModelProperty(value = "封面图", name = "coverImg") private String coverImg; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxFlowConfig.java b/mallinkService/src/main/java/com/iformall/domain/po/WxFlowConfig.java index 73d835b16..f6cc11488 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxFlowConfig.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxFlowConfig.java @@ -2,7 +2,7 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -18,13 +18,10 @@ import java.util.List; @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) -public class WxFlowConfig extends BaseEntity { +public class WxFlowConfig extends TenantEntity { protected Long id; - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") - private String tenantId; - @io.swagger.annotations.ApiModelProperty(value="模板名称",name="name") private String name; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxFlowModel.java b/mallinkService/src/main/java/com/iformall/domain/po/WxFlowModel.java index adb8a62d1..f7cfb9966 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxFlowModel.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxFlowModel.java @@ -2,7 +2,7 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.UserTaskVo; import lombok.Data; import lombok.EqualsAndHashCode; @@ -19,13 +19,10 @@ import java.util.List; @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) -public class WxFlowModel extends BaseEntity { +public class WxFlowModel extends TenantEntity { protected Long id; - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") - private String tenantId; - @io.swagger.annotations.ApiModelProperty(value="模板名称",name="name") private String name; @@ -44,12 +41,12 @@ public class WxFlowModel extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="流程id",name="flowId") private String flowId; - @io.swagger.annotations.ApiModelProperty(value="流程类型4商铺签约5多径签约6商铺终止7多径终止8账单变更9有价卷上架",name="flowType") @TableField(exist = false) + @io.swagger.annotations.ApiModelProperty(value="流程类型4商铺签约5多径签约6商铺终止7多径终止8账单变更9有价卷上架",name="flowType") private Integer flowType; - //流程节点列表 @TableField(exist = false) + @io.swagger.annotations.ApiModelProperty(value="流程节点列表",name="lists") private List lists; } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxFlowRecord.java b/mallinkService/src/main/java/com/iformall/domain/po/WxFlowRecord.java index cff691865..1e5a054bf 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxFlowRecord.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxFlowRecord.java @@ -2,7 +2,7 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -13,9 +13,7 @@ import java.util.List; @TableName(value = "wx_flow_record") @Data @EqualsAndHashCode(callSuper = true) -public class WxFlowRecord extends BaseEntity { - private static final long serialVersionUID = 1849242743274278L; - +public class WxFlowRecord extends TenantEntity { private Long id; @io.swagger.annotations.ApiModelProperty(value="业务id",name="businessId") @@ -41,8 +39,9 @@ public class WxFlowRecord extends BaseEntity { private Date createDate; @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") private Date updateDate; - private String tenantId; + @io.swagger.annotations.ApiModelProperty(value="key",name="taskKey") private String taskKey; // key + @io.swagger.annotations.ApiModelProperty(value="名称",name="taskName") private String taskName;// 名称 @io.swagger.annotations.ApiModelProperty(value="当前状态同apply_status0未审核1审核中2审核完成3驳回4合同作废5撤回",name="currStatus") private Integer currStatus;// 当前状态 @@ -77,11 +76,11 @@ public class WxFlowRecord extends BaseEntity { } public WxFlowRecord(Long businessId,String tenantId){ this.businessId = businessId; - this.tenantId = tenantId; + setTenantId(tenantId); } public WxFlowRecord(Long businessId,String tenantId,Integer approvalType){ this.businessId = businessId; - this.tenantId = tenantId; + setTenantId(tenantId); this.approvalType = approvalType; } } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxGame.java b/mallinkService/src/main/java/com/iformall/domain/po/WxGame.java index 6c56fe6bb..6655dadde 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxGame.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxGame.java @@ -2,7 +2,8 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; +import com.iformall.utils.Constant; import lombok.Data; import lombok.EqualsAndHashCode; @@ -12,14 +13,10 @@ import java.util.List; @TableName(value = "wx_game") @Data @EqualsAndHashCode(callSuper = true) -public class WxGame extends BaseEntity { - private static final long serialVersionUID = 1L; +public class WxGame extends TenantEntity { protected Long id; - @io.swagger.annotations.ApiModelProperty(value = "租户ID", name = "tenantId") - private String tenantId; - @io.swagger.annotations.ApiModelProperty(value = "游戏模板ID", name = "gameId") private Long gameId; @@ -76,8 +73,8 @@ public class WxGame extends BaseEntity { public String getWeappPath() { if (id == null) - return "pages/index/index"; - return "pages/index/index?type=gm&id="+id; + return Constant.mainPageUrl; + return Constant.mainPageUrl + "?type=gm&id="+id; } public String getWeappScene() { diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxGameActionLog.java b/mallinkService/src/main/java/com/iformall/domain/po/WxGameActionLog.java index c29b5ae35..3ca496830 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxGameActionLog.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxGameActionLog.java @@ -2,34 +2,26 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; import java.util.Date; -import java.util.List; @TableName(value = "wx_game_action_log") @Data @EqualsAndHashCode(callSuper = true) -public class WxGameActionLog extends BaseEntity { - private static final long serialVersionUID = 1L; +public class WxGameActionLog extends TenantEntity { protected Long id; - @TableField(exist = false) - protected List ids; - @TableField(exist = false) protected Date startTime; @TableField(exist = false) protected Date endTime; - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") - private String tenantId; - @io.swagger.annotations.ApiModelProperty(value="游戏ID",name="gameId") private Long gameId; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxLevelConfig.java b/mallinkService/src/main/java/com/iformall/domain/po/WxLevelConfig.java index 47dd3ee20..1dc668a2d 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxLevelConfig.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxLevelConfig.java @@ -2,7 +2,7 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.BaseTenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -11,16 +11,12 @@ import java.util.*; @TableName(value = "wx_level_config") @Data @EqualsAndHashCode(callSuper = true) -public class WxLevelConfig extends BaseEntity { - private static final long serialVersionUID = 1L; +public class WxLevelConfig extends BaseTenantEntity { @TableField(exist = false) public static final int DEFAULT_SCALE = 10; protected Long id; - @io.swagger.annotations.ApiModelProperty(value="租户id",name="tenantId") - private String tenantId; - @io.swagger.annotations.ApiModelProperty(value="成长值",name="points") private Integer points; @io.swagger.annotations.ApiModelProperty(value="等级",name="level") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxLevelMerchant.java b/mallinkService/src/main/java/com/iformall/domain/po/WxLevelMerchant.java index a118a81c4..cc232b674 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxLevelMerchant.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxLevelMerchant.java @@ -1,7 +1,7 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -11,14 +11,10 @@ import java.util.Date; @TableName(value = "wx_level_merchant") @Data @EqualsAndHashCode(callSuper = true) -public class WxLevelMerchant extends BaseEntity { - private static final long serialVersionUID = 1L; +public class WxLevelMerchant extends TenantEntity { protected Long id; - - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") - private String tenantId; @io.swagger.annotations.ApiModelProperty(value="等级ID",name="levelId") private Long levelId; @io.swagger.annotations.ApiModelProperty(value="商户ID",name="merchantId") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxLogicPermission.java b/mallinkService/src/main/java/com/iformall/domain/po/WxLogicPermission.java index fb93f546d..242c8dde8 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxLogicPermission.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxLogicPermission.java @@ -11,7 +11,6 @@ import java.util.Date; @TableName(value = "wx_logic_permission") @EqualsAndHashCode(callSuper = true) public class WxLogicPermission extends BaseEntity { - private static final long serialVersionUID = 1L; @io.swagger.annotations.ApiModelProperty(value = "id", name = "主键") protected Long id; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMall.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMall.java index 4da52b4b9..503aa4060 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMall.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMall.java @@ -17,7 +17,6 @@ public class WxMall extends BaseEntity { protected Long id; - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @io.swagger.annotations.ApiModelProperty(value="商场名",name="name") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMallBuilding.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMallBuilding.java index d0f9a3903..d0cb23952 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMallBuilding.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMallBuilding.java @@ -2,7 +2,7 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -12,7 +12,7 @@ import java.util.List; @TableName(value = "wx_mall_building") @Data @EqualsAndHashCode(callSuper = true) -public class WxMallBuilding extends BaseEntity { +public class WxMallBuilding extends TenantEntity { private static final long serialVersionUID = 1L; protected Long id; @@ -20,8 +20,6 @@ public class WxMallBuilding extends BaseEntity { @TableField(exist = false) protected List floors; - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") - private String tenantId; @io.swagger.annotations.ApiModelProperty(value="商场id",name="mallId") private Long mallId; @io.swagger.annotations.ApiModelProperty(value="楼座名",name="name") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMallFloor.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMallFloor.java index 3d8ed37bc..1060ab8ee 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMallFloor.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMallFloor.java @@ -1,7 +1,7 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -11,13 +11,10 @@ import java.util.*; @TableName(value = "wx_mall_floor") @Data @EqualsAndHashCode(callSuper = true) -public class WxMallFloor extends BaseEntity { - private static final long serialVersionUID = 1L; +public class WxMallFloor extends TenantEntity { protected Long id; - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") - private String tenantId; @io.swagger.annotations.ApiModelProperty(value="商场id",name="mallId") private Long mallId; @io.swagger.annotations.ApiModelProperty(value="楼座id",name="buildingId") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java index 85f4c2bed..ca255582e 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java @@ -4,10 +4,12 @@ import cn.afterturn.easypoi.excel.annotation.Excel; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.iformall.common.SortColumn; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.WxShopVo; import com.iformall.enums.EnumBusiness; +import com.iformall.enums.EnumMerchantStatus; import com.iformall.enums.EnumSubBusiness; +import com.iformall.utils.Constant; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -22,7 +24,7 @@ import java.util.stream.Collectors; @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) -public class WxMerchant extends BaseEntity { +public class WxMerchant extends TenantEntity { protected Long id; @@ -71,6 +73,13 @@ public class WxMerchant extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="状态1可用0停用",name="status") private Integer status; + public boolean checkStatus() { + if (getStatus().equals(EnumMerchantStatus.VALID.getCode())) { + return true; + } + return false; + } + @TableField(exist = false) @Excel(name="账户类型",width = 20,orderNum = "7",replace = {"_null","商户号_0","微信号_1"}) @io.swagger.annotations.ApiModelProperty(value="账户类型",name="accountTypeValue") @@ -124,18 +133,25 @@ public class WxMerchant extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "辅谈人", name = "talkUserAux") private String talkUserAux; + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value = "开始时间", name = "startTime") - private transient Date starttime; + private Date starttime; + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value = "结束时间", name = "endTime") - private transient Date endtime; + private Date endtime; + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value = "昵称", name = "userName") - private transient String userName; + private String userName; + + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value = "联系方式", name = "phone") - private transient String phone; + private String phone; + + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value = "卷名称", name = "couponName") - private transient String couponName; + private String couponName; public String getShopsStr() { if (shopVos != null && shopVos.size() > 0) { @@ -189,8 +205,7 @@ public class WxMerchant extends BaseEntity { private Integer rentShopType; @TableField(exist = false) private Integer isUse; - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") - private String tenantId; + @io.swagger.annotations.ApiModelProperty(value="商户图片",name="imgUrl") private String imgUrl; @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") @@ -235,8 +250,8 @@ public class WxMerchant extends BaseEntity { public String getWeappPath() { if(id == null) - return "pages/index/index"; - return "pages/index/index?type=md&id=" + id; + return Constant.mainPageUrl; + return Constant.mainPageUrl + "?type=md&id=" + id; } public String getWeappScene() { diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantBUser.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantBUser.java index 571210d3d..1f1aba28a 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantBUser.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantBUser.java @@ -1,7 +1,8 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.utils.Constant; import lombok.Data; import lombok.EqualsAndHashCode; @@ -13,13 +14,10 @@ import java.util.UUID; @TableName(value = "wx_merchant_b_user") @Data @EqualsAndHashCode(callSuper = true) -public class WxMerchantBUser extends BaseEntity { - private static final long serialVersionUID = 1L; +public class WxMerchantBUser extends TenantEntity { protected Long id; - @io.swagger.annotations.ApiModelProperty(value = "租户ID", name = "tenantId") - private String tenantId; @io.swagger.annotations.ApiModelProperty(value = "B端用户手机号", name = "phone") private String phone; @io.swagger.annotations.ApiModelProperty(value = "", name = "userPwd") @@ -41,6 +39,8 @@ public class WxMerchantBUser extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "绑定状态1未绑定商户0已绑定商户", name = "status") private Integer status; + @TableField(exist = false) + @io.swagger.annotations.ApiModelProperty(value = "b用户ID", name = "buserId") private transient Long buserId; public String createToken(Date currentDate) { diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantCorp.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantCorp.java index 7fc9df685..0a972be25 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantCorp.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantCorp.java @@ -1,7 +1,7 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -10,13 +10,10 @@ import java.util.Date; @TableName(value = "wx_merchant_corp") @Data @EqualsAndHashCode(callSuper = true) -public class WxMerchantCorp extends BaseEntity { - private static final long serialVersionUID = 1L; +public class WxMerchantCorp extends TenantEntity { protected Long id; - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") - private String tenantId; @io.swagger.annotations.ApiModelProperty(value="商户ID",name="merchantId") private Long merchantId; @io.swagger.annotations.ApiModelProperty(value="法人证件类型1居民身份证2军官证3学生证4驾驶证5护照",name="corpPapersType") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantPowerBillConfig.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantPowerBillConfig.java index 8af338059..d53cdbb82 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantPowerBillConfig.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantPowerBillConfig.java @@ -2,7 +2,7 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -15,14 +15,10 @@ import java.util.Date; @Data @JsonIgnoreProperties(value = {"handler"}) @EqualsAndHashCode(callSuper = true) -public class WxMerchantPowerBillConfig extends BaseEntity { +public class WxMerchantPowerBillConfig extends TenantEntity { protected Long id; - - @io.swagger.annotations.ApiModelProperty(value = "tenantId", name = "tenantId") - private String tenantId; - @io.swagger.annotations.ApiModelProperty(value = "'商户ID'", name = "merchantId") private Long merchantId; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantShop.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantShop.java index af549ca4c..386ff1bfd 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantShop.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantShop.java @@ -1,7 +1,7 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -10,14 +10,10 @@ import java.util.Date; @TableName(value = "wx_merchant_shop") @Data @EqualsAndHashCode(callSuper = true) -public class WxMerchantShop extends BaseEntity { - private static final long serialVersionUID = 1L; +public class WxMerchantShop extends TenantEntity { protected Long id; - - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") - private String tenantId; @io.swagger.annotations.ApiModelProperty(value="商户ID",name="merchantId") private Long merchantId; @io.swagger.annotations.ApiModelProperty(value="商铺ID",name="shopId") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantSubsidy.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantSubsidy.java index 55bac8d30..7a888af6f 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantSubsidy.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantSubsidy.java @@ -4,7 +4,7 @@ import cn.afterturn.easypoi.excel.annotation.Excel; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.iformall.common.SortColumn; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -17,18 +17,13 @@ import java.util.List; @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) -public class WxMerchantSubsidy extends BaseEntity { +public class WxMerchantSubsidy extends TenantEntity { protected Long id; @TableField(exist = false) protected String idStr; - - - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") - private String tenantId; - @Excel(name="交易单号",width = 20,orderNum = "1") @io.swagger.annotations.ApiModelProperty(value="订单ID",name="orderId") private Long orderId; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantTax.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantTax.java index 07a13a45f..a1ce70154 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantTax.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantTax.java @@ -1,7 +1,7 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -11,13 +11,10 @@ import java.util.Date; @TableName(value = "wx_merchant_tax") @Data @EqualsAndHashCode(callSuper = true) -public class WxMerchantTax extends BaseEntity { - private static final long serialVersionUID = 1L; +public class WxMerchantTax extends TenantEntity { protected Long id; - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") - private String tenantId; @io.swagger.annotations.ApiModelProperty(value="商户ID",name="merchantId") private Long merchantId; @io.swagger.annotations.ApiModelProperty(value="纳税人类型1一般纳税人2小规模纳税人",name="taxpayerType") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantTradeDaily.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantTradeDaily.java index 49041b81d..bcc11287e 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantTradeDaily.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantTradeDaily.java @@ -2,7 +2,7 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; import org.apache.commons.lang3.StringUtils; @@ -13,13 +13,10 @@ import java.util.Date; @TableName(value = "wx_merchant_trade_daily") @Data @EqualsAndHashCode(callSuper = true) -public class WxMerchantTradeDaily extends BaseEntity { - private static final long serialVersionUID = 1L; +public class WxMerchantTradeDaily extends TenantEntity { protected Long id; - @io.swagger.annotations.ApiModelProperty(value = "租户ID", name = "tenantId") - private String tenantId; @io.swagger.annotations.ApiModelProperty(value = "商户id", name = "merchantId") private Long merchantId; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMsgCallback.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMsgCallback.java index 9bc485707..2967306a1 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMsgCallback.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMsgCallback.java @@ -1,7 +1,7 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -13,7 +13,7 @@ import java.util.Date; @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) -public class WxMsgCallback extends BaseEntity { +public class WxMsgCallback extends TenantEntity { protected Long id; @@ -21,8 +21,6 @@ public class WxMsgCallback extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="回调ID",name="callbackId") private Long callbackId; - @io.swagger.annotations.ApiModelProperty(value="租户id",name="tenantId") - private String tenantId; @io.swagger.annotations.ApiModelProperty(value="批次号",name="batchNo") private String batchNo; @io.swagger.annotations.ApiModelProperty(value="手机号",name="phone") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMsgConfig.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMsgConfig.java index 7d18fc340..0103531f2 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMsgConfig.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMsgConfig.java @@ -1,21 +1,17 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; @TableName(value = "wx_msg_config") @Data @EqualsAndHashCode(callSuper = true) -public class WxMsgConfig extends BaseEntity { - private static final long serialVersionUID = 1L; +public class WxMsgConfig extends TenantEntity { protected Long id; - - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") - private String tenantId; @io.swagger.annotations.ApiModelProperty(value="",name="secret") private String secret; @io.swagger.annotations.ApiModelProperty(value="",name="publickey") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMsgLimit.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMsgLimit.java index fd0057037..53e460f2e 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMsgLimit.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMsgLimit.java @@ -2,7 +2,7 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -13,12 +13,10 @@ import java.util.Date; @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) -public class WxMsgLimit extends BaseEntity { +public class WxMsgLimit extends TenantEntity { protected Long id; - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") - private String tenantId; @io.swagger.annotations.ApiModelProperty(value="1: 短信-验证码(24小时10条)2:短信-营销(24小时3条) 11:prepay_id(7天内3次), 12:form_id(7天内1次), 13.open_id for 小程序统一消息限制(2天内1次),14.open_id for 公众号模板消息限制(2天内1次)",name="type") private Integer type; @io.swagger.annotations.ApiModelProperty(value="限制ID",name="limitId") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMsgModel.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMsgModel.java index a27e1ef29..deffff615 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMsgModel.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMsgModel.java @@ -1,7 +1,7 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -13,12 +13,10 @@ import java.util.Date; @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) -public class WxMsgModel extends BaseEntity { +public class WxMsgModel extends TenantEntity { protected Long id; - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") - private String tenantId; @io.swagger.annotations.ApiModelProperty(value="名称",name="name") private String name; @io.swagger.annotations.ApiModelProperty(value="签名",name="signature") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMsgSignature.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMsgSignature.java index 5d303d251..6c2bad99e 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMsgSignature.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMsgSignature.java @@ -1,7 +1,7 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -12,12 +12,10 @@ import java.util.*; @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) -public class WxMsgSignature extends BaseEntity { +public class WxMsgSignature extends TenantEntity { protected Long id; - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") - private String tenantId; @io.swagger.annotations.ApiModelProperty(value="签名",name="name") private String name; @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createtime") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMsgValidationcode.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMsgValidationcode.java index b5196c435..ac246d492 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMsgValidationcode.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMsgValidationcode.java @@ -2,7 +2,7 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -12,12 +12,10 @@ import java.util.Date; @TableName(value = "wx_msg_validationcode") @Data @EqualsAndHashCode(callSuper = true) -public class WxMsgValidationcode extends BaseEntity { - private static final long serialVersionUID = 1L; +public class WxMsgValidationcode extends TenantEntity { protected Long id; - @io.swagger.annotations.ApiModelProperty(value="",name="phone") private String phone; @io.swagger.annotations.ApiModelProperty(value="",name="expiretime") @@ -26,8 +24,6 @@ public class WxMsgValidationcode extends BaseEntity { private Date createtime; @io.swagger.annotations.ApiModelProperty(value="场景 1 登录 2买券 3停车 4审批流通知",name="type") private Integer type; - @io.swagger.annotations.ApiModelProperty(value="",name="tenantId") - private String tenantId; @io.swagger.annotations.ApiModelProperty(value="内容",name="msg") private String msg; @io.swagger.annotations.ApiModelProperty(value="签名",name="signature") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMsgValidationcodeModel.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMsgValidationcodeModel.java index 7e00cc665..5325dca11 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMsgValidationcodeModel.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMsgValidationcodeModel.java @@ -1,7 +1,7 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -10,13 +10,10 @@ import java.util.Date; @TableName(value = "wx_msg_validationcode_model") @Data @EqualsAndHashCode(callSuper = true) -public class WxMsgValidationcodeModel extends BaseEntity { - private static final long serialVersionUID = 1L; - +public class WxMsgValidationcodeModel extends TenantEntity { protected Long id; - @io.swagger.annotations.ApiModelProperty(value="名称",name="name") private String name; @io.swagger.annotations.ApiModelProperty(value="签名",name="signature") @@ -34,9 +31,6 @@ public class WxMsgValidationcodeModel extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="场景",name="type") private Integer type; - @io.swagger.annotations.ApiModelProperty(value="tenantid",name="tenantId") - private String tenantId; - @io.swagger.annotations.ApiModelProperty(value="邮箱背景图片",name="emailBgImg") private String emailBgImg; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxOrder.java b/mallinkService/src/main/java/com/iformall/domain/po/WxOrder.java index 609f2ee6c..8bc7a8256 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxOrder.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxOrder.java @@ -3,7 +3,7 @@ package com.iformall.domain.po; import cn.afterturn.easypoi.excel.annotation.Excel; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -16,7 +16,7 @@ import java.util.List; @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) -public class WxOrder extends BaseEntity { +public class WxOrder extends TenantEntity { protected Long id; @@ -43,8 +43,6 @@ public class WxOrder extends BaseEntity { @Excel(name = "订单编号", width = 20, orderNum = "1") @io.swagger.annotations.ApiModelProperty(value="订单码;正反向交易保持一致。",name="orderNumber") private Long orderNumber; - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") - private String tenantId; @io.swagger.annotations.ApiModelProperty(value="c端用户id",name="cUserId") private Long cUserId; @io.swagger.annotations.ApiModelProperty(value="渠道ID",name="couponChannelId") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxOrderGroup.java b/mallinkService/src/main/java/com/iformall/domain/po/WxOrderGroup.java index c221d9494..5d65131ed 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxOrderGroup.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxOrderGroup.java @@ -1,23 +1,19 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; - import java.util.Date; @TableName(value = "wx_order_group") @Data @EqualsAndHashCode(callSuper = true) -public class WxOrderGroup extends BaseEntity { - private static final long serialVersionUID = 1L; +public class WxOrderGroup extends TenantEntity { protected Long id; - @io.swagger.annotations.ApiModelProperty(value = "租户ID", name = "tenantId") - private String tenantId; @io.swagger.annotations.ApiModelProperty(value = "订单ID", name = "orderId") private Long orderId; @io.swagger.annotations.ApiModelProperty(value = "券ID", name = "couponId") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxOrderPress.java b/mallinkService/src/main/java/com/iformall/domain/po/WxOrderPress.java index ccce48ddf..4c6906714 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxOrderPress.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxOrderPress.java @@ -1,7 +1,7 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -10,13 +10,10 @@ import java.util.*; @TableName(value = "wx_order_press") @Data @EqualsAndHashCode(callSuper = true) -public class WxOrderPress extends BaseEntity { - private static final long serialVersionUID = 1L; +public class WxOrderPress extends TenantEntity { protected Long id; - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") - private String tenantId; @io.swagger.annotations.ApiModelProperty(value="券ID",name="couponId") private Long couponId; @io.swagger.annotations.ApiModelProperty(value="订单ID",name="orderId") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxPark.java b/mallinkService/src/main/java/com/iformall/domain/po/WxPark.java index a6f3bbfcc..cbafa1075 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxPark.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxPark.java @@ -1,7 +1,7 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -10,14 +10,10 @@ import java.util.*; @TableName(value = "wx_park") @Data @EqualsAndHashCode(callSuper = true) -public class WxPark extends BaseEntity { - private static final long serialVersionUID = 1L; +public class WxPark extends TenantEntity { protected Long id; - - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") - private String tenantId; @io.swagger.annotations.ApiModelProperty(value="停车场图片",name="imgUrl") private String imgUrl; @io.swagger.annotations.ApiModelProperty(value="停车场地址",name="addr") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxPayAccount.java b/mallinkService/src/main/java/com/iformall/domain/po/WxPayAccount.java index 694d07d35..cc1085a88 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxPayAccount.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxPayAccount.java @@ -1,20 +1,17 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; @TableName(value = "wx_pay_account") @Data @EqualsAndHashCode(callSuper = true) -public class WxPayAccount extends BaseEntity { - private static final long serialVersionUID = 1L; +public class WxPayAccount extends TenantEntity { protected Long id; - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") - private String tenantId; @io.swagger.annotations.ApiModelProperty(value="微信商户号/特约服务商号",name="mchId") private String mchId; @io.swagger.annotations.ApiModelProperty(value="微信服务商号",name="subMchId") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxPayAccountBill.java b/mallinkService/src/main/java/com/iformall/domain/po/WxPayAccountBill.java index 101274cfa..b9bcd09cc 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxPayAccountBill.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxPayAccountBill.java @@ -1,7 +1,7 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -12,13 +12,10 @@ import lombok.EqualsAndHashCode; @TableName(value = "wx_pay_account_bill") @Data @EqualsAndHashCode(callSuper = true) -public class WxPayAccountBill extends BaseEntity { - private static final long serialVersionUID = 1L; +public class WxPayAccountBill extends TenantEntity { protected Long id; - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") - private String tenantId; @io.swagger.annotations.ApiModelProperty(value="微信商户号/特约服务商号",name="mchId") private String mchId; @io.swagger.annotations.ApiModelProperty(value="微信服务商号",name="subMchId") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxPayBill.java b/mallinkService/src/main/java/com/iformall/domain/po/WxPayBill.java index 446d1db53..b806f9e6e 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxPayBill.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxPayBill.java @@ -1,7 +1,7 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -14,62 +14,40 @@ import java.util.Date; @TableName(value = "wx_pay_bill") @Data @EqualsAndHashCode(callSuper = true) -public class WxPayBill extends BaseEntity { - private static final long serialVersionUID = 1L; - +public class WxPayBill extends TenantEntity { protected Long id; - - /**租户ID**/ - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") - private String tenantId; - /**创建时间**/ @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createTime") private Date createTime; - /**更新时间**/ @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateTime") private Date updateTime; - /**账单ID**/ @io.swagger.annotations.ApiModelProperty(value="账单ID",name="billId") private Long billId; - /**用户ID**/ @io.swagger.annotations.ApiModelProperty(value="用户ID",name="bUserId") private Long bUserId; - /**ip地址**/ @io.swagger.annotations.ApiModelProperty(value="ip地址",name="ip") private String ip; - /**支付金额(分)**/ @io.swagger.annotations.ApiModelProperty(value="支付金额(分)",name="payAmount") private Long payAmount; - /**支付发起时间**/ @io.swagger.annotations.ApiModelProperty(value="支付发起时间",name="payTimeStart") private Date payTimeStart; - /**支付结束时间**/ @io.swagger.annotations.ApiModelProperty(value="支付结束时间",name="payTimeEnd") private Date payTimeEnd; - /**微信预支付交易会话标识**/ @io.swagger.annotations.ApiModelProperty(value="微信预支付交易会话标识",name="prepayId") private String prepayId; - /**微信生成的订单号**/ @io.swagger.annotations.ApiModelProperty(value="微信生成的订单号",name="transactionId") private String transactionId; - /**支付渠道: 0-微信 1-支付宝 2-银联 **/ @io.swagger.annotations.ApiModelProperty(value="支付渠道: 0-微信 1-支付宝 2-银联 ",name="payVendor") private Integer payVendor; - /**支付订单号**/ @io.swagger.annotations.ApiModelProperty(value="支付订单号",name="payBillNo") private String payBillNo; - /**支付状态: 0-支付中;1-支付成功;2-支付失败**/ @io.swagger.annotations.ApiModelProperty(value="支付状态: 0-支付中;1-支付成功;2-支付失败",name="payBillStatus") private Integer payBillStatus; - /**分账状态: 0-未分账;1-分账**/ @io.swagger.annotations.ApiModelProperty(value="分账状态: 0-未分账;1-分账",name="payBillStatus") private Integer share; - /**分账金额(总金额扣除手续费后的金额)**/ @io.swagger.annotations.ApiModelProperty(value="分账金额",name="shareAmount") private Integer shareAmount; - /**支付失败原因**/ @io.swagger.annotations.ApiModelProperty(value="支付失败原因",name="failReason") private String failReason; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxPayOrder.java b/mallinkService/src/main/java/com/iformall/domain/po/WxPayOrder.java index 955396a7d..92c7a2020 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxPayOrder.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxPayOrder.java @@ -1,7 +1,7 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -10,15 +10,10 @@ import java.util.*; @TableName(value = "wx_pay_order") @Data @EqualsAndHashCode(callSuper = true) -public class WxPayOrder extends BaseEntity { - private static final long serialVersionUID = 1L; - +public class WxPayOrder extends TenantEntity { protected Long id; - - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") - private String tenantId; @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createTime") private Date createTime; @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateTime") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxPowerBillAutoConfig.java b/mallinkService/src/main/java/com/iformall/domain/po/WxPowerBillAutoConfig.java index 1240ca0fe..4b4f6ce91 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxPowerBillAutoConfig.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxPowerBillAutoConfig.java @@ -2,7 +2,7 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -15,13 +15,10 @@ import java.util.Date; @Data @JsonIgnoreProperties(value = {"handler"}) @EqualsAndHashCode(callSuper = true) -public class WxPowerBillAutoConfig extends BaseEntity { +public class WxPowerBillAutoConfig extends TenantEntity { protected Long id; - @io.swagger.annotations.ApiModelProperty(value = "tenantId", name = "tenantId") - private String tenantId; - @io.swagger.annotations.ApiModelProperty(value = "'单价'", name = "unitPrice") private String unitPrice; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxPrepayment.java b/mallinkService/src/main/java/com/iformall/domain/po/WxPrepayment.java index 5a2768bfb..ab86b047e 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxPrepayment.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxPrepayment.java @@ -2,7 +2,7 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -15,13 +15,10 @@ import java.util.Date; @TableName(value = "wx_prepayment") @Data @EqualsAndHashCode(callSuper = true) -public class WxPrepayment extends BaseEntity { - private static final long serialVersionUID = 1L; +public class WxPrepayment extends TenantEntity { protected Long id; - @io.swagger.annotations.ApiModelProperty(value = "租户ID", name = "tenantId") - private String tenantId; @io.swagger.annotations.ApiModelProperty(value = "商户ID", name = "merchantId") private Long merchantId; @io.swagger.annotations.ApiModelProperty(value = "最后付款方式1微信", name = "lastPayWay") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxPrepaymentHistory.java b/mallinkService/src/main/java/com/iformall/domain/po/WxPrepaymentHistory.java index a9b744d59..2b414ba07 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxPrepaymentHistory.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxPrepaymentHistory.java @@ -2,7 +2,7 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -15,14 +15,10 @@ import java.util.Date; @TableName(value = "wx_prepayment_history") @Data @EqualsAndHashCode(callSuper = true) -public class WxPrepaymentHistory extends BaseEntity { - private static final long serialVersionUID = 1L; +public class WxPrepaymentHistory extends TenantEntity { protected Long id; - - @io.swagger.annotations.ApiModelProperty(value = "租户ID", name = "tenantId") - private String tenantId; @io.swagger.annotations.ApiModelProperty(value = "商户ID", name = "merchantId") private Long merchantId; @io.swagger.annotations.ApiModelProperty(value = "付款方式1微信", name = "payWay") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxProfitSharingOrder.java b/mallinkService/src/main/java/com/iformall/domain/po/WxProfitSharingOrder.java index de7b73c2f..9a64b99db 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxProfitSharingOrder.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxProfitSharingOrder.java @@ -1,7 +1,7 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -10,8 +10,7 @@ import java.util.*; @TableName(value = "wx_profit_sharing_order") @Data @EqualsAndHashCode(callSuper = true) -public class WxProfitSharingOrder extends BaseEntity { - private static final long serialVersionUID = 1L; +public class WxProfitSharingOrder extends TenantEntity { protected Long id; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxProfitSharingReceiver.java b/mallinkService/src/main/java/com/iformall/domain/po/WxProfitSharingReceiver.java index 3fd143d58..d3f91e694 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxProfitSharingReceiver.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxProfitSharingReceiver.java @@ -2,7 +2,7 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -11,15 +11,10 @@ import java.util.Date; @TableName(value = "wx_profit_sharing_receiver") @Data @EqualsAndHashCode(callSuper = true) -public class WxProfitSharingReceiver extends BaseEntity { - private static final long serialVersionUID = 1L; - +public class WxProfitSharingReceiver extends TenantEntity { protected Long id; - - @io.swagger.annotations.ApiModelProperty(value="接收方(商场租户id)",name="tenantId") - private String tenantId; @io.swagger.annotations.ApiModelProperty(value="商户ID",name="merchantId") private Long merchantId; @io.swagger.annotations.ApiModelProperty(value="分账接收方类型,1 = MERCHANT_ID(商户 ID) 2 = PERSONAL_WECHATID(个人微信号) 3 = PERSONAL_OPENID(个人openid(由父商 户 APPID 转换得到) 4 = PERSONAL_SUB_OPENID(个人 sub_openid(由子商户 APPID 转换得到))",name="receiverType") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxProfitSharingResult.java b/mallinkService/src/main/java/com/iformall/domain/po/WxProfitSharingResult.java index adf0a33ee..411553468 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxProfitSharingResult.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxProfitSharingResult.java @@ -1,7 +1,7 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -10,15 +10,10 @@ import java.util.*; @TableName(value = "wx_profit_sharing_result") @Data @EqualsAndHashCode(callSuper = true) -public class WxProfitSharingResult extends BaseEntity { - private static final long serialVersionUID = 1L; - +public class WxProfitSharingResult extends TenantEntity { protected Long id; - - @io.swagger.annotations.ApiModelProperty(value="接收方(商场租户id)",name="tenantId") - private String tenantId; @io.swagger.annotations.ApiModelProperty(value="商户ID",name="merchantId") private Long merchantId; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java b/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java index df8b8b8b8..9e6803ae5 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java @@ -3,7 +3,7 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.iformall.common.SortColumn; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.enums.EnumPriceUnit; import com.iformall.enums.EnumRentContractAdjustPeriod; import lombok.Data; @@ -21,7 +21,7 @@ import java.util.Map; @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) -public class WxPropertyContract extends BaseEntity { +public class WxPropertyContract extends TenantEntity { protected Long id; @@ -57,9 +57,6 @@ public class WxPropertyContract extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="付款周期",name="receivePeriod") private Integer receivePeriod; - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") - private String tenantId; - @io.swagger.annotations.ApiModelProperty(value="合同文件路径",name="filepath") private String filepath; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxQuestion.java b/mallinkService/src/main/java/com/iformall/domain/po/WxQuestion.java index ddd98bf38..ba7100155 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxQuestion.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxQuestion.java @@ -9,11 +9,10 @@ import lombok.EqualsAndHashCode; @Data @EqualsAndHashCode(callSuper = true) public class WxQuestion extends BaseEntity { - private static final long serialVersionUID = 1L; protected Long id; - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") + @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @io.swagger.annotations.ApiModelProperty(value="问题内容",name="content") private String content; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxQuestionConfig.java b/mallinkService/src/main/java/com/iformall/domain/po/WxQuestionConfig.java index 53fa379f2..7fe575efe 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxQuestionConfig.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxQuestionConfig.java @@ -13,12 +13,10 @@ import java.util.List; @Data @EqualsAndHashCode(callSuper = true) public class WxQuestionConfig extends BaseEntity { - private static final long serialVersionUID = 1L; protected Long id; - - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") + @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @io.swagger.annotations.ApiModelProperty(value="问题列表",name="questionList") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxQuestionLog.java b/mallinkService/src/main/java/com/iformall/domain/po/WxQuestionLog.java index 41cc572d1..97e301bdd 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxQuestionLog.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxQuestionLog.java @@ -12,24 +12,19 @@ import java.util.Date; @Data @EqualsAndHashCode(callSuper = true) public class WxQuestionLog extends BaseEntity { - private static final long serialVersionUID = 1L; protected Long id; - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") + @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @io.swagger.annotations.ApiModelProperty(value="用户ID",name="userId") private Long userId; - /**问题ID**/ @io.swagger.annotations.ApiModelProperty(value="问题ID",name="questionId") private Long questionId; - /**答案**/ @io.swagger.annotations.ApiModelProperty(value="答案",name="answer") private String answer; - /**创建时间**/ @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createTime") private Date createTime; - /**更新时间**/ @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateTime") private Date updateTime; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxRefundOrder.java b/mallinkService/src/main/java/com/iformall/domain/po/WxRefundOrder.java index 6a7db969c..029cd6e22 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxRefundOrder.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxRefundOrder.java @@ -1,7 +1,7 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -10,15 +10,10 @@ import java.util.*; @TableName(value = "wx_refund_order") @Data @EqualsAndHashCode(callSuper = true) -public class WxRefundOrder extends BaseEntity { - private static final long serialVersionUID = 1L; - +public class WxRefundOrder extends TenantEntity { protected Long id; - - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") - private String tenantId; @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createTime") private Date createTime; @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateTime") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java index 3a9e06e29..df357e980 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java @@ -3,7 +3,7 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.iformall.common.SortColumn; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.enums.EnumPriceUnit; import com.iformall.enums.EnumRentContractAdjustPeriod; import lombok.Data; @@ -23,11 +23,10 @@ import java.util.Map; @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) -public class WxRentContract extends BaseEntity { +public class WxRentContract extends TenantEntity { protected Long id; - @TableField(exist = false) @SortColumn(column = "shopNumber") private String shopNumber; @@ -93,8 +92,6 @@ public class WxRentContract extends BaseEntity { private Date signDate; @io.swagger.annotations.ApiModelProperty(value = "付款周期", name = "receivePeriod") private Integer receivePeriod; - @io.swagger.annotations.ApiModelProperty(value = "租户ID", name = "tenantId") - private String tenantId; @io.swagger.annotations.ApiModelProperty(value = "合同文件路径", name = "filepath") private String filepath; @io.swagger.annotations.ApiModelProperty(value = "合同进度状态1待签约2已签约未记租3计租中4提前终止5合同到期", name = "status") @@ -164,12 +161,10 @@ public class WxRentContract extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "起租结束时间", name = "rentalEndDate") private Date endDate; - //审核状态,0未审核 1审核中 2审核通过 3驳回 - @io.swagger.annotations.ApiModelProperty(value = "审核状态", name = "applyStatus") + @io.swagger.annotations.ApiModelProperty(value = "审核状态, 0未审核 1审核中 2审核通过 3驳回", name = "applyStatus") private Integer applyStatus; - // 审批流1合同2账单3终止审批 - @io.swagger.annotations.ApiModelProperty(value = "审批流类型", name = "businessType") + @io.swagger.annotations.ApiModelProperty(value = "审批流类型: 审批流1合同2账单3终止审批", name = "businessType") private Integer businessType; @io.swagger.annotations.ApiModelProperty(value = "开户行", name = "bankName") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxScoreHistory.java b/mallinkService/src/main/java/com/iformall/domain/po/WxScoreHistory.java index 70c4b63e6..2025b010b 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxScoreHistory.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxScoreHistory.java @@ -2,7 +2,7 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -11,18 +11,15 @@ import java.util.*; @TableName(value = "wx_score_history") @Data @EqualsAndHashCode(callSuper = true) -public class WxScoreHistory extends BaseEntity { - private static final long serialVersionUID = 1L; +public class WxScoreHistory extends TenantEntity { protected Long id; - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") - private String tenantId; @io.swagger.annotations.ApiModelProperty(value="会员ID",name="cUserId") private Long cUserId; @io.swagger.annotations.ApiModelProperty(value="创建日期",name="createDate") private Date createDate; - @io.swagger.annotations.ApiModelProperty(value="/**成长值类型(1:每日登录, 2:消费,3:绑车牌,4:连接wifi,5:微信昵称授权,6:微信手机授权)**/",name="scoreType") + @io.swagger.annotations.ApiModelProperty(value="成长值类型(1:每日登录, 2:消费,3:绑车牌,4:连接wifi,5:微信昵称授权,6:微信手机授权)",name="scoreType") private Integer scoreType; @io.swagger.annotations.ApiModelProperty(value="有效日期",name="validDate") private Date validDate; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxScreenAd.java b/mallinkService/src/main/java/com/iformall/domain/po/WxScreenAd.java index 75229e915..72c9c72c5 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxScreenAd.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxScreenAd.java @@ -2,7 +2,7 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -13,13 +13,10 @@ import java.util.Date; @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) -public class WxScreenAd extends BaseEntity { +public class WxScreenAd extends TenantEntity { protected Long id; - @io.swagger.annotations.ApiModelProperty(value="租户id",name="tenantId") - private String tenantId; - @io.swagger.annotations.ApiModelProperty(value="标题",name="title") private String title; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxShop.java b/mallinkService/src/main/java/com/iformall/domain/po/WxShop.java index 0d402df63..9a895495e 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxShop.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxShop.java @@ -4,7 +4,7 @@ import cn.afterturn.easypoi.excel.annotation.Excel; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.iformall.common.SortColumn; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -17,7 +17,7 @@ import java.util.Date; @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) -public class WxShop extends BaseEntity { +public class WxShop extends TenantEntity { protected Long id; @@ -34,9 +34,6 @@ public class WxShop extends BaseEntity { @TableField(exist = false) private String merchantName; - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") - private String tenantId; - @Excel(name="类型",width = 20,orderNum = "1", replace = {"商铺_null", "固定点位_1", "临时促销点位_2", "宣传点位_3","ATM点位_4","仓库点位_5","其他点位_6"}) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxSubsidy.java b/mallinkService/src/main/java/com/iformall/domain/po/WxSubsidy.java index 7b39db08d..82fdb97ff 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxSubsidy.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxSubsidy.java @@ -1,7 +1,7 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -12,12 +12,10 @@ import java.util.*; @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) -public class WxSubsidy extends BaseEntity { +public class WxSubsidy extends TenantEntity { protected Long id; - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") - private String tenantId; @io.swagger.annotations.ApiModelProperty(value="操作用户ID",name="operatorUserId") private Long operatorUserId; @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createTime") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxTemplateMsg.java b/mallinkService/src/main/java/com/iformall/domain/po/WxTemplateMsg.java index d1199ba77..6a251375c 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxTemplateMsg.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxTemplateMsg.java @@ -1,7 +1,7 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -10,13 +10,10 @@ import java.util.*; @TableName(value = "wx_template_msg") @Data @EqualsAndHashCode(callSuper = true) -public class WxTemplateMsg extends BaseEntity { - private static final long serialVersionUID = 1L; +public class WxTemplateMsg extends TenantEntity { protected Long id; - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") - private String tenantId; @io.swagger.annotations.ApiModelProperty(value="模板ID",name="templateId") private String templateId; @io.swagger.annotations.ApiModelProperty(value="模板类型1:核销成功消息,2:核销失败消息, 101:公众号审核结果消息, 102:公众号卡券核销消息",name="type") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxTopic.java b/mallinkService/src/main/java/com/iformall/domain/po/WxTopic.java index 53f59ea00..8693ccc85 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxTopic.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxTopic.java @@ -2,7 +2,8 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; +import com.iformall.utils.Constant; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -14,12 +15,10 @@ import java.util.List; @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) -public class WxTopic extends BaseEntity { +public class WxTopic extends TenantEntity { protected Long id; - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") - private String tenantId; @io.swagger.annotations.ApiModelProperty(value="名称",name="name") private String name; @io.swagger.annotations.ApiModelProperty(value="标题",name="title") @@ -84,8 +83,8 @@ public class WxTopic extends BaseEntity { public String getWeappPath() { if(id == null) - return "pages/index/index"; - return "pages/index/index?type=td&id="+id; + return Constant.mainPageUrl; + return Constant.mainPageUrl + "?type=td&id="+id; } public String getWeappScene() { diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxUserDataRule.java b/mallinkService/src/main/java/com/iformall/domain/po/WxUserDataRule.java index 5110e0618..c01c4b7be 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxUserDataRule.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxUserDataRule.java @@ -1,7 +1,7 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -10,15 +10,12 @@ import java.util.Date; @TableName(value = "wx_user_data_rule") @Data @EqualsAndHashCode(callSuper = true) -public class WxUserDataRule extends BaseEntity { - private static final long serialVersionUID = 1L; +public class WxUserDataRule extends TenantEntity { protected Long id; @io.swagger.annotations.ApiModelProperty(value = "用户ID", name = "userId") private Long userId; - @io.swagger.annotations.ApiModelProperty(value = "租户ID", name = "tenantId") - private String tenantId; @io.swagger.annotations.ApiModelProperty(value = "权限类型", name = "type") private Integer type; @io.swagger.annotations.ApiModelProperty(value = "楼层楼座", name = "buildingFloor") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxUserVisit.java b/mallinkService/src/main/java/com/iformall/domain/po/WxUserVisit.java index 898b536ee..9365a8b7a 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxUserVisit.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxUserVisit.java @@ -11,12 +11,9 @@ import java.util.*; @Data @EqualsAndHashCode(callSuper = true) public class WxUserVisit extends BaseEntity { - private static final long serialVersionUID = 1L; - protected Long id; - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @io.swagger.annotations.ApiModelProperty(value="日期字符串",name="refDate") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxWiWideInfo.java b/mallinkService/src/main/java/com/iformall/domain/po/WxWiWideInfo.java index 2ffa95d19..08da0f17e 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxWiWideInfo.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxWiWideInfo.java @@ -1,7 +1,7 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -10,16 +10,10 @@ import java.util.Date; @TableName(value = "wx_wiwide_info") @Data @EqualsAndHashCode(callSuper = true) -public class WxWiWideInfo extends BaseEntity { - private static final long serialVersionUID = 1L; - +public class WxWiWideInfo extends TenantEntity { protected Long id; - - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") - private String tenantId; - @io.swagger.annotations.ApiModelProperty(value="迈外迪id",name="wiwideId") private String wiwideId; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/base/BaseTenantEntity.java b/mallinkService/src/main/java/com/iformall/domain/po/base/BaseTenantEntity.java new file mode 100644 index 000000000..c440a7850 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/domain/po/base/BaseTenantEntity.java @@ -0,0 +1,15 @@ +package com.iformall.domain.po.base; + +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * @author luozukai + * @date 2019/4/24 14:32 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class BaseTenantEntity extends BaseEntity { + @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") + private String tenantId; +} diff --git a/mallinkService/src/main/java/com/iformall/domain/po/base/TenantEntity.java b/mallinkService/src/main/java/com/iformall/domain/po/base/TenantEntity.java new file mode 100644 index 000000000..f8d892f7b --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/domain/po/base/TenantEntity.java @@ -0,0 +1,15 @@ +package com.iformall.domain.po.base; + +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * @author luozukai + * @date 2019/4/24 14:32 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class TenantEntity extends BaseEntity { + @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") + private String tenantId; +} diff --git a/mallinkService/src/main/java/com/iformall/domain/po/invest/InvestCustomerEntity.java b/mallinkService/src/main/java/com/iformall/domain/po/invest/InvestCustomerEntity.java index 76c828ec0..c51b95447 100755 --- a/mallinkService/src/main/java/com/iformall/domain/po/invest/InvestCustomerEntity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/invest/InvestCustomerEntity.java @@ -87,4 +87,10 @@ public class InvestCustomerEntity extends InvestBaseEntity { @Version private Date updateDate; + /** + * 合同编号 + */ + @io.swagger.annotations.ApiModelProperty(value = "合同编号", name = "contractNo") + private String contractNo; + } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/msg/BaseMsg.java b/mallinkService/src/main/java/com/iformall/domain/po/msg/BaseMsg.java index 9a344cf44..d9613338b 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/msg/BaseMsg.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/msg/BaseMsg.java @@ -17,12 +17,12 @@ import lombok.ToString; public class BaseMsg extends BaseEntity { private static final long serialVersionUID = 923764283764823L; - @io.swagger.annotations.ApiModelProperty(value="域0全部 1sys 2a端 3c端 4b端",name="domain") @TableField(exist = false) + @io.swagger.annotations.ApiModelProperty(value="域0全部 1sys 2a端 3c端 4b端",name="domain") private Integer domain = 0; - @io.swagger.annotations.ApiModelProperty(value="租户id",name="tenantId") @TableField(exist = false) + @io.swagger.annotations.ApiModelProperty(value="租户id",name="tenantId") private String tenantId; @io.swagger.annotations.ApiModelProperty(value="唯一标识",name="uuid") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/msg/FmInsideNotifyPaySuccessMsg.java b/mallinkService/src/main/java/com/iformall/domain/po/msg/FmInsideNotifyPaySuccessMsg.java index 86201a387..6a5695c85 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/msg/FmInsideNotifyPaySuccessMsg.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/msg/FmInsideNotifyPaySuccessMsg.java @@ -8,7 +8,6 @@ import lombok.ToString; @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) public class FmInsideNotifyPaySuccessMsg extends BaseMsg { - private static final long serialVersionUID = 1L; @io.swagger.annotations.ApiModelProperty(value = "消息来源", name = "payWay") private Integer payWay; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/msg/FmInsideNotifyRefundSuccessMsg.java b/mallinkService/src/main/java/com/iformall/domain/po/msg/FmInsideNotifyRefundSuccessMsg.java index b8b8b63d4..720f029e8 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/msg/FmInsideNotifyRefundSuccessMsg.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/msg/FmInsideNotifyRefundSuccessMsg.java @@ -8,7 +8,6 @@ import lombok.ToString; @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) public class FmInsideNotifyRefundSuccessMsg extends BaseMsg { - private static final long serialVersionUID = 1L; @io.swagger.annotations.ApiModelProperty(value = "消息来源", name = "payWay") private Integer payWay; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/msg/FmInsideOrderSuccessMsg.java b/mallinkService/src/main/java/com/iformall/domain/po/msg/FmInsideOrderSuccessMsg.java index a1fcf8d2e..74d0845d0 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/msg/FmInsideOrderSuccessMsg.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/msg/FmInsideOrderSuccessMsg.java @@ -8,7 +8,6 @@ import lombok.ToString; @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) public class FmInsideOrderSuccessMsg extends BaseMsg{ - private static final long serialVersionUID = 1L; @io.swagger.annotations.ApiModelProperty(value = "租户ID", name = "tenantId") private String tenantId; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/msg/WxMsg.java b/mallinkService/src/main/java/com/iformall/domain/po/msg/WxMsg.java index 36032f6f2..ca83e0c7e 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/msg/WxMsg.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/msg/WxMsg.java @@ -16,7 +16,6 @@ import java.util.List; @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) public class WxMsg extends BaseMsg{ - private static final long serialVersionUID = 1L; protected Long id; @@ -53,7 +52,6 @@ public class WxMsg extends BaseMsg{ @io.swagger.annotations.ApiModelProperty(value = "excelpath", name = "excelpath") private String excelpath; - /*发送人群标签**/ @io.swagger.annotations.ApiModelProperty(value="发送人群标签",name="tags") private String tags; @@ -69,12 +67,15 @@ public class WxMsg extends BaseMsg{ @io.swagger.annotations.ApiModelProperty(value = "couponInjectId", name = "couponInjectId") private Long couponInjectId; - - //用于mq发送消息 + @TableField(exist = false) + @io.swagger.annotations.ApiModelProperty(value = "用于mq发送消息", name = "wxMsgConfig") private WxMsgConfig wxMsgConfig; - //coupon精准投放 + + @TableField(exist = false) + @io.swagger.annotations.ApiModelProperty(value = "coupon精准投放", name = "couponInject") private WxCouponInject couponInject; @TableField(exist = false) + @io.swagger.annotations.ApiModelProperty(value = "", name = "filterList") List filterList; } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/msg/WxMsgRecord.java b/mallinkService/src/main/java/com/iformall/domain/po/msg/WxMsgRecord.java index 8be6829e0..7e3d7ad50 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/msg/WxMsgRecord.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/msg/WxMsgRecord.java @@ -12,10 +12,8 @@ import java.util.Map; @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) public class WxMsgRecord extends BaseMsg { - private static final long serialVersionUID = 18957895653478L; protected Long id; - //msg 消息类型1短信 2回调短信 邮件 3微信小程序模板 4微信公众号模板 5系统通 @io.swagger.annotations.ApiModelProperty(value="消息类型 1短信 2回调短信 3邮件 4微信小程序模板 5微信公众号模板 6系统通知 7websocket",name="msg") private String msg; @io.swagger.annotations.ApiModelProperty(value="发送时间",name="sendTime") diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/KwMerchantMeterVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/KwMerchantMeterVo.java index ec12fbfc6..b05fc363e 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/KwMerchantMeterVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/KwMerchantMeterVo.java @@ -2,6 +2,7 @@ package com.iformall.domain.vo; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.iformall.domain.po.KwMeter; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -13,7 +14,8 @@ import java.util.List; */ @JsonIgnoreProperties(value = {"handler"}) @Data -public class KwMerchantMeterVo { +@EqualsAndHashCode(callSuper = true) +public class KwMerchantMeterVo extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value="商户ID",name="name") @@ -22,9 +24,6 @@ public class KwMerchantMeterVo { @io.swagger.annotations.ApiModelProperty(value="商户状态",name="name") private String status; - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="name") - private String tenantId; - @io.swagger.annotations.ApiModelProperty(value="商户名",name="name") private String merchantName; diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/KwMeterDataVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/KwMeterDataVo.java index 67b7c06a2..0cd459edd 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/KwMeterDataVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/KwMeterDataVo.java @@ -1,6 +1,6 @@ package com.iformall.domain.vo; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -11,10 +11,7 @@ import java.util.Date; */ @Data @EqualsAndHashCode(callSuper = true) -public class KwMeterDataVo extends BaseEntity { - - @io.swagger.annotations.ApiModelProperty(value = "tenantId", name = "tenantId") - private String tenantId; +public class KwMeterDataVo extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value = "电表ID", name = "meterId") private Long meterId; diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAll.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAll.java index 8fb4b02e0..6440a7720 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAll.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAll.java @@ -2,7 +2,7 @@ package com.iformall.domain.vo; import com.baomidou.mybatisplus.annotation.TableField; import com.iformall.common.SortColumn; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -15,14 +15,11 @@ import java.util.List; @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) -public class WxBillAll extends BaseEntity { +public class WxBillAll extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value="appId",name="appId") private String appId; - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") - private String tenantId; - @io.swagger.annotations.ApiModelProperty(value="商户名称",name="merchantName") private String merchantName; diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAllVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAllVo.java index e48351551..af97755ff 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAllVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAllVo.java @@ -2,7 +2,9 @@ package com.iformall.domain.vo; import cn.afterturn.easypoi.excel.annotation.Excel; import com.baomidou.mybatisplus.annotation.TableField; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; +import lombok.EqualsAndHashCode; import java.math.BigDecimal; import java.util.Date; @@ -11,11 +13,10 @@ import java.util.Date; * @author gongbiao */ @Data -public class WxBillAllVo { +@EqualsAndHashCode(callSuper = true) +public class WxBillAllVo extends TenantEntity { private Long id; - private String tenantId; - private Long merchantId; private Long shopId; diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderCVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderCVo.java index fa298a968..c80a63370 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderCVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderCVo.java @@ -28,8 +28,6 @@ public class WxCouponOrderCVo extends WxCouponOrder { /** 基础购买到的券信息 */ - @io.swagger.annotations.ApiModelProperty(value = "", name = "tenantId") - private String tenantId; @io.swagger.annotations.ApiModelProperty(value = "单张券ID", name = "couponId") private Long couponId; @io.swagger.annotations.ApiModelProperty(value = "用户订单ID", name = "orderId") diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderCarCVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderCarCVo.java index f7d72e1d1..9c4e48869 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderCarCVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderCarCVo.java @@ -12,8 +12,6 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) public class WxCouponOrderCarCVo extends WxCouponOrderCVo { - private static final long serialVersionUID = 6687954932922444531L; - @io.swagger.annotations.ApiModelProperty(value="couponFreeId",name="couponFreeId") private Integer couponFreeId; diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCreditHistoryVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCreditHistoryVo.java index 034659626..b8d17977e 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCreditHistoryVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCreditHistoryVo.java @@ -1,12 +1,15 @@ package com.iformall.domain.vo; import cn.afterturn.easypoi.excel.annotation.Excel; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; +import lombok.EqualsAndHashCode; import java.util.Date; @Data -public class WxCreditHistoryVo { +@EqualsAndHashCode(callSuper = true) +public class WxCreditHistoryVo extends TenantEntity { @Excel(name = "微信昵称", width = 20, orderNum = "1") @@ -56,9 +59,6 @@ public class WxCreditHistoryVo { @io.swagger.annotations.ApiModelProperty(value="积分ID",name="creditId") private String creditId; - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") - private String tenantId; - @io.swagger.annotations.ApiModelProperty(value="用户ID",name="cUserId") private Long cUserId; diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantTradeDailyVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantTradeDailyVo.java index a8244ae08..992a3b065 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantTradeDailyVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantTradeDailyVo.java @@ -2,7 +2,7 @@ package com.iformall.domain.vo; import cn.afterturn.easypoi.excel.annotation.Excel; import com.baomidou.mybatisplus.annotation.TableField; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.enums.EnumBusiness; import com.iformall.enums.EnumSubBusiness; import lombok.Data; @@ -18,13 +18,10 @@ import java.util.stream.Collectors; @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) -public class WxMerchantTradeDailyVo extends BaseEntity { +public class WxMerchantTradeDailyVo extends TenantEntity { protected Long id; - - @io.swagger.annotations.ApiModelProperty(value = "租户ID", name = "tenantId") - private String tenantId; @io.swagger.annotations.ApiModelProperty(value = "商户id", name = "merchantId") private Long merchantId; @io.swagger.annotations.ApiModelProperty(value = "b用户id", name = "bUserId") diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantVo.java index 3233ee49f..704bfa2fd 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantVo.java @@ -1,15 +1,16 @@ package com.iformall.domain.vo; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import io.swagger.models.auth.In; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; +import lombok.EqualsAndHashCode; import java.util.List; @JsonIgnoreProperties(value = {"handler"}) @Data -public class WxMerchantVo { - private static final long serialVersionUID = 6687964942922444531L; +@EqualsAndHashCode(callSuper = true) +public class WxMerchantVo extends TenantEntity { protected Long id; diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderCouponVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderCouponVo.java index 021547b00..f87eabcb4 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderCouponVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderCouponVo.java @@ -2,7 +2,9 @@ package com.iformall.domain.vo; import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; +import lombok.EqualsAndHashCode; import java.util.Date; import java.util.List; @@ -10,9 +12,8 @@ import java.util.List; @JsonIgnoreProperties(value = {"handler"}) @Data -public class WxOrderCouponVo { - - private static final long serialVersionUID = 6687964932922444531L; +@EqualsAndHashCode(callSuper = true) +public class WxOrderCouponVo extends TenantEntity { protected Long id; @@ -22,8 +23,6 @@ public class WxOrderCouponVo { /** 基础购买到的券信息 */ @io.swagger.annotations.ApiModelProperty(value="订单码;正反向交易保持一致。",name="orderNumber") private Long orderNumber; - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") - private String tenantId; @io.swagger.annotations.ApiModelProperty(value="c端用户id",name="cUserId") private Long cUserId; diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderGroupMarketing.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderGroupMarketing.java index 09c6ebd31..72a5ad979 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderGroupMarketing.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderGroupMarketing.java @@ -1,6 +1,6 @@ package com.iformall.domain.vo; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -8,9 +8,8 @@ import lombok.ToString; @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) -public class WxOrderGroupMarketing extends BaseEntity { +public class WxOrderGroupMarketing extends TenantEntity { - private String tenantId; private String couponId; private String coverImg; private String title; diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderQueryVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderQueryVo.java index b55bb582b..71c8a70e8 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderQueryVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderQueryVo.java @@ -1,7 +1,7 @@ package com.iformall.domain.vo; import com.baomidou.mybatisplus.annotation.TableField; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -14,10 +14,7 @@ import java.util.Date; @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) -public class WxOrderQueryVo extends BaseEntity { - - @io.swagger.annotations.ApiModelProperty(value="tenantId",name="tenantId") - private String tenantId; +public class WxOrderQueryVo extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value="商户名称",name="merchantName") private String merchantName; diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxProfitSharingOrderDetailsVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxProfitSharingOrderDetailsVo.java index eecd53496..5e5e4aecb 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxProfitSharingOrderDetailsVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxProfitSharingOrderDetailsVo.java @@ -1,19 +1,20 @@ package com.iformall.domain.vo; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; +import lombok.EqualsAndHashCode; -import java.io.Serializable; import java.util.Date; /** * @author gongbiao */ @Data -public class WxProfitSharingOrderDetailsVo implements Serializable { - private static final long serialVersionUID = 1L; +@EqualsAndHashCode(callSuper = true) +public class WxProfitSharingOrderDetailsVo extends TenantEntity { private Long Id; - private String tenantId; + private Integer payAmount; private Date createTime; private Integer sharingStatus; diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxProfitSharingOrderQueryVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxProfitSharingOrderQueryVo.java index e1ca57274..e27d871f4 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxProfitSharingOrderQueryVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxProfitSharingOrderQueryVo.java @@ -2,6 +2,7 @@ package com.iformall.domain.vo; import com.baomidou.mybatisplus.annotation.TableField; import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -14,10 +15,7 @@ import java.util.Date; @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) -public class WxProfitSharingOrderQueryVo extends BaseEntity { - - @io.swagger.annotations.ApiModelProperty(value="tenantId",name="tenantId") - private String tenantId; +public class WxProfitSharingOrderQueryVo extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value="商户名称",name="merchantName") private String merchantName; diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxProfitSharingOrderVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxProfitSharingOrderVo.java index 0b142e0dd..ba32ee021 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxProfitSharingOrderVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxProfitSharingOrderVo.java @@ -1,19 +1,20 @@ package com.iformall.domain.vo; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; +import lombok.EqualsAndHashCode; -import java.io.Serializable; import java.util.Date; /** * @author gongbiao */ @Data -public class WxProfitSharingOrderVo implements Serializable { - private static final long serialVersionUID = 1L; +@EqualsAndHashCode(callSuper = true) +public class WxProfitSharingOrderVo extends TenantEntity { private Long id; - private String tenantId; + private Long merchantId; private String merchantName; private Long orderId; diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxRentPropertyContractVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxRentPropertyContractVo.java index a92599839..3bc401568 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxRentPropertyContractVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxRentPropertyContractVo.java @@ -1,6 +1,6 @@ package com.iformall.domain.vo; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -13,7 +13,7 @@ import java.util.Date; @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) -public class WxRentPropertyContractVo extends BaseEntity { +public class WxRentPropertyContractVo extends TenantEntity { protected Long id; @@ -50,9 +50,6 @@ public class WxRentPropertyContractVo extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "审批状态", name = "applyStatus") private Integer applyStatus; - @io.swagger.annotations.ApiModelProperty(value = "租户ID", name = "tenantId") - private String tenantId; - @io.swagger.annotations.ApiModelProperty(value = "操作类型1区分租赁物业2合并租赁物业", name = "operationType") private Integer operationType; diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxBLogMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxBLogMapper.java deleted file mode 100644 index b5ce1cb21..000000000 --- a/mallinkService/src/main/java/com/iformall/mapper/WxBLogMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.iformall.mapper; - -import java.util.*; -import com.iformall.common.CommonMapper; -import com.iformall.domain.po.WxBLog; - -public interface WxBLogMapper extends CommonMapper { - - List findList(WxBLog wxBLog); - - - - - - -} diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCLogMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCLogMapper.java deleted file mode 100644 index e0fe2b679..000000000 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCLogMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.iformall.mapper; - -import java.util.*; -import com.iformall.common.CommonMapper; -import com.iformall.domain.po.WxCLog; - -public interface WxCLogMapper extends CommonMapper { - - List findList(WxCLog wxCLog); - - - - - - -} diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxChannelMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxChannelMapper.java deleted file mode 100644 index 9cdb814a0..000000000 --- a/mallinkService/src/main/java/com/iformall/mapper/WxChannelMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.iformall.mapper; - -import java.util.*; -import com.iformall.common.CommonMapper; -import com.iformall.domain.po.WxChannel; - -public interface WxChannelMapper extends CommonMapper { - - List findList(WxChannel wxChannel); - - - - - - -} diff --git a/mallinkService/src/main/java/com/iformall/service/WxBLogService.java b/mallinkService/src/main/java/com/iformall/service/WxBLogService.java deleted file mode 100644 index 0edac6d26..000000000 --- a/mallinkService/src/main/java/com/iformall/service/WxBLogService.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.iformall.service; - -import com.github.pagehelper.PageInfo; -import com.iformall.domain.po.WxBLog; - -public interface WxBLogService { - - /** - * 根据实体查询分页列表 - * - * @param record - * @param offset - * @param limit - * @return - */ - PageInfo listAsPage(WxBLog record, Integer pageIndex, Integer pageSize); - - /** - * 根据Id获得实体 - * - * @param id - * @return - */ - WxBLog getById(Long id); - - /** - * 保存或更新实体 - * - * @param record - */ - void saveOrUpdate(WxBLog record); - - /** - * 根据Id删除实体 - * - * @param id - */ - void deleteById(Long id); - - - - - - - - -} diff --git a/mallinkService/src/main/java/com/iformall/service/WxCLogService.java b/mallinkService/src/main/java/com/iformall/service/WxCLogService.java deleted file mode 100644 index fac46fa9a..000000000 --- a/mallinkService/src/main/java/com/iformall/service/WxCLogService.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.iformall.service; - -import com.github.pagehelper.PageInfo; -import com.iformall.domain.po.WxCLog; - -public interface WxCLogService { - - /** - * 根据实体查询分页列表 - * - * @param record - * @param offset - * @param limit - * @return - */ - PageInfo listAsPage(WxCLog record, Integer pageIndex, Integer pageSize); - - /** - * 根据Id获得实体 - * - * @param id - * @return - */ - WxCLog getById(Long id); - - /** - * 保存或更新实体 - * - * @param record - */ - void saveOrUpdate(WxCLog record); - - /** - * 根据Id删除实体 - * - * @param id - */ - void deleteById(Long id); - - - - - - - - -} diff --git a/mallinkService/src/main/java/com/iformall/service/WxChannelService.java b/mallinkService/src/main/java/com/iformall/service/WxChannelService.java deleted file mode 100644 index 33c04a90f..000000000 --- a/mallinkService/src/main/java/com/iformall/service/WxChannelService.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.iformall.service; - -import com.github.pagehelper.PageInfo; -import com.iformall.domain.po.WxChannel; - -public interface WxChannelService { - - /** - * 根据实体查询分页列表 - * - * @param record - * @param offset - * @param limit - * @return - */ - PageInfo listAsPage(WxChannel record, Integer pageIndex, Integer pageSize); - - /** - * 根据Id获得实体 - * - * @param id - * @return - */ - WxChannel getById(Long id); - - /** - * 保存或更新实体 - * - * @param record - */ - void saveOrUpdate(WxChannel record); - - /** - * 根据Id删除实体 - * - * @param id - */ - void deleteById(Long id); - - - - - - - - -} diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBLogServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBLogServiceImpl.java deleted file mode 100644 index 590124191..000000000 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBLogServiceImpl.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.iformall.service.impl; - -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import com.iformall.domain.po.WxBLog; -import com.iformall.mapper.WxBLogMapper; -import com.iformall.service.WxBLogService; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.iformall.common.IdWorker; - -@Service -public class WxBLogServiceImpl implements WxBLogService { - private final Logger logger = LoggerFactory.getLogger(this.getClass()); - - @Autowired - WxBLogMapper wxBLogMapper; - - - @Override - public PageInfo listAsPage(WxBLog record, Integer pageIndex, Integer pageSize) { - return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxBLogMapper.findList(record)); - } - - @Override - public WxBLog getById(Long id) { - return wxBLogMapper.selectById(id); - } - - @Override - public void saveOrUpdate(WxBLog record) { - if (record.getId() == null) { - //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); - final IdWorker idWorker = IdWorker.get(); - record.setId(idWorker.nextId()); - wxBLogMapper.insert(record); - } else { - wxBLogMapper.updateById(record); - } - } - - @Override - public void deleteById(Long id) { - wxBLogMapper.deleteById(id); - } - - - - - - - - -} diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCLogServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCLogServiceImpl.java deleted file mode 100644 index c5a46ccc8..000000000 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCLogServiceImpl.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.iformall.service.impl; - -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import com.iformall.domain.po.WxCLog; -import com.iformall.mapper.WxCLogMapper; -import com.iformall.service.WxCLogService; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.iformall.common.IdWorker; - -@Service -public class WxCLogServiceImpl implements WxCLogService { - private final Logger logger = LoggerFactory.getLogger(this.getClass()); - - @Autowired - WxCLogMapper wxCLogMapper; - - - @Override - public PageInfo listAsPage(WxCLog record, Integer pageIndex, Integer pageSize) { - return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCLogMapper.findList(record)); - } - - @Override - public WxCLog getById(Long id) { - return wxCLogMapper.selectById(id); - } - - @Override - public void saveOrUpdate(WxCLog record) { - if (record.getId() == null) { - //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); - final IdWorker idWorker = IdWorker.get(); - record.setId(idWorker.nextId()); - wxCLogMapper.insert(record); - } else { - wxCLogMapper.updateById(record); - } - } - - @Override - public void deleteById(Long id) { - wxCLogMapper.deleteById(id); - } - - - - - - - - -} diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxChannelServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxChannelServiceImpl.java deleted file mode 100644 index c7af3feeb..000000000 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxChannelServiceImpl.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.iformall.service.impl; - -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import com.iformall.domain.po.WxChannel; -import com.iformall.mapper.WxChannelMapper; -import com.iformall.service.WxChannelService; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.iformall.common.IdWorker; - -@Service -public class WxChannelServiceImpl implements WxChannelService { - private final Logger logger = LoggerFactory.getLogger(this.getClass()); - - @Autowired - WxChannelMapper wxChannelMapper; - - - @Override - public PageInfo listAsPage(WxChannel record, Integer pageIndex, Integer pageSize) { - return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxChannelMapper.findList(record)); - } - - @Override - public WxChannel getById(Long id) { - return wxChannelMapper.selectById(id); - } - - @Override - public void saveOrUpdate(WxChannel record) { - if (record.getId() == null) { - //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); - final IdWorker idWorker = IdWorker.get(); - record.setId(idWorker.nextId()); - wxChannelMapper.insert(record); - } else { - wxChannelMapper.updateById(record); - } - } - - @Override - public void deleteById(Long id) { - wxChannelMapper.deleteById(id); - } - - - - - - - - -} diff --git a/mallinkService/src/main/java/com/iformall/service/invest/event/InvestListener.java b/mallinkService/src/main/java/com/iformall/service/invest/event/InvestListener.java index a8bf194bf..93800740d 100644 --- a/mallinkService/src/main/java/com/iformall/service/invest/event/InvestListener.java +++ b/mallinkService/src/main/java/com/iformall/service/invest/event/InvestListener.java @@ -35,7 +35,7 @@ public class InvestListener implements ApplicationListener { LambdaQueryWrapper query = new LambdaQueryWrapper<>(); query.in(InvestTaskEntity::getTargetId, rentEventInfo.getTargetIds()); query.eq(InvestTaskEntity::getTargetType, EnumInvestType.RENT); - query.eq(InvestTaskEntity::getStatus, EnumTaskStatus.NEGOTIATING); + query.in(InvestTaskEntity::getStatus, EnumTaskStatus.NEGOTIATING, EnumTaskStatus.INTENTION); List tasks = taskService.list(query); if (CollectionUtils.isEmpty(tasks)) { log.warn("receive InvestEvent , tasks is empty : {}", tasks); diff --git a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBaseServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBaseServiceImpl.java index 9d4f7f736..c04dbd6cc 100644 --- a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBaseServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBaseServiceImpl.java @@ -68,9 +68,9 @@ public class InvestBaseServiceImpl, T> extends ServiceIm @Override public T getByIdNotNull(Serializable id) { - InvestHelper.checkResult(id, "id=null"); + InvestHelper.checkResult(id, "id=" + id); T t = super.getById(id); - InvestHelper.checkResult(t, "id=null"); + InvestHelper.checkResult(t, "id=" + id); return t; } @@ -95,7 +95,7 @@ public class InvestBaseServiceImpl, T> extends ServiceIm } void checkUserAndTenant(T input, Consumer consumer) { - InvestHelper.notNull(input, "参数"); + InvestHelper.notNull(input, "参数 " + input); InvestHelper.notNull(InvestUserContext.getUser(), ErrorCode.USER_IS_EMPTY); ((InvestBaseEntity) input).setTenantId(InvestUserContext.getUser().getTenantId()); if (consumer != null) { diff --git a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java index ed74b8fbe..419bac65a 100644 --- a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java @@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.iformall.common.ErrorCode; import com.iformall.common.Result; +import com.iformall.common.ResultData; import com.iformall.domain.dto.InvestDemandDto; import com.iformall.domain.dto.InvestTaskDto; import com.iformall.domain.po.*; @@ -516,8 +517,9 @@ public class InvestBizServiceImpl implements InvestBizService { LambdaQueryWrapper taskQueryWrapper = new LambdaQueryWrapper<>(); InvestPageResult investPage = new InvestPageResult<>(); taskQueryWrapper.apply(StringUtils.isNotBlank(taskParams.getOwner()), "`owner` REGEXP {0}", taskParams.getOwner()); - taskQueryWrapper.apply(Objects.nonNull(params.getBusinessId()), "`content` REGEXP {0}", - String.format("\"businessId\": %d", params.getBusinessId())); + if (Objects.nonNull(params.getBusinessId())) { + taskQueryWrapper.apply("`content` REGEXP {0}", buildBusinessQuery(params)); + } taskParams.setOwner(null); taskQueryWrapper.setEntity(taskParams); @@ -566,6 +568,13 @@ public class InvestBizServiceImpl implements InvestBizService { return investPage; } + private String buildBusinessQuery(InvestTaskQuery params) { + if (params.getBusinessId() <= 10) { + return String.format("\"businessId\": %d[^1%d]", params.getBusinessId(), params.getBusinessId()); + } + return String.format("\"businessId\": %d", params.getBusinessId()); + } + private Collection buildShopContractQuery(Collection shops, EnumRentShopType shopType) { Collection shopIds = new ArrayList<>(); if (CollectionUtils.isNotEmpty(shops)) { @@ -698,10 +707,10 @@ public class InvestBizServiceImpl implements InvestBizService { } private String getDayEnd(Date date) { - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - calendar.add(Calendar.DAY_OF_YEAR, 1); - return DateUtils.format(calendar.getTime()); + //Calendar calendar = Calendar.getInstance(); + //calendar.setTime(date); + //calendar.add(Calendar.DAY_OF_YEAR, 1); + return DateUtils.format(date); } private String getDayStart(Date date) { @@ -772,6 +781,7 @@ public class InvestBizServiceImpl implements InvestBizService { public boolean saveCustomerAndDemand(InvestDemandDto demandDto) { InvestHelper.notNull(demandDto, demandDto.getCustomer(), demandDto.getDemand()); InvestCustomerEntity customerEntity = demandDto.getCustomer(); + checkCustomer(customerEntity); customerService.save(customerEntity); InvestDemandEntity demandEntity = demandDto.getDemand(); demandEntity.setCustomerId(customerEntity.getId()); @@ -780,16 +790,29 @@ public class InvestBizServiceImpl implements InvestBizService { return true; } + private void checkCustomer(InvestCustomerEntity customerEntity) { + if (Objects.equals(customerEntity.getType(), EnumCustomerType.COOPERATIVE)) { + InvestHelper.notNull(customerEntity.getContractNo(), "合同编号"); + WxRentContract contract = new WxRentContract(); + contract.setTenantId(InvestUserContext.getUser().getTenantId()); + contract.setContractNumber(customerEntity.getContractNo()); + ResultData resultData = rentContractService.hasContractNumber(contract); + InvestHelper.isTrue(Objects.equals(resultData.data, true),ErrorCode.INVEST_RESULT_NOT_FOUND,"合同编号"); + } + } + @Transactional(rollbackFor = Exception.class) @Override public boolean updateCustomerAndDemand(InvestDemandDto demandDto) { InvestHelper.notNull(demandDto, demandDto.getCustomer(), demandDto.getDemand()); Long customerId = demandDto.getCustomer().getId(); + InvestCustomerEntity customerEntity = demandDto.getCustomer(); if (Objects.isNull(customerId)) { customerId = demandDto.getDemand().getCustomerId(); - demandDto.getCustomer().setId(customerId); + customerEntity.setId(customerId); } - customerService.updateById(demandDto.getCustomer()); + checkCustomer(customerEntity); + customerService.updateById(customerEntity); InvestDemandEntity demandEntity = demandDto.getDemand(); if (Objects.isNull(demandEntity.getCustomerId())) { demandEntity.setCustomerId(customerId); @@ -800,7 +823,7 @@ public class InvestBizServiceImpl implements InvestBizService { } else { demandService.updateById(demandEntity); } - saveMessage(demandEntity, demandDto.getCustomer()); + saveMessage(demandEntity, customerEntity); return true; } @@ -1026,11 +1049,11 @@ public class InvestBizServiceImpl implements InvestBizService { .eq(InvestTaskEntity::getTenantId, InvestUserContext.getUser().getTenantId()))); result.put("customerTotal", customerService.count(new LambdaQueryWrapper() .eq(InvestCustomerEntity::getTenantId, InvestUserContext.getUser().getTenantId()))); - result.put("taskToday", customerService.count(new LambdaQueryWrapper() + result.put("customerToday", customerService.count(new LambdaQueryWrapper() .apply("date_format(create_date,'%Y-%m-%d') = {0}", DateUtils.format(new Date())) .eq(InvestCustomerEntity::getTenantId, InvestUserContext.getUser().getTenantId()))); result.put("customerImportant", customerService.count(new LambdaQueryWrapper() - .eq(InvestCustomerEntity::getType, EnumCustomerType.INTENTIONAL) + .in(InvestCustomerEntity::getType, EnumCustomerType.POTENTIAL,EnumCustomerType.INTENTIONAL) .eq(InvestCustomerEntity::getTenantId, InvestUserContext.getUser().getTenantId()))); result.put("remindTotal", remindService.count(new LambdaQueryWrapper() .eq(InvestRemindEntity::getTenantId, InvestUserContext.getUser().getTenantId()))); @@ -1046,10 +1069,10 @@ public class InvestBizServiceImpl implements InvestBizService { .apply("`owner` REGEXP {0}", InvestUserContext.getUserId()))); result.put("customerTotal", demandService.count(new LambdaQueryWrapper() .eq(InvestDemandEntity::getOwner, InvestUserContext.getUser().getTenantId()))); - result.put("taskToday", customerService.count(new LambdaQueryWrapper() + result.put("taskToday", taskService.count(new LambdaQueryWrapper() .apply("`owner` REGEXP {0}", InvestUserContext.getUserId()) .apply("date_format(create_date,'%Y-%m-%d') = {0}", DateUtils.format(new Date())) - .eq(InvestCustomerEntity::getTenantId, InvestUserContext.getUser().getTenantId()))); + .eq(InvestTaskEntity::getTenantId, InvestUserContext.getUser().getTenantId()))); result.put("customerToday", demandService.count(new LambdaQueryWrapper() .eq(InvestDemandEntity::getOwner, InvestUserContext.getUser().getTenantId()) .apply("date_format(create_date,'%Y-%m-%d') = {0}", DateUtils.format(new Date())) diff --git a/mallinkService/src/main/java/com/iformall/utils/Constant.java b/mallinkService/src/main/java/com/iformall/utils/Constant.java index 00307865d..f9ab8c0a4 100644 --- a/mallinkService/src/main/java/com/iformall/utils/Constant.java +++ b/mallinkService/src/main/java/com/iformall/utils/Constant.java @@ -10,6 +10,10 @@ public class Constant { public static final int WX_LIMIT_DAYS = 30; // 微信分账限制30天 + // 前端未初始常量 + public static final String UNDEFINED = "undefined"; + + public static final String mainPageUrl = "pages/index/index"; // 1小时过期, public final static int H_EXPIRE = 3600000; @@ -21,20 +25,27 @@ public class Constant { public static final String LOGIN_USER_KEY = "LOGIN_USER_KEY"; public static final String TENANT_ID = "TENANT_ID"; + + public static final String adminPage = "https://admin.malls.iformall.com"; + + + public static final String floor_back_img = "https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/789/9eea8e0e-15ea-4be0-a43d-31e2e9d8db8c.jpg"; + + + /// REDIS key Prev + // PUSH Limit + public static final String PUSH_LIMIT_KEY_PREV = "setting:pushlimit:"; + // 成长值规则 key prev - public static final String SCORE_RULES_KEY_PREV = "setting:scorerules1:"; + public static final String SCORE_RULES_KEY_PREV = "setting:scorerules:"; // 积分规则 key prev - public static final String CREDIT_RULES_KEY_PREV = "setting:creditrules1:"; + public static final String CREDIT_RULES_KEY_PREV = "setting:creditrules:"; // 获取mall信息 public static final String MALL_KEY_PREV = "mall:"; + public static final String TENANT_KEY_PREV = "tenant:"; - public static final String UNDEFINED = "undefined"; - + // 导入会员 public static final String importMemPrev = "importmem:"; public static final String importInvestCustomerPrev = "importinvestcustomer:"; - public static final String adminPage = "https://admin.malls.iformall.com"; - - - public static final String floor_back_img = "https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/789/9eea8e0e-15ea-4be0-a43d-31e2e9d8db8c.jpg"; } diff --git a/mallinkService/src/main/resources/mapper/InvestCustomerMapper.xml b/mallinkService/src/main/resources/mapper/InvestCustomerMapper.xml index 7930e51af..78f03f492 100644 --- a/mallinkService/src/main/resources/mapper/InvestCustomerMapper.xml +++ b/mallinkService/src/main/resources/mapper/InvestCustomerMapper.xml @@ -15,6 +15,7 @@ + diff --git a/mallinkService/src/main/resources/mapper/WxBLogMapper.xml b/mallinkService/src/main/resources/mapper/WxBLogMapper.xml deleted file mode 100644 index f2dff7911..000000000 --- a/mallinkService/src/main/resources/mapper/WxBLogMapper.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - - - - - - `id`,`tenant_id`,`data`,`create_date` - - - - where 1 = 1 - - - and `id` = #{id} - - - - - and `tenant_id` = #{tenantId} - - - - - and `data` like concat('%', #{data},'%') - - - - - and `create_date` = #{createDate} - - - - and id in - - #{idItem} - - - order by ${sortColumns} - - - - - - - - - - diff --git a/mallinkService/src/main/resources/mapper/WxCLogMapper.xml b/mallinkService/src/main/resources/mapper/WxCLogMapper.xml deleted file mode 100644 index e6c0533fb..000000000 --- a/mallinkService/src/main/resources/mapper/WxCLogMapper.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - - - - - - `id`,`tenant_id`,`data`,`create_date` - - - - where 1 = 1 - - - and `id` = #{id} - - - - - and `tenant_id` = #{tenantId} - - - - - and `data` like concat('%', #{data},'%') - - - - - and `create_date` = #{createDate} - - - - and id in - - #{idItem} - - - order by ${sortColumns} - - - - - - - - - - diff --git a/mallinkService/src/main/resources/mapper/WxChannelMapper.xml b/mallinkService/src/main/resources/mapper/WxChannelMapper.xml deleted file mode 100644 index 1a1832c5d..000000000 --- a/mallinkService/src/main/resources/mapper/WxChannelMapper.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - - - - - - - `id`,`channel_id`,`title`,`img`,`batch` - - - - where 1 = 1 - - - and `id` = #{id} - - - - and `channel_id` = #{channelId} - - - - and `title` like concat('%', #{title},'%') - - - - and `img` like concat('%', #{img},'%') - - - and `batch` = #{batch} - - - and id in - - #{idItem} - - - order by ${sortColumns} - - - - - - - - - -