Просмотр исходного кода

Merge tag 'jenkins-back-end-3133' into release

develop
release_toaliyun_real
Burce 6 лет назад
Родитель
Сommit
52746e4cbd
100 измененных файлов: 286 добавлений и 665 удалений
  1. +1
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestBaseController.java
  2. +1
    -0
      mallinkAdmin/src/main/resources/db/migration/V201910231900__W_INVEST_CREATE.sql
  3. +0
    -69
      mallinkBApi/src/main/java/com/iformall/controller/WxBLogController.java
  4. +0
    -1
      mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java
  5. +2
    -4
      mallinkService/src/main/java/com/iformall/domain/dto/KwMerchantMeterDto.java
  6. +2
    -5
      mallinkService/src/main/java/com/iformall/domain/dto/KwMeterDataDto.java
  7. +2
    -3
      mallinkService/src/main/java/com/iformall/domain/dto/MarkingCouponDataReportDto.java
  8. +2
    -12
      mallinkService/src/main/java/com/iformall/domain/dto/WxCUserBasicInfoDto.java
  9. +4
    -6
      mallinkService/src/main/java/com/iformall/domain/dto/WxMallBuildingFloorDto.java
  10. +4
    -4
      mallinkService/src/main/java/com/iformall/domain/dto/WxMerchantDto.java
  11. +2
    -3
      mallinkService/src/main/java/com/iformall/domain/dto/WxOrderReportDto.java
  12. +4
    -5
      mallinkService/src/main/java/com/iformall/domain/dto/WxSharingOrderDto.java
  13. +2
    -6
      mallinkService/src/main/java/com/iformall/domain/po/KwBox.java
  14. +2
    -5
      mallinkService/src/main/java/com/iformall/domain/po/KwBoxCmdHistory.java
  15. +2
    -5
      mallinkService/src/main/java/com/iformall/domain/po/KwMerchantMeter.java
  16. +2
    -5
      mallinkService/src/main/java/com/iformall/domain/po/KwMeter.java
  17. +2
    -5
      mallinkService/src/main/java/com/iformall/domain/po/KwMeterData.java
  18. +2
    -7
      mallinkService/src/main/java/com/iformall/domain/po/MallResource.java
  19. +2
    -6
      mallinkService/src/main/java/com/iformall/domain/po/MallRole.java
  20. +2
    -5
      mallinkService/src/main/java/com/iformall/domain/po/MallRolePermission.java
  21. +2
    -4
      mallinkService/src/main/java/com/iformall/domain/po/MallUserAction.java
  22. +24
    -9
      mallinkService/src/main/java/com/iformall/domain/po/MallUserInfo.java
  23. +2
    -4
      mallinkService/src/main/java/com/iformall/domain/po/PosCouponOrderVerify.java
  24. +2
    -5
      mallinkService/src/main/java/com/iformall/domain/po/PosMallConfig.java
  25. +5
    -7
      mallinkService/src/main/java/com/iformall/domain/po/PosOrder.java
  26. +5
    -5
      mallinkService/src/main/java/com/iformall/domain/po/PosPayOrder.java
  27. +2
    -10
      mallinkService/src/main/java/com/iformall/domain/po/PushLimit.java
  28. +5
    -7
      mallinkService/src/main/java/com/iformall/domain/po/WxActivity.java
  29. +2
    -5
      mallinkService/src/main/java/com/iformall/domain/po/WxActivityJoin.java
  30. +2
    -4
      mallinkService/src/main/java/com/iformall/domain/po/WxAdminLog.java
  31. +2
    -6
      mallinkService/src/main/java/com/iformall/domain/po/WxAppinfo.java
  32. +2
    -4
      mallinkService/src/main/java/com/iformall/domain/po/WxAuthorizerInfo.java
  33. +0
    -26
      mallinkService/src/main/java/com/iformall/domain/po/WxBLog.java
  34. +2
    -5
      mallinkService/src/main/java/com/iformall/domain/po/WxBillAction.java
  35. +3
    -4
      mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java
  36. +3
    -6
      mallinkService/src/main/java/com/iformall/domain/po/WxBillDeposit.java
  37. +3
    -5
      mallinkService/src/main/java/com/iformall/domain/po/WxBillOther.java
  38. +2
    -6
      mallinkService/src/main/java/com/iformall/domain/po/WxBillOtherDeposit.java
  39. +3
    -6
      mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java
  40. +2
    -4
      mallinkService/src/main/java/com/iformall/domain/po/WxBillPropertyDeposit.java
  41. +3
    -7
      mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java
  42. +2
    -7
      mallinkService/src/main/java/com/iformall/domain/po/WxBillSettle.java
  43. +2
    -6
      mallinkService/src/main/java/com/iformall/domain/po/WxBillSettleBill.java
  44. +2
    -5
      mallinkService/src/main/java/com/iformall/domain/po/WxBillSettleRecord.java
  45. +2
    -6
      mallinkService/src/main/java/com/iformall/domain/po/WxBrand.java
  46. +2
    -4
      mallinkService/src/main/java/com/iformall/domain/po/WxBuser.java
  47. +0
    -25
      mallinkService/src/main/java/com/iformall/domain/po/WxCLog.java
  48. +3
    -5
      mallinkService/src/main/java/com/iformall/domain/po/WxCUser.java
  49. +5
    -11
      mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java
  50. +2
    -5
      mallinkService/src/main/java/com/iformall/domain/po/WxCUserCar.java
  51. +2
    -4
      mallinkService/src/main/java/com/iformall/domain/po/WxCUserFromB.java
  52. +2
    -7
      mallinkService/src/main/java/com/iformall/domain/po/WxCUserTags.java
  53. +5
    -6
      mallinkService/src/main/java/com/iformall/domain/po/WxCampaign.java
  54. +2
    -4
      mallinkService/src/main/java/com/iformall/domain/po/WxCarCmdLog.java
  55. +2
    -3
      mallinkService/src/main/java/com/iformall/domain/po/WxCarPayRecord.java
  56. +4
    -8
      mallinkService/src/main/java/com/iformall/domain/po/WxCardInfo.java
  57. +2
    -5
      mallinkService/src/main/java/com/iformall/domain/po/WxCardSpend.java
  58. +2
    -5
      mallinkService/src/main/java/com/iformall/domain/po/WxCardTransferInfo.java
  59. +0
    -25
      mallinkService/src/main/java/com/iformall/domain/po/WxChannel.java
  60. +12
    -13
      mallinkService/src/main/java/com/iformall/domain/po/WxChartDataEntity.java
  61. +2
    -4
      mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java
  62. +2
    -6
      mallinkService/src/main/java/com/iformall/domain/po/WxCouponActionLog.java
  63. +2
    -5
      mallinkService/src/main/java/com/iformall/domain/po/WxCouponCar.java
  64. +6
    -7
      mallinkService/src/main/java/com/iformall/domain/po/WxCouponChannel.java
  65. +2
    -5
      mallinkService/src/main/java/com/iformall/domain/po/WxCouponInject.java
  66. +2
    -7
      mallinkService/src/main/java/com/iformall/domain/po/WxCouponMerchant.java
  67. +2
    -5
      mallinkService/src/main/java/com/iformall/domain/po/WxCouponOrder.java
  68. +3
    -5
      mallinkService/src/main/java/com/iformall/domain/po/WxCouponPassword.java
  69. +2
    -4
      mallinkService/src/main/java/com/iformall/domain/po/WxCouponPresent.java
  70. +2
    -4
      mallinkService/src/main/java/com/iformall/domain/po/WxCouponSend.java
  71. +2
    -6
      mallinkService/src/main/java/com/iformall/domain/po/WxCouponSendConfig.java
  72. +0
    -1
      mallinkService/src/main/java/com/iformall/domain/po/WxCouponType.java
  73. +4
    -6
      mallinkService/src/main/java/com/iformall/domain/po/WxCreditHistory.java
  74. +2
    -6
      mallinkService/src/main/java/com/iformall/domain/po/WxCuserFloatingLayer.java
  75. +2
    -3
      mallinkService/src/main/java/com/iformall/domain/po/WxDataRuleTarget.java
  76. +2
    -7
      mallinkService/src/main/java/com/iformall/domain/po/WxDateAmountRecord.java
  77. +2
    -5
      mallinkService/src/main/java/com/iformall/domain/po/WxDevice.java
  78. +2
    -6
      mallinkService/src/main/java/com/iformall/domain/po/WxFloatingLayer.java
  79. +2
    -5
      mallinkService/src/main/java/com/iformall/domain/po/WxFlowConfig.java
  80. +4
    -7
      mallinkService/src/main/java/com/iformall/domain/po/WxFlowModel.java
  81. +6
    -7
      mallinkService/src/main/java/com/iformall/domain/po/WxFlowRecord.java
  82. +5
    -8
      mallinkService/src/main/java/com/iformall/domain/po/WxGame.java
  83. +2
    -10
      mallinkService/src/main/java/com/iformall/domain/po/WxGameActionLog.java
  84. +2
    -6
      mallinkService/src/main/java/com/iformall/domain/po/WxLevelConfig.java
  85. +2
    -6
      mallinkService/src/main/java/com/iformall/domain/po/WxLevelMerchant.java
  86. +0
    -1
      mallinkService/src/main/java/com/iformall/domain/po/WxLogicPermission.java
  87. +0
    -1
      mallinkService/src/main/java/com/iformall/domain/po/WxMall.java
  88. +2
    -4
      mallinkService/src/main/java/com/iformall/domain/po/WxMallBuilding.java
  89. +2
    -5
      mallinkService/src/main/java/com/iformall/domain/po/WxMallFloor.java
  90. +26
    -11
      mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java
  91. +5
    -5
      mallinkService/src/main/java/com/iformall/domain/po/WxMerchantBUser.java
  92. +2
    -5
      mallinkService/src/main/java/com/iformall/domain/po/WxMerchantCorp.java
  93. +2
    -6
      mallinkService/src/main/java/com/iformall/domain/po/WxMerchantPowerBillConfig.java
  94. +2
    -6
      mallinkService/src/main/java/com/iformall/domain/po/WxMerchantShop.java
  95. +2
    -7
      mallinkService/src/main/java/com/iformall/domain/po/WxMerchantSubsidy.java
  96. +2
    -5
      mallinkService/src/main/java/com/iformall/domain/po/WxMerchantTax.java
  97. +2
    -5
      mallinkService/src/main/java/com/iformall/domain/po/WxMerchantTradeDaily.java
  98. +2
    -4
      mallinkService/src/main/java/com/iformall/domain/po/WxMsgCallback.java
  99. +2
    -6
      mallinkService/src/main/java/com/iformall/domain/po/WxMsgConfig.java
  100. +2
    -4
      mallinkService/src/main/java/com/iformall/domain/po/WxMsgLimit.java

+ 1
- 0
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") ;
}


+ 1
- 0
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`),


+ 0
- 69
mallinkBApi/src/main/java/com/iformall/controller/WxBLogController.java Просмотреть файл

@@ -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<WxBLog> 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));
}


}

+ 0
- 1
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;


+ 2
- 4
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;


+ 2
- 5
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;


+ 2
- 3
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)


+ 2
- 12
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;


+ 4
- 6
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")


+ 4
- 4
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;



+ 2
- 3
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;


+ 4
- 5
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")


+ 2
- 6
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;



+ 2
- 5
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;



+ 2
- 5
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;



+ 2
- 5
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;


+ 2
- 5
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;



+ 2
- 7
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")


+ 2
- 6
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")


+ 2
- 5
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<Long> 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")


+ 2
- 4
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")


+ 24
- 9
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;
}

}

+ 2
- 4
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")


+ 2
- 5
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")


+ 5
- 7
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")


+ 5
- 5
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")


+ 2
- 10
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<Long> 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")


+ 5
- 7
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() {


+ 2
- 5
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")


+ 2
- 4
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")


+ 2
- 6
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")


+ 2
- 4
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")


+ 0
- 26
mallinkService/src/main/java/com/iformall/domain/po/WxBLog.java Просмотреть файл

@@ -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;
}

+ 2
- 5
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;



+ 3
- 4
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")


+ 3
- 6
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")


+ 3
- 5
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")


+ 2
- 6
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;



+ 3
- 6
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;



+ 2
- 4
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")


+ 3
- 7
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;



+ 2
- 7
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;


+ 2
- 6
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;


+ 2
- 5
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")


+ 2
- 6
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;


+ 2
- 4
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")


+ 0
- 25
mallinkService/src/main/java/com/iformall/domain/po/WxCLog.java Просмотреть файл

@@ -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;
}

+ 3
- 5
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")


+ 5
- 11
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;

}

+ 2
- 5
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")


+ 2
- 4
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")


+ 2
- 7
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")


+ 5
- 6
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<WxCouponChannelVo> 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() {


+ 2
- 4
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")


+ 2
- 3
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;


+ 4
- 8
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")


+ 2
- 5
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")


+ 2
- 5
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;



+ 0
- 25
mallinkService/src/main/java/com/iformall/domain/po/WxChannel.java Просмотреть файл

@@ -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;

}

+ 12
- 13
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();
}
}

+ 2
- 4
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")


+ 2
- 6
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")


+ 2
- 5
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")


+ 6
- 7
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<Long> 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;
}
}



+ 2
- 5
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")


+ 2
- 7
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")


+ 2
- 5
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")


+ 3
- 5
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")


+ 2
- 4
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")


+ 2
- 4
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;



+ 2
- 6
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")


+ 0
- 1
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;



+ 4
- 6
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<Long> tags;
private List<Long> tags;

}

+ 2
- 6
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;



+ 2
- 3
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;



+ 2
- 7
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")


+ 2
- 5
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;



+ 2
- 6
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;



+ 2
- 5
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;



+ 4
- 7
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<UserTaskVo> lists;

}

+ 6
- 7
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;
}
}

+ 5
- 8
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() {


+ 2
- 10
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<Long> 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;



+ 2
- 6
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")


+ 2
- 6
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")


+ 0
- 1
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;


+ 0
- 1
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")


+ 2
- 4
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<WxMallFloor> 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")


+ 2
- 5
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")


+ 26
- 11
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() {


+ 5
- 5
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) {


+ 2
- 5
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")


+ 2
- 6
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;



+ 2
- 6
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")


+ 2
- 7
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;


+ 2
- 5
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")


+ 2
- 5
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;



+ 2
- 4
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")


+ 2
- 6
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")


+ 2
- 4
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")


Некоторые файлы не были показаны из-за большого количества измененных файлов

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