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

[框架][升级]:mybatis升级到mybatis-plus

release_toaliyun_real
Stormeye Wu 6 лет назад
Родитель
Сommit
ef82f22fc3
100 измененных файлов: 606 добавлений и 923 удалений
  1. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/UserApplication.java
  2. +5
    -1
      mallinkAdmin/src/main/java/com/iformall/config/MyBatisConfiguration.java
  3. +2
    -2
      mallinkAdmin/src/main/java/com/iformall/controller/app/WxAppinfoController.java
  4. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/car/WxCarController.java
  5. +2
    -2
      mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java
  6. +2
    -2
      mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java
  7. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java
  8. +3
    -7
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponSendController.java
  9. +2
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/mem/BillDailyAsyncTask.java
  10. +3
    -2
      mallinkAdmin/src/main/java/com/iformall/controller/mem/ImportTemplateTask.java
  11. +0
    -1
      mallinkAdmin/src/main/resources/application-dev.yml
  12. +12
    -12
      mallinkAdmin/src/main/resources/application.yml
  13. +1
    -1
      mallinkBApi/src/main/java/com/iformall/BApplication.java
  14. +12
    -11
      mallinkBApi/src/main/resources/application.yml
  15. +1
    -1
      mallinkCApi/src/main/java/com/iformall/CApplication.java
  16. +0
    -2
      mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java
  17. +12
    -11
      mallinkCApi/src/main/resources/application.yml
  18. +1
    -1
      mallinkCallback/src/main/java/com/iformall/CallbackApplication.java
  19. +12
    -13
      mallinkCallback/src/main/resources/application.yml
  20. +1
    -1
      mallinkMQConsumer/src/main/java/com/iformall/ConsumerApplication.java
  21. +3
    -3
      mallinkMQConsumer/src/main/java/com/iformall/mq/MqBaseConsumer.java
  22. +12
    -11
      mallinkMQConsumer/src/main/resources/application.yml
  23. +1
    -1
      mallinkPosApi/src/main/java/com/iformall/PosApplication.java
  24. +20
    -19
      mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java
  25. +12
    -11
      mallinkPosApi/src/main/resources/application.yml
  26. +1
    -1
      mallinkSchedule/src/main/java/com/iformall/ScheduleApplication.java
  27. +4
    -3
      mallinkSchedule/src/main/java/com/iformall/schedule/ActivitySchedule.java
  28. +10
    -9
      mallinkSchedule/src/main/java/com/iformall/schedule/ChartDataSchedule.java
  29. +1
    -1
      mallinkSchedule/src/main/java/com/iformall/schedule/CouponExpiringSchedule.java
  30. +5
    -4
      mallinkSchedule/src/main/java/com/iformall/schedule/CouponOrderExpiringSchedule.java
  31. +1
    -1
      mallinkSchedule/src/main/java/com/iformall/schedule/CouponSendSchedule.java
  32. +2
    -2
      mallinkSchedule/src/main/java/com/iformall/schedule/MsgSendingSchedule.java
  33. +18
    -14
      mallinkSchedule/src/main/java/com/iformall/schedule/OrderExpiringSchedule.java
  34. +6
    -5
      mallinkSchedule/src/main/java/com/iformall/schedule/PowerBillAutoBuildSchedule.java
  35. +1
    -1
      mallinkSchedule/src/main/java/com/iformall/schedule/WeChatAccessTokenSchedule.java
  36. +12
    -11
      mallinkSchedule/src/main/resources/application.yml
  37. +2
    -5
      mallinkService/src/main/java/com/iformall/common/CommonMapper.java
  38. +0
    -6
      mallinkService/src/main/java/com/iformall/domain/dto/KwMerchantMeterDataDto.java
  39. +0
    -4
      mallinkService/src/main/java/com/iformall/domain/dto/KwMerchantMeterDto.java
  40. +0
    -7
      mallinkService/src/main/java/com/iformall/domain/dto/KwMeterDataDto.java
  41. +6
    -6
      mallinkService/src/main/java/com/iformall/domain/dto/MarkingCouponDataReportDto.java
  42. +17
    -19
      mallinkService/src/main/java/com/iformall/domain/dto/WxCUserBasicInfoDto.java
  43. +0
    -4
      mallinkService/src/main/java/com/iformall/domain/dto/WxCUserBasicInfoFilterDto.java
  44. +2
    -2
      mallinkService/src/main/java/com/iformall/domain/dto/WxCouponChannelDto.java
  45. +11
    -7
      mallinkService/src/main/java/com/iformall/domain/po/BaseEntity.java
  46. +7
    -11
      mallinkService/src/main/java/com/iformall/domain/po/KwBox.java
  47. +3
    -9
      mallinkService/src/main/java/com/iformall/domain/po/KwBoxCmdHistory.java
  48. +4
    -8
      mallinkService/src/main/java/com/iformall/domain/po/KwMerchantMeter.java
  49. +10
    -14
      mallinkService/src/main/java/com/iformall/domain/po/KwMeter.java
  50. +2
    -11
      mallinkService/src/main/java/com/iformall/domain/po/KwMeterData.java
  51. +17
    -20
      mallinkService/src/main/java/com/iformall/domain/po/MallPermission.java
  52. +5
    -12
      mallinkService/src/main/java/com/iformall/domain/po/MallResource.java
  53. +6
    -12
      mallinkService/src/main/java/com/iformall/domain/po/MallRole.java
  54. +4
    -11
      mallinkService/src/main/java/com/iformall/domain/po/MallRolePermission.java
  55. +3
    -11
      mallinkService/src/main/java/com/iformall/domain/po/MallSaleType.java
  56. +3
    -10
      mallinkService/src/main/java/com/iformall/domain/po/MallUserAction.java
  57. +14
    -19
      mallinkService/src/main/java/com/iformall/domain/po/MallUserInfo.java
  58. +4
    -12
      mallinkService/src/main/java/com/iformall/domain/po/MallUserRole.java
  59. +4
    -13
      mallinkService/src/main/java/com/iformall/domain/po/PosActionLog.java
  60. +4
    -11
      mallinkService/src/main/java/com/iformall/domain/po/PosCouponOrderVerify.java
  61. +4
    -12
      mallinkService/src/main/java/com/iformall/domain/po/PosMallConfig.java
  62. +6
    -11
      mallinkService/src/main/java/com/iformall/domain/po/PosOrder.java
  63. +5
    -13
      mallinkService/src/main/java/com/iformall/domain/po/PosPayOrder.java
  64. +4
    -6
      mallinkService/src/main/java/com/iformall/domain/po/PushLimit.java
  65. +4
    -10
      mallinkService/src/main/java/com/iformall/domain/po/SysMonitor.java
  66. +6
    -11
      mallinkService/src/main/java/com/iformall/domain/po/ThDevInfo.java
  67. +9
    -15
      mallinkService/src/main/java/com/iformall/domain/po/WxActivity.java
  68. +4
    -10
      mallinkService/src/main/java/com/iformall/domain/po/WxActivityJoin.java
  69. +2
    -10
      mallinkService/src/main/java/com/iformall/domain/po/WxAdminLog.java
  70. +5
    -10
      mallinkService/src/main/java/com/iformall/domain/po/WxAppinfo.java
  71. +3
    -8
      mallinkService/src/main/java/com/iformall/domain/po/WxAuthorizerInfo.java
  72. +5
    -10
      mallinkService/src/main/java/com/iformall/domain/po/WxBLog.java
  73. +7
    -13
      mallinkService/src/main/java/com/iformall/domain/po/WxBillAction.java
  74. +10
    -14
      mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java
  75. +5
    -10
      mallinkService/src/main/java/com/iformall/domain/po/WxBillDeposit.java
  76. +16
    -19
      mallinkService/src/main/java/com/iformall/domain/po/WxBillOther.java
  77. +15
    -18
      mallinkService/src/main/java/com/iformall/domain/po/WxBillOtherDeposit.java
  78. +20
    -24
      mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java
  79. +4
    -10
      mallinkService/src/main/java/com/iformall/domain/po/WxBillPropertyDeposit.java
  80. +22
    -25
      mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java
  81. +19
    -21
      mallinkService/src/main/java/com/iformall/domain/po/WxBillSettle.java
  82. +10
    -11
      mallinkService/src/main/java/com/iformall/domain/po/WxBillSettleBill.java
  83. +3
    -10
      mallinkService/src/main/java/com/iformall/domain/po/WxBillSettleRecord.java
  84. +5
    -10
      mallinkService/src/main/java/com/iformall/domain/po/WxBrand.java
  85. +9
    -15
      mallinkService/src/main/java/com/iformall/domain/po/WxBusiness.java
  86. +3
    -10
      mallinkService/src/main/java/com/iformall/domain/po/WxCLog.java
  87. +14
    -16
      mallinkService/src/main/java/com/iformall/domain/po/WxCUser.java
  88. +12
    -16
      mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java
  89. +3
    -10
      mallinkService/src/main/java/com/iformall/domain/po/WxCUserCar.java
  90. +4
    -11
      mallinkService/src/main/java/com/iformall/domain/po/WxCUserFromB.java
  91. +5
    -10
      mallinkService/src/main/java/com/iformall/domain/po/WxCUserTags.java
  92. +7
    -9
      mallinkService/src/main/java/com/iformall/domain/po/WxCampaign.java
  93. +3
    -10
      mallinkService/src/main/java/com/iformall/domain/po/WxCarCmdLog.java
  94. +8
    -8
      mallinkService/src/main/java/com/iformall/domain/po/WxCarPayRecord.java
  95. +8
    -11
      mallinkService/src/main/java/com/iformall/domain/po/WxCardInfo.java
  96. +16
    -20
      mallinkService/src/main/java/com/iformall/domain/po/WxCardSpend.java
  97. +2
    -27
      mallinkService/src/main/java/com/iformall/domain/po/WxCardTransferInfo.java
  98. +2
    -9
      mallinkService/src/main/java/com/iformall/domain/po/WxChannel.java
  99. +2
    -4
      mallinkService/src/main/java/com/iformall/domain/po/WxChartDataEntity.java
  100. +4
    -11
      mallinkService/src/main/java/com/iformall/domain/po/WxComponentVerifyTicket.java

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

@@ -1,6 +1,7 @@
package com.iformall; package com.iformall;


import com.ulisesbocchio.jasyptspringboot.annotation.EnableEncryptableProperties; import com.ulisesbocchio.jasyptspringboot.annotation.EnableEncryptableProperties;
import org.mybatis.spring.annotation.MapperScan;
import org.rocketmq.starter.annotation.EnableRocketMQ; import org.rocketmq.starter.annotation.EnableRocketMQ;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
@@ -8,7 +9,6 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.scheduling.annotation.EnableAsync; import org.springframework.scheduling.annotation.EnableAsync;
import springfox.documentation.swagger2.annotations.EnableSwagger2; import springfox.documentation.swagger2.annotations.EnableSwagger2;
import tk.mybatis.spring.annotation.MapperScan;


/** /**
* @author chenkx * @author chenkx


+ 5
- 1
mallinkAdmin/src/main/java/com/iformall/config/MyBatisConfiguration.java Просмотреть файл

@@ -1,15 +1,18 @@
package com.iformall.config; package com.iformall.config;


import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
import com.iformall.plugin.MultiTenancy; import com.iformall.plugin.MultiTenancy;
import org.apache.ibatis.reflection.MetaObject;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.transaction.annotation.EnableTransactionManagement;


import java.util.Properties; import java.util.Properties;


@EnableTransactionManagement
@Configuration @Configuration
public class MyBatisConfiguration { public class MyBatisConfiguration {



@Bean @Bean
public MultiTenancy multiTenancy() { public MultiTenancy multiTenancy() {
MultiTenancy multiTenancy = new MultiTenancy(); MultiTenancy multiTenancy = new MultiTenancy();
@@ -20,4 +23,5 @@ public class MyBatisConfiguration {
multiTenancy.setProperties(properties); multiTenancy.setProperties(properties);
return multiTenancy; return multiTenancy;
} }

} }

+ 2
- 2
mallinkAdmin/src/main/java/com/iformall/controller/app/WxAppinfoController.java Просмотреть файл

@@ -60,7 +60,7 @@ public class WxAppinfoController extends BaseController {
if(map!=null && map.get("url") !=null) { if(map!=null && map.get("url") !=null) {
String url = map.get("url"); String url = map.get("url");
merchant.setQrCode(url); merchant.setQrCode(url);
wxMerchantMapper.updateByPrimaryKeySelective(merchant);
wxMerchantMapper.updateById(merchant);
} }
} }
}); });
@@ -86,7 +86,7 @@ public class WxAppinfoController extends BaseController {
if(map!=null && map.get("url") !=null) { if(map!=null && map.get("url") !=null) {
String url = map.get("url"); String url = map.get("url");
couponChannel.setQrCode(url); couponChannel.setQrCode(url);
wxCouponChannelMapper.updateByPrimaryKeySelective(couponChannel);
wxCouponChannelMapper.updateById(couponChannel);
} }
} }
}); });


+ 1
- 1
mallinkAdmin/src/main/java/com/iformall/controller/car/WxCarController.java Просмотреть файл

@@ -259,7 +259,7 @@ public class WxCarController extends BaseController {
//投放审批 //投放审批
wc.setPutApplyStatus(EnumRentContractAppStatus.APPLYING.getCode()); wc.setPutApplyStatus(EnumRentContractAppStatus.APPLYING.getCode());
} }
wxCouponMapper.updateByPrimaryKeySelective(wc);
wxCouponMapper.updateById(wc);
} }


return new ResultData(coupon.getId()); return new ResultData(coupon.getId());


+ 2
- 2
mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java Просмотреть файл

@@ -76,7 +76,7 @@ public class WxPropertyContractController extends BaseController {
@SystemControllerLog(description = "物业合同-更新租赁开始日期") @SystemControllerLog(description = "物业合同-更新租赁开始日期")
public ResultData updateRentStartTime(@RequestBody WxPropertyContract wxPropertyContract) { public ResultData updateRentStartTime(@RequestBody WxPropertyContract wxPropertyContract) {
logger.debug("[" + getIpAddr() + "] WxPropertyContractController::updateRentStartTime"); logger.debug("[" + getIpAddr() + "] WxPropertyContractController::updateRentStartTime");
WxPropertyContract propertyContract = wxPropertyContractMapper.selectByPrimaryKey(wxPropertyContract.getId());
WxPropertyContract propertyContract = wxPropertyContractMapper.selectById(wxPropertyContract.getId());
MallUserInfo user = getUser(); MallUserInfo user = getUser();
propertyContract.setTenantId(user.getTenantId()); propertyContract.setTenantId(user.getTenantId());
propertyContract.setAdjustPeriodHandle(); propertyContract.setAdjustPeriodHandle();
@@ -194,7 +194,7 @@ public class WxPropertyContractController extends BaseController {
@SystemControllerLog(description = "物业合同-生成账单列表金额") @SystemControllerLog(description = "物业合同-生成账单列表金额")
public ResultData buildBillPriceList(@RequestBody WxPropertyContract wxPropertyContract) throws Exception{ public ResultData buildBillPriceList(@RequestBody WxPropertyContract wxPropertyContract) throws Exception{
logger.debug("[" + getIpAddr() + "] WxRentContractController::buildBillPriceList"); logger.debug("[" + getIpAddr() + "] WxRentContractController::buildBillPriceList");
WxPropertyContract dbRent = wxPropertyContractMapper.selectByPrimaryKey(wxPropertyContract.getId());
WxPropertyContract dbRent = wxPropertyContractMapper.selectById(wxPropertyContract.getId());
dbRent.setPreviewBillRentList(wxPropertyContract.getPreviewBillRentList()); dbRent.setPreviewBillRentList(wxPropertyContract.getPreviewBillRentList());
if(dbRent.getRentStartType()!=null && dbRent.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){ if(dbRent.getRentStartType()!=null && dbRent.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){
dbRent.setRentalStartDate(dbRent.getStartDate()); dbRent.setRentalStartDate(dbRent.getStartDate());


+ 2
- 2
mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java Просмотреть файл

@@ -116,7 +116,7 @@ public class WxRentContractController extends BaseController {
@SystemControllerLog(description = "租赁合同-生成账单列表金额") @SystemControllerLog(description = "租赁合同-生成账单列表金额")
public ResultData buildBillPriceList(@RequestBody WxRentContract wxRentContract) throws Exception{ public ResultData buildBillPriceList(@RequestBody WxRentContract wxRentContract) throws Exception{
logger.debug("[" + getIpAddr() + "] WxRentContractController::buildBillPriceList"); logger.debug("[" + getIpAddr() + "] WxRentContractController::buildBillPriceList");
WxRentContract dbRent = wxRentContractMapper.selectByPrimaryKey(wxRentContract.getId());
WxRentContract dbRent = wxRentContractMapper.selectById(wxRentContract.getId());
dbRent.setPreviewBillRentList(wxRentContract.getPreviewBillRentList()); dbRent.setPreviewBillRentList(wxRentContract.getPreviewBillRentList());


if(dbRent.getRentStartType()!=null && dbRent.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){ if(dbRent.getRentStartType()!=null && dbRent.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){
@@ -154,7 +154,7 @@ public class WxRentContractController extends BaseController {
@SystemControllerLog(description = "租赁合同-更新租赁开始日期") @SystemControllerLog(description = "租赁合同-更新租赁开始日期")
public ResultData updateRentStartTime(@RequestBody WxRentContract wxRentContract) { public ResultData updateRentStartTime(@RequestBody WxRentContract wxRentContract) {
logger.debug("[" + getIpAddr() + "] WxRentContractController::updateRentStartTime"); logger.debug("[" + getIpAddr() + "] WxRentContractController::updateRentStartTime");
WxRentContract rentContract = wxRentContractMapper.selectByPrimaryKey(wxRentContract.getId());
WxRentContract rentContract = wxRentContractMapper.selectById(wxRentContract.getId());
rentContract.setRentalStartDate(wxRentContract.getRentalStartDate()); rentContract.setRentalStartDate(wxRentContract.getRentalStartDate());
Date oldDate = wxRentContract.getRentalStartDate(); Date oldDate = wxRentContract.getRentalStartDate();
if(wxRentContract.getRentStartType()!=null && wxRentContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){ if(wxRentContract.getRentStartType()!=null && wxRentContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){


+ 1
- 1
mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java Просмотреть файл

@@ -91,7 +91,7 @@ public class WxCouponChannelController extends BaseController {
if(map!=null && map.get("url") !=null) { if(map!=null && map.get("url") !=null) {
String url = map.get("url"); String url = map.get("url");
couponChannel.setQrCode(url); couponChannel.setQrCode(url);
wxCouponChannelMapper.updateByPrimaryKeySelective(couponChannel);
wxCouponChannelMapper.updateById(couponChannel);
} }
} }
return resultData; return resultData;


+ 3
- 7
mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponSendController.java Просмотреть файл

@@ -1,18 +1,15 @@
package com.iformall.controller.market; package com.iformall.controller.market;


import com.alibaba.fastjson.JSONObject;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.iformall.annotation.SystemControllerLog; import com.iformall.annotation.SystemControllerLog;
import com.iformall.common.ErrorCode; import com.iformall.common.ErrorCode;
import com.iformall.common.Result; import com.iformall.common.Result;
import com.iformall.common.ResultData; import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController; import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.BaseEntity;
import com.iformall.domain.po.WxCoupon; import com.iformall.domain.po.WxCoupon;
import com.iformall.domain.po.WxCouponSend; import com.iformall.domain.po.WxCouponSend;
import com.iformall.domain.vo.WxCouponSendVo; import com.iformall.domain.vo.WxCouponSendVo;
import com.iformall.enums.EnumCouponSendSendType; import com.iformall.enums.EnumCouponSendSendType;
import com.iformall.enums.EnumCouponSendStatus;
import com.iformall.enums.EnumCouponSendType; import com.iformall.enums.EnumCouponSendType;
import com.iformall.enums.EnumCouponStatus; import com.iformall.enums.EnumCouponStatus;
import com.iformall.exception.MallinkException; import com.iformall.exception.MallinkException;
@@ -28,7 +25,6 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;


import javax.validation.constraints.NotNull;
import java.util.Date; import java.util.Date;
import java.util.Objects; import java.util.Objects;


@@ -78,7 +74,7 @@ public class WxCouponSendController extends BaseController {
}) })
@SystemControllerLog(description = "注券-添加或更新配置") @SystemControllerLog(description = "注券-添加或更新配置")
public ResultData addConfig(Integer beforeDays, Integer sendType) { public ResultData addConfig(Integer beforeDays, Integer sendType) {
if(!Objects.equals(sendType,EnumCouponSendSendType.BIRTHDAY.getCode())) {
if (!Objects.equals(sendType, EnumCouponSendSendType.BIRTHDAY.getCode())) {
return new ResultData(ErrorCode.COUPON_VALID_NOT_SUPPORTED); return new ResultData(ErrorCode.COUPON_VALID_NOT_SUPPORTED);
} }
try { try {
@@ -158,9 +154,9 @@ public class WxCouponSendController extends BaseController {
return new ResultData(ErrorCode.COUPON_SEND_IS_INVALID); return new ResultData(ErrorCode.COUPON_SEND_IS_INVALID);
} }
try { try {
wxCouponSendService.updateInvalid(wxCouponSend);
wxCouponSendService.updateInvalid(wxCouponSend);
} catch (MallinkException e) { } catch (MallinkException e) {
return new ResultData(e.getErrorCode(),e.getMessage()) ;
return new ResultData(e.getErrorCode(), e.getMessage());
} }
return new ResultData(); return new ResultData();
} }


+ 2
- 1
mallinkAdmin/src/main/java/com/iformall/controller/mem/BillDailyAsyncTask.java Просмотреть файл

@@ -5,6 +5,7 @@ import cn.afterturn.easypoi.excel.entity.ImportParams;
import cn.afterturn.easypoi.excel.entity.result.ExcelImportResult; import cn.afterturn.easypoi.excel.entity.result.ExcelImportResult;
import cn.afterturn.easypoi.handler.impl.ExcelDataHandlerDefaultImpl; import cn.afterturn.easypoi.handler.impl.ExcelDataHandlerDefaultImpl;
import cn.afterturn.easypoi.handler.inter.IExcelDataHandler; import cn.afterturn.easypoi.handler.inter.IExcelDataHandler;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.iformall.domain.po.MallUserInfo; import com.iformall.domain.po.MallUserInfo;
import com.iformall.domain.po.WxShop; import com.iformall.domain.po.WxShop;
import com.iformall.domain.vo.WxBillDailyVo; import com.iformall.domain.vo.WxBillDailyVo;
@@ -104,7 +105,7 @@ public class BillDailyAsyncTask {
shop.setType(vo.getRentShopType()); shop.setType(vo.getRentShopType());
shop.setStatus(EnumShopStatus.RENT.getCode()); shop.setStatus(EnumShopStatus.RENT.getCode());
shop.setIsDel(EnumDelStatus.NOT_DEL.getCode()); shop.setIsDel(EnumDelStatus.NOT_DEL.getCode());
WxShop wxShop = wxShopMapper.selectOne(shop);
WxShop wxShop = wxShopMapper.selectOne(new QueryWrapper(shop));
if (wxShop == null) { if (wxShop == null) {
logger.error("店铺不存在", vo.toString()); logger.error("店铺不存在", vo.toString());
fail++; fail++;


+ 3
- 2
mallinkAdmin/src/main/java/com/iformall/controller/mem/ImportTemplateTask.java Просмотреть файл

@@ -5,6 +5,7 @@ import cn.afterturn.easypoi.excel.entity.ImportParams;
import cn.afterturn.easypoi.excel.entity.result.ExcelImportResult; import cn.afterturn.easypoi.excel.entity.result.ExcelImportResult;
import cn.afterturn.easypoi.handler.impl.ExcelDataHandlerDefaultImpl; import cn.afterturn.easypoi.handler.impl.ExcelDataHandlerDefaultImpl;
import cn.afterturn.easypoi.handler.inter.IExcelDataHandler; import cn.afterturn.easypoi.handler.inter.IExcelDataHandler;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.iformall.domain.po.MallUserInfo; import com.iformall.domain.po.MallUserInfo;
import com.iformall.domain.po.WxMerchant; import com.iformall.domain.po.WxMerchant;
import com.iformall.domain.po.WxTags; import com.iformall.domain.po.WxTags;
@@ -96,7 +97,7 @@ public class ImportTemplateTask {
wxMerchantQuery.setTenantId(tenantId); wxMerchantQuery.setTenantId(tenantId);
wxMerchantQuery.setName(merchantName); wxMerchantQuery.setName(merchantName);
wxMerchantQuery.setStatus(EnumMerchantStatus.VALID.getCode()); wxMerchantQuery.setStatus(EnumMerchantStatus.VALID.getCode());
WxMerchant wxMerchant = wxMerchantMapper.selectOne(wxMerchantQuery);
WxMerchant wxMerchant = wxMerchantMapper.selectOne(new QueryWrapper(wxMerchantQuery));
if (wxMerchant != null) { if (wxMerchant != null) {
merchantMap.put(merchantName, wxMerchant); merchantMap.put(merchantName, wxMerchant);
} }
@@ -192,7 +193,7 @@ public class ImportTemplateTask {
wxMerchantQuery.setTenantId(tenantId); wxMerchantQuery.setTenantId(tenantId);
wxMerchantQuery.setName(merchantName); wxMerchantQuery.setName(merchantName);
wxMerchantQuery.setStatus(EnumMerchantStatus.VALID.getCode()); wxMerchantQuery.setStatus(EnumMerchantStatus.VALID.getCode());
WxMerchant wxMerchant = wxMerchantMapper.selectOne(wxMerchantQuery);
WxMerchant wxMerchant = wxMerchantMapper.selectOne(new QueryWrapper(wxMerchantQuery));
if (wxMerchant != null) { if (wxMerchant != null) {
merchantMap.put(merchantName, wxMerchant); merchantMap.put(merchantName, wxMerchant);
} }


+ 0
- 1
mallinkAdmin/src/main/resources/application-dev.yml Просмотреть файл

@@ -125,6 +125,5 @@ ueditor:


logging: logging:
level: level:
tk.mybatis: debug
com.iformall: debug com.iformall: debug
path: ./logs/admin path: ./logs/admin

+ 12
- 12
mallinkAdmin/src/main/resources/application.yml Просмотреть файл

@@ -49,21 +49,21 @@ spring:
baseline-version: 1 baseline-version: 1




# @{link} https://github.com/abel533
#Mybatis
mybatis:
type-aliases-package: com.iformall.domain.po
# MybatisPlus
mybatis-plus:
mapper-locations: classpath:mapper/*Mapper.xml mapper-locations: classpath:mapper/*Mapper.xml
global-config:
db-config:
id-type: id_worker
field-strategy: not_null
db-type: mysql
configuration: configuration:
map-underscore-to-camel-case: true
cache-enabled: true
lazy-loading-enabled: true
use-generated-keys: true
default-fetch-size: 100
default-statement-timeout: 10000

jdbc-type-for-null: 'null'
cache-enabled: false
call-setters-on-nulls: true
type-aliases-package: com.iformall.domain.po


#PageHelper
# PageHelper
pagehelper: pagehelper:
helperDialect: mysql helperDialect: mysql
reasonable: false reasonable: false


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

@@ -1,12 +1,12 @@
package com.iformall; package com.iformall;


import com.ulisesbocchio.jasyptspringboot.annotation.EnableEncryptableProperties; import com.ulisesbocchio.jasyptspringboot.annotation.EnableEncryptableProperties;
import org.mybatis.spring.annotation.MapperScan;
import org.rocketmq.starter.annotation.EnableRocketMQ; import org.rocketmq.starter.annotation.EnableRocketMQ;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import tk.mybatis.spring.annotation.MapperScan;


/** /**
* @author chenkx * @author chenkx


+ 12
- 11
mallinkBApi/src/main/resources/application.yml Просмотреть файл

@@ -22,20 +22,21 @@ spring:
retry-another-broker-when-not-store-ok: false retry-another-broker-when-not-store-ok: false
retry-times-when-send-failed: 2 retry-times-when-send-failed: 2


# @{link} https://github.com/abel533
#Mybatis
mybatis:
type-aliases-package: com.iformall.domain.po
# MybatisPlus
mybatis-plus:
mapper-locations: classpath:mapper/*Mapper.xml mapper-locations: classpath:mapper/*Mapper.xml
global-config:
db-config:
id-type: id_worker
field-strategy: not_null
db-type: mysql
configuration: configuration:
map-underscore-to-camel-case: true
cache-enabled: true
lazy-loading-enabled: true
use-generated-keys: true
default-fetch-size: 100
default-statement-timeout: 10
jdbc-type-for-null: 'null'
cache-enabled: false
call-setters-on-nulls: true
type-aliases-package: com.iformall.domain.po


#PageHelper
# PageHelper
pagehelper: pagehelper:
helperDialect: mysql helperDialect: mysql
reasonable: false reasonable: false


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

@@ -1,12 +1,12 @@
package com.iformall; package com.iformall;


import com.ulisesbocchio.jasyptspringboot.annotation.EnableEncryptableProperties; import com.ulisesbocchio.jasyptspringboot.annotation.EnableEncryptableProperties;
import org.mybatis.spring.annotation.MapperScan;
import org.rocketmq.starter.annotation.EnableRocketMQ; import org.rocketmq.starter.annotation.EnableRocketMQ;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import tk.mybatis.spring.annotation.MapperScan;


/** /**
* @author chenkx * @author chenkx


+ 0
- 2
mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java Просмотреть файл

@@ -33,7 +33,6 @@ public class WxCouponController extends BaseController {


@Autowired @Autowired
private WxCouponChannelService wxCouponChannelService; private WxCouponChannelService wxCouponChannelService;

@Autowired @Autowired
private WxCouponService couponService; private WxCouponService couponService;


@@ -41,7 +40,6 @@ public class WxCouponController extends BaseController {
@Qualifier("couponDetailRedisTemplate") @Qualifier("couponDetailRedisTemplate")
RedisTemplate<String, WxCouponCVo> cdRedisTemplate; RedisTemplate<String, WxCouponCVo> cdRedisTemplate;



@ApiOperation("根据id(couponChannel)查询接口") @ApiOperation("根据id(couponChannel)查询接口")
@GetMapping("/detail") @GetMapping("/detail")
@ApiImplicitParams({ @ApiImplicitParams({


+ 12
- 11
mallinkCApi/src/main/resources/application.yml Просмотреть файл

@@ -22,20 +22,21 @@ spring:
retry-another-broker-when-not-store-ok: false retry-another-broker-when-not-store-ok: false
retry-times-when-send-failed: 2 retry-times-when-send-failed: 2


# @{link} https://github.com/abel533
#Mybatis
mybatis:
type-aliases-package: com.iformall.domain.po
# MybatisPlus
mybatis-plus:
mapper-locations: classpath:mapper/*Mapper.xml mapper-locations: classpath:mapper/*Mapper.xml
global-config:
db-config:
id-type: id_worker
field-strategy: not_null
db-type: mysql
configuration: configuration:
map-underscore-to-camel-case: true
cache-enabled: true
lazy-loading-enabled: true
use-generated-keys: true
default-fetch-size: 100
default-statement-timeout: 10
jdbc-type-for-null: 'null'
cache-enabled: false
call-setters-on-nulls: true
type-aliases-package: com.iformall.domain.po


#PageHelper
# PageHelper
pagehelper: pagehelper:
helperDialect: mysql helperDialect: mysql
reasonable: false reasonable: false


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

@@ -1,6 +1,7 @@
package com.iformall; package com.iformall;


import com.ulisesbocchio.jasyptspringboot.annotation.EnableEncryptableProperties; import com.ulisesbocchio.jasyptspringboot.annotation.EnableEncryptableProperties;
import org.mybatis.spring.annotation.MapperScan;
import org.rocketmq.starter.annotation.EnableRocketMQ; import org.rocketmq.starter.annotation.EnableRocketMQ;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
@@ -8,7 +9,6 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.scheduling.annotation.EnableAsync; import org.springframework.scheduling.annotation.EnableAsync;
import springfox.documentation.swagger2.annotations.EnableSwagger2; import springfox.documentation.swagger2.annotations.EnableSwagger2;
import tk.mybatis.spring.annotation.MapperScan;


/** /**
* @author chenkx * @author chenkx


+ 12
- 13
mallinkCallback/src/main/resources/application.yml Просмотреть файл

@@ -41,22 +41,21 @@ spring:
proxy-target-class: true proxy-target-class: true
auto: true auto: true



# @{link} https://github.com/abel533
#Mybatis
mybatis:
type-aliases-package: com.iformall.domain.po
# MybatisPlus
mybatis-plus:
mapper-locations: classpath:mapper/*Mapper.xml mapper-locations: classpath:mapper/*Mapper.xml
global-config:
db-config:
id-type: id_worker
field-strategy: not_null
db-type: mysql
configuration: configuration:
map-underscore-to-camel-case: true
cache-enabled: true
lazy-loading-enabled: true
use-generated-keys: true
default-fetch-size: 100
default-statement-timeout: 10

jdbc-type-for-null: 'null'
cache-enabled: false
call-setters-on-nulls: true
type-aliases-package: com.iformall.domain.po


#PageHelper
# PageHelper
pagehelper: pagehelper:
helperDialect: mysql helperDialect: mysql
reasonable: false reasonable: false


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

@@ -1,13 +1,13 @@
package com.iformall; package com.iformall;


import com.ulisesbocchio.jasyptspringboot.annotation.EnableEncryptableProperties; import com.ulisesbocchio.jasyptspringboot.annotation.EnableEncryptableProperties;
import org.mybatis.spring.annotation.MapperScan;
import org.rocketmq.starter.annotation.EnableRocketMQ; import org.rocketmq.starter.annotation.EnableRocketMQ;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import springfox.documentation.swagger2.annotations.EnableSwagger2; import springfox.documentation.swagger2.annotations.EnableSwagger2;
import tk.mybatis.spring.annotation.MapperScan;


/** /**
* @author chenkx * @author chenkx


+ 3
- 3
mallinkMQConsumer/src/main/java/com/iformall/mq/MqBaseConsumer.java Просмотреть файл

@@ -97,13 +97,13 @@ public class MqBaseConsumer {
fmInsideNotifyRefundSuccessMsgService.send(msg); fmInsideNotifyRefundSuccessMsgService.send(msg);
} }
baseMsg.setMsgStatus(EnumMsgRecordStatus.CONSUME_SUCC.getCode()); baseMsg.setMsgStatus(EnumMsgRecordStatus.CONSUME_SUCC.getCode());
wxMsgRecordMapper.update(baseMsg);
wxMsgRecordMapper.updateByBaseMsg(baseMsg);
}catch (Throwable e){ }catch (Throwable e){
try { try {
log.error("consum received error: ", e); log.error("consum received error: ", e);
baseMsg.setStatusMessage(e.getMessage()); baseMsg.setStatusMessage(e.getMessage());
baseMsg.setMsgStatus(EnumMsgRecordStatus.CONSUME_FAIL.getCode()); baseMsg.setMsgStatus(EnumMsgRecordStatus.CONSUME_FAIL.getCode());
wxMsgRecordMapper.update(baseMsg);
wxMsgRecordMapper.updateByBaseMsg(baseMsg);


if(null != baseMsg){ if(null != baseMsg){
if(baseMsg.getDelayTimeLevel() > 0){ if(baseMsg.getDelayTimeLevel() > 0){
@@ -119,7 +119,7 @@ public class MqBaseConsumer {
}else{ }else{
baseMsg.setStatusMessage("重试次数超过3次"); baseMsg.setStatusMessage("重试次数超过3次");
baseMsg.setMsgStatus(EnumMsgRecordStatus.CONSUME_FAIL.getCode()); baseMsg.setMsgStatus(EnumMsgRecordStatus.CONSUME_FAIL.getCode());
wxMsgRecordMapper.update(baseMsg);
wxMsgRecordMapper.updateByBaseMsg(baseMsg);
} }
} }
}catch (Throwable e1){ }catch (Throwable e1){


+ 12
- 11
mallinkMQConsumer/src/main/resources/application.yml Просмотреть файл

@@ -39,20 +39,21 @@ spring:
virtual-host: / virtual-host: /




# @{link} https://github.com/abel533
#Mybatis
mybatis:
type-aliases-package: com.iformall.domain.po
# MybatisPlus
mybatis-plus:
mapper-locations: classpath:mapper/*Mapper.xml mapper-locations: classpath:mapper/*Mapper.xml
global-config:
db-config:
id-type: id_worker
field-strategy: not_null
db-type: mysql
configuration: configuration:
map-underscore-to-camel-case: true
cache-enabled: true
lazy-loading-enabled: true
use-generated-keys: true
default-fetch-size: 100
default-statement-timeout: 10
jdbc-type-for-null: 'null'
cache-enabled: false
call-setters-on-nulls: true
type-aliases-package: com.iformall.domain.po


#PageHelper
# PageHelper
pagehelper: pagehelper:
helperDialect: mysql helperDialect: mysql
reasonable: false reasonable: false


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

@@ -1,12 +1,12 @@
package com.iformall; package com.iformall;


import com.ulisesbocchio.jasyptspringboot.annotation.EnableEncryptableProperties; import com.ulisesbocchio.jasyptspringboot.annotation.EnableEncryptableProperties;
import org.mybatis.spring.annotation.MapperScan;
import org.rocketmq.starter.annotation.EnableRocketMQ; import org.rocketmq.starter.annotation.EnableRocketMQ;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import tk.mybatis.spring.annotation.MapperScan;


/** /**
* @author Stormeye * @author Stormeye


+ 20
- 19
mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java Просмотреть файл

@@ -3,6 +3,7 @@ package com.iformall.service.impl;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.iformall.common.ErrorCode; import com.iformall.common.ErrorCode;
import com.iformall.common.IdWorker; import com.iformall.common.IdWorker;
import com.iformall.domain.po.*; import com.iformall.domain.po.*;
@@ -271,7 +272,7 @@ public class PosServiceImpl implements PosService {
logger.error(e.getMessage()); logger.error(e.getMessage());
throw new MallinkException(ErrorCode.SYS_PARAMETER_CAST_ERROR.getCode(), e.getMessage()); throw new MallinkException(ErrorCode.SYS_PARAMETER_CAST_ERROR.getCode(), e.getMessage());
} }
WxCouponOrder couponOrder = couponOrderMapper.selectByPrimaryKey(cardId);
WxCouponOrder couponOrder = couponOrderMapper.selectById(cardId);
if (couponOrder == null) { if (couponOrder == null) {
throw new MallinkException(ErrorCode.CARD_IS_NOT_FOUND); throw new MallinkException(ErrorCode.CARD_IS_NOT_FOUND);
} }
@@ -431,7 +432,7 @@ public class PosServiceImpl implements PosService {
throw new MallinkException(ErrorCode.VERIFY_COUPON_TYPE_NOT_SUPPORT); throw new MallinkException(ErrorCode.VERIFY_COUPON_TYPE_NOT_SUPPORT);
} }
// 5. get coupon // 5. get coupon
WxCoupon wxCoupon = couponMapper.selectByPrimaryKey(couponOrderCVo.getCouponId());
WxCoupon wxCoupon = couponMapper.selectById(couponOrderCVo.getCouponId());
if (wxCoupon == null) { if (wxCoupon == null) {
logger.error("券: coupon-" + wxCoupon.getId() + "不存在" + "couponOrder-" + couponOrderCVo.getId()); logger.error("券: coupon-" + wxCoupon.getId() + "不存在" + "couponOrder-" + couponOrderCVo.getId());
throw new MallinkException(ErrorCode.COUPON_ORDER_IS_NULL); throw new MallinkException(ErrorCode.COUPON_ORDER_IS_NULL);
@@ -570,7 +571,7 @@ public class PosServiceImpl implements PosService {
} }
if (couponSelected) { if (couponSelected) {
// 5. get coupon // 5. get coupon
WxCoupon wxCoupon = couponMapper.selectByPrimaryKey(couponOrderCVo.getCouponId());
WxCoupon wxCoupon = couponMapper.selectById(couponOrderCVo.getCouponId());
if (wxCoupon == null) { if (wxCoupon == null) {
logger.error("券: coupon-" + wxCoupon.getId() + "不存在" + "couponOrder-" + couponOrderCVo.getId()); logger.error("券: coupon-" + wxCoupon.getId() + "不存在" + "couponOrder-" + couponOrderCVo.getId());
throw new MallinkException(ErrorCode.COUPON_ORDER_IS_NULL); throw new MallinkException(ErrorCode.COUPON_ORDER_IS_NULL);
@@ -1033,7 +1034,7 @@ public class PosServiceImpl implements PosService {
throw new MallinkException(ErrorCode.VERIFY_COUPON_ORDER_MERCHANT_IS_NULL); throw new MallinkException(ErrorCode.VERIFY_COUPON_ORDER_MERCHANT_IS_NULL);
} }
// 5. 核销后无法反向 // 5. 核销后无法反向
WxCoupon coupon = couponMapper.selectByPrimaryKey(couponOrderCVo.getCouponId());
WxCoupon coupon = couponMapper.selectById(couponOrderCVo.getCouponId());
if (coupon.getSalePrice() > 0 || if (coupon.getSalePrice() > 0 ||
(coupon.getSubsidyType() > EnumCouponSubsidyType.NO_SUBSIDY.getCode() && coupon.getSubsidyNum() > 0)) { (coupon.getSubsidyType() > EnumCouponSubsidyType.NO_SUBSIDY.getCode() && coupon.getSubsidyNum() > 0)) {
logger.error("券包ID: " + couponOrderIdStr + "核销无法退回"); logger.error("券包ID: " + couponOrderIdStr + "核销无法退回");
@@ -2010,7 +2011,7 @@ public class PosServiceImpl implements PosService {
/// setPosPaymentType(EnumNeuPosPamentType.MEM_DISCOUNT.getCode()); /// setPosPaymentType(EnumNeuPosPamentType.MEM_DISCOUNT.getCode());
setPosPayDes("POS会员折扣支付"); setPosPayDes("POS会员折扣支付");
}}; }};
int sqlRow = payOrderMapper.insertSelective(payOrder);
int sqlRow = payOrderMapper.insert(payOrder);
if (sqlRow != 1) { if (sqlRow != 1) {
logger.error("pay order insert error: " + payOrder.toString()); logger.error("pay order insert error: " + payOrder.toString());
throw new MallinkException(ErrorCode.DB_FAIL); throw new MallinkException(ErrorCode.DB_FAIL);
@@ -2058,7 +2059,7 @@ public class PosServiceImpl implements PosService {
setPosPayDes("POS优惠券支付"); setPosPayDes("POS优惠券支付");
setPosPayOrderNo(posPayOrderNo); setPosPayOrderNo(posPayOrderNo);
}}; }};
int sqlRow = payOrderMapper.insertSelective(payOrder);
int sqlRow = payOrderMapper.insert(payOrder);
if (sqlRow != 1) { if (sqlRow != 1) {
logger.error("pay order insert error: " + payOrder.toString()); logger.error("pay order insert error: " + payOrder.toString());
throw new MallinkException(ErrorCode.DB_FAIL); throw new MallinkException(ErrorCode.DB_FAIL);
@@ -2069,20 +2070,20 @@ public class PosServiceImpl implements PosService {
WxCouponOrder updateCO = new WxCouponOrder(); WxCouponOrder updateCO = new WxCouponOrder();
updateCO.setId(couponOrderId); updateCO.setId(couponOrderId);
updateCO.setCouponOrderStatus(EnumCouponOrderStatus.COUPON_ORDER_USED.getCode()); updateCO.setCouponOrderStatus(EnumCouponOrderStatus.COUPON_ORDER_USED.getCode());
couponOrderMapper.updateByPrimaryKeySelective(updateCO);
couponOrderMapper.updateById(updateCO);
} }
WxCouponOrderCVo couponOrderCVo = couponOrderService.detailCUserVo(posPayOrderNo); WxCouponOrderCVo couponOrderCVo = couponOrderService.detailCUserVo(posPayOrderNo);
if (couponOrderCVo != null) { if (couponOrderCVo != null) {
// 3. 成长值 // 3. 成长值
try { try {
WxOrder scoreOrder = orderMapper.selectByPrimaryKey(couponOrderCVo.getOrderId());
WxOrder scoreOrder = orderMapper.selectById(couponOrderCVo.getOrderId());
int point = scoreRulesService.addScore2(EnumScoreType.CONSUMPTION, scoreOrder, couponOrderCVo.getBusinessId()); int point = scoreRulesService.addScore2(EnumScoreType.CONSUMPTION, scoreOrder, couponOrderCVo.getBusinessId());
scoreCreditCalc.setScore(scoreCreditCalc.getScore() + point); scoreCreditCalc.setScore(scoreCreditCalc.getScore() + point);
} catch (Exception e) { } catch (Exception e) {
logger.error("交易核销成长值异常:" + e.getMessage()); logger.error("交易核销成长值异常:" + e.getMessage());
} }


WxCoupon wxCoupon = couponMapper.selectByPrimaryKey(couponOrderCVo.getCouponId());
WxCoupon wxCoupon = couponMapper.selectById(couponOrderCVo.getCouponId());
if (wxCoupon == null) { if (wxCoupon == null) {
logger.error("券: coupon-" + wxCoupon.getId() + "不存在" + "couponOrder-" + couponOrderCVo.getId()); logger.error("券: coupon-" + wxCoupon.getId() + "不存在" + "couponOrder-" + couponOrderCVo.getId());
throw new MallinkException(ErrorCode.COUPON_ORDER_IS_NULL); throw new MallinkException(ErrorCode.COUPON_ORDER_IS_NULL);
@@ -2144,7 +2145,7 @@ public class PosServiceImpl implements PosService {
setPosPayOrderNo(posPayOrderNo); setPosPayOrderNo(posPayOrderNo);


}}; }};
int sqlRow = payOrderMapper.insertSelective(payOrder);
int sqlRow = payOrderMapper.insert(payOrder);
if (sqlRow != 1) { if (sqlRow != 1) {
logger.error("pay order insert error: " + payOrder.toString()); logger.error("pay order insert error: " + payOrder.toString());
throw new MallinkException(ErrorCode.DB_FAIL); throw new MallinkException(ErrorCode.DB_FAIL);
@@ -2206,7 +2207,7 @@ public class PosServiceImpl implements PosService {
setPosPayOrderNo(neuPayThirdNo); setPosPayOrderNo(neuPayThirdNo);


}}; }};
int sqlRow = payOrderMapper.insertSelective(payOrder);
int sqlRow = payOrderMapper.insert(payOrder);
if (sqlRow != 1) { if (sqlRow != 1) {
logger.error("pay order insert error: " + payOrder.toString()); logger.error("pay order insert error: " + payOrder.toString());
throw new MallinkException(ErrorCode.DB_FAIL); throw new MallinkException(ErrorCode.DB_FAIL);
@@ -2215,7 +2216,7 @@ public class PosServiceImpl implements PosService {
// 2. 积分, 成长值 // 2. 积分, 成长值
// 3. 成长值 // 3. 成长值
try { try {
WxOrder scoreOrder = orderMapper.selectByPrimaryKey(order.getId());
WxOrder scoreOrder = orderMapper.selectById(order.getId());
scoreOrder.setPayment(neuPaymentAmount); scoreOrder.setPayment(neuPaymentAmount);
int point = scoreRulesService.addScore2(EnumScoreType.CONSUMPTION, scoreOrder, merchant.getBusinessId()); int point = scoreRulesService.addScore2(EnumScoreType.CONSUMPTION, scoreOrder, merchant.getBusinessId());
scoreCreditCalc.setScore(scoreCreditCalc.getScore() + point); scoreCreditCalc.setScore(scoreCreditCalc.getScore() + point);
@@ -2257,7 +2258,7 @@ public class PosServiceImpl implements PosService {
}}; }};


try { try {
payOrderQ = payOrderMapper.selectOne(payOrderQ);
payOrderQ = payOrderMapper.selectOne(new QueryWrapper<>(payOrderQ));
} catch (Exception e) { } catch (Exception e) {
throw new MallinkException(ErrorCode.PAY_ORDER_NOT_FOUND); throw new MallinkException(ErrorCode.PAY_ORDER_NOT_FOUND);
} }
@@ -2294,7 +2295,7 @@ public class PosServiceImpl implements PosService {
}}; }};
refundPayOrder.setPayOrderNo(String.valueOf(payOrderQ.getId())); refundPayOrder.setPayOrderNo(String.valueOf(payOrderQ.getId()));


int sqlRow = refundOrderMapper.insertSelective(refundPayOrder);
int sqlRow = refundOrderMapper.insert(refundPayOrder);
if (sqlRow != 1) { if (sqlRow != 1) {
logger.error("refund order insert error: " + refundPayOrder.toString()); logger.error("refund order insert error: " + refundPayOrder.toString());
throw new MallinkException(ErrorCode.DB_FAIL); throw new MallinkException(ErrorCode.DB_FAIL);
@@ -2325,7 +2326,7 @@ public class PosServiceImpl implements PosService {
setPosOrderId(posOrderId); setPosOrderId(posOrderId);
}}; }};
try { try {
orderQ = orderMapper.selectOne(orderQ);
orderQ = orderMapper.selectOne(new QueryWrapper<>(orderQ));
} catch (Exception e) { } catch (Exception e) {
isExist = false; isExist = false;
} }
@@ -2357,7 +2358,7 @@ public class PosServiceImpl implements PosService {
}}; }};


try { try {
orderMapper.insertSelective(order);
orderMapper.insert(order);
} catch (Exception e) { } catch (Exception e) {
logger.error(e.getMessage()); logger.error(e.getMessage());
throw new MallinkException(ErrorCode.DB_FAIL); throw new MallinkException(ErrorCode.DB_FAIL);
@@ -2387,7 +2388,7 @@ public class PosServiceImpl implements PosService {
setPosOrderId(posOrderId); setPosOrderId(posOrderId);
}}; }};
try { try {
orderQ = orderMapper.selectOne(orderQ);
orderQ = orderMapper.selectOne(new QueryWrapper<>(orderQ));
} catch (Exception e) { } catch (Exception e) {
throw new MallinkException(ErrorCode.ORDER_IS_NOT_FIND); throw new MallinkException(ErrorCode.ORDER_IS_NOT_FIND);
} }
@@ -2404,7 +2405,7 @@ public class PosServiceImpl implements PosService {
}}; }};
refundQ.setOrderNumber(orderQ.getOrderNumber()); refundQ.setOrderNumber(orderQ.getOrderNumber());
try { try {
refundQ = orderMapper.selectOne(refundQ);
refundQ = orderMapper.selectOne(new QueryWrapper<>(refundQ));
} catch (Exception e) { } catch (Exception e) {
} }
if (refundQ != null) { if (refundQ != null) {
@@ -2436,7 +2437,7 @@ public class PosServiceImpl implements PosService {
order.setOrderNumber(orderQ.getOrderNumber()); order.setOrderNumber(orderQ.getOrderNumber());


try { try {
orderMapper.insertSelective(order);
orderMapper.insert(order);
} catch (Exception e) { } catch (Exception e) {
logger.error(e.getMessage()); logger.error(e.getMessage());
throw new MallinkException(ErrorCode.DB_FAIL); throw new MallinkException(ErrorCode.DB_FAIL);


+ 12
- 11
mallinkPosApi/src/main/resources/application.yml Просмотреть файл

@@ -22,20 +22,21 @@ spring:
retry-another-broker-when-not-store-ok: false retry-another-broker-when-not-store-ok: false
retry-times-when-send-failed: 2 retry-times-when-send-failed: 2


# @{link} https://github.com/abel533
#Mybatis
mybatis:
type-aliases-package: com.iformall.domain.po
# MybatisPlus
mybatis-plus:
mapper-locations: classpath:mapper/*Mapper.xml mapper-locations: classpath:mapper/*Mapper.xml
global-config:
db-config:
id-type: id_worker
field-strategy: not_null
db-type: mysql
configuration: configuration:
map-underscore-to-camel-case: true
cache-enabled: true
lazy-loading-enabled: true
use-generated-keys: true
default-fetch-size: 100
default-statement-timeout: 10
jdbc-type-for-null: 'null'
cache-enabled: false
call-setters-on-nulls: true
type-aliases-package: com.iformall.domain.po


#PageHelper
# PageHelper
pagehelper: pagehelper:
helperDialect: mysql helperDialect: mysql
reasonable: false reasonable: false


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

@@ -1,13 +1,13 @@
package com.iformall; package com.iformall;


import com.ulisesbocchio.jasyptspringboot.annotation.EnableEncryptableProperties; import com.ulisesbocchio.jasyptspringboot.annotation.EnableEncryptableProperties;
import org.mybatis.spring.annotation.MapperScan;
import org.rocketmq.starter.annotation.EnableRocketMQ; import org.rocketmq.starter.annotation.EnableRocketMQ;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import springfox.documentation.swagger2.annotations.EnableSwagger2; import springfox.documentation.swagger2.annotations.EnableSwagger2;
import tk.mybatis.spring.annotation.MapperScan;


/** /**
* @author chenkx * @author chenkx


+ 4
- 3
mallinkSchedule/src/main/java/com/iformall/schedule/ActivitySchedule.java Просмотреть файл

@@ -1,5 +1,6 @@
package com.iformall.schedule; package com.iformall.schedule;


import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.iformall.domain.po.WxActivity; import com.iformall.domain.po.WxActivity;
import com.iformall.domain.po.WxActivityJoin; import com.iformall.domain.po.WxActivityJoin;
import com.iformall.domain.po.WxCampaign; import com.iformall.domain.po.WxCampaign;
@@ -117,14 +118,14 @@ public class ActivitySchedule {
campaign.setStatus(EnumCampaignStatus.STATUS_THROW_IN.getCode()); campaign.setStatus(EnumCampaignStatus.STATUS_THROW_IN.getCode());
campaign.setType(EnumCampaignType.PAGEPATH.getCode()); campaign.setType(EnumCampaignType.PAGEPATH.getCode());
campaign.setProduceType(EnumCampaignProductType.ACTIVITY_JOIN.getCode()); campaign.setProduceType(EnumCampaignProductType.ACTIVITY_JOIN.getCode());
List<WxCampaign> campaignList = wxCampaignMapper.select(campaign);
List<WxCampaign> campaignList = wxCampaignMapper.selectList(new QueryWrapper(campaign));
for (WxCampaign wxCampaign : campaignList) { for (WxCampaign wxCampaign : campaignList) {
WxActivity wxActivity = wxActivityMapper.selectByPrimaryKey(wxCampaign.getProduceId());
WxActivity wxActivity = wxActivityMapper.selectById(wxCampaign.getProduceId());
if (wxActivity.getStatus().equals(EnumActivityStatus.STATUS_TAKE_OFFF.getCode())) { if (wxActivity.getStatus().equals(EnumActivityStatus.STATUS_TAKE_OFFF.getCode())) {
activityList.add(wxActivity); activityList.add(wxActivity);
wxCampaign.setStatus(EnumCampaignStatus.STATUS_TAKE_OFFF.getCode()); wxCampaign.setStatus(EnumCampaignStatus.STATUS_TAKE_OFFF.getCode());
wxCampaign.setUpdateTime(new Date()); wxCampaign.setUpdateTime(new Date());
wxCampaignMapper.updateByPrimaryKeySelective(wxCampaign);
wxCampaignMapper.updateById(wxCampaign);
} }
} }
} }


+ 10
- 9
mallinkSchedule/src/main/java/com/iformall/schedule/ChartDataSchedule.java Просмотреть файл

@@ -1,5 +1,6 @@
package com.iformall.schedule; package com.iformall.schedule;


import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.iformall.common.IdWorker; import com.iformall.common.IdWorker;
import com.iformall.domain.dto.WxCUserBasicInfoDto; import com.iformall.domain.dto.WxCUserBasicInfoDto;
import com.iformall.domain.po.WxChartDataEntity; import com.iformall.domain.po.WxChartDataEntity;
@@ -80,38 +81,38 @@ public class ChartDataSchedule {
params.put("tenantId", tenantId); params.put("tenantId", tenantId);
wxChartDataEntity.setTenantId(tenantId); wxChartDataEntity.setTenantId(tenantId);
wxChartDataEntity.setType(EnumChartType.CAR_OUT.getCode()); wxChartDataEntity.setType(EnumChartType.CAR_OUT.getCode());
int count = wxChartDataMapper.selectCount(wxChartDataEntity);
int count = wxChartDataMapper.selectCount(new QueryWrapper(wxChartDataEntity));
if (count == 0) { if (count == 0) {
logger.info("出场车数>>>>>>>>>>>>>>>>>>>>>>>>>>"); logger.info("出场车数>>>>>>>>>>>>>>>>>>>>>>>>>>");
carOutData(params, createtime, date, tenantId); carOutData(params, createtime, date, tenantId);
} }
wxChartDataEntity.setType(EnumChartType.CAR_PAID.getCode()); wxChartDataEntity.setType(EnumChartType.CAR_PAID.getCode());
count = wxChartDataMapper.selectCount(wxChartDataEntity);
count = wxChartDataMapper.selectCount(new QueryWrapper(wxChartDataEntity));
if (count == 0) { if (count == 0) {
params.put("cmdType", EnumCarCmd.CAR_ETCP_CALLBACK_PAY_MANUAL.getCode()); params.put("cmdType", EnumCarCmd.CAR_ETCP_CALLBACK_PAY_MANUAL.getCode());
logger.info("缴费车辆>>>>>>>>>>>>>>>>>>>>>>>>>>"); logger.info("缴费车辆>>>>>>>>>>>>>>>>>>>>>>>>>>");
carPaidData(params, createtime, date, tenantId); carPaidData(params, createtime, date, tenantId);
} }
wxChartDataEntity.setType(EnumChartType.CAR_PAY_FEE.getCode()); wxChartDataEntity.setType(EnumChartType.CAR_PAY_FEE.getCode());
count = wxChartDataMapper.selectCount(wxChartDataEntity);
count = wxChartDataMapper.selectCount(new QueryWrapper(wxChartDataEntity));
if (count == 0) { if (count == 0) {
logger.info("缴费金额>>>>>>>>>>>>>>>>>>>>>>>>>>"); logger.info("缴费金额>>>>>>>>>>>>>>>>>>>>>>>>>>");
carPayFeeData(params, createtime, date, tenantId); carPayFeeData(params, createtime, date, tenantId);
} }
wxChartDataEntity.setType(EnumChartType.CAR_MEMBER.getCode()); wxChartDataEntity.setType(EnumChartType.CAR_MEMBER.getCode());
count = wxChartDataMapper.selectCount(wxChartDataEntity);
count = wxChartDataMapper.selectCount(new QueryWrapper(wxChartDataEntity));
if (count == 0) { if (count == 0) {
logger.info("新增会员>>>>>>>>>>>>>>>>>>>>>>>>>>"); logger.info("新增会员>>>>>>>>>>>>>>>>>>>>>>>>>>");
carMemberData(params, createtime, date, tenantId); carMemberData(params, createtime, date, tenantId);
} }
wxChartDataEntity.setType(EnumChartType.CAR_NEW_MEMBER.getCode()); wxChartDataEntity.setType(EnumChartType.CAR_NEW_MEMBER.getCode());
count = wxChartDataMapper.selectCount(wxChartDataEntity);
count = wxChartDataMapper.selectCount(new QueryWrapper(wxChartDataEntity));
if (count == 0) { if (count == 0) {
logger.info("新增停车会员>>>>>>>>>>>>>>>>>>>>>>>>>>"); logger.info("新增停车会员>>>>>>>>>>>>>>>>>>>>>>>>>>");
carNewMemberData(createtime, date, tenantId); carNewMemberData(createtime, date, tenantId);
} }
wxChartDataEntity.setType(EnumChartType.CAR_BIND.getCode()); wxChartDataEntity.setType(EnumChartType.CAR_BIND.getCode());
count = wxChartDataMapper.selectCount(wxChartDataEntity);
count = wxChartDataMapper.selectCount(new QueryWrapper(wxChartDataEntity));
if (count == 0) { if (count == 0) {
logger.info("已绑车辆>>>>>>>>>>>>>>>>>>>>>>>>>>"); logger.info("已绑车辆>>>>>>>>>>>>>>>>>>>>>>>>>>");
carBindData(params, createtime, date, tenantId); carBindData(params, createtime, date, tenantId);
@@ -139,7 +140,7 @@ public class ChartDataSchedule {
params.put("tenantId", tenantId); params.put("tenantId", tenantId);
wxChartDataEntity.setTenantId(tenantId); wxChartDataEntity.setTenantId(tenantId);
wxChartDataEntity.setType(EnumChartType.SALE_COUPON_PRICE.getCode()); wxChartDataEntity.setType(EnumChartType.SALE_COUPON_PRICE.getCode());
int count = wxChartDataMapper.selectCount(wxChartDataEntity);
int count = wxChartDataMapper.selectCount(new QueryWrapper(wxChartDataEntity));
if (count == 0) { if (count == 0) {
logger.info("销售总交易额>>>>>>>>>>>>>>>>>>>>>>>>>>"); logger.info("销售总交易额>>>>>>>>>>>>>>>>>>>>>>>>>>");
WxCouponOrder wxCouponOrder = new WxCouponOrder(); WxCouponOrder wxCouponOrder = new WxCouponOrder();
@@ -171,7 +172,7 @@ public class ChartDataSchedule {


wxChartDataEntity.setTenantId(tenantId); wxChartDataEntity.setTenantId(tenantId);
wxChartDataEntity.setType(EnumChartType.MERCHANT_TRADE.getCode()); wxChartDataEntity.setType(EnumChartType.MERCHANT_TRADE.getCode());
int count = wxChartDataMapper.selectCount(wxChartDataEntity);
int count = wxChartDataMapper.selectCount(new QueryWrapper(wxChartDataEntity));
if (count == 0) { if (count == 0) {
logger.info("解单金额>>>>>>>>>>>>>>>>>>>>>>>>>>"); logger.info("解单金额>>>>>>>>>>>>>>>>>>>>>>>>>>");
WxMerchantTradeDaily wxMerchantTradeDaily = new WxMerchantTradeDaily(); WxMerchantTradeDaily wxMerchantTradeDaily = new WxMerchantTradeDaily();
@@ -237,7 +238,7 @@ public class ChartDataSchedule {
wxChartDataEntity.setQuerytime(querytime); wxChartDataEntity.setQuerytime(querytime);
wxChartDataEntity.setCreatetime(createtime); wxChartDataEntity.setCreatetime(createtime);
logger.info(">>>>>>>>>>>>>>>>>>>>>>>>>>>" + wxChartDataEntity.toString()); logger.info(">>>>>>>>>>>>>>>>>>>>>>>>>>>" + wxChartDataEntity.toString());
wxChartDataMapper.insertSelective(wxChartDataEntity);
wxChartDataMapper.insert(wxChartDataEntity);
} }


} }

+ 1
- 1
mallinkSchedule/src/main/java/com/iformall/schedule/CouponExpiringSchedule.java Просмотреть файл

@@ -93,7 +93,7 @@ public class CouponExpiringSchedule {
WxGame record = new WxGame(); WxGame record = new WxGame();
record.setId(g.getId()); record.setId(g.getId());
record.setStatus(EnumGameStatus.STATUS_TAKE_OFFF.getCode()); record.setStatus(EnumGameStatus.STATUS_TAKE_OFFF.getCode());
wxGameMapper.updateByPrimaryKeySelective(record);
wxGameMapper.updateById(record);
} }
}); });
} }


+ 5
- 4
mallinkSchedule/src/main/java/com/iformall/schedule/CouponOrderExpiringSchedule.java Просмотреть файл

@@ -1,5 +1,6 @@
package com.iformall.schedule; package com.iformall.schedule;


import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.iformall.domain.dto.WxSharingOrderDto; import com.iformall.domain.dto.WxSharingOrderDto;
import com.iformall.domain.po.*; import com.iformall.domain.po.*;
import com.iformall.enums.*; import com.iformall.enums.*;
@@ -98,11 +99,11 @@ public class CouponOrderExpiringSchedule {
updateRecord.setCouponOrderStatus(EnumCouponOrderStatus.COUPON_ORDER_OVER_TIME.getCode()); //券已过期 updateRecord.setCouponOrderStatus(EnumCouponOrderStatus.COUPON_ORDER_OVER_TIME.getCode()); //券已过期
} }
updateRecord.setUpdateDate(new Date()); updateRecord.setUpdateDate(new Date());
wxCouponOrderMapper.updateByPrimaryKeySelective(updateRecord);
wxCouponOrderMapper.updateById(updateRecord);


// 库存退回 // 库存退回
if(bStockBack) { if(bStockBack) {
WxOrder order = wxOrderMapper.selectByPrimaryKey(co.getOrderId());
WxOrder order = wxOrderMapper.selectById(co.getOrderId());
if(order != null) { if(order != null) {
wxOrderService.stockBack(order); wxOrderService.stockBack(order);
} }
@@ -133,7 +134,7 @@ public class CouponOrderExpiringSchedule {
wxPayOrder.setTenantId(co.getTenantId()); wxPayOrder.setTenantId(co.getTenantId());
wxPayOrder.setOrderId(co.getOrderId()); wxPayOrder.setOrderId(co.getOrderId());
wxPayOrder.setPayOrderStatus(EnumPayStatus.PAY_STATUS_SUCCESS.getCode()); wxPayOrder.setPayOrderStatus(EnumPayStatus.PAY_STATUS_SUCCESS.getCode());
wxPayOrder = wxPayOrderMapper.selectOne(wxPayOrder);
wxPayOrder = wxPayOrderMapper.selectOne(new QueryWrapper(wxPayOrder));
if (wxPayOrder != null && wxPayOrder.getShare().equals(EnumPayShare.YES.getCode())) { if (wxPayOrder != null && wxPayOrder.getShare().equals(EnumPayShare.YES.getCode())) {
WxSharingOrderDto wxSharingOrderDto = new WxSharingOrderDto(); WxSharingOrderDto wxSharingOrderDto = new WxSharingOrderDto();
wxSharingOrderDto.setCUserId(wxPayOrder.getCUserId()); wxSharingOrderDto.setCUserId(wxPayOrder.getCUserId());
@@ -162,7 +163,7 @@ public class CouponOrderExpiringSchedule {


if(bStockBack) { if(bStockBack) {
// 库存退回 // 库存退回
WxOrder order = wxOrderMapper.selectByPrimaryKey(co.getOrderId());
WxOrder order = wxOrderMapper.selectById(co.getOrderId());
if(order != null) { if(order != null) {
wxOrderService.stockBack(order); wxOrderService.stockBack(order);
} }


+ 1
- 1
mallinkSchedule/src/main/java/com/iformall/schedule/CouponSendSchedule.java Просмотреть файл

@@ -335,7 +335,7 @@ public class CouponSendSchedule {
WxCUserBasicInfo toUpdate = new WxCUserBasicInfo(); WxCUserBasicInfo toUpdate = new WxCUserBasicInfo();
toUpdate.setId(cu.getId()); toUpdate.setId(cu.getId());
toUpdate.setScoreDate(cu.getBirthdate()); toUpdate.setScoreDate(cu.getBirthdate());
wxCUserBasicInfoMapper.updateByPrimaryKeySelective(toUpdate);
wxCUserBasicInfoMapper.updateById(toUpdate);
} catch (Exception e) { } catch (Exception e) {
logger.error("定时发券:记录积分倍率日期失败 {}", e.getMessage()); logger.error("定时发券:记录积分倍率日期失败 {}", e.getMessage());
continue; continue;


+ 2
- 2
mallinkSchedule/src/main/java/com/iformall/schedule/MsgSendingSchedule.java Просмотреть файл

@@ -86,7 +86,7 @@ public class MsgSendingSchedule {
// Integer modelId = null; // Integer modelId = null;
// Long modelIdParam = wxMsg.getModelId(); // Long modelIdParam = wxMsg.getModelId();
// if (modelIdParam != null) { // if (modelIdParam != null) {
// WxMsgModel wxMsgModel = wxMsgModelMapper.selectByPrimaryKey(modelIdParam);
// WxMsgModel wxMsgModel = wxMsgModelMapper.selectById(modelIdParam);
// modelId = wxMsgModel.getModelId(); // modelId = wxMsgModel.getModelId();
// } // }
// String result = WiwideUtil.sendMsg(secret, bid, publickey, phone, signature, msg, notifyUrl, EnumVerifyCode.NO.getCode().toString(), modelId); // String result = WiwideUtil.sendMsg(secret, bid, publickey, phone, signature, msg, notifyUrl, EnumVerifyCode.NO.getCode().toString(), modelId);
@@ -99,7 +99,7 @@ public class MsgSendingSchedule {
// wxMsg.setSendstatus(EnumMsgSendStatus.MSG_SEND_FAIL.getCode()); // wxMsg.setSendstatus(EnumMsgSendStatus.MSG_SEND_FAIL.getCode());
// } // }
// wxMsg.setStatus(EnumMsgStatus.MSG_STATUS_SENDED.getCode()); // wxMsg.setStatus(EnumMsgStatus.MSG_STATUS_SENDED.getCode());
// wxMsgMapper.updateByPrimaryKeySelective(wxMsg);
// wxMsgMapper.updateById(wxMsg);
// logger.info("短信发送结束:" + jsonObjectResult.toJSONString()); // logger.info("短信发送结束:" + jsonObjectResult.toJSONString());
// } // }



+ 18
- 14
mallinkSchedule/src/main/java/com/iformall/schedule/OrderExpiringSchedule.java Просмотреть файл

@@ -1,14 +1,16 @@
package com.iformall.schedule; package com.iformall.schedule;


import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.iformall.domain.po.WxAppinfo; import com.iformall.domain.po.WxAppinfo;
import com.iformall.domain.po.WxOrder; import com.iformall.domain.po.WxOrder;
import com.iformall.enums.*;
import com.iformall.enums.EnumAppType;
import com.iformall.enums.EnumOrderStatus;
import com.iformall.enums.EnumOrderType;
import com.iformall.enums.EnumRefundStatus;
import com.iformall.mapper.WxAppinfoMapper; import com.iformall.mapper.WxAppinfoMapper;
import com.iformall.mapper.WxCouponMapper; import com.iformall.mapper.WxCouponMapper;
import com.iformall.mapper.WxOrderGroupMapper; import com.iformall.mapper.WxOrderGroupMapper;
import com.iformall.mapper.WxOrderMapper; import com.iformall.mapper.WxOrderMapper;
import com.iformall.mq.MqBaseProducer;
import com.iformall.service.WxMsgRecordService;
import com.iformall.service.WxOrderGroupService; import com.iformall.service.WxOrderGroupService;
import com.iformall.service.WxOrderService; import com.iformall.service.WxOrderService;
import com.iformall.service.WxRefundOrderService; import com.iformall.service.WxRefundOrderService;
@@ -19,6 +21,7 @@ import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;

import java.util.Date; import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
@@ -98,9 +101,9 @@ public class OrderExpiringSchedule {
// 拼团取消 // 拼团取消
WxOrder order = new WxOrder(); WxOrder order = new WxOrder();
order.setOrderStatus(EnumOrderStatus.ORDER_STATUS_COOPERATING_UNPAID.getCode()); order.setOrderStatus(EnumOrderStatus.ORDER_STATUS_COOPERATING_UNPAID.getCode());
wxOrderMapper.select(order).stream().forEach(o -> {
wxOrderMapper.selectList(new QueryWrapper(order)).stream().forEach(o -> {
try { try {
orderGroupExpired(o);
orderGroupExpired((WxOrder) o);
} catch (Exception e) { } catch (Exception e) {
logger.error("拼团取消失败" + e.getMessage()); logger.error("拼团取消失败" + e.getMessage());
} }
@@ -109,9 +112,9 @@ public class OrderExpiringSchedule {
//拼团过期 //拼团过期
order = new WxOrder(); order = new WxOrder();
order.setOrderStatus(EnumOrderStatus.ORDER_STATUS_COOPERATING_OVERTIME.getCode()); order.setOrderStatus(EnumOrderStatus.ORDER_STATUS_COOPERATING_OVERTIME.getCode());
wxOrderMapper.select(order).stream().forEach(o -> {
wxOrderMapper.selectList(new QueryWrapper(order)).stream().forEach(o -> {
try { try {
returnMoney(o);
returnMoney((WxOrder) o);
} catch (Exception e) { } catch (Exception e) {
logger.error("拼团过期退款失败" + e.getMessage()); logger.error("拼团过期退款失败" + e.getMessage());
} }
@@ -120,9 +123,9 @@ public class OrderExpiringSchedule {


//拼团券下架 //拼团券下架
order.setOrderStatus(EnumOrderStatus.ORDER_STATUS_COOPERATING_CANCEL.getCode()); order.setOrderStatus(EnumOrderStatus.ORDER_STATUS_COOPERATING_CANCEL.getCode());
wxOrderMapper.select(order).stream().forEach(o -> {
wxOrderMapper.selectList(new QueryWrapper(order)).stream().forEach(o -> {
try { try {
returnMoney(o);
returnMoney((WxOrder) o);
} catch (Exception e) { } catch (Exception e) {
logger.error("拼团券下架退款失败" + e.getMessage()); logger.error("拼团券下架退款失败" + e.getMessage());
} }
@@ -130,14 +133,15 @@ public class OrderExpiringSchedule {


//参团失败 //参团失败
order.setOrderStatus(EnumOrderStatus.ORDER_STATUS_COOPERATING_FAILD.getCode()); order.setOrderStatus(EnumOrderStatus.ORDER_STATUS_COOPERATING_FAILD.getCode());
wxOrderMapper.select(order).stream().forEach(o -> {
wxOrderMapper.selectList(new QueryWrapper(order)).stream().forEach(o -> {
try { try {
returnMoney(o);
returnMoney((WxOrder) o);
} catch (Exception e) { } catch (Exception e) {
logger.error("参团失败退款失败" + e.getMessage()); logger.error("参团失败退款失败" + e.getMessage());
} }
}); });



} }


@Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class})
@@ -147,7 +151,7 @@ public class OrderExpiringSchedule {
updateOrder.setId(order.getId()); updateOrder.setId(order.getId());
updateOrder.setUpdateDate(new Date()); updateOrder.setUpdateDate(new Date());
updateOrder.setOrderStatus(EnumOrderStatus.ORDER_STATUS_OVERTIME_CANCEL.getCode()); updateOrder.setOrderStatus(EnumOrderStatus.ORDER_STATUS_OVERTIME_CANCEL.getCode());
wxOrderMapper.updateByPrimaryKeySelective(updateOrder);
wxOrderMapper.updateById(updateOrder);


// 库存退回 // 库存退回
wxOrderService.stockBack(order); wxOrderService.stockBack(order);
@@ -166,7 +170,7 @@ public class OrderExpiringSchedule {
updateOrder.setTenantId(order.getTenantId()); updateOrder.setTenantId(order.getTenantId());
updateOrder.setOrderStatus(EnumOrderStatus.ORDER_STATUS_PRESS_OVERTIME.getCode()); updateOrder.setOrderStatus(EnumOrderStatus.ORDER_STATUS_PRESS_OVERTIME.getCode());
updateOrder.setUpdateDate(curDate); updateOrder.setUpdateDate(curDate);
wxOrderMapper.updateByPrimaryKeySelective(updateOrder);
wxOrderMapper.updateById(updateOrder);
// 库存退回 // 库存退回
wxOrderService.stockBack(order); wxOrderService.stockBack(order);


@@ -186,7 +190,7 @@ public class OrderExpiringSchedule {
updateOrder.setTenantId(order.getTenantId()); updateOrder.setTenantId(order.getTenantId());
updateOrder.setOrderStatus(EnumOrderStatus.ORDER_STATUS_COOPERATING_BREAK.getCode()); updateOrder.setOrderStatus(EnumOrderStatus.ORDER_STATUS_COOPERATING_BREAK.getCode());
updateOrder.setUpdateDate(curDate); updateOrder.setUpdateDate(curDate);
wxOrderMapper.updateByPrimaryKeySelective(updateOrder);
wxOrderMapper.updateById(updateOrder);
// 库存退回 // 库存退回
wxOrderService.stockBack(order); wxOrderService.stockBack(order);




+ 6
- 5
mallinkSchedule/src/main/java/com/iformall/schedule/PowerBillAutoBuildSchedule.java Просмотреть файл

@@ -2,6 +2,7 @@ package com.iformall.schedule;


import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.iformall.domain.dto.KwMeterDataDto; import com.iformall.domain.dto.KwMeterDataDto;
import com.iformall.domain.po.*; import com.iformall.domain.po.*;
import com.iformall.domain.vo.KwMeterDataVo; import com.iformall.domain.vo.KwMeterDataVo;
@@ -63,8 +64,8 @@ public class PowerBillAutoBuildSchedule {
public void powerBillAutoConfigStart() { public void powerBillAutoConfigStart() {
logger.info("自动生成电费账单开始...."); logger.info("自动生成电费账单开始....");
int dayOfMonth = LocalDate.now().getDayOfMonth(); int dayOfMonth = LocalDate.now().getDayOfMonth();
List<WxPowerBillAutoConfig> wxPowerBillAutoConfigs = wxPowerBillAutoConfigMapper.selectAll()
.stream().filter(config -> StringUtils.isNotEmpty(config.getUnitPrice())
List<WxPowerBillAutoConfig> wxPowerBillAutoConfigs = wxPowerBillAutoConfigMapper.selectList(new QueryWrapper(null));
wxPowerBillAutoConfigs = wxPowerBillAutoConfigs.stream().filter(config -> StringUtils.isNotEmpty(config.getUnitPrice())
&& StringUtils.isNotEmpty(config.getBuildDay()) && StringUtils.isNotEmpty(config.getBuildDay())
&& StringUtils.isNotEmpty(config.getReceiveDay())) && StringUtils.isNotEmpty(config.getReceiveDay()))
.collect(Collectors.toList()); .collect(Collectors.toList());
@@ -80,7 +81,7 @@ public class PowerBillAutoBuildSchedule {
private void merchantPowerBillConfigStart(WxPowerBillAutoConfig wxPowerBillAutoConfig) { private void merchantPowerBillConfigStart(WxPowerBillAutoConfig wxPowerBillAutoConfig) {
WxMerchantPowerBillConfig wxMerchantPowerBillConfig = new WxMerchantPowerBillConfig(); WxMerchantPowerBillConfig wxMerchantPowerBillConfig = new WxMerchantPowerBillConfig();
wxMerchantPowerBillConfig.setTenantId(wxPowerBillAutoConfig.getTenantId()); wxMerchantPowerBillConfig.setTenantId(wxPowerBillAutoConfig.getTenantId());
List<WxMerchantPowerBillConfig> wxMerchantPowerBillConfigs = wxMerchantPowerBillConfigMapper.select(wxMerchantPowerBillConfig);
List<WxMerchantPowerBillConfig> wxMerchantPowerBillConfigs = wxMerchantPowerBillConfigMapper.selectList(new QueryWrapper(wxMerchantPowerBillConfig));
for (int i = 0; i < wxMerchantPowerBillConfigs.size(); i++) { for (int i = 0; i < wxMerchantPowerBillConfigs.size(); i++) {
buildPowerBill(wxMerchantPowerBillConfigs.get(i), wxPowerBillAutoConfig); buildPowerBill(wxMerchantPowerBillConfigs.get(i), wxPowerBillAutoConfig);
} }
@@ -142,7 +143,7 @@ public class PowerBillAutoBuildSchedule {
KwMerchantMeter kwMerchantMeter = new KwMerchantMeter(); KwMerchantMeter kwMerchantMeter = new KwMerchantMeter();
kwMerchantMeter.setMerchantId(merchantId); kwMerchantMeter.setMerchantId(merchantId);
kwMerchantMeter.setStatus(EnumMerchantMeterStatus.VALID.getCode()); kwMerchantMeter.setStatus(EnumMerchantMeterStatus.VALID.getCode());
List<KwMerchantMeter> merchantMeterList = kwMerchantMeterMapper.select(kwMerchantMeter);
List<KwMerchantMeter> merchantMeterList = kwMerchantMeterMapper.selectList(new QueryWrapper(kwMerchantMeter));
int usedPower = 0; int usedPower = 0;
if (!merchantMeterList.isEmpty()) { if (!merchantMeterList.isEmpty()) {
int size = merchantMeterList.size(); int size = merchantMeterList.size();
@@ -208,7 +209,7 @@ public class PowerBillAutoBuildSchedule {
WxMerchantShop wxMerchantShop = new WxMerchantShop(); WxMerchantShop wxMerchantShop = new WxMerchantShop();
wxMerchantShop.setMerchantId(merchantId); wxMerchantShop.setMerchantId(merchantId);
wxMerchantShop.setIsDel(EnumDelStatus.NOT_DEL.getCode()); wxMerchantShop.setIsDel(EnumDelStatus.NOT_DEL.getCode());
List<WxMerchantShop> select = wxMerchantShopMapper.select(wxMerchantShop);
List<WxMerchantShop> select = wxMerchantShopMapper.selectList(new QueryWrapper(wxMerchantShop));
if (!select.isEmpty()) { if (!select.isEmpty()) {
return select.get(0).getShopId(); return select.get(0).getShopId();
} }


+ 1
- 1
mallinkSchedule/src/main/java/com/iformall/schedule/WeChatAccessTokenSchedule.java Просмотреть файл

@@ -51,7 +51,7 @@ public class WeChatAccessTokenSchedule {
updateAppInfo.setAccessToken(accessToken); updateAppInfo.setAccessToken(accessToken);
updateAppInfo.setLastTokenTime(new Date()); updateAppInfo.setLastTokenTime(new Date());
updateAppInfo.setExpiresIn(7200); updateAppInfo.setExpiresIn(7200);
wxAppinfoMapper.updateByPrimaryKeySelective(updateAppInfo);
wxAppinfoMapper.updateById(updateAppInfo);
} catch (WxErrorException e) { } catch (WxErrorException e) {
logger.error(e.getMessage()); logger.error(e.getMessage());
} catch (Exception e) { } catch (Exception e) {


+ 12
- 11
mallinkSchedule/src/main/resources/application.yml Просмотреть файл

@@ -39,20 +39,21 @@ spring:
virtual-host: / virtual-host: /




# @{link} https://github.com/abel533
#Mybatis
mybatis:
type-aliases-package: com.iformall.domain.po
# MybatisPlus
mybatis-plus:
mapper-locations: classpath:mapper/*Mapper.xml mapper-locations: classpath:mapper/*Mapper.xml
global-config:
db-config:
id-type: id_worker
field-strategy: not_null
db-type: mysql
configuration: configuration:
map-underscore-to-camel-case: true
cache-enabled: true
lazy-loading-enabled: true
use-generated-keys: true
default-fetch-size: 100
default-statement-timeout: 10
jdbc-type-for-null: 'null'
cache-enabled: false
call-setters-on-nulls: true
type-aliases-package: com.iformall.domain.po


#PageHelper
# PageHelper
pagehelper: pagehelper:
helperDialect: mysql helperDialect: mysql
reasonable: false reasonable: false


+ 2
- 5
mallinkService/src/main/java/com/iformall/common/CommonMapper.java Просмотреть файл

@@ -1,9 +1,6 @@
package com.iformall.common; package com.iformall.common;


import tk.mybatis.mapper.common.BaseMapper;
import tk.mybatis.mapper.common.IdsMapper;
import tk.mybatis.mapper.common.Marker;
import tk.mybatis.mapper.common.special.InsertListMapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;


import java.io.Serializable; import java.io.Serializable;


@@ -12,5 +9,5 @@ import java.io.Serializable;
* @date 2017-12-27 * @date 2017-12-27
*/ */


public interface CommonMapper<T, ID extends Serializable> extends BaseMapper<T>, IdsMapper<T>, InsertListMapper<T>, Marker {
public interface CommonMapper<T, ID extends Serializable> extends BaseMapper<T> {
} }

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

@@ -1,14 +1,8 @@
package com.iformall.domain.dto; package com.iformall.domain.dto;


import com.iformall.domain.po.BaseEntity;
import com.iformall.domain.po.WxBillProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;


import java.util.ArrayList;
import java.util.Date;
import java.util.List;

/** /**
* @author gongbiao * @author gongbiao
*/ */


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

@@ -4,10 +4,6 @@ import com.iformall.domain.po.BaseEntity;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;


import java.util.ArrayList;
import java.util.Date;
import java.util.List;

/** /**
* @author gongbiao * @author gongbiao
*/ */


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

@@ -1,17 +1,10 @@
package com.iformall.domain.dto; package com.iformall.domain.dto;


import com.iformall.domain.po.BaseEntity; import com.iformall.domain.po.BaseEntity;
import io.swagger.models.auth.In;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.ToString;


import javax.persistence.Id;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.List;


/** /**
* @author gongbiao * @author gongbiao


+ 6
- 6
mallinkService/src/main/java/com/iformall/domain/dto/MarkingCouponDataReportDto.java Просмотреть файл

@@ -1,12 +1,12 @@
package com.iformall.domain.dto; package com.iformall.domain.dto;


import com.baomidou.mybatisplus.annotation.TableField;
import com.iformall.common.SortColumn; import com.iformall.common.SortColumn;
import com.iformall.domain.po.BaseEntity; import com.iformall.domain.po.BaseEntity;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.ToString; import lombok.ToString;


import javax.persistence.Transient;
import java.util.Date; import java.util.Date;


/** /**
@@ -25,19 +25,19 @@ public class MarkingCouponDataReportDto extends BaseEntity {
private String tenantId; private String tenantId;
private Integer channelType; private Integer channelType;


@Transient
@TableField(exist = false)
@SortColumn(column = "xTime") @SortColumn(column = "xTime")
private String xTime; private String xTime;
@Transient
@TableField(exist = false)
@SortColumn(column = "sendCount") @SortColumn(column = "sendCount")
private Integer sendCount; private Integer sendCount;


@Transient
@TableField(exist = false)
private Integer pv; private Integer pv;
@Transient
@TableField(exist = false)
private Integer uv; private Integer uv;


@Transient
@TableField(exist = false)
@SortColumn(column = "xTime") @SortColumn(column = "xTime")
private String xtime; private String xtime;




+ 17
- 19
mallinkService/src/main/java/com/iformall/domain/dto/WxCUserBasicInfoDto.java Просмотреть файл

@@ -1,15 +1,13 @@
package com.iformall.domain.dto; package com.iformall.domain.dto;


import com.baomidou.mybatisplus.annotation.TableField;
import com.iformall.domain.po.BaseEntity; import com.iformall.domain.po.BaseEntity;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;


import java.io.Serializable;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;


import javax.persistence.Id;
import javax.persistence.Transient;
/** /**
* 用户查询dto * 用户查询dto
* @author jinguo * @author jinguo
@@ -24,7 +22,7 @@ public class WxCUserBasicInfoDto extends BaseEntity {
*/ */
private static final long serialVersionUID = -1116465873573690766L; private static final long serialVersionUID = -1116465873573690766L;


@Id
protected Long id; protected Long id;
@io.swagger.annotations.ApiModelProperty(value="开始时间",name="startTime") @io.swagger.annotations.ApiModelProperty(value="开始时间",name="startTime")
@@ -39,50 +37,50 @@ public class WxCUserBasicInfoDto extends BaseEntity {
@io.swagger.annotations.ApiModelProperty(value="姓名",name="name") @io.swagger.annotations.ApiModelProperty(value="姓名",name="name")
private String name; private String name;
@Transient
@TableField(exist = false)
@io.swagger.annotations.ApiModelProperty(value="租户id",name="tenantId") @io.swagger.annotations.ApiModelProperty(value="租户id",name="tenantId")
private String tenantId; private String tenantId;


@Transient
@TableField(exist = false)
private Integer reportType; private Integer reportType;


@Transient
@TableField(exist = false)
private Date birthStartTime; private Date birthStartTime;


@Transient
@TableField(exist = false)
private Date birthEndTime; private Date birthEndTime;


@Transient
@TableField(exist = false)
private Date loginStartTime; private Date loginStartTime;


@Transient
@TableField(exist = false)
private Date loginEndTime; private Date loginEndTime;


@Transient
@TableField(exist = false)
private Date verifiedStartTime; private Date verifiedStartTime;


@Transient
@TableField(exist = false)
private Date verifiedEndTime; private Date verifiedEndTime;


@Transient
@TableField(exist = false)
private Integer levelStartScore; private Integer levelStartScore;


@Transient
@TableField(exist = false)
private Integer levelEndScore; private Integer levelEndScore;


@Transient
@TableField(exist = false)
private Integer sex; private Integer sex;


@Transient
@TableField(exist = false)
List<Long> tagIds; List<Long> tagIds;


@Transient
@TableField(exist = false)
private String phones; private String phones;


@Transient
@TableField(exist = false)
@io.swagger.annotations.ApiModelProperty(value="1查询导入的数据",name="queryImport") @io.swagger.annotations.ApiModelProperty(value="1查询导入的数据",name="queryImport")
protected Integer queryImport; protected Integer queryImport;


@Transient
@TableField(exist = false)
protected List<WxCUserBasicInfoFilterDto> filterList; protected List<WxCUserBasicInfoFilterDto> filterList;
} }

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

@@ -2,11 +2,7 @@ package com.iformall.domain.dto;


import lombok.Data; import lombok.Data;


import javax.persistence.Id;
import javax.persistence.Transient;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date;
import java.util.List;


/** /**
* 用户查询dto * 用户查询dto


+ 2
- 2
mallinkService/src/main/java/com/iformall/domain/dto/WxCouponChannelDto.java Просмотреть файл

@@ -1,8 +1,8 @@
package com.iformall.domain.dto; package com.iformall.domain.dto;


import com.baomidou.mybatisplus.annotation.TableField;
import lombok.Data; import lombok.Data;


import javax.persistence.Transient;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;
import java.util.Map; import java.util.Map;
@@ -17,7 +17,7 @@ public class WxCouponChannelDto implements Serializable {
private Date beginTime; private Date beginTime;
private Date endTime; private Date endTime;


@Transient
@TableField(exist = false)
@io.swagger.annotations.ApiModelProperty(value = "审批流参数", name = "flowParams") @io.swagger.annotations.ApiModelProperty(value = "审批流参数", name = "flowParams")
private Map<String, Object> flowParams; private Map<String, Object> flowParams;




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

@@ -1,11 +1,11 @@
package com.iformall.domain.po; package com.iformall.domain.po;


import com.baomidou.mybatisplus.annotation.TableField;
import com.iformall.common.SortColumn; import com.iformall.common.SortColumn;
import lombok.Data; import lombok.Data;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;


import javax.persistence.Transient;
import java.io.Serializable; import java.io.Serializable;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.util.ArrayList; import java.util.ArrayList;
@@ -21,22 +21,26 @@ import java.util.List;
public class BaseEntity implements Serializable { public class BaseEntity implements Serializable {


private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Transient

@TableField(exist = false)
private List<Long> ids;

@TableField(exist = false)
private String sortColumn; private String sortColumn;


@Transient
@TableField(exist = false)
private String sortOrder; private String sortOrder;


@Transient
@TableField(exist = false)
private String sortColumns; private String sortColumns;


@Transient
@TableField(exist = false)
protected String floorForRule; protected String floorForRule;


@Transient
@TableField(exist = false)
protected String businessForRule; protected String businessForRule;


@Transient
@TableField(exist = false)
protected String[] tempShop; protected String[] tempShop;


public String getSortColumns() { public String getSortColumns() {


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

@@ -1,29 +1,25 @@
package com.iformall.domain.po; 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.fasterxml.jackson.annotation.JsonIgnoreProperties;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.ToString;


import javax.persistence.Id;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;


/** /**
* @author gongbiao * @author gongbiao
*/ */
@Table(name = "kw_box")
@TableName(value = "kw_box")
@Data @Data
@JsonIgnoreProperties(value = {"handler"}) @JsonIgnoreProperties(value = {"handler"})
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
public class KwBox extends BaseEntity { public class KwBox extends BaseEntity {
@Id
protected Long id; protected Long id;
@Transient
protected List<Long> ids;



@io.swagger.annotations.ApiModelProperty(value = "tenantId", name = "tenantId") @io.swagger.annotations.ApiModelProperty(value = "tenantId", name = "tenantId")
private String tenantId; private String tenantId;
@@ -73,10 +69,10 @@ public class KwBox extends BaseEntity {
@io.swagger.annotations.ApiModelProperty(value = "最大目标数量", name = "maxTagNum") @io.swagger.annotations.ApiModelProperty(value = "最大目标数量", name = "maxTagNum")
private Integer maxTagNum; private Integer maxTagNum;


@Transient
@TableField(exist = false)
private Integer meterCount; private Integer meterCount;


@Transient
@TableField(exist = false)
private List<KwMeter> meters; private List<KwMeter> meters;


} }

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

@@ -1,28 +1,22 @@
package com.iformall.domain.po; package com.iformall.domain.po;


import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.ToString; import lombok.ToString;


import javax.persistence.Id;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.List;


/** /**
* @author gongbiao * @author gongbiao
*/ */
@Table(name = "kw_box_cmd_history")
@TableName(value = "kw_box_cmd_history")
@Data @Data
@ToString(callSuper = true) @ToString(callSuper = true)
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
public class KwBoxCmdHistory extends BaseEntity { public class KwBoxCmdHistory extends BaseEntity {
@Id
protected Long id; protected Long id;
@Transient
protected List<Long> ids;


@io.swagger.annotations.ApiModelProperty(value = "tenantId", name = "tenantId") @io.swagger.annotations.ApiModelProperty(value = "tenantId", name = "tenantId")
private String tenantId; private String tenantId;


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

@@ -1,12 +1,11 @@
package com.iformall.domain.po; package com.iformall.domain.po;


import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.ToString; import lombok.ToString;


import javax.persistence.Id;
import javax.persistence.Table;
import javax.persistence.Transient;

import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
@@ -14,16 +13,13 @@ import java.util.List;
/** /**
* @author gongbiao * @author gongbiao
*/ */
@Table(name = "kw_merchant_meter")
@TableName(value = "kw_merchant_meter")
@Data @Data
@ToString(callSuper = true) @ToString(callSuper = true)
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
public class KwMerchantMeter extends BaseEntity { public class KwMerchantMeter extends BaseEntity {
@Id
protected Long id;
@Transient
protected List<Long> ids;


protected Long id;


@io.swagger.annotations.ApiModelProperty(value = "tenantId", name = "tenantId") @io.swagger.annotations.ApiModelProperty(value = "tenantId", name = "tenantId")
private String tenantId; private String tenantId;


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

@@ -1,28 +1,24 @@
package com.iformall.domain.po; package com.iformall.domain.po;


import cn.afterturn.easypoi.excel.annotation.Excel; 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.fasterxml.jackson.annotation.JsonIgnoreProperties;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;


import javax.persistence.Id;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.util.Date; import java.util.Date;
import java.util.List;


/** /**
* @author gongbiao * @author gongbiao
*/ */
@Table(name = "kw_meter")
@TableName(value = "kw_meter")
@Data @Data
@JsonIgnoreProperties(value = {"handler"}) @JsonIgnoreProperties(value = {"handler"})
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
public class KwMeter extends BaseEntity { public class KwMeter extends BaseEntity {
@Id
protected Long id; protected Long id;
@Transient
protected List<Long> ids;


@io.swagger.annotations.ApiModelProperty(value = "tenantId", name = "tenantId") @io.swagger.annotations.ApiModelProperty(value = "tenantId", name = "tenantId")
private String tenantId; private String tenantId;
@@ -71,27 +67,27 @@ public class KwMeter extends BaseEntity {
private Integer bindStatus; private Integer bindStatus;


@Excel(name = "采集设备号", width = 20, orderNum = "7") @Excel(name = "采集设备号", width = 20, orderNum = "7")
@Transient
@TableField(exist = false)
private String boxImei; private String boxImei;


@Excel(name = "协议(0,1,2-AUTO,97,07协议)", width =30, orderNum = "5") @Excel(name = "协议(0,1,2-AUTO,97,07协议)", width =30, orderNum = "5")
@Transient
@TableField(exist = false)
@io.swagger.annotations.ApiModelProperty(value = "协议(0,1,2-AUTO,97,07协议)", name = "protocol") @io.swagger.annotations.ApiModelProperty(value = "协议(0,1,2-AUTO,97,07协议)", name = "protocol")
private Integer protocol; private Integer protocol;


@Excel(name = "波特率(1200,2400,9600)", width = 30, orderNum = "6") @Excel(name = "波特率(1200,2400,9600)", width = 30, orderNum = "6")
@Transient
@TableField(exist = false)
@io.swagger.annotations.ApiModelProperty(value = "波特率(1200,2400,9600)", name = "bandrate") @io.swagger.annotations.ApiModelProperty(value = "波特率(1200,2400,9600)", name = "bandrate")
private Integer bandrate; private Integer bandrate;


@Transient
@TableField(exist = false)
@Excel(name = "商户", width = 20, orderNum = "8") @Excel(name = "商户", width = 20, orderNum = "8")
private String merchantName; private String merchantName;


@Transient
@TableField(exist = false)
private Long merchantId; private Long merchantId;


@Transient
@TableField(exist = false)
private Integer merchantMeterStatus; private Integer merchantMeterStatus;


} }

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

@@ -1,20 +1,16 @@
package com.iformall.domain.po; package com.iformall.domain.po;


import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.ToString; import lombok.ToString;


import javax.persistence.Id;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.List;


/** /**
* @author gongbiao * @author gongbiao
*/ */
@Table(name = "kw_meter_data")
@TableName(value = "kw_meter_data")
@Data @Data
@ToString(callSuper = true) @ToString(callSuper = true)
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@@ -22,12 +18,7 @@ public class KwMeterData extends BaseEntity {


protected Long id; protected Long id;


@Id
protected Long fake_id; protected Long fake_id;
@Transient
protected List<Long> ids;



@io.swagger.annotations.ApiModelProperty(value = "tenantId", name = "tenantId") @io.swagger.annotations.ApiModelProperty(value = "tenantId", name = "tenantId")
private String tenantId; private String tenantId;


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

@@ -1,43 +1,40 @@
package com.iformall.domain.po; package com.iformall.domain.po;


import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;


import javax.persistence.*;
import javax.persistence.Transient;
import java.util.List; import java.util.List;
import javax.persistence.Id;


@Table(name = "mall_permission")
@TableName(value = "mall_permission")
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
public class MallPermission extends BaseEntity { public class MallPermission extends BaseEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Id
protected Long id; protected Long id;
@Transient
protected List<Long> ids;


@io.swagger.annotations.ApiModelProperty(value="权限名称",name="name")

@io.swagger.annotations.ApiModelProperty(value="权限名称",name="name")
private String name; private String name;
@Transient
@TableField(exist = false)
@io.swagger.annotations.ApiModelProperty(value="权限名称[LIKE]",name="nameLike") @io.swagger.annotations.ApiModelProperty(value="权限名称[LIKE]",name="nameLike")
private String nameLike; private String nameLike;
@io.swagger.annotations.ApiModelProperty(value="父编号ID,一级菜单为0",name="parentId") @io.swagger.annotations.ApiModelProperty(value="父编号ID,一级菜单为0",name="parentId")
private Long parentId; private Long parentId;
@Transient
@TableField(exist = false)
@io.swagger.annotations.ApiModelProperty(value="原父编号ID",name="origParentId") @io.swagger.annotations.ApiModelProperty(value="原父编号ID",name="origParentId")
private Long origParentId; private Long origParentId;
@Transient
@TableField(exist = false)
@io.swagger.annotations.ApiModelProperty(value="父菜单",name="parentName") @io.swagger.annotations.ApiModelProperty(value="父菜单",name="parentName")
private String parentName; private String parentName;
@io.swagger.annotations.ApiModelProperty(value="是否可用 Y/N",name="permission") @io.swagger.annotations.ApiModelProperty(value="是否可用 Y/N",name="permission")
private String available; private String available;
@io.swagger.annotations.ApiModelProperty(value="授权(多个用逗号分隔,如:user:list,user:create)",name="permission") @io.swagger.annotations.ApiModelProperty(value="授权(多个用逗号分隔,如:user:list,user:create)",name="permission")
private String permission; private String permission;
@Transient
@TableField(exist = false)
private List<String> permissions; private List<String> permissions;
@io.swagger.annotations.ApiModelProperty(value="资源类型0:目录 1:菜单 2:按钮",name="resourceType") @io.swagger.annotations.ApiModelProperty(value="资源类型0:目录 1:菜单 2:按钮",name="resourceType")
private Integer resourceType; private Integer resourceType;
@@ -54,20 +51,20 @@ public class MallPermission extends BaseEntity {
@io.swagger.annotations.ApiModelProperty(value="排序",name="sort") @io.swagger.annotations.ApiModelProperty(value="排序",name="sort")
private Integer sort; private Integer sort;


@Transient
@TableField(exist = false)
private Integer sortFrom; private Integer sortFrom;
@Transient
@TableField(exist = false)
private Integer sortTo; private Integer sortTo;
@Transient
@TableField(exist = false)
private Integer sortGte; private Integer sortGte;
@Transient
@TableField(exist = false)
private Integer sortGt; private Integer sortGt;
@Transient
@TableField(exist = false)
private Integer sortLte; private Integer sortLte;
@Transient
@TableField(exist = false)
private Integer sortLt; private Integer sortLt;


@Transient
@TableField(exist = false)
@io.swagger.annotations.ApiModelProperty(value="子菜单",name="children") @io.swagger.annotations.ApiModelProperty(value="子菜单",name="children")
private List<?> children; private List<?> children;




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

@@ -1,27 +1,20 @@
package com.iformall.domain.po; package com.iformall.domain.po;


import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;


import javax.persistence.*;
import javax.persistence.Transient;
import java.util.List;
import javax.persistence.Id;

@Table(name = "mall_resource")
@TableName(value = "mall_resource")
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
public class MallResource extends BaseEntity { public class MallResource extends BaseEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Id
protected Long id; protected Long id;
@Transient
protected List<Long> ids;


@io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")

@io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")
private String tenantId; private String tenantId;
@io.swagger.annotations.ApiModelProperty(value="bucket名称",name="bucket") @io.swagger.annotations.ApiModelProperty(value="bucket名称",name="bucket")
private String bucket; private String bucket;


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

@@ -1,24 +1,18 @@
package com.iformall.domain.po; package com.iformall.domain.po;


import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;


import javax.persistence.*;
import javax.persistence.Transient;
import java.util.List;
import javax.persistence.Id;

@Table(name = "mall_role")
@TableName(value = "mall_role")
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
public class MallRole extends BaseEntity { public class MallRole extends BaseEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Id
protected Long id; protected Long id;
@Transient
protected List<Long> ids;



@io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")
private String tenantId; private String tenantId;
@@ -28,8 +22,8 @@ public class MallRole extends BaseEntity {
private String available; private String available;
@io.swagger.annotations.ApiModelProperty(value="角色描述",name="description") @io.swagger.annotations.ApiModelProperty(value="角色描述",name="description")
private String description; private String description;
@Transient
@TableField(exist = false)
@io.swagger.annotations.ApiModelProperty(value="权限列表",name="menus") @io.swagger.annotations.ApiModelProperty(value="权限列表",name="menus")
private String menus; private String menus;




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

@@ -1,29 +1,23 @@
package com.iformall.domain.po; package com.iformall.domain.po;


import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;


import javax.persistence.Id;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.util.List; import java.util.List;


@Table(name = "mall_role_permission")
@TableName(value = "mall_role_permission")
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
public class MallRolePermission extends BaseEntity { public class MallRolePermission extends BaseEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Id
protected Long id; protected Long id;
@Transient
protected List<Long> ids;


@Transient
@TableField(exist = false)
protected List<Long> permissionIds; protected List<Long> permissionIds;



@io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")
private String tenantId; private String tenantId;
@io.swagger.annotations.ApiModelProperty(value="角色ID",name="roleId") @io.swagger.annotations.ApiModelProperty(value="角色ID",name="roleId")
@@ -31,5 +25,4 @@ public class MallRolePermission extends BaseEntity {
@io.swagger.annotations.ApiModelProperty(value="权限ID",name="permissionId") @io.swagger.annotations.ApiModelProperty(value="权限ID",name="permissionId")
private Long permissionId; private Long permissionId;



} }

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

@@ -1,26 +1,18 @@
package com.iformall.domain.po; package com.iformall.domain.po;


import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;


import javax.persistence.Id;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.util.List;

@Table(name = "mall_sale_type")
@TableName(value = "mall_sale_type")
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
public class MallSaleType extends BaseEntity { public class MallSaleType extends BaseEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;


@Id
protected Long id; protected Long id;


@Transient
protected List<Long> ids;

@io.swagger.annotations.ApiModelProperty(value="销售类型名",name="name")
@io.swagger.annotations.ApiModelProperty(value="销售类型名",name="name")
private String name; private String name;
@io.swagger.annotations.ApiModelProperty(value="资源类型1:速享版 2:速享标准版 3.标准版",name="type") @io.swagger.annotations.ApiModelProperty(value="资源类型1:速享版 2:速享标准版 3.标准版",name="type")
private Integer type; private Integer type;


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

@@ -1,26 +1,19 @@
package com.iformall.domain.po; package com.iformall.domain.po;


import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;


import javax.persistence.*;
import java.util.*; import java.util.*;
import javax.persistence.Transient;
import java.util.List;
import javax.persistence.Id;


@Table(name = "mall_user_action")
@TableName(value = "mall_user_action")
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
public class MallUserAction extends BaseEntity { public class MallUserAction extends BaseEntity {
@Id
protected Long id; protected Long id;
@Transient
protected List<Long> ids;


@io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")
@io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")
private String tenantId; private String tenantId;
@io.swagger.annotations.ApiModelProperty(value="用户ID",name="userId") @io.swagger.annotations.ApiModelProperty(value="用户ID",name="userId")
private Long userId; private Long userId;


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

@@ -1,5 +1,7 @@
package com.iformall.domain.po; package com.iformall.domain.po;


import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.iformall.enums.EnumUserAdmin; import com.iformall.enums.EnumUserAdmin;
import com.iformall.enums.EnumUserWechat; import com.iformall.enums.EnumUserWechat;
import com.iformall.utils.Constant; import com.iformall.utils.Constant;
@@ -7,27 +9,20 @@ import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.ToString; import lombok.ToString;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;


import javax.persistence.Id;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.util.ArrayList;

import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;


@Table(name = "mall_user_info")
@TableName(value = "mall_user_info")
@Data @Data
@ToString(callSuper = true) @ToString(callSuper = true)
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
public class MallUserInfo extends BaseEntity { public class MallUserInfo extends BaseEntity {


@Id
protected Long id; protected Long id;
@Transient
protected List<Long> ids;



@io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")
private String tenantId; private String tenantId;
@@ -58,28 +53,28 @@ public class MallUserInfo extends BaseEntity {
private String webOpenId; private String webOpenId;


@io.swagger.annotations.ApiModelProperty(value="1 未绑定wechat,0 绑定微信",name="withWechat") @io.swagger.annotations.ApiModelProperty(value="1 未绑定wechat,0 绑定微信",name="withWechat")
@Transient
@TableField(exist = false)
private Integer withWechat; private Integer withWechat;


@Transient
@TableField(exist = false)
private Integer withWechatForQuery; private Integer withWechatForQuery;


@Transient
@TableField(exist = false)
private Long roleId; private Long roleId;
@Transient
@TableField(exist = false)
private String roleName; private String roleName;
//该用户所有的角色 //该用户所有的角色
@Transient
@TableField(exist = false)
private List<MallRole> role; private List<MallRole> role;
//该用户包含的所有权限 //该用户包含的所有权限
@Transient
@TableField(exist = false)
private List<MallPermission> permission; private List<MallPermission> permission;
//拥有的菜单权限 //拥有的菜单权限
@Transient
@TableField(exist = false)
private String menus; private String menus;


@Transient
@TableField(exist = false)
private String captcha; private String captcha;


@io.swagger.annotations.ApiModelProperty(value = "邮箱", name = "email") @io.swagger.annotations.ApiModelProperty(value = "邮箱", name = "email")


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

@@ -1,26 +1,18 @@
package com.iformall.domain.po; package com.iformall.domain.po;


import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;


import javax.persistence.Id;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.util.List;

@Table(name = "mall_user_role")
@TableName(value = "mall_user_role")
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
public class MallUserRole extends BaseEntity { public class MallUserRole extends BaseEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Id
protected Long id; protected Long id;
@Transient
protected List<String> ids;
@io.swagger.annotations.ApiModelProperty(value="用户ID",name="uid")

@io.swagger.annotations.ApiModelProperty(value="用户ID",name="uid")
private Long uid; private Long uid;
@io.swagger.annotations.ApiModelProperty(value="角色ID",name="roleId") @io.swagger.annotations.ApiModelProperty(value="角色ID",name="roleId")
private Long roleId; private Long roleId;


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

@@ -1,26 +1,17 @@
package com.iformall.domain.po; package com.iformall.domain.po;


import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
import javax.persistence.*;
import java.util.*;
import java.math.*;
import javax.persistence.Transient;
import java.util.List;
import javax.persistence.Id;
import java.io.Serializable; import java.io.Serializable;


@Table(name = "pos_action_log")
@TableName(value = "pos_action_log")
@Data @Data
public class PosActionLog implements Serializable { public class PosActionLog implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Id
protected Long id; protected Long id;
@Transient
protected List<Long> ids;
@io.swagger.annotations.ApiModelProperty(value="访问url",name="url")

@io.swagger.annotations.ApiModelProperty(value="访问url",name="url")
private String url; private String url;
@io.swagger.annotations.ApiModelProperty(value="ip地址",name="ip") @io.swagger.annotations.ApiModelProperty(value="ip地址",name="ip")
private String ip; private String ip;


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

@@ -1,26 +1,19 @@
package com.iformall.domain.po; package com.iformall.domain.po;


import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;


import javax.persistence.*;
import javax.persistence.Transient;
import java.util.Date; import java.util.Date;
import java.util.List;
import javax.persistence.Id;


@Table(name = "pos_coupon_order_verify")
@TableName(value = "pos_coupon_order_verify")
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
public class PosCouponOrderVerify extends BaseEntity { public class PosCouponOrderVerify extends BaseEntity {


@Id
protected Long id; protected Long id;
@Transient
protected List<Long> ids;
@io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")

@io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")
private String tenantId; private String tenantId;
@io.swagger.annotations.ApiModelProperty(value="券包ID",name="couponOrderId") @io.swagger.annotations.ApiModelProperty(value="券包ID",name="couponOrderId")
private Long couponOrderId; private Long couponOrderId;


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

@@ -1,27 +1,20 @@
package com.iformall.domain.po; package com.iformall.domain.po;


import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;


import javax.persistence.*;
import java.util.*; import java.util.*;
import javax.persistence.Transient;
import java.util.List;
import javax.persistence.Id;


@Table(name = "pos_mall_config")
@TableName(value = "pos_mall_config")
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
public class PosMallConfig extends BaseEntity { public class PosMallConfig extends BaseEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Id
protected Long id; protected Long id;
@Transient
protected List<Long> ids;
@io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")

@io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")
private String tenantId; private String tenantId;
@io.swagger.annotations.ApiModelProperty(value="会员折扣是否开启,0-禁用,1-可用",name="discount") @io.swagger.annotations.ApiModelProperty(value="会员折扣是否开启,0-禁用,1-可用",name="discount")
private Integer discount; private Integer discount;
@@ -34,5 +27,4 @@ public class PosMallConfig extends BaseEntity {
@io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate")
private Date updateDate; private Date updateDate;



} }

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

@@ -1,25 +1,20 @@
package com.iformall.domain.po; package com.iformall.domain.po;


import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
import javax.persistence.*;
import java.util.*; import java.util.*;
import javax.persistence.Transient;
import java.util.List;
import javax.persistence.Id;
import java.io.Serializable; import java.io.Serializable;


@Table(name = "pos_order")
@TableName(value = "pos_order")
@Data @Data
public class PosOrder implements Serializable { public class PosOrder implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Id
protected Long id; protected Long id;
@Transient
protected List<Long> ids;
@io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")


@io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")
private String tenantId; private String tenantId;
@io.swagger.annotations.ApiModelProperty(value="POS订单ID",name="posOrderNo") @io.swagger.annotations.ApiModelProperty(value="POS订单ID",name="posOrderNo")
private String posOrderNo; private String posOrderNo;


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

@@ -1,26 +1,18 @@
package com.iformall.domain.po; package com.iformall.domain.po;


import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
import javax.persistence.*;
import java.util.*; import java.util.*;
import java.math.*;
import javax.persistence.Transient;
import java.util.List;
import javax.persistence.Id;
import java.io.Serializable; import java.io.Serializable;


@Table(name = "pos_pay_order")
@TableName(value = "pos_pay_order")
@Data @Data
public class PosPayOrder implements Serializable { public class PosPayOrder implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Id

protected Long id; protected Long id;
@Transient
protected List<Long> ids;
@io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")

@io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")
private String tenantId; private String tenantId;
@io.swagger.annotations.ApiModelProperty(value="创建时间",name="createTime") @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createTime")
private Date createTime; private Date createTime;


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

@@ -1,24 +1,22 @@
package com.iformall.domain.po; package com.iformall.domain.po;


import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;


import javax.persistence.*;
import java.util.*; import java.util.*;
import javax.persistence.Transient;
import java.util.List; import java.util.List;
import javax.persistence.Id;


@Table(name = "push_limit")
@TableName(value = "push_limit")
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
public class PushLimit extends BaseEntity { public class PushLimit extends BaseEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;


@Id
protected Long id; protected Long id;


@Transient
@TableField(exist = false)
protected List<Long> ids; protected List<Long> ids;


@io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")


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

@@ -1,24 +1,18 @@
package com.iformall.domain.po; package com.iformall.domain.po;


import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;


import javax.persistence.*;
import javax.persistence.Transient;
import java.util.List;
import javax.persistence.Id;

@Table(name = "sys_monitor")
@TableName(value = "sys_monitor")
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
public class SysMonitor extends BaseEntity { public class SysMonitor extends BaseEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Id
protected Long id; protected Long id;
@Transient
protected List<Long> ids;



@io.swagger.annotations.ApiModelProperty(value="网址url",name="name") @io.swagger.annotations.ApiModelProperty(value="网址url",name="name")
private String name; private String name;


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

@@ -1,26 +1,21 @@
package com.iformall.domain.po; package com.iformall.domain.po;


import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;


import javax.persistence.*;
import java.util.*; import java.util.*;
import javax.persistence.Transient;
import java.util.List;
import javax.persistence.Id;


@Table(name = "th_dev_info")
@TableName(value = "th_dev_info")
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
public class ThDevInfo extends BaseEntity { public class ThDevInfo extends BaseEntity {
@Id
protected Long id; protected Long id;
@Transient
protected List<Long> ids;
@io.swagger.annotations.ApiModelProperty(value="开发者ID",name="devId")


@io.swagger.annotations.ApiModelProperty(value="开发者ID",name="devId")
private String devId; private String devId;
@io.swagger.annotations.ApiModelProperty(value="名称",name="name") @io.swagger.annotations.ApiModelProperty(value="名称",name="name")
private String name; private String name;


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

@@ -1,30 +1,24 @@
package com.iformall.domain.po; package com.iformall.domain.po;


import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.ToString; import lombok.ToString;


import javax.persistence.Id;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.util.Date; import java.util.Date;
import java.util.List;


/** /**
* @author gongbiao * @author gongbiao
*/ */
@Table(name = "wx_activity")
@TableName(value = "wx_activity")
@Data @Data
@ToString(callSuper = true) @ToString(callSuper = true)
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
public class WxActivity extends BaseEntity { public class WxActivity extends BaseEntity {


@Id
protected Long id; protected Long id;


@Transient
protected List<Long> ids;



@io.swagger.annotations.ApiModelProperty(value = "租户", name = "tenantId") @io.swagger.annotations.ApiModelProperty(value = "租户", name = "tenantId")
private String tenantId; private String tenantId;
@@ -77,20 +71,20 @@ public class WxActivity extends BaseEntity {
@io.swagger.annotations.ApiModelProperty(value = "是否发送短信1是0否", name = "sendMsg") @io.swagger.annotations.ApiModelProperty(value = "是否发送短信1是0否", name = "sendMsg")
private Integer sendMsg; private Integer sendMsg;


@Transient
@TableField(exist = false)
@io.swagger.annotations.ApiModelProperty(value = "开始时间", name = "starttime") @io.swagger.annotations.ApiModelProperty(value = "开始时间", name = "starttime")
private Date starttime; private Date starttime;


@Transient
@TableField(exist = false)
@io.swagger.annotations.ApiModelProperty(value = "结束时间", name = "endtime") @io.swagger.annotations.ApiModelProperty(value = "结束时间", name = "endtime")
private Date endtime; private Date endtime;




@Transient
@TableField(exist = false)
@io.swagger.annotations.ApiModelProperty(value = "报名小程序路径", name = "weappPath") @io.swagger.annotations.ApiModelProperty(value = "报名小程序路径", name = "weappPath")
protected String weappPath; protected String weappPath;


@Transient
@TableField(exist = false)
@io.swagger.annotations.ApiModelProperty(value = "报名二维码", name = "weappSceneForJoin") @io.swagger.annotations.ApiModelProperty(value = "报名二维码", name = "weappSceneForJoin")
protected String weappSceneForJoin; protected String weappSceneForJoin;


@@ -103,11 +97,11 @@ public class WxActivity extends BaseEntity {
} }




@Transient
@TableField(exist = false)
@io.swagger.annotations.ApiModelProperty(value = "签到小程序路径", name = "weappPath") @io.swagger.annotations.ApiModelProperty(value = "签到小程序路径", name = "weappPath")
protected String weappPathForSign; protected String weappPathForSign;


@Transient
@TableField(exist = false)
@io.swagger.annotations.ApiModelProperty(value = "签到二维码", name = "weappSceneForSign") @io.swagger.annotations.ApiModelProperty(value = "签到二维码", name = "weappSceneForSign")
protected String weappSceneForSign; protected String weappSceneForSign;




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

@@ -1,31 +1,25 @@
package com.iformall.domain.po; package com.iformall.domain.po;


import cn.afterturn.easypoi.excel.annotation.Excel; import cn.afterturn.easypoi.excel.annotation.Excel;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.ToString; import lombok.ToString;


import javax.persistence.Id;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.util.Date; import java.util.Date;
import java.util.List;


/** /**
* @author gongbiao * @author gongbiao
*/ */
@Table(name = "wx_activity_join")
@TableName(value = "wx_activity_join")
@Data @Data
@ToString(callSuper = true) @ToString(callSuper = true)
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
public class WxActivityJoin extends BaseEntity { public class WxActivityJoin extends BaseEntity {


@Id
protected Long id; protected Long id;


@Transient
protected List<Long> ids;

@io.swagger.annotations.ApiModelProperty(value = "租户ID", name = "tenantId") @io.swagger.annotations.ApiModelProperty(value = "租户ID", name = "tenantId")
private String tenantId; private String tenantId;


@@ -78,7 +72,7 @@ public class WxActivityJoin extends BaseEntity {
@io.swagger.annotations.ApiModelProperty(value = "图片", name = "imgUrl") @io.swagger.annotations.ApiModelProperty(value = "图片", name = "imgUrl")
private String imgUrl; private String imgUrl;


@Transient
@TableField(exist = false)
@io.swagger.annotations.ApiModelProperty(value = "状态", name = "statusStr") @io.swagger.annotations.ApiModelProperty(value = "状态", name = "statusStr")
private String statusStr; private String statusStr;




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

@@ -1,23 +1,15 @@
package com.iformall.domain.po; package com.iformall.domain.po;


import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;


import javax.persistence.Id;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.util.List;

@Table(name = "wx_admin_log")
@TableName(value = "wx_admin_log")
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
public class WxAdminLog extends BaseEntity { public class WxAdminLog extends BaseEntity {


@Id
protected Long id; protected Long id;
@Transient
protected List<Long> ids;


@io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")
private String tenantId; private String tenantId;


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

@@ -1,26 +1,21 @@
package com.iformall.domain.po; package com.iformall.domain.po;


import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;


import javax.persistence.Id;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.util.Date; import java.util.Date;
import java.util.List;


@Table(name = "wx_appinfo")
@TableName(value = "wx_appinfo")
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
public class WxAppinfo extends BaseEntity { public class WxAppinfo extends BaseEntity {


@Id
protected Long id; protected Long id;
@Transient
protected List<Long> ids;


@io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")

@io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")
private String tenantId; private String tenantId;
@io.swagger.annotations.ApiModelProperty(value="小程序ID",name="appId") @io.swagger.annotations.ApiModelProperty(value="小程序ID",name="appId")
private String appId; private String appId;


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

@@ -1,24 +1,19 @@
package com.iformall.domain.po; package com.iformall.domain.po;


import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;


import javax.persistence.Id;
import javax.persistence.Table;
import javax.persistence.Transient;

import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;


@Table(name = "wx_authorizer_info")
@TableName(value = "wx_authorizer_info")
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
public class WxAuthorizerInfo extends BaseEntity { public class WxAuthorizerInfo extends BaseEntity {


@Id
protected Long id; protected Long id;
@Transient
protected List<Long> ids;


@io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")
private String tenantId; private String tenantId;


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

@@ -1,27 +1,22 @@
package com.iformall.domain.po; package com.iformall.domain.po;


import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;


import javax.persistence.Id;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.util.Date; import java.util.Date;
import java.util.List;


@Table(name = "wx_b_log")
@TableName(value = "wx_b_log")
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
public class WxBLog extends BaseEntity { public class WxBLog extends BaseEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Id
protected Long id; protected Long id;
@Transient
protected List<String> ids;


@io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")

@io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")
private String tenantId; private String tenantId;
@io.swagger.annotations.ApiModelProperty(value="",name="data") @io.swagger.annotations.ApiModelProperty(value="",name="data")
private String data; private String data;


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

@@ -1,28 +1,22 @@
package com.iformall.domain.po; package com.iformall.domain.po;


import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;


import javax.persistence.Id;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.util.Date; import java.util.Date;
import java.util.List;


/** /**
* @author gongbiao * @author gongbiao
*/ */
@Table(name = "wx_bill_action")
@TableName(value = "wx_bill_action")
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
public class WxBillAction extends BaseEntity { public class WxBillAction extends BaseEntity {


@Id
protected Long id; protected Long id;


@Transient
protected List<Long> ids;

@io.swagger.annotations.ApiModelProperty(value = "租户ID", name = "tenantId") @io.swagger.annotations.ApiModelProperty(value = "租户ID", name = "tenantId")
private String tenantId; private String tenantId;


@@ -53,15 +47,15 @@ public class WxBillAction extends BaseEntity {
@io.swagger.annotations.ApiModelProperty(value = "付款时间", name = "payDate") @io.swagger.annotations.ApiModelProperty(value = "付款时间", name = "payDate")
private Date payDate; private Date payDate;


@Transient
@TableField(exist = false)
private Long oldPrice; private Long oldPrice;


@Transient
@TableField(exist = false)
private Long newPrice; private Long newPrice;




@Transient
@TableField(exist = false)
private String startDate; private String startDate;
@Transient
@TableField(exist = false)
private String endDate; private String endDate;
} }

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

@@ -1,14 +1,13 @@
package com.iformall.domain.po; package com.iformall.domain.po;


import cn.afterturn.easypoi.excel.annotation.Excel; 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.common.SortColumn;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.ToString; import lombok.ToString;


import javax.persistence.Id;
import javax.persistence.Table;
import javax.persistence.Transient;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
@@ -17,18 +16,15 @@ import java.util.Map;
/** /**
* @author gongbiao * @author gongbiao
*/ */
@Table(name = "wx_bill_daily")
@TableName(value = "wx_bill_daily")
@Data @Data
@ToString(callSuper = true) @ToString(callSuper = true)
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
public class WxBillDaily extends BaseEntity{ public class WxBillDaily extends BaseEntity{
@Id
protected Long id; protected Long id;


@Transient
protected List<Long> ids;


@Transient
@TableField(exist = false)
private String merchantName; private String merchantName;


@Excel(name = "费用类型*", replace = {"水费_1", "电费_2"}, width = 20, orderNum = "2") @Excel(name = "费用类型*", replace = {"水费_1", "电费_2"}, width = 20, orderNum = "2")
@@ -82,23 +78,23 @@ public class WxBillDaily extends BaseEntity{
@io.swagger.annotations.ApiModelProperty(value = "费用明细", name = "priceDetail") @io.swagger.annotations.ApiModelProperty(value = "费用明细", name = "priceDetail")
private String priceDetail; private String priceDetail;


@Transient
@TableField(exist = false)
private Integer allPeriod; private Integer allPeriod;


@Transient
@TableField(exist = false)
private Long needPay; private Long needPay;


@Transient
@TableField(exist = false)
private Long latePayPrice; private Long latePayPrice;


@Transient
@TableField(exist = false)
@SortColumn(column = "period") @SortColumn(column = "period")
private Integer period; private Integer period;


@Transient
@TableField(exist = false)
private String shopNumber; private String shopNumber;


@Transient
@TableField(exist = false)
private List<Map<String, Object>> shops; private List<Map<String, Object>> shops;


@io.swagger.annotations.ApiModelProperty(value = "开始时间", name = "starttime") @io.swagger.annotations.ApiModelProperty(value = "开始时间", name = "starttime")


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

@@ -1,30 +1,25 @@
package com.iformall.domain.po; package com.iformall.domain.po;


import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;


import javax.persistence.Id;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.util.Date; import java.util.Date;
import java.util.List;


/** /**
* @author gongbiao * @author gongbiao
*/ */
@Table(name = "wx_bill_rent_deposit")
@TableName(value = "wx_bill_rent_deposit")
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
public class WxBillDeposit extends BaseEntity { public class WxBillDeposit extends BaseEntity {


@Id
protected Long id; protected Long id;
@Transient
protected List<Long> ids;




@Transient
@TableField(exist = false)
private String merchantName; private String merchantName;


@io.swagger.annotations.ApiModelProperty(value="租金合同ID",name="rentContractId") @io.swagger.annotations.ApiModelProperty(value="租金合同ID",name="rentContractId")


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

@@ -1,14 +1,13 @@
package com.iformall.domain.po; package com.iformall.domain.po;


import cn.afterturn.easypoi.excel.annotation.Excel; 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.common.SortColumn;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.ToString; import lombok.ToString;


import javax.persistence.Id;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
@@ -17,19 +16,17 @@ import java.util.Map;
/** /**
* @author gongbiao * @author gongbiao
*/ */
@Table(name = "wx_bill_other")
@TableName(value = "wx_bill_other")
@Data @Data
@ToString(callSuper = true) @ToString(callSuper = true)
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
public class WxBillOther extends BaseEntity { public class WxBillOther extends BaseEntity {
@Id
protected Long id; protected Long id;
@Transient
protected List<Long> ids;


@Excel(name = "商户名称", width = 20, orderNum = "2")
@Transient

@Excel(name = "商户名称", width = 20, orderNum = "2")
@TableField(exist = false)
private String merchantName; private String merchantName;


@Excel(name = "其他费用名称", width = 20, orderNum = "3") @Excel(name = "其他费用名称", width = 20, orderNum = "3")
@@ -83,30 +80,30 @@ public class WxBillOther extends BaseEntity {
@io.swagger.annotations.ApiModelProperty(value = "支付方式:见枚举EnumBillPayWay", name = "payWay") @io.swagger.annotations.ApiModelProperty(value = "支付方式:见枚举EnumBillPayWay", name = "payWay")
private Integer payWay; private Integer payWay;


@Transient
@TableField(exist = false)
private Integer allPeriod; private Integer allPeriod;


@Transient
@TableField(exist = false)
private Long needPay; private Long needPay;


@Transient
@TableField(exist = false)
private Long latePayPrice; private Long latePayPrice;


@Transient
@TableField(exist = false)
@SortColumn(column = "period") @SortColumn(column = "period")
private Integer period; private Integer period;


@Excel(name = "商铺号", width = 20, orderNum = "1") @Excel(name = "商铺号", width = 20, orderNum = "1")
@Transient
@TableField(exist = false)
private String shopNumber; private String shopNumber;


@Transient
@TableField(exist = false)
@Excel(name = "实际应收金额(元)", orderNum = "4", width = 20) @Excel(name = "实际应收金额(元)", orderNum = "4", width = 20)
private String receivePayStr; private String receivePayStr;
@Transient
@TableField(exist = false)
@Excel(name = "实收金额(元)", orderNum = "5", width = 20) @Excel(name = "实收金额(元)", orderNum = "5", width = 20)
private String payStr; private String payStr;
@Transient
@TableField(exist = false)
@Excel(name = "欠缴金额(元)", orderNum = "6", width = 20) @Excel(name = "欠缴金额(元)", orderNum = "6", width = 20)
private String oweStr; private String oweStr;


@@ -128,7 +125,7 @@ public class WxBillOther extends BaseEntity {
return new BigDecimal(owe == null ? 0 : owe).divide(new BigDecimal(100)).toPlainString(); return new BigDecimal(owe == null ? 0 : owe).divide(new BigDecimal(100)).toPlainString();
} }


@Transient
@TableField(exist = false)
private List<Map<String, Object>> shops; private List<Map<String, Object>> shops;
@io.swagger.annotations.ApiModelProperty(value = "冻结状态,0正常1冻结", name = "freeze") @io.swagger.annotations.ApiModelProperty(value = "冻结状态,0正常1冻结", name = "freeze")
private Integer freeze; private Integer freeze;


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

@@ -1,14 +1,14 @@
package com.iformall.domain.po; package com.iformall.domain.po;


import cn.afterturn.easypoi.excel.annotation.Excel; 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.common.SortColumn;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.ToString; import lombok.ToString;


import javax.persistence.Id;
import javax.persistence.Table;
import javax.persistence.Transient;

import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
@@ -17,20 +17,17 @@ import java.util.Map;
/** /**
* @author gongbiao * @author gongbiao
*/ */
@Table(name = "wx_bill_other_deposit")
@TableName(value = "wx_bill_other_deposit")
@Data @Data
@ToString(callSuper = true) @ToString(callSuper = true)
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
public class WxBillOtherDeposit extends BaseEntity { public class WxBillOtherDeposit extends BaseEntity {
@Id
protected Long id;


@Transient
protected List<Long> ids;
protected Long id;




@Excel(name = "商户名称", width = 20, orderNum = "2") @Excel(name = "商户名称", width = 20, orderNum = "2")
@Transient
@TableField(exist = false)
private String merchantName; private String merchantName;


@io.swagger.annotations.ApiModelProperty(value = "账单名称", name = "name") @io.swagger.annotations.ApiModelProperty(value = "账单名称", name = "name")
@@ -88,28 +85,28 @@ public class WxBillOtherDeposit extends BaseEntity {
@io.swagger.annotations.ApiModelProperty(value = "支付方式:见枚举EnumBillPayWay", name = "payWay") @io.swagger.annotations.ApiModelProperty(value = "支付方式:见枚举EnumBillPayWay", name = "payWay")
private Integer payWay; private Integer payWay;


@Transient
@TableField(exist = false)
private Integer allPeriod; private Integer allPeriod;


@Transient
@TableField(exist = false)
private Long needPay; private Long needPay;


@Transient
@TableField(exist = false)
private Long latePayPrice; private Long latePayPrice;


@Transient
@TableField(exist = false)
@SortColumn(column = "period") @SortColumn(column = "period")
private Integer period; private Integer period;


@Excel(name = "商铺号", width = 20, orderNum = "1") @Excel(name = "商铺号", width = 20, orderNum = "1")
@Transient
@TableField(exist = false)
private String shopNumber; private String shopNumber;




@Transient
@TableField(exist = false)
@Excel(name = "实际应收金额(元)", orderNum = "4", width = 20) @Excel(name = "实际应收金额(元)", orderNum = "4", width = 20)
private String receivePayStr; private String receivePayStr;
@Transient
@TableField(exist = false)
@Excel(name = "实收金额(元)", orderNum = "5", width = 20) @Excel(name = "实收金额(元)", orderNum = "5", width = 20)
private String payStr; private String payStr;


@@ -128,10 +125,10 @@ public class WxBillOtherDeposit extends BaseEntity {
return status == 5 ? updatetime : null; return status == 5 ? updatetime : null;
} }


@Transient
@TableField(exist = false)
@Excel(name = "退款日", orderNum = "7", width = 20, format = "yyyy-MM-dd") @Excel(name = "退款日", orderNum = "7", width = 20, format = "yyyy-MM-dd")
private Date returnDate; private Date returnDate;
@Transient
@TableField(exist = false)
private List<Map<String, Object>> shops; private List<Map<String, Object>> shops;


@io.swagger.annotations.ApiModelProperty(value = "开始时间", name = "starttime") @io.swagger.annotations.ApiModelProperty(value = "开始时间", name = "starttime")


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

@@ -1,35 +1,31 @@
package com.iformall.domain.po; package com.iformall.domain.po;


import cn.afterturn.easypoi.excel.annotation.Excel; 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.common.SortColumn;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.ToString; import lombok.ToString;


import javax.persistence.Id;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
import java.util.List;


/** /**
* @author gongbiao * @author gongbiao
*/ */
@Table(name = "wx_bill_property")
@TableName(value = "wx_bill_property")
@Data @Data
@ToString(callSuper = true) @ToString(callSuper = true)
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
public class WxBillProperty extends BaseEntity { public class WxBillProperty extends BaseEntity {


@Id
protected Long id; protected Long id;
@Transient
protected List<Long> ids;


@Excel(name = "商户名称", width = 20, orderNum = "2")
@Transient

@Excel(name = "商户名称", width = 20, orderNum = "2")
@TableField(exist = false)
private String merchantName; private String merchantName;


@io.swagger.annotations.ApiModelProperty(value="物业合同ID",name="propertyContractId") @io.swagger.annotations.ApiModelProperty(value="物业合同ID",name="propertyContractId")
@@ -44,7 +40,7 @@ public class WxBillProperty extends BaseEntity {
} }


@Excel(name = "本期账款(元)", width = 20, orderNum = "6") @Excel(name = "本期账款(元)", width = 20, orderNum = "6")
@Transient
@TableField(exist = false)
private String receivePayStr; private String receivePayStr;




@@ -53,7 +49,7 @@ public class WxBillProperty extends BaseEntity {
} }


@Excel(name = "实收账款(元)", width = 20, orderNum = "7") @Excel(name = "实收账款(元)", width = 20, orderNum = "7")
@Transient
@TableField(exist = false)
private String payStr; private String payStr;


@io.swagger.annotations.ApiModelProperty(value="实收金额",name="pay") @io.swagger.annotations.ApiModelProperty(value="实收金额",name="pay")
@@ -83,7 +79,7 @@ public class WxBillProperty extends BaseEntity {
} }


@Excel(name = "欠缴金额(元)", width = 20, orderNum = "9") @Excel(name = "欠缴金额(元)", width = 20, orderNum = "9")
@Transient
@TableField(exist = false)
private String oweStr; private String oweStr;


@Excel(name = "状态", replace = {"欠缴_1", "待缴_2", "已结清_3", "未到期_4", "已退还_5", "失效_6"}, width = 20, orderNum = "8") @Excel(name = "状态", replace = {"欠缴_1", "待缴_2", "已结清_3", "未到期_4", "已退还_5", "失效_6"}, width = 20, orderNum = "8")
@@ -135,7 +131,7 @@ public class WxBillProperty extends BaseEntity {
} }


@Excel(name = "滞纳金(元)", width = 20, orderNum = "12") @Excel(name = "滞纳金(元)", width = 20, orderNum = "12")
@Transient
@TableField(exist = false)
private String latePayPriceStr; private String latePayPriceStr;


@io.swagger.annotations.ApiModelProperty(value = "账期", name = "period") @io.swagger.annotations.ApiModelProperty(value = "账期", name = "period")
@@ -156,33 +152,33 @@ public class WxBillProperty extends BaseEntity {
@io.swagger.annotations.ApiModelProperty(value = "备注", name = "comments") @io.swagger.annotations.ApiModelProperty(value = "备注", name = "comments")
private String comments; private String comments;


@Transient
@TableField(exist = false)
private Integer allPeriod; private Integer allPeriod;


@Excel(name = "商铺号", width = 20, orderNum = "1") @Excel(name = "商铺号", width = 20, orderNum = "1")
@Transient
@TableField(exist = false)
private String shopNumber; private String shopNumber;


@Excel(name = "押金状态", replace = {"欠缴_1", "待缴_2", "已结清_3", "未到期_4", "已退还_5", "失效_6", "无押金_0"}, width = 20, orderNum = "3") @Excel(name = "押金状态", replace = {"欠缴_1", "待缴_2", "已结清_3", "未到期_4", "已退还_5", "失效_6", "无押金_0"}, width = 20, orderNum = "3")
@Transient
@TableField(exist = false)
private Integer depositStatus; private Integer depositStatus;


@Transient
@TableField(exist = false)
private Long deposit; private Long deposit;


@Transient
@TableField(exist = false)
private Integer limitStart; private Integer limitStart;
@Transient
@TableField(exist = false)
private Integer limitEnd; private Integer limitEnd;


@io.swagger.annotations.ApiModelProperty(value = "n日后开始计算滞纳金", name = "latePayRatio") @io.swagger.annotations.ApiModelProperty(value = "n日后开始计算滞纳金", name = "latePayRatio")
@Transient
@TableField(exist = false)
private Integer latePayDay; private Integer latePayDay;




@Transient
@TableField(exist = false)
private String latePayMoneyBefore; private String latePayMoneyBefore;
@Transient
@TableField(exist = false)
private String latePayMoneyUpdate; private String latePayMoneyUpdate;


@io.swagger.annotations.ApiModelProperty(value = "冻结状态,0正常1冻结", name = "freeze") @io.swagger.annotations.ApiModelProperty(value = "冻结状态,0正常1冻结", name = "freeze")


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

@@ -1,29 +1,23 @@
package com.iformall.domain.po; package com.iformall.domain.po;


import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;


import javax.persistence.Id;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.util.Date; import java.util.Date;
import java.util.List;


/** /**
* @author gongbiao * @author gongbiao
*/ */
@Table(name = "wx_bill_property_deposit")
@TableName(value = "wx_bill_property_deposit")
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
public class WxBillPropertyDeposit extends BaseEntity { public class WxBillPropertyDeposit extends BaseEntity {


@Id
protected Long id; protected Long id;
@Transient
protected List<Long> ids;


@Transient
@TableField(exist = false)
private String merchantName; private String merchantName;


@io.swagger.annotations.ApiModelProperty(value="物业合同ID",name="propertyContractId") @io.swagger.annotations.ApiModelProperty(value="物业合同ID",name="propertyContractId")


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

@@ -1,35 +1,32 @@
package com.iformall.domain.po; package com.iformall.domain.po;


import cn.afterturn.easypoi.excel.annotation.Excel; 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.common.SortColumn;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.ToString; import lombok.ToString;


import javax.persistence.Id;
import javax.persistence.Table;
import javax.persistence.Transient;

import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
import java.util.List;


/** /**
* @author gongbiao * @author gongbiao
*/ */
@Table(name = "wx_bill_rent")
@TableName(value = "wx_bill_rent")
@Data @Data
@ToString(callSuper = true) @ToString(callSuper = true)
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
public class WxBillRent extends BaseEntity { public class WxBillRent extends BaseEntity {


@Id
protected Long id; protected Long id;
@Transient
protected List<Long> ids;


@Excel(name = "商户名称", width = 20, orderNum = "2")
@Transient

@Excel(name = "商户名称", width = 20, orderNum = "2")
@TableField(exist = false)
private String merchantName; private String merchantName;


@io.swagger.annotations.ApiModelProperty(value="租金合同ID",name="rentContractId") @io.swagger.annotations.ApiModelProperty(value="租金合同ID",name="rentContractId")
@@ -43,7 +40,7 @@ public class WxBillRent extends BaseEntity {
} }


@Excel(name = "本期账款(元)", width = 20, orderNum = "6") @Excel(name = "本期账款(元)", width = 20, orderNum = "6")
@Transient
@TableField(exist = false)
private String receivePayStr; private String receivePayStr;


public String getPayStr() { public String getPayStr() {
@@ -51,7 +48,7 @@ public class WxBillRent extends BaseEntity {
} }


@Excel(name = "实收账款(元)", width = 20, orderNum = "7") @Excel(name = "实收账款(元)", width = 20, orderNum = "7")
@Transient
@TableField(exist = false)
private String payStr; private String payStr;


@io.swagger.annotations.ApiModelProperty(value="实收金额",name="pay") @io.swagger.annotations.ApiModelProperty(value="实收金额",name="pay")
@@ -83,7 +80,7 @@ public class WxBillRent extends BaseEntity {
} }


@Excel(name = "欠缴金额(元)", width = 20, orderNum = "9") @Excel(name = "欠缴金额(元)", width = 20, orderNum = "9")
@Transient
@TableField(exist = false)
private String oweStr; private String oweStr;


@Excel(name = "状态", replace = {"欠缴_1", "待缴_2", "已结清_3", "未到期_4", "已退还_5", "失效_6"}, width = 20, orderNum = "8") @Excel(name = "状态", replace = {"欠缴_1", "待缴_2", "已结清_3", "未到期_4", "已退还_5", "失效_6"}, width = 20, orderNum = "8")
@@ -136,7 +133,7 @@ public class WxBillRent extends BaseEntity {
} }


@Excel(name = "滞纳金(元)", width = 20, orderNum = "12") @Excel(name = "滞纳金(元)", width = 20, orderNum = "12")
@Transient
@TableField(exist = false)
private String latePayPriceStr; private String latePayPriceStr;


@SortColumn(column = "period") @SortColumn(column = "period")
@@ -159,38 +156,38 @@ public class WxBillRent extends BaseEntity {
@io.swagger.annotations.ApiModelProperty(value = "备注", name = "comments") @io.swagger.annotations.ApiModelProperty(value = "备注", name = "comments")
private String comments; private String comments;


@Transient
@TableField(exist = false)
private Integer allPeriod; private Integer allPeriod;


@Excel(name = "商铺号", width = 20, orderNum = "1") @Excel(name = "商铺号", width = 20, orderNum = "1")
@Transient
@TableField(exist = false)
private String shopNumber; private String shopNumber;


@Excel(name = "押金状态", replace = {"欠缴_1", "待缴_2", "已结清_3", "未到期_4", "已退还_5", "失效_6", "无押金_0"}, width = 20, orderNum = "3") @Excel(name = "押金状态", replace = {"欠缴_1", "待缴_2", "已结清_3", "未到期_4", "已退还_5", "失效_6", "无押金_0"}, width = 20, orderNum = "3")
@Transient
@TableField(exist = false)
private Integer depositStatus; private Integer depositStatus;


@Transient
@TableField(exist = false)
private Integer rentType; private Integer rentType;


@Transient
@TableField(exist = false)
private Long deposit; private Long deposit;


@io.swagger.annotations.ApiModelProperty(value = "联营费率", name = "payRatio") @io.swagger.annotations.ApiModelProperty(value = "联营费率", name = "payRatio")
private Long payRatio; private Long payRatio;


@Transient
@TableField(exist = false)
private Integer limitStart; private Integer limitStart;
@Transient
@TableField(exist = false)
private Integer limitEnd; private Integer limitEnd;


@io.swagger.annotations.ApiModelProperty(value = "n日后开始计算滞纳金", name = "latePayRatio") @io.swagger.annotations.ApiModelProperty(value = "n日后开始计算滞纳金", name = "latePayRatio")
@Transient
@TableField(exist = false)
private Integer latePayDay; private Integer latePayDay;


@Transient
@TableField(exist = false)
private String latePayMoneyBefore; private String latePayMoneyBefore;
@Transient
@TableField(exist = false)
private String latePayMoneyUpdate; private String latePayMoneyUpdate;
private String busDiscountRatio; private String busDiscountRatio;




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

@@ -1,12 +1,12 @@
package com.iformall.domain.po; package com.iformall.domain.po;


import cn.afterturn.easypoi.excel.annotation.Excel; import cn.afterturn.easypoi.excel.annotation.Excel;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;


import javax.persistence.Id;
import javax.persistence.Table;
import javax.persistence.Transient;

import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@@ -14,24 +14,22 @@ import java.util.Map;
/** /**
* @author luozukai * @author luozukai
*/ */
@Table(name = "wx_bill_settle")
@TableName(value = "wx_bill_settle")
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
public class WxBillSettle extends BaseEntity { public class WxBillSettle extends BaseEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;


@Id
protected Long id; protected Long id;


@Transient
protected List<Long> ids;


@io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")
@io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")
private String tenantId; private String tenantId;
@io.swagger.annotations.ApiModelProperty(value="结算单号",name="settleNumber") @io.swagger.annotations.ApiModelProperty(value="结算单号",name="settleNumber")
@Excel(name="结算单号",width = 20,orderNum = "1") @Excel(name="结算单号",width = 20,orderNum = "1")
private String settleNumber; private String settleNumber;
@Transient
@TableField(exist = false)
@Excel(name="结算商户",width = 20,orderNum = "2") @Excel(name="结算商户",width = 20,orderNum = "2")
private String merchantName; private String merchantName;
@io.swagger.annotations.ApiModelProperty(value="商户id",name="merchantId") @io.swagger.annotations.ApiModelProperty(value="商户id",name="merchantId")
@@ -58,48 +56,48 @@ public class WxBillSettle extends BaseEntity {
@io.swagger.annotations.ApiModelProperty(value="更新时间",name="updatetime") @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updatetime")
private Date updatetime; private Date updatetime;


@Transient
@TableField(exist = false)
@io.swagger.annotations.ApiModelProperty(value = "审批流参数", name = "flowParams") @io.swagger.annotations.ApiModelProperty(value = "审批流参数", name = "flowParams")
private Map<String, Object> flowParams; private Map<String, Object> flowParams;


//结余金额 //结余金额
@Transient
@TableField(exist = false)
@Excel(name="结算金额(元)",width = 20,orderNum = "6") @Excel(name="结算金额(元)",width = 20,orderNum = "6")
private Long balance; private Long balance;


@Transient
@TableField(exist = false)
@io.swagger.annotations.ApiModelProperty(value = "收款账单列表", name = "receiveBillIds") @io.swagger.annotations.ApiModelProperty(value = "收款账单列表", name = "receiveBillIds")
private List<WxBillSettleBill> receiveBillIds; private List<WxBillSettleBill> receiveBillIds;
@Transient
@TableField(exist = false)
@io.swagger.annotations.ApiModelProperty(value = "承付账单列表", name = "payBillIds") @io.swagger.annotations.ApiModelProperty(value = "承付账单列表", name = "payBillIds")
private List<WxBillSettleBill> payBillIds; private List<WxBillSettleBill> payBillIds;
@Transient
@TableField(exist = false)
@io.swagger.annotations.ApiModelProperty(value = "结单记录", name = "settleRecordList") @io.swagger.annotations.ApiModelProperty(value = "结单记录", name = "settleRecordList")
private List<WxBillSettleRecord> settleRecordList; private List<WxBillSettleRecord> settleRecordList;




@Transient
@TableField(exist = false)
@io.swagger.annotations.ApiModelProperty(value = "开始时间", name = "starttime") @io.swagger.annotations.ApiModelProperty(value = "开始时间", name = "starttime")
private Date starttime; private Date starttime;
@Transient
@TableField(exist = false)
@io.swagger.annotations.ApiModelProperty(value = "结束时间", name = "endtime") @io.swagger.annotations.ApiModelProperty(value = "结束时间", name = "endtime")
private Date endtime; private Date endtime;


@Transient
@TableField(exist = false)
@io.swagger.annotations.ApiModelProperty(value="清算方向 1商场结款 2商户结款",name="settleWay") @io.swagger.annotations.ApiModelProperty(value="清算方向 1商场结款 2商户结款",name="settleWay")
private Integer settleWay; private Integer settleWay;


@Transient
@TableField(exist = false)
@io.swagger.annotations.ApiModelProperty(value="流向 0流入 1流出",name="direction") @io.swagger.annotations.ApiModelProperty(value="流向 0流入 1流出",name="direction")
private Integer direction; private Integer direction;


@Transient
@TableField(exist = false)
private Integer limitStart; private Integer limitStart;
@Transient
@TableField(exist = false)
private Integer limitEnd; private Integer limitEnd;




@Transient
@TableField(exist = false)
@io.swagger.annotations.ApiModelProperty(value="是否过滤结算历史 1不过滤",name="filterSettleRecord") @io.swagger.annotations.ApiModelProperty(value="是否过滤结算历史 1不过滤",name="filterSettleRecord")
private Integer filterSettleRecord =0; private Integer filterSettleRecord =0;
} }

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

@@ -1,24 +1,23 @@
package com.iformall.domain.po; package com.iformall.domain.po;


import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import javax.persistence.Id;
import javax.persistence.Table;
import javax.persistence.Transient;

import java.util.Date; import java.util.Date;
import java.util.List;


/** /**
* @author luozukai * @author luozukai
*/ */
@Table(name = "wx_bill_settle_bill")
@TableName(value = "wx_bill_settle_bill")
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
public class WxBillSettleBill extends BaseEntity { public class WxBillSettleBill extends BaseEntity {
public WxBillSettleBill(){} public WxBillSettleBill(){}
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;


@Id
protected Long id; protected Long id;
@io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")
private String tenantId; private String tenantId;
@@ -39,21 +38,21 @@ public class WxBillSettleBill extends BaseEntity {
private Date updatetime; private Date updatetime;


@io.swagger.annotations.ApiModelProperty(value="账单类型/名称",name="billName") @io.swagger.annotations.ApiModelProperty(value="账单类型/名称",name="billName")
@Transient
@TableField(exist = false)
private String billName; private String billName;
@io.swagger.annotations.ApiModelProperty(value="应收金额",name="receivePay") @io.swagger.annotations.ApiModelProperty(value="应收金额",name="receivePay")
@Transient
@TableField(exist = false)
private String receivePay; private String receivePay;


@Transient
@TableField(exist = false)
@io.swagger.annotations.ApiModelProperty(value="账单开始时间",name="starttime") @io.swagger.annotations.ApiModelProperty(value="账单开始时间",name="starttime")
private Date starttime; private Date starttime;
@Transient
@TableField(exist = false)
@io.swagger.annotations.ApiModelProperty(value="账单结束时间",name="endtime") @io.swagger.annotations.ApiModelProperty(value="账单结束时间",name="endtime")
private Date endtime; private Date endtime;




@Transient
@TableField(exist = false)
@io.swagger.annotations.ApiModelProperty(value="获取应收还是欠缴 0欠缴 1应收",name="getReceivePayOrOwe") @io.swagger.annotations.ApiModelProperty(value="获取应收还是欠缴 0欠缴 1应收",name="getReceivePayOrOwe")
private Integer getReceivePayOrOwe; private Integer getReceivePayOrOwe;
} }

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

@@ -1,30 +1,23 @@
package com.iformall.domain.po; package com.iformall.domain.po;


import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;


import javax.persistence.Id;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.util.Date; import java.util.Date;
import java.util.List;


/** /**
* @author luozukai * @author luozukai
*/ */
@Table(name = "wx_bill_settle_record")
@TableName(value = "wx_bill_settle_record")
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
public class WxBillSettleRecord extends BaseEntity { public class WxBillSettleRecord extends BaseEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;


@Id
protected Long id; protected Long id;


@Transient
protected List<Long> ids;

@io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")
@io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")
private String tenantId; private String tenantId;
@io.swagger.annotations.ApiModelProperty(value="结算单id",name="settleId") @io.swagger.annotations.ApiModelProperty(value="结算单id",name="settleId")
private Long settleId; private Long settleId;


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

@@ -1,30 +1,25 @@
package com.iformall.domain.po; package com.iformall.domain.po;


import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.ToString; import lombok.ToString;


import javax.persistence.Id;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.util.Date; import java.util.Date;
import java.util.List;


/** /**
* @author gongbiao * @author gongbiao
*/ */
@Table(name = "wx_brand")
@TableName(value = "wx_brand")
@Data @Data
@ToString(callSuper = true) @ToString(callSuper = true)
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
public class WxBrand extends BaseEntity{ public class WxBrand extends BaseEntity{
@Id
protected Long id; protected Long id;
@Transient
protected List<Long> ids;


@io.swagger.annotations.ApiModelProperty(value="tenantId",name="tenantId")

@io.swagger.annotations.ApiModelProperty(value="tenantId",name="tenantId")
private String tenantId; private String tenantId;
@io.swagger.annotations.ApiModelProperty(value="名称",name="name") @io.swagger.annotations.ApiModelProperty(value="名称",name="name")


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

@@ -1,26 +1,20 @@
package com.iformall.domain.po; package com.iformall.domain.po;


import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;


import javax.persistence.Id;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.util.Date; import java.util.Date;
import java.util.List;


@Table(name = "wx_business")
@TableName(value = "wx_business")
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
public class WxBusiness extends BaseEntity { public class WxBusiness extends BaseEntity {


@Id
protected Integer id; protected Integer id;
@Transient
protected List<String> ids;


@io.swagger.annotations.ApiModelProperty(value="业态名",name="title")
@io.swagger.annotations.ApiModelProperty(value="业态名",name="title")
private String title; private String title;
@io.swagger.annotations.ApiModelProperty(value="1.优惠券",name="type") @io.swagger.annotations.ApiModelProperty(value="1.优惠券",name="type")
private Integer type; private Integer type;
@@ -29,19 +23,19 @@ public class WxBusiness extends BaseEntity {
@io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate")
private Date updateDate; private Date updateDate;


@Transient
@TableField(exist = false)
@io.swagger.annotations.ApiModelProperty(value="查询-开始时间",name="startdate") @io.swagger.annotations.ApiModelProperty(value="查询-开始时间",name="startdate")
private Date startdate; private Date startdate;


@Transient
@TableField(exist = false)
@io.swagger.annotations.ApiModelProperty(value="查询-结束时间",name="enddate") @io.swagger.annotations.ApiModelProperty(value="查询-结束时间",name="enddate")
private Date enddate; private Date enddate;
@Transient
@TableField(exist = false)
private String tenantId; private String tenantId;


@Transient
@TableField(exist = false)
private Integer limitStart; private Integer limitStart;
@Transient
@TableField(exist = false)
private Integer limitEnd; private Integer limitEnd;
} }

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

@@ -1,27 +1,20 @@
package com.iformall.domain.po; package com.iformall.domain.po;


import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;


import javax.persistence.*;
import java.util.*; import java.util.*;
import javax.persistence.Transient;
import java.util.List;
import javax.persistence.Id;


@Table(name = "wx_c_log")
@TableName(value = "wx_c_log")
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
public class WxCLog extends BaseEntity { public class WxCLog extends BaseEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Id
protected Long id; protected Long id;
@Transient
protected List<String> ids;


@io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")
@io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")
private String tenantId; private String tenantId;
@io.swagger.annotations.ApiModelProperty(value="",name="data") @io.swagger.annotations.ApiModelProperty(value="",name="data")
private String data; private String data;


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

@@ -1,33 +1,31 @@
package com.iformall.domain.po; 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.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.iformall.utils.Constant; import com.iformall.utils.Constant;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.ToString; import lombok.ToString;


import javax.persistence.Id;
import javax.persistence.Table;
import javax.persistence.Transient;

import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.UUID; import java.util.UUID;


@Table(name = "wx_c_user")
@TableName(value = "wx_c_user")
@JsonIgnoreProperties(ignoreUnknown = true) @JsonIgnoreProperties(ignoreUnknown = true)
@Data @Data
@ToString(callSuper = true) @ToString(callSuper = true)
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
public class WxCUser extends BaseEntity { public class WxCUser extends BaseEntity {


@Id
protected Long id; protected Long id;
@Transient
protected List<Long> ids;


@io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")

@io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")
private String tenantId; private String tenantId;
@io.swagger.annotations.ApiModelProperty(value="微信openId",name="openId") @io.swagger.annotations.ApiModelProperty(value="微信openId",name="openId")
private String openId; private String openId;
@@ -121,28 +119,28 @@ public class WxCUser extends BaseEntity {
@io.swagger.annotations.ApiModelProperty(value="积分",name="credit") @io.swagger.annotations.ApiModelProperty(value="积分",name="credit")
private Integer credit; private Integer credit;


@Transient
@TableField(exist = false)
@io.swagger.annotations.ApiModelProperty(value="渠道名称",name="channelName") @io.swagger.annotations.ApiModelProperty(value="渠道名称",name="channelName")
private String channelName; private String channelName;


@Transient
@TableField(exist = false)
@io.swagger.annotations.ApiModelProperty(value="渠道描述",name="sceneDescription") @io.swagger.annotations.ApiModelProperty(value="渠道描述",name="sceneDescription")
protected String sceneDescription; protected String sceneDescription;


@Transient
@TableField(exist = false)
List<String> sceneList; List<String> sceneList;


@Transient
@TableField(exist = false)
protected Date startDate; protected Date startDate;


@Transient
@TableField(exist = false)
protected Date endDate; protected Date endDate;


@Transient
@TableField(exist = false)
@io.swagger.annotations.ApiModelProperty(value="操作人类型 枚举:EnumUserType",name="operatorType") @io.swagger.annotations.ApiModelProperty(value="操作人类型 枚举:EnumUserType",name="operatorType")
private Integer operatorType; private Integer operatorType;


@Transient
@TableField(exist = false)
@io.swagger.annotations.ApiModelProperty(value="操作人ID",name="operatorId") @io.swagger.annotations.ApiModelProperty(value="操作人ID",name="operatorId")
private Long operatorId; private Long operatorId;




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

@@ -2,35 +2,31 @@ package com.iformall.domain.po;


import cn.afterturn.easypoi.excel.annotation.Excel; import cn.afterturn.easypoi.excel.annotation.Excel;
import com.alibaba.fastjson.JSONObject; 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.fasterxml.jackson.annotation.JsonIgnore;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.ToString; import lombok.ToString;


import javax.persistence.Id;
import javax.persistence.Table;
import javax.persistence.Transient;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;


@Table(name = "wx_c_user_basic_info")
@TableName(value = "wx_c_user_basic_info")
@Data @Data
@ToString(callSuper = true) @ToString(callSuper = true)
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
public class WxCUserBasicInfo extends BaseEntity { public class WxCUserBasicInfo extends BaseEntity {


@Id
protected Long id; protected Long id;


@JsonIgnore @JsonIgnore
protected Date scoreDate; protected Date scoreDate;


@Transient
protected List<Long> ids;


@Excel(name="姓名",width = 20,orderNum = "1")
@Excel(name="姓名",width = 20,orderNum = "1")
@NotNull @NotNull
@io.swagger.annotations.ApiModelProperty(value="用户姓名",name="name") @io.swagger.annotations.ApiModelProperty(value="用户姓名",name="name")
private String name; private String name;
@@ -59,7 +55,7 @@ public class WxCUserBasicInfo extends BaseEntity {
private Date birthdate; private Date birthdate;


@Excel(name="地址",width = 20,orderNum = "7") @Excel(name="地址",width = 20,orderNum = "7")
@Transient
@TableField(exist = false)
private String addressStr; private String addressStr;


@io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate")
@@ -99,27 +95,27 @@ public class WxCUserBasicInfo extends BaseEntity {
@io.swagger.annotations.ApiModelProperty(value="活动记录",name="actRecord") @io.swagger.annotations.ApiModelProperty(value="活动记录",name="actRecord")
private Integer actRecord; private Integer actRecord;


@Transient
@TableField(exist = false)
@Excel(name="标签",width = 50,orderNum = "10") @Excel(name="标签",width = 50,orderNum = "10")
private String tagNames; private String tagNames;




@Transient
@TableField(exist = false)
private String tagIds; private String tagIds;


@Transient
@TableField(exist = false)
private List<WxTags> tagsList; private List<WxTags> tagsList;


@Transient
@TableField(exist = false)
private List<String> carList; private List<String> carList;


@Transient
@TableField(exist = false)
private Integer carCount; private Integer carCount;


@Transient
@TableField(exist = false)
private Date startTime; private Date startTime;


@Transient
@TableField(exist = false)
private Date endTime; private Date endTime;


public String getAddressStr() { public String getAddressStr() {


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

@@ -1,27 +1,20 @@
package com.iformall.domain.po; package com.iformall.domain.po;


import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;


import javax.persistence.*;
import java.util.*; import java.util.*;
import javax.persistence.Transient;
import java.util.List;
import javax.persistence.Id;


@Table(name = "wx_c_user_car")
@TableName(value = "wx_c_user_car")
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
public class WxCUserCar extends BaseEntity { public class WxCUserCar extends BaseEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Id
protected Long id; protected Long id;
@Transient
protected List<Long> ids;


@io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")
@io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")
private String tenantId; private String tenantId;
@io.swagger.annotations.ApiModelProperty(value="c端用户id",name="cUserId") @io.swagger.annotations.ApiModelProperty(value="c端用户id",name="cUserId")
private Long cUserId; private Long cUserId;


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

@@ -1,27 +1,20 @@
package com.iformall.domain.po; package com.iformall.domain.po;


import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;


import javax.persistence.Id;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.util.Date; import java.util.Date;
import java.util.List;


@Table(name = "wx_c_user_from_b")
@TableName(value = "wx_c_user_from_b")
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
public class WxCUserFromB extends BaseEntity { public class WxCUserFromB extends BaseEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Id

protected Long id; protected Long id;
@Transient
protected List<Long> ids;


@io.swagger.annotations.ApiModelProperty(value="",name="tenantId")
@io.swagger.annotations.ApiModelProperty(value="",name="tenantId")
private String tenantId; private String tenantId;
@io.swagger.annotations.ApiModelProperty(value="商户ID",name="merchantId") @io.swagger.annotations.ApiModelProperty(value="商户ID",name="merchantId")
private Long merchantId; private Long merchantId;


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

@@ -1,27 +1,22 @@
package com.iformall.domain.po; package com.iformall.domain.po;


import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;


import javax.persistence.*;
import java.util.*; import java.util.*;
import javax.persistence.Transient;
import java.util.List;
import javax.persistence.Id;


@Table(name = "wx_c_user_tags")
@TableName(value = "wx_c_user_tags")
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
public class WxCUserTags extends BaseEntity { public class WxCUserTags extends BaseEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Id
protected Long id; protected Long id;
@Transient
protected List<String> ids;


@io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")

@io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")
private String tenantId; private String tenantId;
@io.swagger.annotations.ApiModelProperty(value="c端用户id",name="userId") @io.swagger.annotations.ApiModelProperty(value="c端用户id",name="userId")
private Long userId; private Long userId;


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

@@ -1,29 +1,27 @@
package com.iformall.domain.po; package com.iformall.domain.po;


import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.iformall.domain.vo.WxCouponChannelVo; import com.iformall.domain.vo.WxCouponChannelVo;
import com.iformall.enums.EnumCampaignType; import com.iformall.enums.EnumCampaignType;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.ToString; import lombok.ToString;


import javax.persistence.Id;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;


@Table(name = "wx_campaign")
@TableName(value = "wx_campaign")
@Data @Data
@ToString(callSuper = true) @ToString(callSuper = true)
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
public class WxCampaign extends BaseEntity { public class WxCampaign extends BaseEntity {


@Id
protected Long id; protected Long id;


@Transient
@TableField(exist = false)
protected List<Long> ids; protected List<Long> ids;
@Transient
@TableField(exist = false)
protected List<WxCouponChannelVo> coupons; protected List<WxCouponChannelVo> coupons;


@io.swagger.annotations.ApiModelProperty(value="",name="tenantId") @io.swagger.annotations.ApiModelProperty(value="",name="tenantId")
@@ -76,11 +74,11 @@ public class WxCampaign extends BaseEntity {
@io.swagger.annotations.ApiModelProperty(value = "小程序跳转二维码,类型3适用", name = "pageScene") @io.swagger.annotations.ApiModelProperty(value = "小程序跳转二维码,类型3适用", name = "pageScene")
private String pageScene; private String pageScene;


@Transient
@TableField(exist = false)
@io.swagger.annotations.ApiModelProperty(value="营销物料-小程序路径",name="weappPath") @io.swagger.annotations.ApiModelProperty(value="营销物料-小程序路径",name="weappPath")
protected String weappPath; protected String weappPath;


@Transient
@TableField(exist = false)
@io.swagger.annotations.ApiModelProperty(value="营销物料-小程序二维码Scene",name="weappScene") @io.swagger.annotations.ApiModelProperty(value="营销物料-小程序二维码Scene",name="weappScene")
protected String weappScene; protected String weappScene;




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

@@ -1,26 +1,19 @@
package com.iformall.domain.po; package com.iformall.domain.po;


import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;


import javax.persistence.Id;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.util.Date; import java.util.Date;
import java.util.List;


@Table(name = "wx_car_cmd_log")
@TableName(value = "wx_car_cmd_log")
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
public class WxCarCmdLog extends BaseEntity { public class WxCarCmdLog extends BaseEntity {


@Id
protected Long id; protected Long id;
@Transient
protected List<Long> ids;


@io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")
@io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")
private String tenantId; private String tenantId;
@io.swagger.annotations.ApiModelProperty(value="停车厂家,1. ETCP,2.停简单",name="vendorType") @io.swagger.annotations.ApiModelProperty(value="停车厂家,1. ETCP,2.停简单",name="vendorType")
private Integer vendorType; private Integer vendorType;


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

@@ -1,21 +1,21 @@
package com.iformall.domain.po; package com.iformall.domain.po;


import cn.afterturn.easypoi.excel.annotation.Excel; import cn.afterturn.easypoi.excel.annotation.Excel;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.ToString; import lombok.ToString;


import javax.persistence.Id;
import javax.persistence.Table;
import javax.persistence.Transient;

import java.util.Date; import java.util.Date;


@Table(name = "wx_car_pay_record")
@TableName(value = "wx_car_pay_record")
@Data @Data
@ToString(callSuper = true) @ToString(callSuper = true)
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
public class WxCarPayRecord extends BaseEntity { public class WxCarPayRecord extends BaseEntity {
@Id
private Long id; private Long id;


@Excel(name="车牌",width = 20,orderNum = "1") @Excel(name="车牌",width = 20,orderNum = "1")
@@ -52,13 +52,13 @@ public class WxCarPayRecord extends BaseEntity {
private Date updateDate; private Date updateDate;




@Transient
@TableField(exist = false)
@io.swagger.annotations.ApiModelProperty(value="开始日期",name="startDate") @io.swagger.annotations.ApiModelProperty(value="开始日期",name="startDate")
private String startDate; private String startDate;
@Transient
@TableField(exist = false)
@io.swagger.annotations.ApiModelProperty(value="结束日期",name="endDate") @io.swagger.annotations.ApiModelProperty(value="结束日期",name="endDate")
private String endDate; private String endDate;
@Transient
@TableField(exist = false)
@io.swagger.annotations.ApiModelProperty(value="是否缴费",name="isPay") @io.swagger.annotations.ApiModelProperty(value="是否缴费",name="isPay")
private Integer isPay; private Integer isPay;




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

@@ -1,30 +1,27 @@
package com.iformall.domain.po; package com.iformall.domain.po;


import cn.afterturn.easypoi.excel.annotation.Excel; import cn.afterturn.easypoi.excel.annotation.Excel;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;


import javax.persistence.Id;
import javax.persistence.Table;
import javax.persistence.Transient;

import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
import java.util.List;


@Table(name = "wx_card_info")
@TableName(value = "wx_card_info")
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
public class WxCardInfo extends BaseEntity { public class WxCardInfo extends BaseEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;


@Excel(name = "卡号", width = 20, orderNum = "1") @Excel(name = "卡号", width = 20, orderNum = "1")
@Id
protected Long id; /**主键ID-与coupon_order_id一致*/ protected Long id; /**主键ID-与coupon_order_id一致*/
@Transient
protected List<Long> ids;


@io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")

@io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")
private String tenantId; private String tenantId;
@io.swagger.annotations.ApiModelProperty(value = "券ID", name = "couponId") @io.swagger.annotations.ApiModelProperty(value = "券ID", name = "couponId")
private Long couponId; private Long couponId;
@@ -40,7 +37,7 @@ public class WxCardInfo extends BaseEntity {
} }


@Excel(name = "余额(元)", width = 20, orderNum = "7") @Excel(name = "余额(元)", width = 20, orderNum = "7")
@Transient
@TableField(exist = false)
private String remainingAmountStr; private String remainingAmountStr;






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

@@ -1,30 +1,26 @@
package com.iformall.domain.po; package com.iformall.domain.po;


import cn.afterturn.easypoi.excel.annotation.Excel; import cn.afterturn.easypoi.excel.annotation.Excel;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.iformall.common.ErrorCode; import com.iformall.common.ErrorCode;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;


import javax.persistence.Id;
import javax.persistence.Table;
import javax.persistence.Transient;

import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;


@Table(name = "wx_card_spend")
@TableName(value = "wx_card_spend")
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
public class WxCardSpend extends BaseEntity { public class WxCardSpend extends BaseEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Id
protected Long id; protected Long id;
@Transient
protected List<Long> ids;


@io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")
@io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")
private String tenantId; private String tenantId;
@io.swagger.annotations.ApiModelProperty(value="储值卡ID",name="cardId") @io.swagger.annotations.ApiModelProperty(value="储值卡ID",name="cardId")
private Long cardId; private Long cardId;
@@ -69,47 +65,47 @@ public class WxCardSpend extends BaseEntity {
@io.swagger.annotations.ApiModelProperty(value="来源(0:C端小程序扫一扫, 1:POS支付)",name="payFrom") @io.swagger.annotations.ApiModelProperty(value="来源(0:C端小程序扫一扫, 1:POS支付)",name="payFrom")
private Integer payFrom; private Integer payFrom;


@Transient
@TableField(exist = false)
@Excel(name = "消费金额(元)", width = 20, orderNum = "7") @Excel(name = "消费金额(元)", width = 20, orderNum = "7")
private String deductionAmountStr; private String deductionAmountStr;


@Transient
@TableField(exist = false)
@Excel(name = "应付金额(元)", width = 20, orderNum = "9") @Excel(name = "应付金额(元)", width = 20, orderNum = "9")
private String paymentStr; private String paymentStr;


@Transient
@TableField(exist = false)
@Excel(name = "实付金额(扣除手续费/元)", width = 20, orderNum = "8") @Excel(name = "实付金额(扣除手续费/元)", width = 20, orderNum = "8")
private String realPaymentStr; private String realPaymentStr;




@Transient
@TableField(exist = false)
protected List<Integer> payStatusS; protected List<Integer> payStatusS;
@Transient
@TableField(exist = false)
protected String payStatusStr; protected String payStatusStr;


@Transient
@TableField(exist = false)
@io.swagger.annotations.ApiModelProperty(value="开始时间",name="startdate") @io.swagger.annotations.ApiModelProperty(value="开始时间",name="startdate")
private Date startdate; private Date startdate;


@Transient
@TableField(exist = false)
@io.swagger.annotations.ApiModelProperty(value="结束时间",name="enddate") @io.swagger.annotations.ApiModelProperty(value="结束时间",name="enddate")
private Date enddate; private Date enddate;


@Transient
@TableField(exist = false)
@io.swagger.annotations.ApiModelProperty(value="时段(0,工作日白天,1,工作日晚上,2周末白天,3周末晚上)",name="timeSlot") @io.swagger.annotations.ApiModelProperty(value="时段(0,工作日白天,1,工作日晚上,2周末白天,3周末晚上)",name="timeSlot")
private Integer timeSlot; private Integer timeSlot;


@Transient
@TableField(exist = false)
private Integer businessId; private Integer businessId;


@Transient
@TableField(exist = false)
private Integer subBusinessId; private Integer subBusinessId;


public String getCardRemainAmountStr() { public String getCardRemainAmountStr() {
return new BigDecimal(cardRemainAmount == null ? 0 : cardRemainAmount).divide(new BigDecimal(100)).toPlainString(); return new BigDecimal(cardRemainAmount == null ? 0 : cardRemainAmount).divide(new BigDecimal(100)).toPlainString();
} }


@Transient
@TableField(exist = false)
@Excel(name = "卡余额(元) ", width = 20, orderNum = "10") @Excel(name = "卡余额(元) ", width = 20, orderNum = "10")
private String cardRemainAmountStr; private String cardRemainAmountStr;




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

@@ -1,43 +1,18 @@
package com.iformall.domain.po; package com.iformall.domain.po;


import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;


import javax.persistence.Id;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.util.Date; import java.util.Date;
import java.util.List;


@Table(name = "wx_card_transfer_info")
@TableName(value = "wx_card_transfer_info")
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
public class WxCardTransferInfo extends BaseEntity { public class WxCardTransferInfo extends BaseEntity {


@Id
protected Long id; protected Long id;


@Transient
protected List<Long> ids;

public Long getId() {
return id;
}

public void setId(Long id) {
this.id = id;
}


public List<Long> getIds() {
return ids;
}

public void setIds(List<Long> ids) {
this.ids = ids;
}


//保存到转赠表中 id,coupon_order_id,tenant_id,title,amount,remain_amount,from_user,to_user,status,create_date,update_date //保存到转赠表中 id,coupon_order_id,tenant_id,title,amount,remain_amount,from_user,to_user,status,create_date,update_date


@io.swagger.annotations.ApiModelProperty(value = "卡与订单关联ID", name = "couponOrderId") @io.swagger.annotations.ApiModelProperty(value = "卡与订单关联ID", name = "couponOrderId")


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

@@ -1,24 +1,17 @@
package com.iformall.domain.po; package com.iformall.domain.po;


import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;


import javax.persistence.Id;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.util.List;


@Table(name = "wx_channel")
@TableName(value = "wx_channel")
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
public class WxChannel extends BaseEntity { public class WxChannel extends BaseEntity {


@Id
protected Long id; protected Long id;


@Transient
protected List<String> ids;

@io.swagger.annotations.ApiModelProperty(value = "渠道ID", name = "channelId") @io.swagger.annotations.ApiModelProperty(value = "渠道ID", name = "channelId")
private Integer channelId; private Integer channelId;
@io.swagger.annotations.ApiModelProperty(value = "渠道名", name = "title") @io.swagger.annotations.ApiModelProperty(value = "渠道名", name = "title")


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

@@ -1,20 +1,18 @@
package com.iformall.domain.po; package com.iformall.domain.po;


import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;


import javax.persistence.Id;
import javax.persistence.Table;
import java.util.Date; import java.util.Date;


@Table(name = "wx_chart_data")
@TableName(value = "wx_chart_data")
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
public class WxChartDataEntity extends BaseEntity { public class WxChartDataEntity extends BaseEntity {


private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;


@Id
protected Long id; protected Long id;
private String tenantId; private String tenantId;
private Integer type; private Integer type;


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

@@ -1,27 +1,20 @@
package com.iformall.domain.po; package com.iformall.domain.po;


import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;


import javax.persistence.*;
import java.util.*; import java.util.*;
import javax.persistence.Transient;
import java.util.List;
import javax.persistence.Id;


@Table(name = "wx_component_verify_ticket")
@TableName(value = "wx_component_verify_ticket")
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
public class WxComponentVerifyTicket extends BaseEntity { public class WxComponentVerifyTicket extends BaseEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Id

protected Long id; protected Long id;
@Transient
protected List<Long> ids;


@io.swagger.annotations.ApiModelProperty(value="微信第三方componentAppid",name="componentAppid")
@io.swagger.annotations.ApiModelProperty(value="微信第三方componentAppid",name="componentAppid")
private String componentAppid; private String componentAppid;
@io.swagger.annotations.ApiModelProperty(value="微信第三方component_verify_ticket",name="componentVerifyTicket") @io.swagger.annotations.ApiModelProperty(value="微信第三方component_verify_ticket",name="componentVerifyTicket")
private String componentVerifyTicket; private String componentVerifyTicket;


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

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