ソースを参照

删除没有用的引入包

2297027248@qq.com 3 年 前
コミット
7e4ed4245c
100 ファイル変更1672 行追加0 行削除
  1. BIN
      yijia-admin/target/classes/com/yijia/web/controller/system/ApiRequestBean.class
  2. BIN
      yijia-admin/target/classes/com/yijia/web/controller/system/ApiResponseBean.class
  3. BIN
      yijia-admin/target/classes/com/yijia/web/controller/system/HttpUtils$1.class
  4. BIN
      yijia-admin/target/classes/com/yijia/web/controller/system/HttpUtils.class
  5. BIN
      yijia-admin/target/classes/com/yijia/web/controller/system/RSAEncrypt.class
  6. BIN
      yijia-admin/target/classes/com/yijia/web/controller/system/RSASignature.class
  7. BIN
      yijia-admin/target/classes/com/yijia/web/controller/system/SXFPaySign.class
  8. BIN
      yijia-admin/target/classes/com/yijia/web/controller/system/SignUtil.class
  9. BIN
      yijia-admin/target/classes/com/yijia/web/controller/system/SysAgentController.class
  10. BIN
      yijia-admin/target/classes/com/yijia/web/controller/system/SysStationPay.class
  11. 5 0
      yijia-admin/target/maven-archiver/pom.properties
  12. 33 0
      yijia-admin/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
  13. 31 0
      yijia-admin/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
  14. BIN
      yijia-admin/target/yijia-admin.jar
  15. BIN
      yijia-admin/target/yijia-admin.jar.original
  16. 5 0
      yijia-common/target/maven-archiver/pom.properties
  17. 98 0
      yijia-common/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
  18. 84 0
      yijia-common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
  19. BIN
      yijia-common/target/yijia-common-1.0.1.jar
  20. BIN
      yijia-coupon/target/classes/com/yijia/coupon/controller/CouponIssueController.class
  21. BIN
      yijia-coupon/target/classes/com/yijia/coupon/controller/CouponIssueRelationController.class
  22. BIN
      yijia-coupon/target/classes/com/yijia/coupon/controller/CouponUserController.class
  23. BIN
      yijia-coupon/target/classes/com/yijia/coupon/domain/AppUserInfo.class
  24. BIN
      yijia-coupon/target/classes/com/yijia/coupon/domain/CouponIssue.class
  25. BIN
      yijia-coupon/target/classes/com/yijia/coupon/domain/CouponIssueRelation.class
  26. BIN
      yijia-coupon/target/classes/com/yijia/coupon/domain/CouponUser.class
  27. BIN
      yijia-coupon/target/classes/com/yijia/coupon/mapper/CouponIssueMapper.class
  28. BIN
      yijia-coupon/target/classes/com/yijia/coupon/mapper/CouponIssueRelationMapper.class
  29. BIN
      yijia-coupon/target/classes/com/yijia/coupon/mapper/CouponUserMapper.class
  30. BIN
      yijia-coupon/target/classes/com/yijia/coupon/service/ICouponIssueRelationService.class
  31. BIN
      yijia-coupon/target/classes/com/yijia/coupon/service/ICouponIssueService.class
  32. BIN
      yijia-coupon/target/classes/com/yijia/coupon/service/ICouponUserService.class
  33. BIN
      yijia-coupon/target/classes/com/yijia/coupon/service/impl/CouponIssueRelationServiceImpl.class
  34. BIN
      yijia-coupon/target/classes/com/yijia/coupon/service/impl/CouponIssueServiceImpl.class
  35. BIN
      yijia-coupon/target/classes/com/yijia/coupon/service/impl/CouponUserServiceImpl.class
  36. 137 0
      yijia-coupon/target/classes/mapper/coupon/CouponIssueMapper.xml
  37. 87 0
      yijia-coupon/target/classes/mapper/coupon/CouponIssueRelationMapper.xml
  38. 124 0
      yijia-coupon/target/classes/mapper/coupon/CouponUserMapper.xml
  39. BIN
      yijia-customer/target/classes/com/yijia/customer/controller/CardExcelImportController.class
  40. BIN
      yijia-customer/target/classes/com/yijia/customer/domain/CardExcelImport.class
  41. BIN
      yijia-customer/target/classes/com/yijia/customer/mapper/CardExcelImportMapper.class
  42. BIN
      yijia-customer/target/classes/com/yijia/customer/service/ICardExcelImportService.class
  43. BIN
      yijia-customer/target/classes/com/yijia/customer/service/impl/CardExcelImportServiceImpl.class
  44. 113 0
      yijia-customer/target/classes/mapper/customer/CardExcelImportMapper.xml
  45. 5 0
      yijia-customer/target/maven-archiver/pom.properties
  46. 45 0
      yijia-customer/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
  47. 45 0
      yijia-customer/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
  48. BIN
      yijia-customer/target/yijia-customer-1.0.1.jar
  49. 5 0
      yijia-framework/target/maven-archiver/pom.properties
  50. 42 0
      yijia-framework/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
  51. 38 0
      yijia-framework/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
  52. BIN
      yijia-framework/target/yijia-framework-1.0.1.jar
  53. 5 0
      yijia-generator/target/maven-archiver/pom.properties
  54. 13 0
      yijia-generator/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
  55. 13 0
      yijia-generator/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
  56. BIN
      yijia-generator/target/yijia-generator-1.0.1.jar
  57. 5 0
      yijia-integral/target/maven-archiver/pom.properties
  58. 34 0
      yijia-integral/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
  59. 34 0
      yijia-integral/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
  60. BIN
      yijia-integral/target/yijia-integral-1.0.1.jar
  61. BIN
      yijia-label/target/classes/com/yijia/label/controller/CustomerLabelController.class
  62. BIN
      yijia-label/target/classes/com/yijia/label/controller/LabelRuleController.class
  63. BIN
      yijia-label/target/classes/com/yijia/label/controller/LabelRuleDetailController.class
  64. BIN
      yijia-label/target/classes/com/yijia/label/domain/CustomerLabel.class
  65. BIN
      yijia-label/target/classes/com/yijia/label/domain/CustomerLabelDemo.class
  66. BIN
      yijia-label/target/classes/com/yijia/label/domain/LabelRule.class
  67. BIN
      yijia-label/target/classes/com/yijia/label/domain/LabelRuleDetail.class
  68. BIN
      yijia-label/target/classes/com/yijia/label/domain/RequsetSysDept.class
  69. BIN
      yijia-label/target/classes/com/yijia/label/domain/RequstCustomerLabel.class
  70. BIN
      yijia-label/target/classes/com/yijia/label/domain/ResponeCustomerLabel.class
  71. BIN
      yijia-label/target/classes/com/yijia/label/mapper/CustomerLabelDemoMapper.class
  72. BIN
      yijia-label/target/classes/com/yijia/label/mapper/CustomerLabelMapper.class
  73. BIN
      yijia-label/target/classes/com/yijia/label/mapper/LabelRuleDetailMapper.class
  74. BIN
      yijia-label/target/classes/com/yijia/label/mapper/LabelRuleMapper.class
  75. BIN
      yijia-label/target/classes/com/yijia/label/service/ICustomerLabelDemoService.class
  76. BIN
      yijia-label/target/classes/com/yijia/label/service/ICustomerLabelService.class
  77. BIN
      yijia-label/target/classes/com/yijia/label/service/ILabelRuleDetailService.class
  78. BIN
      yijia-label/target/classes/com/yijia/label/service/ILabelRuleService.class
  79. BIN
      yijia-label/target/classes/com/yijia/label/service/impl/CustomerLabelDemoServiceImpl.class
  80. BIN
      yijia-label/target/classes/com/yijia/label/service/impl/CustomerLabelServiceImpl.class
  81. BIN
      yijia-label/target/classes/com/yijia/label/service/impl/LabelRuleDetailServiceImpl.class
  82. BIN
      yijia-label/target/classes/com/yijia/label/service/impl/LabelRuleServiceImpl.class
  83. 289 0
      yijia-label/target/classes/mapper/label/CustomerLabelDemoMapper.xml
  84. 133 0
      yijia-label/target/classes/mapper/label/CustomerLabelMapper.xml
  85. 111 0
      yijia-label/target/classes/mapper/label/LabelRuleDetailMapper.xml
  86. 89 0
      yijia-label/target/classes/mapper/label/LabelRuleMapper.xml
  87. 5 0
      yijia-label/target/maven-archiver/pom.properties
  88. 22 0
      yijia-label/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
  89. 22 0
      yijia-label/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
  90. BIN
      yijia-label/target/yijia-label-1.0.1.jar
  91. BIN
      yijia-market/target/classes/com/yijia/markert/controller/MarkertPlanController.class
  92. BIN
      yijia-market/target/classes/com/yijia/markert/controller/MarketCouponController.class
  93. BIN
      yijia-market/target/classes/com/yijia/markert/domain/MarkertPlan.class
  94. BIN
      yijia-market/target/classes/com/yijia/markert/domain/MarketCoupon.class
  95. BIN
      yijia-market/target/classes/com/yijia/markert/mapper/MarkertPlanMapper.class
  96. BIN
      yijia-market/target/classes/com/yijia/markert/mapper/MarketCouponMapper.class
  97. BIN
      yijia-market/target/classes/com/yijia/markert/service/IMarkertPlanService.class
  98. BIN
      yijia-market/target/classes/com/yijia/markert/service/IMarketCouponService.class
  99. BIN
      yijia-market/target/classes/com/yijia/markert/service/impl/MarkertPlanServiceImpl.class
  100. BIN
      yijia-market/target/classes/com/yijia/markert/service/impl/MarketCouponServiceImpl.class

BIN
yijia-admin/target/classes/com/yijia/web/controller/system/ApiRequestBean.class


BIN
yijia-admin/target/classes/com/yijia/web/controller/system/ApiResponseBean.class


BIN
yijia-admin/target/classes/com/yijia/web/controller/system/HttpUtils$1.class


BIN
yijia-admin/target/classes/com/yijia/web/controller/system/HttpUtils.class


BIN
yijia-admin/target/classes/com/yijia/web/controller/system/RSAEncrypt.class


BIN
yijia-admin/target/classes/com/yijia/web/controller/system/RSASignature.class


BIN
yijia-admin/target/classes/com/yijia/web/controller/system/SXFPaySign.class


BIN
yijia-admin/target/classes/com/yijia/web/controller/system/SignUtil.class


BIN
yijia-admin/target/classes/com/yijia/web/controller/system/SysAgentController.class


BIN
yijia-admin/target/classes/com/yijia/web/controller/system/SysStationPay.class


+ 5 - 0
yijia-admin/target/maven-archiver/pom.properties

@@ -0,0 +1,5 @@
+#Generated by Maven
+#Fri Sep 24 09:53:33 CST 2021
+version=1.0.1
+groupId=com.yijia
+artifactId=yijia-admin

+ 33 - 0
yijia-admin/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -0,0 +1,33 @@
+com\yijia\YiJiaServletInitializer.class
+com\yijia\YiJiaApplication.class
+com\yijia\web\controller\system\RSASignature.class
+com\yijia\web\controller\system\SysUserController.class
+com\yijia\web\controller\system\SysStationPay.class
+com\yijia\web\controller\tool\TestController.class
+com\yijia\web\controller\system\SXFPaySign.class
+com\yijia\web\controller\system\SysLoginController.class
+com\yijia\web\controller\common\CommonController.class
+com\yijia\web\controller\tool\UserEntity.class
+com\yijia\web\controller\system\HttpUtils.class
+com\yijia\web\controller\system\HttpUtils$1.class
+com\yijia\web\controller\monitor\SysLogininforController.class
+com\yijia\web\controller\system\SysAgentController.class
+com\yijia\web\core\config\SwaggerConfig.class
+com\yijia\web\controller\system\SysMenuController.class
+com\yijia\web\controller\monitor\ServerController.class
+com\yijia\web\controller\system\SysConfigController.class
+com\yijia\web\controller\system\SysDictTypeController.class
+com\yijia\web\controller\common\CaptchaController.class
+com\yijia\web\controller\monitor\SysUserOnlineController.class
+com\yijia\web\controller\system\SysNoticeController.class
+com\yijia\web\controller\system\SysPostController.class
+com\yijia\web\controller\system\RSAEncrypt.class
+com\yijia\web\controller\system\SysDictDataController.class
+com\yijia\web\controller\monitor\SysOperlogController.class
+com\yijia\web\controller\system\SignUtil.class
+com\yijia\web\controller\system\ApiResponseBean.class
+com\yijia\web\controller\system\SysDeptController.class
+com\yijia\web\controller\system\ApiRequestBean.class
+com\yijia\web\controller\tool\SwaggerController.class
+com\yijia\web\controller\system\SysRoleController.class
+com\yijia\web\controller\system\SysProfileController.class

+ 31 - 0
yijia-admin/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -0,0 +1,31 @@
+D:\java项目\SAAS-AFTEREND2\yijia-admin\src\main\java\com\yijia\web\controller\system\HttpUtils.java
+D:\java项目\SAAS-AFTEREND2\yijia-admin\src\main\java\com\yijia\YiJiaServletInitializer.java
+D:\java项目\SAAS-AFTEREND2\yijia-admin\src\main\java\com\yijia\web\controller\monitor\SysOperlogController.java
+D:\java项目\SAAS-AFTEREND2\yijia-admin\src\main\java\com\yijia\web\controller\system\SysAgentController.java
+D:\java项目\SAAS-AFTEREND2\yijia-admin\src\main\java\com\yijia\YiJiaApplication.java
+D:\java项目\SAAS-AFTEREND2\yijia-admin\src\main\java\com\yijia\web\controller\system\RSAEncrypt.java
+D:\java项目\SAAS-AFTEREND2\yijia-admin\src\main\java\com\yijia\web\controller\system\SysMenuController.java
+D:\java项目\SAAS-AFTEREND2\yijia-admin\src\main\java\com\yijia\web\controller\common\CaptchaController.java
+D:\java项目\SAAS-AFTEREND2\yijia-admin\src\main\java\com\yijia\web\controller\system\SysNoticeController.java
+D:\java项目\SAAS-AFTEREND2\yijia-admin\src\main\java\com\yijia\web\controller\monitor\SysLogininforController.java
+D:\java项目\SAAS-AFTEREND2\yijia-admin\src\main\java\com\yijia\web\controller\system\SysDictDataController.java
+D:\java项目\SAAS-AFTEREND2\yijia-admin\src\main\java\com\yijia\web\controller\tool\TestController.java
+D:\java项目\SAAS-AFTEREND2\yijia-admin\src\main\java\com\yijia\web\controller\common\CommonController.java
+D:\java项目\SAAS-AFTEREND2\yijia-admin\src\main\java\com\yijia\web\controller\system\SysConfigController.java
+D:\java项目\SAAS-AFTEREND2\yijia-admin\src\main\java\com\yijia\web\controller\system\SXFPaySign.java
+D:\java项目\SAAS-AFTEREND2\yijia-admin\src\main\java\com\yijia\web\controller\system\SysUserController.java
+D:\java项目\SAAS-AFTEREND2\yijia-admin\src\main\java\com\yijia\web\controller\system\SysPostController.java
+D:\java项目\SAAS-AFTEREND2\yijia-admin\src\main\java\com\yijia\web\controller\system\RSASignature.java
+D:\java项目\SAAS-AFTEREND2\yijia-admin\src\main\java\com\yijia\web\controller\system\SysProfileController.java
+D:\java项目\SAAS-AFTEREND2\yijia-admin\src\main\java\com\yijia\web\controller\monitor\SysUserOnlineController.java
+D:\java项目\SAAS-AFTEREND2\yijia-admin\src\main\java\com\yijia\web\controller\system\SysRoleController.java
+D:\java项目\SAAS-AFTEREND2\yijia-admin\src\main\java\com\yijia\web\controller\monitor\ServerController.java
+D:\java项目\SAAS-AFTEREND2\yijia-admin\src\main\java\com\yijia\web\controller\system\SysDictTypeController.java
+D:\java项目\SAAS-AFTEREND2\yijia-admin\src\main\java\com\yijia\web\controller\system\ApiRequestBean.java
+D:\java项目\SAAS-AFTEREND2\yijia-admin\src\main\java\com\yijia\web\controller\system\SysLoginController.java
+D:\java项目\SAAS-AFTEREND2\yijia-admin\src\main\java\com\yijia\web\controller\tool\SwaggerController.java
+D:\java项目\SAAS-AFTEREND2\yijia-admin\src\main\java\com\yijia\web\controller\system\ApiResponseBean.java
+D:\java项目\SAAS-AFTEREND2\yijia-admin\src\main\java\com\yijia\web\controller\system\SignUtil.java
+D:\java项目\SAAS-AFTEREND2\yijia-admin\src\main\java\com\yijia\web\controller\system\SysDeptController.java
+D:\java项目\SAAS-AFTEREND2\yijia-admin\src\main\java\com\yijia\web\controller\system\SysStationPay.java
+D:\java项目\SAAS-AFTEREND2\yijia-admin\src\main\java\com\yijia\web\core\config\SwaggerConfig.java

BIN
yijia-admin/target/yijia-admin.jar


BIN
yijia-admin/target/yijia-admin.jar.original


+ 5 - 0
yijia-common/target/maven-archiver/pom.properties

@@ -0,0 +1,5 @@
+#Generated by Maven
+#Fri Sep 24 09:53:18 CST 2021
+version=1.0.1
+groupId=com.yijia
+artifactId=yijia-common

+ 98 - 0
yijia-common/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -0,0 +1,98 @@
+com\yijia\common\utils\html\EscapeUtil.class
+com\yijia\common\config\YiJiaConfig.class
+com\yijia\common\exception\BaseException.class
+com\yijia\common\exception\user\UserPasswordNotMatchException.class
+com\yijia\common\utils\DateUtils.class
+com\yijia\common\exception\DemoModeException.class
+com\yijia\common\core\domain\entity\SysRole.class
+com\yijia\common\annotation\DataSource.class
+com\yijia\common\utils\spring\SpringUtils.class
+com\yijia\common\utils\ServletUtils.class
+com\yijia\common\exception\job\TaskException.class
+com\yijia\common\annotation\DataScope.class
+com\yijia\common\utils\ip\IpUtils.class
+com\yijia\common\enums\BusinessStatus.class
+com\yijia\common\core\domain\model\LoginUser.class
+com\yijia\common\enums\OperatorType.class
+com\yijia\common\utils\file\FileUtils.class
+com\yijia\common\core\controller\BaseController.class
+com\yijia\common\exception\job\TaskException$Code.class
+com\yijia\common\utils\http\HttpUtils.class
+com\yijia\common\core\page\TableDataInfo.class
+com\yijia\common\core\domain\AjaxResult.class
+com\yijia\common\utils\file\MimeTypeUtils.class
+com\yijia\common\filter\RepeatedlyRequestWrapper.class
+com\yijia\common\core\page\PageDomain.class
+com\yijia\common\constant\HttpStatus.class
+com\yijia\common\enums\HttpMethod.class
+com\yijia\common\core\domain\BaseEntity.class
+com\yijia\common\constant\UserConstants.class
+com\yijia\common\utils\ExceptionUtil.class
+com\yijia\common\exception\file\InvalidExtensionException$InvalidFlashExtensionException.class
+com\yijia\common\core\domain\TreeEntity.class
+com\yijia\common\utils\StringUtils.class
+com\yijia\common\annotation\Excels.class
+com\yijia\common\core\controller\BaseController$1.class
+com\yijia\common\core\domain\entity\SysDictData.class
+com\yijia\common\annotation\RepeatSubmit.class
+com\yijia\common\enums\BusinessType.class
+com\yijia\common\core\redis\RedisCache.class
+com\yijia\common\filter\XssHttpServletRequestWrapper.class
+com\yijia\common\exception\UtilException.class
+com\yijia\common\utils\poi\ExcelUtil.class
+com\yijia\common\annotation\Log.class
+com\yijia\common\utils\bean\BeanUtils.class
+com\yijia\common\utils\MessageUtils.class
+com\yijia\common\utils\file\FileUploadUtils.class
+com\yijia\common\utils\sign\Base64.class
+com\yijia\common\utils\uuid\UUID.class
+com\yijia\common\utils\sql\SqlUtil.class
+com\yijia\common\utils\Threads.class
+com\yijia\common\exception\user\CaptchaException.class
+com\yijia\common\filter\RepeatedlyRequestWrapper$1.class
+com\yijia\common\annotation\Excel$Type.class
+com\yijia\common\core\text\Convert.class
+com\yijia\common\utils\html\HTMLFilter.class
+com\yijia\common\utils\http\HttpUtils$1.class
+com\yijia\common\annotation\Excel.class
+com\yijia\common\utils\uuid\UUID$Holder.class
+com\yijia\common\annotation\Excel$ColumnType.class
+com\yijia\common\enums\DataSourceType.class
+com\yijia\common\constant\ScheduleConstants$Status.class
+com\yijia\common\core\domain\model\LoginBody.class
+com\yijia\common\core\page\TableSupport.class
+com\yijia\common\exception\file\FileSizeLimitExceededException.class
+com\yijia\common\utils\uuid\IdUtils.class
+com\yijia\common\exception\file\FileException.class
+com\yijia\common\core\text\StrFormatter.class
+com\yijia\common\utils\http\HttpUtils$TrustAnyTrustManager.class
+com\yijia\common\utils\DictUtils.class
+com\yijia\common\utils\LogUtils.class
+com\yijia\common\exception\file\InvalidExtensionException.class
+com\yijia\common\core\domain\entity\SysDept.class
+com\yijia\common\core\domain\TreeSelect.class
+com\yijia\common\constant\GenConstants.class
+com\yijia\common\utils\ip\AddressUtils.class
+com\yijia\common\exception\CustomException.class
+com\yijia\common\filter\RepeatableFilter.class
+com\yijia\common\core\text\CharsetKit.class
+com\yijia\common\utils\Arith.class
+com\yijia\common\utils\sign\Md5Utils.class
+com\yijia\common\core\domain\entity\SysMenu.class
+com\yijia\common\utils\SecurityUtils.class
+com\yijia\common\constant\Constants.class
+com\yijia\common\exception\file\InvalidExtensionException$InvalidImageExtensionException.class
+com\yijia\common\utils\http\HttpUtils$TrustAnyHostnameVerifier.class
+com\yijia\common\utils\reflect\ReflectUtils.class
+com\yijia\common\exception\user\CaptchaExpireException.class
+com\yijia\common\filter\XssFilter.class
+com\yijia\common\utils\http\HttpHelper.class
+com\yijia\common\constant\ScheduleConstants.class
+com\yijia\common\enums\UserStatus.class
+com\yijia\common\core\domain\entity\SysDictType.class
+com\yijia\common\core\domain\entity\SysUser.class
+com\yijia\common\utils\VerifyCodeUtils.class
+com\yijia\common\exception\file\FileNameLengthLimitExceededException.class
+com\yijia\common\filter\XssHttpServletRequestWrapper$1.class
+com\yijia\common\exception\user\UserException.class
+com\yijia\common\exception\file\InvalidExtensionException$InvalidMediaExtensionException.class

+ 84 - 0
yijia-common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -0,0 +1,84 @@
+D:\java项目\SAAS-AFTEREND2\yijia-common\src\main\java\com\yijia\common\core\domain\entity\SysRole.java
+D:\java项目\SAAS-AFTEREND2\yijia-common\src\main\java\com\yijia\common\exception\file\FileException.java
+D:\java项目\SAAS-AFTEREND2\yijia-common\src\main\java\com\yijia\common\exception\user\UserPasswordNotMatchException.java
+D:\java项目\SAAS-AFTEREND2\yijia-common\src\main\java\com\yijia\common\core\domain\TreeSelect.java
+D:\java项目\SAAS-AFTEREND2\yijia-common\src\main\java\com\yijia\common\filter\RepeatableFilter.java
+D:\java项目\SAAS-AFTEREND2\yijia-common\src\main\java\com\yijia\common\utils\file\FileUtils.java
+D:\java项目\SAAS-AFTEREND2\yijia-common\src\main\java\com\yijia\common\enums\HttpMethod.java
+D:\java项目\SAAS-AFTEREND2\yijia-common\src\main\java\com\yijia\common\annotation\Excel.java
+D:\java项目\SAAS-AFTEREND2\yijia-common\src\main\java\com\yijia\common\utils\file\FileUploadUtils.java
+D:\java项目\SAAS-AFTEREND2\yijia-common\src\main\java\com\yijia\common\utils\poi\ExcelUtil.java
+D:\java项目\SAAS-AFTEREND2\yijia-common\src\main\java\com\yijia\common\core\text\Convert.java
+D:\java项目\SAAS-AFTEREND2\yijia-common\src\main\java\com\yijia\common\annotation\DataScope.java
+D:\java项目\SAAS-AFTEREND2\yijia-common\src\main\java\com\yijia\common\annotation\Log.java
+D:\java项目\SAAS-AFTEREND2\yijia-common\src\main\java\com\yijia\common\exception\file\InvalidExtensionException.java
+D:\java项目\SAAS-AFTEREND2\yijia-common\src\main\java\com\yijia\common\exception\job\TaskException.java
+D:\java项目\SAAS-AFTEREND2\yijia-common\src\main\java\com\yijia\common\filter\RepeatedlyRequestWrapper.java
+D:\java项目\SAAS-AFTEREND2\yijia-common\src\main\java\com\yijia\common\utils\LogUtils.java
+D:\java项目\SAAS-AFTEREND2\yijia-common\src\main\java\com\yijia\common\core\domain\entity\SysUser.java
+D:\java项目\SAAS-AFTEREND2\yijia-common\src\main\java\com\yijia\common\utils\html\HTMLFilter.java
+D:\java项目\SAAS-AFTEREND2\yijia-common\src\main\java\com\yijia\common\utils\StringUtils.java
+D:\java项目\SAAS-AFTEREND2\yijia-common\src\main\java\com\yijia\common\enums\BusinessType.java
+D:\java项目\SAAS-AFTEREND2\yijia-common\src\main\java\com\yijia\common\utils\html\EscapeUtil.java
+D:\java项目\SAAS-AFTEREND2\yijia-common\src\main\java\com\yijia\common\core\page\PageDomain.java
+D:\java项目\SAAS-AFTEREND2\yijia-common\src\main\java\com\yijia\common\utils\reflect\ReflectUtils.java
+D:\java项目\SAAS-AFTEREND2\yijia-common\src\main\java\com\yijia\common\utils\sql\SqlUtil.java
+D:\java项目\SAAS-AFTEREND2\yijia-common\src\main\java\com\yijia\common\annotation\Excels.java
+D:\java项目\SAAS-AFTEREND2\yijia-common\src\main\java\com\yijia\common\core\text\CharsetKit.java
+D:\java项目\SAAS-AFTEREND2\yijia-common\src\main\java\com\yijia\common\core\domain\entity\SysDictType.java
+D:\java项目\SAAS-AFTEREND2\yijia-common\src\main\java\com\yijia\common\annotation\RepeatSubmit.java
+D:\java项目\SAAS-AFTEREND2\yijia-common\src\main\java\com\yijia\common\core\domain\BaseEntity.java
+D:\java项目\SAAS-AFTEREND2\yijia-common\src\main\java\com\yijia\common\config\YiJiaConfig.java
+D:\java项目\SAAS-AFTEREND2\yijia-common\src\main\java\com\yijia\common\utils\ExceptionUtil.java
+D:\java项目\SAAS-AFTEREND2\yijia-common\src\main\java\com\yijia\common\enums\UserStatus.java
+D:\java项目\SAAS-AFTEREND2\yijia-common\src\main\java\com\yijia\common\constant\ScheduleConstants.java
+D:\java项目\SAAS-AFTEREND2\yijia-common\src\main\java\com\yijia\common\enums\DataSourceType.java
+D:\java项目\SAAS-AFTEREND2\yijia-common\src\main\java\com\yijia\common\utils\DictUtils.java
+D:\java项目\SAAS-AFTEREND2\yijia-common\src\main\java\com\yijia\common\exception\BaseException.java
+D:\java项目\SAAS-AFTEREND2\yijia-common\src\main\java\com\yijia\common\utils\spring\SpringUtils.java
+D:\java项目\SAAS-AFTEREND2\yijia-common\src\main\java\com\yijia\common\core\domain\entity\SysDictData.java
+D:\java项目\SAAS-AFTEREND2\yijia-common\src\main\java\com\yijia\common\exception\user\CaptchaException.java
+D:\java项目\SAAS-AFTEREND2\yijia-common\src\main\java\com\yijia\common\utils\file\MimeTypeUtils.java
+D:\java项目\SAAS-AFTEREND2\yijia-common\src\main\java\com\yijia\common\core\domain\TreeEntity.java
+D:\java项目\SAAS-AFTEREND2\yijia-common\src\main\java\com\yijia\common\exception\file\FileNameLengthLimitExceededException.java
+D:\java项目\SAAS-AFTEREND2\yijia-common\src\main\java\com\yijia\common\constant\Constants.java
+D:\java项目\SAAS-AFTEREND2\yijia-common\src\main\java\com\yijia\common\core\domain\entity\SysMenu.java
+D:\java项目\SAAS-AFTEREND2\yijia-common\src\main\java\com\yijia\common\utils\ip\IpUtils.java
+D:\java项目\SAAS-AFTEREND2\yijia-common\src\main\java\com\yijia\common\utils\sign\Base64.java
+D:\java项目\SAAS-AFTEREND2\yijia-common\src\main\java\com\yijia\common\filter\XssHttpServletRequestWrapper.java
+D:\java项目\SAAS-AFTEREND2\yijia-common\src\main\java\com\yijia\common\utils\bean\BeanUtils.java
+D:\java项目\SAAS-AFTEREND2\yijia-common\src\main\java\com\yijia\common\exception\DemoModeException.java
+D:\java项目\SAAS-AFTEREND2\yijia-common\src\main\java\com\yijia\common\exception\file\FileSizeLimitExceededException.java
+D:\java项目\SAAS-AFTEREND2\yijia-common\src\main\java\com\yijia\common\utils\http\HttpHelper.java
+D:\java项目\SAAS-AFTEREND2\yijia-common\src\main\java\com\yijia\common\utils\VerifyCodeUtils.java
+D:\java项目\SAAS-AFTEREND2\yijia-common\src\main\java\com\yijia\common\core\page\TableSupport.java
+D:\java项目\SAAS-AFTEREND2\yijia-common\src\main\java\com\yijia\common\constant\UserConstants.java
+D:\java项目\SAAS-AFTEREND2\yijia-common\src\main\java\com\yijia\common\constant\HttpStatus.java
+D:\java项目\SAAS-AFTEREND2\yijia-common\src\main\java\com\yijia\common\constant\GenConstants.java
+D:\java项目\SAAS-AFTEREND2\yijia-common\src\main\java\com\yijia\common\enums\BusinessStatus.java
+D:\java项目\SAAS-AFTEREND2\yijia-common\src\main\java\com\yijia\common\utils\uuid\IdUtils.java
+D:\java项目\SAAS-AFTEREND2\yijia-common\src\main\java\com\yijia\common\exception\user\UserException.java
+D:\java项目\SAAS-AFTEREND2\yijia-common\src\main\java\com\yijia\common\core\page\TableDataInfo.java
+D:\java项目\SAAS-AFTEREND2\yijia-common\src\main\java\com\yijia\common\core\domain\model\LoginBody.java
+D:\java项目\SAAS-AFTEREND2\yijia-common\src\main\java\com\yijia\common\utils\DateUtils.java
+D:\java项目\SAAS-AFTEREND2\yijia-common\src\main\java\com\yijia\common\enums\OperatorType.java
+D:\java项目\SAAS-AFTEREND2\yijia-common\src\main\java\com\yijia\common\utils\Threads.java
+D:\java项目\SAAS-AFTEREND2\yijia-common\src\main\java\com\yijia\common\core\controller\BaseController.java
+D:\java项目\SAAS-AFTEREND2\yijia-common\src\main\java\com\yijia\common\utils\ServletUtils.java
+D:\java项目\SAAS-AFTEREND2\yijia-common\src\main\java\com\yijia\common\core\domain\entity\SysDept.java
+D:\java项目\SAAS-AFTEREND2\yijia-common\src\main\java\com\yijia\common\exception\UtilException.java
+D:\java项目\SAAS-AFTEREND2\yijia-common\src\main\java\com\yijia\common\utils\sign\Md5Utils.java
+D:\java项目\SAAS-AFTEREND2\yijia-common\src\main\java\com\yijia\common\utils\http\HttpUtils.java
+D:\java项目\SAAS-AFTEREND2\yijia-common\src\main\java\com\yijia\common\utils\ip\AddressUtils.java
+D:\java项目\SAAS-AFTEREND2\yijia-common\src\main\java\com\yijia\common\core\text\StrFormatter.java
+D:\java项目\SAAS-AFTEREND2\yijia-common\src\main\java\com\yijia\common\exception\CustomException.java
+D:\java项目\SAAS-AFTEREND2\yijia-common\src\main\java\com\yijia\common\utils\Arith.java
+D:\java项目\SAAS-AFTEREND2\yijia-common\src\main\java\com\yijia\common\annotation\DataSource.java
+D:\java项目\SAAS-AFTEREND2\yijia-common\src\main\java\com\yijia\common\core\domain\AjaxResult.java
+D:\java项目\SAAS-AFTEREND2\yijia-common\src\main\java\com\yijia\common\exception\user\CaptchaExpireException.java
+D:\java项目\SAAS-AFTEREND2\yijia-common\src\main\java\com\yijia\common\core\domain\model\LoginUser.java
+D:\java项目\SAAS-AFTEREND2\yijia-common\src\main\java\com\yijia\common\utils\SecurityUtils.java
+D:\java项目\SAAS-AFTEREND2\yijia-common\src\main\java\com\yijia\common\core\redis\RedisCache.java
+D:\java项目\SAAS-AFTEREND2\yijia-common\src\main\java\com\yijia\common\filter\XssFilter.java
+D:\java项目\SAAS-AFTEREND2\yijia-common\src\main\java\com\yijia\common\utils\uuid\UUID.java
+D:\java项目\SAAS-AFTEREND2\yijia-common\src\main\java\com\yijia\common\utils\MessageUtils.java

BIN
yijia-common/target/yijia-common-1.0.1.jar


BIN
yijia-coupon/target/classes/com/yijia/coupon/controller/CouponIssueController.class


BIN
yijia-coupon/target/classes/com/yijia/coupon/controller/CouponIssueRelationController.class


BIN
yijia-coupon/target/classes/com/yijia/coupon/controller/CouponUserController.class


BIN
yijia-coupon/target/classes/com/yijia/coupon/domain/AppUserInfo.class


BIN
yijia-coupon/target/classes/com/yijia/coupon/domain/CouponIssue.class


BIN
yijia-coupon/target/classes/com/yijia/coupon/domain/CouponIssueRelation.class


BIN
yijia-coupon/target/classes/com/yijia/coupon/domain/CouponUser.class


BIN
yijia-coupon/target/classes/com/yijia/coupon/mapper/CouponIssueMapper.class


BIN
yijia-coupon/target/classes/com/yijia/coupon/mapper/CouponIssueRelationMapper.class


BIN
yijia-coupon/target/classes/com/yijia/coupon/mapper/CouponUserMapper.class


BIN
yijia-coupon/target/classes/com/yijia/coupon/service/ICouponIssueRelationService.class


BIN
yijia-coupon/target/classes/com/yijia/coupon/service/ICouponIssueService.class


BIN
yijia-coupon/target/classes/com/yijia/coupon/service/ICouponUserService.class


BIN
yijia-coupon/target/classes/com/yijia/coupon/service/impl/CouponIssueRelationServiceImpl.class


BIN
yijia-coupon/target/classes/com/yijia/coupon/service/impl/CouponIssueServiceImpl.class


BIN
yijia-coupon/target/classes/com/yijia/coupon/service/impl/CouponUserServiceImpl.class


+ 137 - 0
yijia-coupon/target/classes/mapper/coupon/CouponIssueMapper.xml

@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yijia.coupon.mapper.CouponIssueMapper">
+
+    <resultMap type="CouponIssue" id="CouponIssueResult">
+        <result property="id"    column="id"    />
+        <result property="issueName"    column="issue_name"    />
+        <result property="issueType"    column="issue_type"    />
+        <result property="discountThresholdAmt"    column="discount_threshold_amt"    />
+        <result property="status"    column="status"    />
+        <result property="stationId"    column="station_id"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="showId"    column="show_id"    />
+        <result property="appointedDays"    column="appointed_days" />
+        <result property="cycleDays"    column="cycle_days" />
+        <result property="availableControl"    column="available_control" />
+        <result property="giveCount"    column="give_count" />
+        <result property="giveLimit"    column="give_limit" />
+        <result property="issueRemark"    column="issue_remark" />
+    </resultMap>
+
+    <sql id="selectCouponIssueVo">
+        select id,issue_name, issue_type, discount_threshold_amt, status, station_id, create_by, create_time, update_by, update_time, show_id,
+        appointed_days,cycle_days,available_control,give_count,give_limit,issue_remark
+         from coupon_issue
+    </sql>
+
+    <select id="selectCouponIssueList" parameterType="CouponIssue" resultMap="CouponIssueResult">
+        <include refid="selectCouponIssueVo"/>
+        <where>
+            <if test="issueName != null  and issueName != ''"> and issue_name like concat('%', #{issueName}, '%')</if>
+            <if test="issueType != null  and issueType != ''"> and issue_type = #{issueType}</if>
+            <if test="discountThresholdAmt != null "> and discount_threshold_amt = #{discountThresholdAmt}</if>
+            <if test="status != null  and status != ''"> and status = #{status}</if>
+            <if test="stationId != null "> and station_id = #{stationId}</if>
+            <if test="showId != null  and showId != ''"> and show_id = #{showId}</if>
+            <if test="appointedDays != null  and appointedDays != ''"> and appointed_days = #{appointedDays}</if>
+            <if test="cycleDays != null  and cycleDays != ''"> and cycle_days = #{cycleDays}</if>
+            <if test="availableControl != null  and availableControl != ''"> and available_control = #{availableControl}</if>
+            <if test="giveCount != null  and giveCount != ''"> and give_count = #{giveCount}</if>
+            <if test="giveLimit != null  and giveLimit != ''"> and give_limit = #{giveLimit}</if>
+            <if test="issueRemark != null  and issueRemark != ''"> and issue_remark like concat('%', #{issueRemark}, '%')</if>
+            <if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 -->
+                AND date_format(create_time,'%y-%m-%d %H:%i:%s') &gt;= date_format(#{beginTime},'%y-%m-%d %H:%i:%s')
+            </if>
+            <if test="endTime != null and endTime != ''"><!-- 结束时间检索 -->
+                AND date_format(create_time,'%y-%m-%d %H:%i:%s') &lt;= date_format(#{endTime},'%y-%m-%d %H:%i:%s')
+            </if>
+        </where>
+        order by status desc , create_time desc
+    </select>
+
+    <select id="selectCouponIssueById" parameterType="String" resultMap="CouponIssueResult">
+        <include refid="selectCouponIssueVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertCouponIssue" parameterType="CouponIssue" >
+        insert into coupon_issue(
+        <if test="id != null">id,</if>
+        <if test="issueName != null">issue_name,</if>
+        <if test="issueType != null">issue_type,</if>
+        <if test="discountThresholdAmt != null">discount_threshold_amt,</if>
+        <if test="status != null">status,</if>
+        <if test="stationId != null">station_id,</if>
+        <if test="createBy != null">create_by,</if>
+        <if test="createTime != null">create_time,</if>
+        <if test="updateBy != null">update_by,</if>
+        <if test="updateTime != null">update_time,</if>
+        <if test="showId != null">show_id,</if>
+        <if test="appointedDays != null">appointed_days,</if>
+        <if test="cycleDays != null">cycle_days,</if>
+        <if test="availableControl != null">available_control,</if>
+        <if test="giveCount != null">give_count,</if>
+        <if test="giveLimit != null">give_limit,</if>
+        <if test="issueRemark != null">issue_remark</if>
+        )values(
+        <if test="id != null">#{id},</if>
+        <if test="issueName != null">#{issueName},</if>
+        <if test="issueType != null">#{issueType},</if>
+        <if test="discountThresholdAmt != null">#{discountThresholdAmt},</if>
+        <if test="status != null">#{status},</if>
+        <if test="stationId != null">#{stationId},</if>
+        <if test="createBy != null">#{createBy},</if>
+        <if test="createTime != null">#{createTime},</if>
+        <if test="updateBy != null">#{updateBy},</if>
+        <if test="updateTime != null">#{updateTime},</if>
+        <if test="showId != null">#{showId},</if>
+        <if test="appointedDays != null">#{appointedDays},</if>
+        <if test="cycleDays != null">#{cycleDays},</if>
+        <if test="availableControl != null">#{availableControl},</if>
+        <if test="giveCount != null">#{giveCount},</if>
+        <if test="giveLimit != null">#{giveLimit},</if>
+        <if test="issueRemark != null">#{issueRemark}</if>
+        )
+    </insert>
+
+    <update id="updateCouponIssue" parameterType="CouponIssue">
+        update coupon_issue
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="issueName != null">issue_name = #{issueName},</if>
+            <if test="issueType != null">issue_type = #{issueType},</if>
+            <if test="discountThresholdAmt != null">discount_threshold_amt = #{discountThresholdAmt},</if>
+            <if test="status != null">status = #{status},</if>
+            <if test="stationId != null">station_id = #{stationId},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="showId != null">show_id = #{showId},</if>
+            <if test="appointedDays != null">appointed_days = #{appointedDays},</if>
+            <if test="cycleDays != null">cycle_days = #{cycleDays},</if>
+            <if test="availableControl != null">available_control = #{availableControl},</if>
+            <if test="giveCount != null">give_count = #{giveCount},</if>
+            <if test="giveLimit != null">give_limit = #{giveLimit},</if>
+            <if test="issueRemark != null">issue_remark = #{issueRemark},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteCouponIssueById" parameterType="Integer">
+        delete from coupon_issue where id = #{id}
+    </delete>
+
+    <delete id="deleteCouponIssueByIds" parameterType="String">
+        delete from coupon_issue where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+
+</mapper>

+ 87 - 0
yijia-coupon/target/classes/mapper/coupon/CouponIssueRelationMapper.xml

@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yijia.coupon.mapper.CouponIssueRelationMapper">
+
+    <resultMap type="CouponIssueRelation" id="CouponIssueRelationResult">
+        <result property="id"    column="id"    />
+        <result property="issueId"    column="issue_id"    />
+        <result property="couponId"    column="coupon_id"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time" />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"  />
+    </resultMap>
+
+    <sql id="selectCouponIssueRelationVo">
+        select id, issue_id, coupon_id, create_by, create_time, update_by, update_time from coupon_issue_relation
+    </sql>
+
+    <select id="selectCouponIssueRelationList" parameterType="CouponIssueRelation" resultMap="CouponIssueRelationResult">
+        <include refid="selectCouponIssueRelationVo"/>
+        <where>
+            <if test="issueId != null "> and issue_id = #{issueId}</if>
+            <if test="couponId != null "> and coupon_id = #{couponId}</if>
+        </where>
+    </select>
+
+    <select id="selectCouponIssueRelationById" parameterType="Long" resultMap="CouponIssueRelationResult">
+        <include refid="selectCouponIssueRelationVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertCouponIssueRelation" parameterType="CouponIssueRelation">
+        insert into coupon_issue_relation
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="issueId != null">issue_id,</if>
+            <if test="couponId != null">coupon_id,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="issueId != null">#{issueId},</if>
+            <if test="couponId != null">#{couponId},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+         </trim>
+    </insert>
+
+    <update id="updateCouponIssueRelation" parameterType="CouponIssueRelation">
+        update coupon_issue_relation
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="issueId != null">issue_id = #{issueId},</if>
+            <if test="couponId != null">coupon_id = #{couponId},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteCouponIssueRelationById" parameterType="Long">
+        delete from coupon_issue_relation where id = #{id}
+    </delete>
+
+    <delete id="deleteCouponIssueRelation" parameterType="Long">
+        delete from coupon_issue_relation
+        <where>
+            <if test="issueId != null "> and issue_id = #{issueId}</if>
+            <if test="couponId != null "> and coupon_id = #{couponId}</if>
+        </where>
+    </delete>
+    <delete id="deleteCouponIssueRelationByIds" parameterType="String">
+        delete from coupon_issue_relation where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+
+</mapper>

+ 124 - 0
yijia-coupon/target/classes/mapper/coupon/CouponUserMapper.xml

@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yijia.coupon.mapper.CouponUserMapper">
+
+    <resultMap type="CouponUser" id="CouponUserResult">
+        <result property="id"    column="id"    />
+        <result property="unionId"    column="union_id"    />
+        <result property="stationId"    column="station_id"    />
+        <result property="issueId"    column="issue_id"    />
+        <result property="couponId"    column="coupon_id"    />
+        <result property="couponIsUsed"    column="coupon_is_used"    />
+        <result property="couponIsEffective"    column="coupon_is_effective"    />
+        <result property="getCouponTime"    column="get_coupon_time"    />
+        <result property="couponEffectiveTime"    column="coupon_effective_time"    />
+        <result property="userId"    column="user_id"    />
+        <result property="mobilePhone"    column="mobile_phone"    />
+        <result property="blogNickName"    column="blog_nick_name"    />
+        <result property="couponName"    column="coupon_name"    />
+        <result property="issueName"    column="issue_name"    />
+        <result property="couponRemark"    column="coupon_remark"    />
+        <result property="issueRemark"    column="issue_remark"    />
+        <result property="couponType"    column="coupon_type"    />
+        <result property="couponAmt"    column="coupon_amt"    />
+        <result property="verificationUserPhone"    column="verification_user_phone"    />
+    </resultMap>
+
+
+    <sql id="selectCouponUserVo">
+           SELECT a.union_id,a.station_id,
+            a.issue_id,a.id,a.get_coupon_time,a.coupon_id,
+            a.coupon_is_used,a.coupon_is_effective,a.coupon_effective_time,
+            b.coupon_name,c.issue_name,d.user_id,d.mobile_phone,d.blog_nick_name,
+            b.coupon_remark,c.issue_remark,b.coupon_type,b.coupon_amt,a.verification_user_phone
+            from  coupon_user a
+            left join coupon_info b on a.coupon_id=b.id
+            left join coupon_issue c  on  a.issue_id=c.id
+	        left  join app_user_info d  on a.union_id=d.union_id
+    </sql>
+
+    <select id="selectCouponUserList" parameterType="CouponUser" resultMap="CouponUserResult">
+        <include refid="selectCouponUserVo"/>
+        <where>
+            <if test="unionId != null "> and a.union_id = #{unionId}</if>
+            <if test="stationId != null  and stationId != ''">and a.station_id = #{stationId}</if>
+            <if test="issueId != null  and issueId != ''"> and a.issue_id = #{issueId}</if>
+            <if test="couponId != null "> and a.coupon_id = #{couponId}</if>
+            <if test="couponIsUsed != null  and couponIsUsed != '' "> and a.coupon_is_used = #{couponIsUsed}</if>
+            <if test="couponIsEffective != null  and couponIsEffective != ''">and a.coupon_is_effective = #{couponIsEffective}</if>
+            <if test="getCouponTime != null  and getCouponTime != ''"> and a.get_coupon_time = #{getCouponTime}</if>
+            <if test="couponEffectiveTime != null and couponEffectiveTime != ''"> and a.coupon_effective_time = #{couponEffectiveTime}</if>
+            <if test="verificationUserPhone != null and verificationUserPhone != ''"> and a.verification_user_phone like concat('%', #{verificationUserPhone}, '%')</if>
+            <if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 -->
+                AND date_format(a.get_coupon_time,'%y-%m-%d %H:%i:%s') &gt;= date_format(#{beginTime},'%y-%m-%d %H:%i:%s')
+            </if>
+            <if test="endTime != null and endTime != ''"><!-- 结束时间检索 -->
+                AND date_format(a.get_coupon_time,'%y-%m-%d %H:%i:%s') &lt;= date_format(#{endTime},'%y-%m-%d %H:%i:%s')
+            </if>
+            <if test="stationIdList != null ">
+                and a.station_id in
+                <foreach item="item" index="index" collection="stationIdList"
+                         open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+        order by a.id desc
+    </select>
+
+    <select id="selectCouponUserById" parameterType="Integer" resultMap="CouponUserResult">
+        <include refid="selectCouponUserVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertCouponUser" parameterType="CouponUser" useGeneratedKeys="true" keyProperty="id">
+        insert into coupon_user
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="unionId != null">union_id,</if>
+            <if test="stationId != null">station_id,</if>
+            <if test="issueId != null">issue_id,</if>
+            <if test="couponId != null">coupon_id,</if>
+            <if test="couponIsUsed != null">coupon_is_used,</if>
+            <if test="couponIsEffective != null">coupon_is_effective,</if>
+            <if test="couponEffectiveTime != null">coupon_effective_time,</if>
+            <if test="getCouponTime != null">get_coupon_time,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="unionId != null">#{unionId},</if>
+            <if test="stationId != null">#{stationId},</if>
+            <if test="issueId != null">#{issueId},</if>
+            <if test="couponId != null">#{couponId},</if>
+            <if test="couponIsUsed != null">#{couponIsUsed},</if>
+            <if test="couponIsEffective != null">#{couponIsEffective},</if>
+            <if test="couponEffectiveTime != null">#{couponEffectiveTime},</if>
+            <if test="getCouponTime != null">#{getCouponTime},</if>
+        </trim>
+    </insert>
+
+    <update id="updateCouponUser" parameterType="CouponUser">
+        update coupon_user
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="unionId != null">union_id = #{unionId},</if>
+            <if test="stationId != null">station_id = #{stationId},</if>
+            <if test="issueId != null">issue_id = #{issueId},</if>
+            <if test="couponId != null">coupon_id = #{couponId},</if>
+            <if test="couponIsUsed != null">coupon_is_used = #{couponIsUsed},</if>
+            <if test="couponIsEffective != null">couponEffectiveTime = #{couponIsEffective},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteCouponUserById" parameterType="Integer">
+        delete from coupon_user where id = #{id}
+    </delete>
+
+    <delete id="deleteCouponUserByIds" parameterType="String">
+        delete from coupon_user where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+
+</mapper>

BIN
yijia-customer/target/classes/com/yijia/customer/controller/CardExcelImportController.class


BIN
yijia-customer/target/classes/com/yijia/customer/domain/CardExcelImport.class


BIN
yijia-customer/target/classes/com/yijia/customer/mapper/CardExcelImportMapper.class


BIN
yijia-customer/target/classes/com/yijia/customer/service/ICardExcelImportService.class


BIN
yijia-customer/target/classes/com/yijia/customer/service/impl/CardExcelImportServiceImpl.class


+ 113 - 0
yijia-customer/target/classes/mapper/customer/CardExcelImportMapper.xml

@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yijia.customer.mapper.CardExcelImportMapper">
+
+    <resultMap type="CardExcelImport" id="CardExcelImportResult">
+        <result property="excelId"    column="excel_id"    />
+        <result property="balance"    column="balance"    />
+        <result property="integral"    column="integral"    />
+        <result property="phoneNumber"    column="phone_number"    />
+        <result property="cardType"    column="card_type"    />
+        <result property="stationId"    column="station_id"    />
+        <result property="memberGrade"    column="member_grade"    />
+        <result property="stationName"    column="dept_name"    />
+        <result property="labelId"    column="label_id"    />
+        <result property="couponIssueId"    column="coupon_issue_id"    />
+    </resultMap>
+
+    <sql id="selectCardExcelImportVo">
+          SELECT a.excel_id,a.station_id,a.phone_number,
+        a.member_grade,a.integral,a.card_type,a.balance,b.dept_name,
+				a.label_id,a.coupon_issue_id
+        from  card_excel_import a
+        left  join sys_dept b  on a.station_id=b.dept_id
+    </sql>
+
+    <select id="selectCardExcelImportList" parameterType="CardExcelImport" resultMap="CardExcelImportResult">
+        <include refid="selectCardExcelImportVo"/>
+        <where>
+            <if test="balance != null  and balance != ''"> and a.balance = #{balance}</if>
+            <if test="integral != null  and integral != ''"> and a.integral = #{integral}</if>
+            <if test="phoneNumber != null  and phoneNumber != ''"> and a.phone_number = #{phoneNumber}</if>
+            <if test="cardType != null  and cardType != ''"> and a.card_type = #{cardType} </if>
+            <if test="stationId != null  and stationId != ''"> and a.station_id = #{stationId}</if>
+            <if test="memberGrade != null  and memberGrade != ''"> and a.member_grade = #{memberGrade}</if>
+            <if test="labelId != null  and labelId != ''"> and a.label_id = #{labelId}</if>
+            <if test="couponIssueId != null  and couponIssueId != ''"> and a.coupon_issue_id = #{couponIssueId}</if>
+            <if test="stationIdList != null ">
+                and a.station_id in
+                <foreach item="item" index="index" collection="stationIdList"
+                         open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+        order by excel_id desc
+    </select>
+
+    <select id="selectCardExcelImportById" parameterType="Long" resultMap="CardExcelImportResult">
+        <include refid="selectCardExcelImportVo"/>
+        where excel_id = #{excelId}
+    </select>
+
+    <select id="selectCardExcelImportByPhoneStation" parameterType="CardExcelImport" resultMap="CardExcelImportResult">
+        <include refid="selectCardExcelImportVo"/>
+        <where>
+            <if test="phoneNumber != null  and phoneNumber != ''"> and a.phone_number = #{phoneNumber}</if>
+            <if test="stationId != null  and stationId != ''"> and a.station_id = #{stationId}</if>
+        </where>
+    </select>
+
+    <insert id="insertCardExcelImport" parameterType="CardExcelImport" useGeneratedKeys="true" keyProperty="excelId">
+        insert into card_excel_import
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="balance != null">balance,</if>
+            <if test="integral != null">integral,</if>
+            <if test="phoneNumber != null">phone_number,</if>
+            <if test="cardType != null">card_type,</if>
+            <if test="stationId != null">station_id,</if>
+            <if test="memberGrade != null">member_grade,</if>
+            <if test="labelId != null">label_id,</if>
+            <if test="couponIssueId != null">coupon_issue_id,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="balance != null">#{balance},</if>
+            <if test="integral != null">#{integral},</if>
+            <if test="phoneNumber != null">#{phoneNumber},</if>
+            <if test="cardType != null">#{cardType},</if>
+            <if test="stationId != null">#{stationId},</if>
+            <if test="memberGrade != null">#{memberGrade},</if>
+            <if test="labelId != null">#{labelId},</if>
+            <if test="couponIssueId != null">#{couponIssueId},</if>
+         </trim>
+    </insert>
+
+    <update id="updateCardExcelImport" parameterType="CardExcelImport">
+        update card_excel_import
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="balance != null">balance = #{balance},</if>
+            <if test="integral != null">integral = #{integral},</if>
+            <if test="phoneNumber != null">phone_number = #{phoneNumber},</if>
+            <if test="cardType != null">card_type = #{cardType},</if>
+            <if test="stationId != null">station_id = #{stationId},</if>
+            <if test="memberGrade != null">member_grade = #{memberGrade},</if>
+            <if test="labelId != null">label_id = #{labelId},</if>
+            <if test="couponIssueId != null">coupon_issue_id = #{couponIssueId},</if>
+        </trim>
+        where excel_id = #{excelId}
+    </update>
+
+    <delete id="deleteCardExcelImportById" parameterType="Long">
+        delete from card_excel_import where excel_id = #{excelId}
+    </delete>
+
+    <delete id="deleteCardExcelImportByIds" parameterType="String">
+        delete from card_excel_import where excel_id in
+        <foreach item="excelId" collection="array" open="(" separator="," close=")">
+            #{excelId}
+        </foreach>
+    </delete>
+
+</mapper>

+ 5 - 0
yijia-customer/target/maven-archiver/pom.properties

@@ -0,0 +1,5 @@
+#Generated by Maven
+#Fri Sep 24 09:53:29 CST 2021
+version=1.0.1
+groupId=com.yijia
+artifactId=yijia-customer

+ 45 - 0
yijia-customer/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -0,0 +1,45 @@
+com\yijia\customer\domain\CustomerGradeSetting.class
+com\yijia\customer\controller\CustomerCardRecordConsumptionController.class
+com\yijia\customer\mapper\CardExcelImportMapper.class
+com\yijia\customer\controller\CustomerElectronicCardController.class
+com\yijia\customer\service\ICustomerCardRecordConsumptionService.class
+com\yijia\customer\service\ICardExcelImportService.class
+com\yijia\customer\domain\CustomerCardSetting.class
+com\yijia\customer\controller\CustomerManageController.class
+com\yijia\customer\controller\CustomerCardSettingDetailController.class
+com\yijia\customer\controller\CustomerCardRecordRechargeController.class
+com\yijia\customer\service\ICustomerElectronicCardService.class
+com\yijia\customer\domain\CustomerCardSettingDetail.class
+com\yijia\customer\mapper\CustomerGradeSettingMapper.class
+com\yijia\customer\service\ICustomerCardRecordRechargeService.class
+com\yijia\customer\service\ICustomerGradeSettingService.class
+com\yijia\customer\controller\CustomerGradeSettingController.class
+com\yijia\customer\service\impl\CustomerCardUseRecordServiceImpl.class
+com\yijia\customer\service\ICustomerManageService.class
+com\yijia\customer\controller\CustomerCardSettingController.class
+com\yijia\customer\mapper\CustomerCardRecordConsumptionMapper.class
+com\yijia\customer\domain\CustomerCardRecordRecharge.class
+com\yijia\customer\mapper\CustomerCardUseRecordMapper.class
+com\yijia\customer\domain\CardExcelImport.class
+com\yijia\customer\domain\CustomerCardUseRecord.class
+com\yijia\customer\service\ICustomerCardUseRecordService.class
+com\yijia\customer\service\ICustomerCardSettingService.class
+com\yijia\customer\service\impl\CustomerCardRecordRechargeServiceImpl.class
+com\yijia\customer\mapper\CustomerManageMapper.class
+com\yijia\customer\service\impl\CustomerCardSettingDetailServiceImpl.class
+com\yijia\customer\service\impl\CardExcelImportServiceImpl.class
+com\yijia\customer\mapper\CustomerElectronicCardMapper.class
+com\yijia\customer\domain\CustomerCardRecordConsumption.class
+com\yijia\customer\mapper\CustomerCardRecordRechargeMapper.class
+com\yijia\customer\service\ICustomerCardSettingDetailService.class
+com\yijia\customer\domain\CustomerElectronicCard.class
+com\yijia\customer\mapper\CustomerCardSettingDetailMapper.class
+com\yijia\customer\service\impl\CustomerGradeSettingServiceImpl.class
+com\yijia\customer\domain\CustomerManage.class
+com\yijia\customer\service\impl\CustomerElectronicCardServiceImpl.class
+com\yijia\customer\service\impl\CustomerCardSettingServiceImpl.class
+com\yijia\customer\controller\CustomerCardUseRecordController.class
+com\yijia\customer\service\impl\CustomerCardRecordConsumptionServiceImpl.class
+com\yijia\customer\service\impl\CustomerManageServiceImpl.class
+com\yijia\customer\controller\CardExcelImportController.class
+com\yijia\customer\mapper\CustomerCardSettingMapper.class

+ 45 - 0
yijia-customer/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -0,0 +1,45 @@
+D:\java项目\SAAS-AFTEREND2\yijia-customer\src\main\java\com\yijia\customer\mapper\CustomerCardSettingMapper.java
+D:\java项目\SAAS-AFTEREND2\yijia-customer\src\main\java\com\yijia\customer\mapper\CustomerManageMapper.java
+D:\java项目\SAAS-AFTEREND2\yijia-customer\src\main\java\com\yijia\customer\domain\CustomerCardRecordRecharge.java
+D:\java项目\SAAS-AFTEREND2\yijia-customer\src\main\java\com\yijia\customer\service\impl\CustomerCardRecordRechargeServiceImpl.java
+D:\java项目\SAAS-AFTEREND2\yijia-customer\src\main\java\com\yijia\customer\mapper\CustomerCardRecordConsumptionMapper.java
+D:\java项目\SAAS-AFTEREND2\yijia-customer\src\main\java\com\yijia\customer\mapper\CustomerElectronicCardMapper.java
+D:\java项目\SAAS-AFTEREND2\yijia-customer\src\main\java\com\yijia\customer\domain\CardExcelImport.java
+D:\java项目\SAAS-AFTEREND2\yijia-customer\src\main\java\com\yijia\customer\service\ICustomerCardUseRecordService.java
+D:\java项目\SAAS-AFTEREND2\yijia-customer\src\main\java\com\yijia\customer\controller\CustomerGradeSettingController.java
+D:\java项目\SAAS-AFTEREND2\yijia-customer\src\main\java\com\yijia\customer\controller\CustomerCardUseRecordController.java
+D:\java项目\SAAS-AFTEREND2\yijia-customer\src\main\java\com\yijia\customer\domain\CustomerCardSetting.java
+D:\java项目\SAAS-AFTEREND2\yijia-customer\src\main\java\com\yijia\customer\service\ICustomerGradeSettingService.java
+D:\java项目\SAAS-AFTEREND2\yijia-customer\src\main\java\com\yijia\customer\controller\CustomerCardRecordConsumptionController.java
+D:\java项目\SAAS-AFTEREND2\yijia-customer\src\main\java\com\yijia\customer\service\ICardExcelImportService.java
+D:\java项目\SAAS-AFTEREND2\yijia-customer\src\main\java\com\yijia\customer\service\ICustomerCardRecordConsumptionService.java
+D:\java项目\SAAS-AFTEREND2\yijia-customer\src\main\java\com\yijia\customer\domain\CustomerElectronicCard.java
+D:\java项目\SAAS-AFTEREND2\yijia-customer\src\main\java\com\yijia\customer\mapper\CustomerCardRecordRechargeMapper.java
+D:\java项目\SAAS-AFTEREND2\yijia-customer\src\main\java\com\yijia\customer\service\impl\CustomerCardSettingServiceImpl.java
+D:\java项目\SAAS-AFTEREND2\yijia-customer\src\main\java\com\yijia\customer\controller\CustomerCardSettingDetailController.java
+D:\java项目\SAAS-AFTEREND2\yijia-customer\src\main\java\com\yijia\customer\controller\CustomerManageController.java
+D:\java项目\SAAS-AFTEREND2\yijia-customer\src\main\java\com\yijia\customer\mapper\CustomerCardSettingDetailMapper.java
+D:\java项目\SAAS-AFTEREND2\yijia-customer\src\main\java\com\yijia\customer\service\impl\CustomerCardUseRecordServiceImpl.java
+D:\java项目\SAAS-AFTEREND2\yijia-customer\src\main\java\com\yijia\customer\service\impl\CustomerElectronicCardServiceImpl.java
+D:\java项目\SAAS-AFTEREND2\yijia-customer\src\main\java\com\yijia\customer\controller\CustomerCardSettingController.java
+D:\java项目\SAAS-AFTEREND2\yijia-customer\src\main\java\com\yijia\customer\domain\CustomerCardUseRecord.java
+D:\java项目\SAAS-AFTEREND2\yijia-customer\src\main\java\com\yijia\customer\mapper\CardExcelImportMapper.java
+D:\java项目\SAAS-AFTEREND2\yijia-customer\src\main\java\com\yijia\customer\controller\CardExcelImportController.java
+D:\java项目\SAAS-AFTEREND2\yijia-customer\src\main\java\com\yijia\customer\service\ICustomerElectronicCardService.java
+D:\java项目\SAAS-AFTEREND2\yijia-customer\src\main\java\com\yijia\customer\controller\CustomerCardRecordRechargeController.java
+D:\java项目\SAAS-AFTEREND2\yijia-customer\src\main\java\com\yijia\customer\service\ICustomerCardSettingDetailService.java
+D:\java项目\SAAS-AFTEREND2\yijia-customer\src\main\java\com\yijia\customer\domain\CustomerManage.java
+D:\java项目\SAAS-AFTEREND2\yijia-customer\src\main\java\com\yijia\customer\service\ICustomerCardSettingService.java
+D:\java项目\SAAS-AFTEREND2\yijia-customer\src\main\java\com\yijia\customer\domain\CustomerCardSettingDetail.java
+D:\java项目\SAAS-AFTEREND2\yijia-customer\src\main\java\com\yijia\customer\controller\CustomerElectronicCardController.java
+D:\java项目\SAAS-AFTEREND2\yijia-customer\src\main\java\com\yijia\customer\service\ICustomerManageService.java
+D:\java项目\SAAS-AFTEREND2\yijia-customer\src\main\java\com\yijia\customer\service\impl\CustomerCardRecordConsumptionServiceImpl.java
+D:\java项目\SAAS-AFTEREND2\yijia-customer\src\main\java\com\yijia\customer\domain\CustomerCardRecordConsumption.java
+D:\java项目\SAAS-AFTEREND2\yijia-customer\src\main\java\com\yijia\customer\mapper\CustomerGradeSettingMapper.java
+D:\java项目\SAAS-AFTEREND2\yijia-customer\src\main\java\com\yijia\customer\service\impl\CustomerGradeSettingServiceImpl.java
+D:\java项目\SAAS-AFTEREND2\yijia-customer\src\main\java\com\yijia\customer\domain\CustomerGradeSetting.java
+D:\java项目\SAAS-AFTEREND2\yijia-customer\src\main\java\com\yijia\customer\service\ICustomerCardRecordRechargeService.java
+D:\java项目\SAAS-AFTEREND2\yijia-customer\src\main\java\com\yijia\customer\service\impl\CardExcelImportServiceImpl.java
+D:\java项目\SAAS-AFTEREND2\yijia-customer\src\main\java\com\yijia\customer\mapper\CustomerCardUseRecordMapper.java
+D:\java项目\SAAS-AFTEREND2\yijia-customer\src\main\java\com\yijia\customer\service\impl\CustomerCardSettingDetailServiceImpl.java
+D:\java项目\SAAS-AFTEREND2\yijia-customer\src\main\java\com\yijia\customer\service\impl\CustomerManageServiceImpl.java

BIN
yijia-customer/target/yijia-customer-1.0.1.jar


+ 5 - 0
yijia-framework/target/maven-archiver/pom.properties

@@ -0,0 +1,5 @@
+#Generated by Maven
+#Fri Sep 24 09:53:22 CST 2021
+version=1.0.1
+groupId=com.yijia
+artifactId=yijia-framework

+ 42 - 0
yijia-framework/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -0,0 +1,42 @@
+com\yijia\framework\aspectj\DataSourceAspect.class
+com\yijia\framework\interceptor\RepeatSubmitInterceptor.class
+com\yijia\framework\web\exception\GlobalExceptionHandler.class
+com\yijia\framework\web\domain\server\Sys.class
+com\yijia\framework\web\service\SysPermissionService.class
+com\yijia\framework\web\domain\Server.class
+com\yijia\framework\manager\ShutdownManager.class
+com\yijia\framework\web\domain\server\Cpu.class
+com\yijia\framework\config\ResourcesConfig.class
+com\yijia\framework\datasource\DynamicDataSource.class
+com\yijia\framework\config\MyBatisConfig.class
+com\yijia\framework\manager\AsyncManager.class
+com\yijia\framework\manager\factory\AsyncFactory$2.class
+com\yijia\framework\config\DruidConfig$1.class
+com\yijia\framework\web\domain\server\Jvm.class
+com\yijia\framework\web\service\SysLoginService.class
+com\yijia\framework\config\ApplicationConfig.class
+com\yijia\framework\web\service\UserDetailsServiceImpl.class
+com\yijia\framework\config\DruidConfig.class
+com\yijia\framework\config\ThreadPoolConfig.class
+com\yijia\framework\config\RedisConfig.class
+com\yijia\framework\config\ThreadPoolConfig$1.class
+com\yijia\framework\aspectj\LogAspect.class
+com\yijia\framework\web\domain\server\SysFile.class
+com\yijia\framework\config\FilterConfig.class
+com\yijia\framework\config\CaptchaConfig.class
+com\yijia\framework\security\handle\AuthenticationEntryPointImpl.class
+com\yijia\framework\web\domain\server\Mem.class
+com\yijia\framework\config\properties\DruidProperties.class
+com\yijia\framework\manager\factory\AsyncFactory.class
+com\yijia\framework\web\service\PermissionService.class
+com\yijia\framework\config\SecurityConfig.class
+com\yijia\framework\manager\factory\AsyncFactory$1.class
+com\yijia\framework\interceptor\impl\SameUrlDataInterceptor.class
+com\yijia\framework\config\FastJson2JsonRedisSerializer.class
+com\yijia\framework\security\filter\JwtAuthenticationTokenFilter.class
+com\yijia\framework\aspectj\DataScopeAspect.class
+com\yijia\framework\config\ServerConfig.class
+com\yijia\framework\web\service\TokenService.class
+com\yijia\framework\datasource\DynamicDataSourceContextHolder.class
+com\yijia\framework\security\handle\LogoutSuccessHandlerImpl.class
+com\yijia\framework\config\KaptchaTextCreator.class

+ 38 - 0
yijia-framework/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -0,0 +1,38 @@
+D:\java项目\SAAS-AFTEREND2\yijia-framework\src\main\java\com\yijia\framework\web\service\UserDetailsServiceImpl.java
+D:\java项目\SAAS-AFTEREND2\yijia-framework\src\main\java\com\yijia\framework\config\ResourcesConfig.java
+D:\java项目\SAAS-AFTEREND2\yijia-framework\src\main\java\com\yijia\framework\config\ThreadPoolConfig.java
+D:\java项目\SAAS-AFTEREND2\yijia-framework\src\main\java\com\yijia\framework\web\domain\Server.java
+D:\java项目\SAAS-AFTEREND2\yijia-framework\src\main\java\com\yijia\framework\config\FilterConfig.java
+D:\java项目\SAAS-AFTEREND2\yijia-framework\src\main\java\com\yijia\framework\config\DruidConfig.java
+D:\java项目\SAAS-AFTEREND2\yijia-framework\src\main\java\com\yijia\framework\datasource\DynamicDataSourceContextHolder.java
+D:\java项目\SAAS-AFTEREND2\yijia-framework\src\main\java\com\yijia\framework\security\handle\LogoutSuccessHandlerImpl.java
+D:\java项目\SAAS-AFTEREND2\yijia-framework\src\main\java\com\yijia\framework\web\domain\server\Jvm.java
+D:\java项目\SAAS-AFTEREND2\yijia-framework\src\main\java\com\yijia\framework\security\handle\AuthenticationEntryPointImpl.java
+D:\java项目\SAAS-AFTEREND2\yijia-framework\src\main\java\com\yijia\framework\web\domain\server\Cpu.java
+D:\java项目\SAAS-AFTEREND2\yijia-framework\src\main\java\com\yijia\framework\web\service\TokenService.java
+D:\java项目\SAAS-AFTEREND2\yijia-framework\src\main\java\com\yijia\framework\manager\AsyncManager.java
+D:\java项目\SAAS-AFTEREND2\yijia-framework\src\main\java\com\yijia\framework\web\service\PermissionService.java
+D:\java项目\SAAS-AFTEREND2\yijia-framework\src\main\java\com\yijia\framework\manager\ShutdownManager.java
+D:\java项目\SAAS-AFTEREND2\yijia-framework\src\main\java\com\yijia\framework\web\service\SysLoginService.java
+D:\java项目\SAAS-AFTEREND2\yijia-framework\src\main\java\com\yijia\framework\web\domain\server\Mem.java
+D:\java项目\SAAS-AFTEREND2\yijia-framework\src\main\java\com\yijia\framework\web\domain\server\Sys.java
+D:\java项目\SAAS-AFTEREND2\yijia-framework\src\main\java\com\yijia\framework\interceptor\impl\SameUrlDataInterceptor.java
+D:\java项目\SAAS-AFTEREND2\yijia-framework\src\main\java\com\yijia\framework\manager\factory\AsyncFactory.java
+D:\java项目\SAAS-AFTEREND2\yijia-framework\src\main\java\com\yijia\framework\config\MyBatisConfig.java
+D:\java项目\SAAS-AFTEREND2\yijia-framework\src\main\java\com\yijia\framework\aspectj\LogAspect.java
+D:\java项目\SAAS-AFTEREND2\yijia-framework\src\main\java\com\yijia\framework\config\ApplicationConfig.java
+D:\java项目\SAAS-AFTEREND2\yijia-framework\src\main\java\com\yijia\framework\config\RedisConfig.java
+D:\java项目\SAAS-AFTEREND2\yijia-framework\src\main\java\com\yijia\framework\config\properties\DruidProperties.java
+D:\java项目\SAAS-AFTEREND2\yijia-framework\src\main\java\com\yijia\framework\aspectj\DataScopeAspect.java
+D:\java项目\SAAS-AFTEREND2\yijia-framework\src\main\java\com\yijia\framework\config\FastJson2JsonRedisSerializer.java
+D:\java项目\SAAS-AFTEREND2\yijia-framework\src\main\java\com\yijia\framework\security\filter\JwtAuthenticationTokenFilter.java
+D:\java项目\SAAS-AFTEREND2\yijia-framework\src\main\java\com\yijia\framework\web\service\SysPermissionService.java
+D:\java项目\SAAS-AFTEREND2\yijia-framework\src\main\java\com\yijia\framework\config\SecurityConfig.java
+D:\java项目\SAAS-AFTEREND2\yijia-framework\src\main\java\com\yijia\framework\config\KaptchaTextCreator.java
+D:\java项目\SAAS-AFTEREND2\yijia-framework\src\main\java\com\yijia\framework\config\ServerConfig.java
+D:\java项目\SAAS-AFTEREND2\yijia-framework\src\main\java\com\yijia\framework\datasource\DynamicDataSource.java
+D:\java项目\SAAS-AFTEREND2\yijia-framework\src\main\java\com\yijia\framework\web\domain\server\SysFile.java
+D:\java项目\SAAS-AFTEREND2\yijia-framework\src\main\java\com\yijia\framework\aspectj\DataSourceAspect.java
+D:\java项目\SAAS-AFTEREND2\yijia-framework\src\main\java\com\yijia\framework\web\exception\GlobalExceptionHandler.java
+D:\java项目\SAAS-AFTEREND2\yijia-framework\src\main\java\com\yijia\framework\config\CaptchaConfig.java
+D:\java项目\SAAS-AFTEREND2\yijia-framework\src\main\java\com\yijia\framework\interceptor\RepeatSubmitInterceptor.java

BIN
yijia-framework/target/yijia-framework-1.0.1.jar


+ 5 - 0
yijia-generator/target/maven-archiver/pom.properties

@@ -0,0 +1,5 @@
+#Generated by Maven
+#Fri Sep 24 09:53:24 CST 2021
+version=1.0.1
+groupId=com.yijia
+artifactId=yijia-generator

+ 13 - 0
yijia-generator/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -0,0 +1,13 @@
+com\yijia\generator\mapper\GenTableMapper.class
+com\yijia\generator\util\VelocityUtils.class
+com\yijia\generator\service\IGenTableColumnService.class
+com\yijia\generator\service\GenTableColumnServiceImpl.class
+com\yijia\generator\mapper\GenTableColumnMapper.class
+com\yijia\generator\domain\GenTableColumn.class
+com\yijia\generator\util\VelocityInitializer.class
+com\yijia\generator\util\GenUtils.class
+com\yijia\generator\service\GenTableServiceImpl.class
+com\yijia\generator\config\GenConfig.class
+com\yijia\generator\domain\GenTable.class
+com\yijia\generator\controller\GenController.class
+com\yijia\generator\service\IGenTableService.class

+ 13 - 0
yijia-generator/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -0,0 +1,13 @@
+D:\java项目\SAAS-AFTEREND2\yijia-generator\src\main\java\com\yijia\generator\domain\GenTable.java
+D:\java项目\SAAS-AFTEREND2\yijia-generator\src\main\java\com\yijia\generator\config\GenConfig.java
+D:\java项目\SAAS-AFTEREND2\yijia-generator\src\main\java\com\yijia\generator\controller\GenController.java
+D:\java项目\SAAS-AFTEREND2\yijia-generator\src\main\java\com\yijia\generator\mapper\GenTableColumnMapper.java
+D:\java项目\SAAS-AFTEREND2\yijia-generator\src\main\java\com\yijia\generator\mapper\GenTableMapper.java
+D:\java项目\SAAS-AFTEREND2\yijia-generator\src\main\java\com\yijia\generator\util\VelocityInitializer.java
+D:\java项目\SAAS-AFTEREND2\yijia-generator\src\main\java\com\yijia\generator\domain\GenTableColumn.java
+D:\java项目\SAAS-AFTEREND2\yijia-generator\src\main\java\com\yijia\generator\service\GenTableColumnServiceImpl.java
+D:\java项目\SAAS-AFTEREND2\yijia-generator\src\main\java\com\yijia\generator\service\GenTableServiceImpl.java
+D:\java项目\SAAS-AFTEREND2\yijia-generator\src\main\java\com\yijia\generator\util\GenUtils.java
+D:\java项目\SAAS-AFTEREND2\yijia-generator\src\main\java\com\yijia\generator\service\IGenTableColumnService.java
+D:\java项目\SAAS-AFTEREND2\yijia-generator\src\main\java\com\yijia\generator\util\VelocityUtils.java
+D:\java项目\SAAS-AFTEREND2\yijia-generator\src\main\java\com\yijia\generator\service\IGenTableService.java

BIN
yijia-generator/target/yijia-generator-1.0.1.jar


+ 5 - 0
yijia-integral/target/maven-archiver/pom.properties

@@ -0,0 +1,5 @@
+#Generated by Maven
+#Fri Sep 24 09:53:31 CST 2021
+version=1.0.1
+groupId=com.yijia
+artifactId=yijia-integral

+ 34 - 0
yijia-integral/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -0,0 +1,34 @@
+com\yijia\integral\service\IIntegralRuleDetailService.class
+com\yijia\integral\service\IIntegralShopPicService.class
+com\yijia\integral\mapper\CustomerPointsMapper.class
+com\yijia\integral\service\impl\IntegralRuleDetailServiceImpl.class
+com\yijia\integral\domain\CustomerPoints.class
+com\yijia\integral\service\IIntegralWaresService.class
+com\yijia\integral\service\impl\CustomerPointsServiceImpl.class
+com\yijia\integral\mapper\CustomerPointsRecordMapper.class
+com\yijia\integral\mapper\IntegralRuleDetailMapper.class
+com\yijia\integral\service\ICustomerPointsService.class
+com\yijia\integral\domain\IntegralOrder.class
+com\yijia\integral\mapper\IntegralRuleMapper.class
+com\yijia\integral\service\impl\IntegralShopPicServiceImpl.class
+com\yijia\integral\controller\IntegralWaresController.class
+com\yijia\integral\controller\IntegralOrderController.class
+com\yijia\integral\mapper\IntegralShopPicMapper.class
+com\yijia\integral\domain\IntegralWares.class
+com\yijia\integral\service\IIntegralRuleService.class
+com\yijia\integral\service\impl\CustomerPointsRecordServiceImpl.class
+com\yijia\integral\domain\CustomerPointsRecord.class
+com\yijia\integral\domain\IntegralRule.class
+com\yijia\integral\service\impl\IntegralRuleServiceImpl.class
+com\yijia\integral\service\impl\IntegralWaresServiceImpl.class
+com\yijia\integral\mapper\IntegralOrderMapper.class
+com\yijia\integral\domain\IntegralShopPic.class
+com\yijia\integral\controller\IntegralShopPicController.class
+com\yijia\integral\domain\IntegralRuleDetail.class
+com\yijia\integral\service\impl\IntegralOrderServiceImpl.class
+com\yijia\integral\controller\IntegralRuleController.class
+com\yijia\integral\mapper\IntegralWaresMapper.class
+com\yijia\integral\controller\CustomerPointsRecordController.class
+com\yijia\integral\service\IIntegralOrderService.class
+com\yijia\integral\controller\CustomerPointsController.class
+com\yijia\integral\service\ICustomerPointsRecordService.class

+ 34 - 0
yijia-integral/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -0,0 +1,34 @@
+D:\java项目\SAAS-AFTEREND2\yijia-integral\src\main\java\com\yijia\integral\controller\IntegralWaresController.java
+D:\java项目\SAAS-AFTEREND2\yijia-integral\src\main\java\com\yijia\integral\domain\IntegralOrder.java
+D:\java项目\SAAS-AFTEREND2\yijia-integral\src\main\java\com\yijia\integral\service\IIntegralRuleDetailService.java
+D:\java项目\SAAS-AFTEREND2\yijia-integral\src\main\java\com\yijia\integral\service\impl\IntegralRuleDetailServiceImpl.java
+D:\java项目\SAAS-AFTEREND2\yijia-integral\src\main\java\com\yijia\integral\domain\IntegralWares.java
+D:\java项目\SAAS-AFTEREND2\yijia-integral\src\main\java\com\yijia\integral\domain\CustomerPoints.java
+D:\java项目\SAAS-AFTEREND2\yijia-integral\src\main\java\com\yijia\integral\domain\CustomerPointsRecord.java
+D:\java项目\SAAS-AFTEREND2\yijia-integral\src\main\java\com\yijia\integral\controller\IntegralOrderController.java
+D:\java项目\SAAS-AFTEREND2\yijia-integral\src\main\java\com\yijia\integral\domain\IntegralShopPic.java
+D:\java项目\SAAS-AFTEREND2\yijia-integral\src\main\java\com\yijia\integral\mapper\IntegralShopPicMapper.java
+D:\java项目\SAAS-AFTEREND2\yijia-integral\src\main\java\com\yijia\integral\service\impl\CustomerPointsServiceImpl.java
+D:\java项目\SAAS-AFTEREND2\yijia-integral\src\main\java\com\yijia\integral\service\impl\IntegralOrderServiceImpl.java
+D:\java项目\SAAS-AFTEREND2\yijia-integral\src\main\java\com\yijia\integral\service\impl\IntegralRuleServiceImpl.java
+D:\java项目\SAAS-AFTEREND2\yijia-integral\src\main\java\com\yijia\integral\domain\IntegralRuleDetail.java
+D:\java项目\SAAS-AFTEREND2\yijia-integral\src\main\java\com\yijia\integral\mapper\IntegralOrderMapper.java
+D:\java项目\SAAS-AFTEREND2\yijia-integral\src\main\java\com\yijia\integral\mapper\IntegralRuleMapper.java
+D:\java项目\SAAS-AFTEREND2\yijia-integral\src\main\java\com\yijia\integral\mapper\IntegralWaresMapper.java
+D:\java项目\SAAS-AFTEREND2\yijia-integral\src\main\java\com\yijia\integral\service\impl\IntegralShopPicServiceImpl.java
+D:\java项目\SAAS-AFTEREND2\yijia-integral\src\main\java\com\yijia\integral\controller\CustomerPointsController.java
+D:\java项目\SAAS-AFTEREND2\yijia-integral\src\main\java\com\yijia\integral\mapper\IntegralRuleDetailMapper.java
+D:\java项目\SAAS-AFTEREND2\yijia-integral\src\main\java\com\yijia\integral\mapper\CustomerPointsMapper.java
+D:\java项目\SAAS-AFTEREND2\yijia-integral\src\main\java\com\yijia\integral\service\IIntegralOrderService.java
+D:\java项目\SAAS-AFTEREND2\yijia-integral\src\main\java\com\yijia\integral\service\IIntegralShopPicService.java
+D:\java项目\SAAS-AFTEREND2\yijia-integral\src\main\java\com\yijia\integral\controller\CustomerPointsRecordController.java
+D:\java项目\SAAS-AFTEREND2\yijia-integral\src\main\java\com\yijia\integral\service\impl\CustomerPointsRecordServiceImpl.java
+D:\java项目\SAAS-AFTEREND2\yijia-integral\src\main\java\com\yijia\integral\service\impl\IntegralWaresServiceImpl.java
+D:\java项目\SAAS-AFTEREND2\yijia-integral\src\main\java\com\yijia\integral\controller\IntegralRuleController.java
+D:\java项目\SAAS-AFTEREND2\yijia-integral\src\main\java\com\yijia\integral\service\IIntegralRuleService.java
+D:\java项目\SAAS-AFTEREND2\yijia-integral\src\main\java\com\yijia\integral\controller\IntegralShopPicController.java
+D:\java项目\SAAS-AFTEREND2\yijia-integral\src\main\java\com\yijia\integral\service\ICustomerPointsService.java
+D:\java项目\SAAS-AFTEREND2\yijia-integral\src\main\java\com\yijia\integral\service\ICustomerPointsRecordService.java
+D:\java项目\SAAS-AFTEREND2\yijia-integral\src\main\java\com\yijia\integral\mapper\CustomerPointsRecordMapper.java
+D:\java项目\SAAS-AFTEREND2\yijia-integral\src\main\java\com\yijia\integral\domain\IntegralRule.java
+D:\java项目\SAAS-AFTEREND2\yijia-integral\src\main\java\com\yijia\integral\service\IIntegralWaresService.java

BIN
yijia-integral/target/yijia-integral-1.0.1.jar


BIN
yijia-label/target/classes/com/yijia/label/controller/CustomerLabelController.class


BIN
yijia-label/target/classes/com/yijia/label/controller/LabelRuleController.class


BIN
yijia-label/target/classes/com/yijia/label/controller/LabelRuleDetailController.class


BIN
yijia-label/target/classes/com/yijia/label/domain/CustomerLabel.class


BIN
yijia-label/target/classes/com/yijia/label/domain/CustomerLabelDemo.class


BIN
yijia-label/target/classes/com/yijia/label/domain/LabelRule.class


BIN
yijia-label/target/classes/com/yijia/label/domain/LabelRuleDetail.class


BIN
yijia-label/target/classes/com/yijia/label/domain/RequsetSysDept.class


BIN
yijia-label/target/classes/com/yijia/label/domain/RequstCustomerLabel.class


BIN
yijia-label/target/classes/com/yijia/label/domain/ResponeCustomerLabel.class


BIN
yijia-label/target/classes/com/yijia/label/mapper/CustomerLabelDemoMapper.class


BIN
yijia-label/target/classes/com/yijia/label/mapper/CustomerLabelMapper.class


BIN
yijia-label/target/classes/com/yijia/label/mapper/LabelRuleDetailMapper.class


BIN
yijia-label/target/classes/com/yijia/label/mapper/LabelRuleMapper.class


BIN
yijia-label/target/classes/com/yijia/label/service/ICustomerLabelDemoService.class


BIN
yijia-label/target/classes/com/yijia/label/service/ICustomerLabelService.class


BIN
yijia-label/target/classes/com/yijia/label/service/ILabelRuleDetailService.class


BIN
yijia-label/target/classes/com/yijia/label/service/ILabelRuleService.class


BIN
yijia-label/target/classes/com/yijia/label/service/impl/CustomerLabelDemoServiceImpl.class


BIN
yijia-label/target/classes/com/yijia/label/service/impl/CustomerLabelServiceImpl.class


BIN
yijia-label/target/classes/com/yijia/label/service/impl/LabelRuleDetailServiceImpl.class


BIN
yijia-label/target/classes/com/yijia/label/service/impl/LabelRuleServiceImpl.class


+ 289 - 0
yijia-label/target/classes/mapper/label/CustomerLabelDemoMapper.xml

@@ -0,0 +1,289 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yijia.label.mapper.CustomerLabelDemoMapper">
+    <resultMap type="CustomerLabelDemo" id="CustomerLabelDemoResult">
+        <result property="id"    column="id"    />
+        <result property="phone"    column="phone"    />
+        <result property="stationId"    column="station_id"    />
+        <result property="customerName"    column="customer_name"    />
+        <result property="labelName"    column="label_name"    />
+        <result property="labelId"    column="label_id"    />
+        <result property="createDate"    column="create_date"    />
+    </resultMap>
+
+    <select id="selectCustomerLabelDemoList" parameterType="CustomerLabelDemo" resultMap="CustomerLabelDemoResult">
+        SELECT zq.*,r.label_name,r.id as label_id from (
+        SELECT consumer_id,sum(order_liters) order_liters,sum(amt) as amt,count(1) count_num,p.station_id,max(created_date) as create_date,
+        a.mobile_phone as phone,blog_nick_name as customer_name
+        from pay_order p
+        join app_user_info a on a.user_id = p.consumer_id
+        where  p.status ="1"
+        <if test="stationId != null "> and p.station_id = #{stationId}</if>
+        <if test="oilName != null "> and oil_name = #{oilName} </if>
+        <if test="beginDate != null and beginDate != ''"><!-- 开始时间检索 -->
+            AND date_format(created_date,'%Y-%m-%d %H:%i:%s') &gt;= date_format(#{beginDate},'%Y-%m-%d %H:%i:%s')
+        </if>
+        <if test="endDate != null and endDate != ''"><!-- 结束时间检索 -->
+            AND date_format(created_date,'%Y-%m-%d %H:%i:%s') &lt;= date_format(#{endDate},'%Y-%m-%d %H:%i:%s')
+        </if>
+        group by consumer_id,p.station_id,a.mobile_phone,blog_nick_name
+        ORDER BY create_date desc) zq
+        left join customer_label l on zq.station_id = l.station_id and zq.phone = l.phone and l.del_flag ="0"
+        left join label_rule r on r.id = l.label_id and r.del_flag ="0"
+        <where>
+            <if test="labelId != null "> and l.label_id >= #{labelId}</if>
+            <if test="startCountNum != null "> and zq.count_num >= #{startCountNum}</if>
+            <if test="endCountNum != null "> and zq.count_num &lt; #{endCountNum}</if>
+            <if test="amtFlag != null and amtFlag=='2'.toString()">
+                <choose>
+                    <when test="startAmt != null and endAmt != null">
+                       and (  zq.amt >= #{startAmt} and zq.amt &lt; #{endAmt})
+                    </when>
+                    <when test="startAmt != null and endAmt == null">
+                        and  zq.amt >= #{startAmt}
+                    </when>
+                    <when test="endAmt != null and startAmt == null">
+                        and  zq.amt &lt; #{endAmt}
+                    </when>
+                    <otherwise>
+                    </otherwise>
+                </choose>
+            </if>
+            <if test="amtFlag != null and amtFlag=='1'.toString() ">
+                <choose>
+                    <when test="startAmt != null and endAmt != null">
+                        or (  zq.amt >= #{startAmt} and zq.amt &lt; #{endAmt})
+                    </when>
+                    <when test="startAmt != null and endAmt == null">
+                        or  zq.amt >= #{startAmt}
+                    </when>
+                    <when test="endAmt != null and startAmt == null">
+                        or  zq.amt &lt; #{endAmt}
+                    </when>
+                    <otherwise>
+                    </otherwise>
+                </choose>
+            </if>
+            <if test="litersFlag != null and litersFlag=='2'.toString() ">
+                <choose>
+                    <when test="startLiters != null and endLiters != null">
+                        and (  zq.order_liters >= #{startLiters} and zq.order_liters &lt; #{endLiters})
+                    </when>
+                    <when test="startLiters != null and endLiters == null">
+                        and  zq.order_liters >= #{startLiters}
+                    </when>
+                    <when test="endLiters != null and startLiters == null">
+                        and  zq.order_liters &lt; #{endLiters}
+                    </when>
+                    <otherwise>
+                    </otherwise>
+                </choose>
+            </if>
+            <if test="litersFlag != null and litersFlag=='1'.toString() ">
+                <choose>
+                    <when test="startLiters != null and endLiters != null">
+                        or (  zq.order_liters >= #{startLiters} and zq.order_liters &lt; #{endLiters})
+                    </when>
+                    <when test="startLiters != null and endLiters == null">
+                        or  zq.order_liters >= #{startLiters}
+                    </when>
+                    <when test="endLiters != null and startLiters == null">
+                        or  zq.order_liters &lt; #{endLiters}
+                    </when>
+                    <otherwise>
+                    </otherwise>
+                </choose>
+            </if>
+        </where>
+    </select>
+
+    <select id="selectPhoneCustomerLabelList" parameterType="CustomerLabelDemo" resultMap="CustomerLabelDemoResult">
+        SELECT id,phone,label_id,station_id	from customer_label
+        <where>
+            <if test="stationId != null "> and station_id = #{stationId}</if>
+            <if test="labelId != null "> and label_id = #{labelId}</if>
+            <if test="delFlag != null "> and del_flag = #{delFlag}</if>
+            <if test="phone != null  and phone != ''"> and phone like concat('%', #{phone}, '%')</if>
+            <if test="phoneList != null ">
+                and phone in
+                <foreach item="item" index="index" collection="phoneList"
+                         open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+    </select>
+
+    <select id="secondCustomerLabelDemoList" parameterType="CustomerLabelDemo" resultMap="CustomerLabelDemoResult">
+        SELECT  zh.*,r.label_name,r.id as label_id from (
+        SELECT consumer_id,sum(order_liters) order_liters,sum(amt) as amt,count(1) count_num,p.station_id,max(created_date) as create_date,
+        a.mobile_phone as phone,blog_nick_name as customer_name
+        from pay_order p
+        join app_user_info a on a.user_id = p.consumer_id
+        where `status` = "1"
+        <if test="stationId != null "> and p.station_id = #{stationId}</if>
+        <if test="oilName != null "> and oil_name = #{oilName} </if>
+        <if test="secondBeginDate != null and beginDate != ''"><!-- 开始时间检索 -->
+            AND date_format(created_date,'%Y-%m-%d %H:%i:%s') &gt;= date_format(#{secondBeginDate},'%Y-%m-%d %H:%i:%s')
+        </if>
+        <if test="secondEndDate != null and secondEndDate != ''"><!-- 结束时间检索 -->
+            AND date_format(created_date,'%Y-%m-%d %H:%i:%s') &lt;= date_format(#{secondEndDate},'%Y-%m-%d %H:%i:%s')
+        </if>
+        group by consumer_id,p.station_id,a.mobile_phone,blog_nick_name
+        ORDER BY create_date desc) zh
+        left join customer_label l on zh.station_id = l.station_id and zh.phone = l.phone and l.del_flag ="0"
+        left join label_rule r on r.id = l.label_id
+        where 1=1
+        <if test="labelId != null "> and l.label_id = #{labelId}</if>
+        <if test="stationId != null "> and zh.station_id = #{stationId}</if>
+        <if test="secondStartCountNum != null "> and zh.count_num > #{secondStartCountNum}</if>
+        <if test="secondEndCountNum != null "> and  zh.count_num &lt;=#{secondEndCountNum} </if>
+        <if test="secondAmtFlag != null and secondAmtFlag=='2'.toString() ">
+            <choose>
+                <when test="secondStartAmt != null and secondEndAmt != null">
+                    and (  zh.amt > #{secondStartAmt} and zh.amt &lt;= #{secondEndAmt})
+                </when>
+                <when test="secondStartAmt != null and secondEndAmt == null">
+                    and  zh.amt > #{secondStartAmt}
+                </when>
+                <when test="secondEndAmt != null and secondStartAmt == null">
+                    and  zh.amt &lt;= #{secondEndAmt}
+                </when>
+                <otherwise>
+                </otherwise>
+            </choose>
+        </if>
+        <if test="secondAmtFlag != null and secondAmtFlag=='1'.toString() ">
+            <choose>
+                <when test="secondStartAmt != null and secondEndAmt != null">
+                    or (  zh.amt > #{secondStartAmt} and zh.amt &lt;=#{secondEndAmt})
+                </when>
+                <when test="secondStartAmt != null and secondEndAmt == null">
+                    or  zh.amt > #{secondStartAmt}
+                </when>
+                <when test="secondEndAmt != null and startAmt == null">
+                    or  zh.amt &lt;= #{secondEndAmt}
+                </when>
+                <otherwise>
+                </otherwise>
+            </choose>
+        </if>
+        <if test="secondLitersFlag != null and secondLitersFlag=='2'.toString() ">
+            <choose>
+                <when test="secondStartLiters != null and secondEndLiters != null">
+                    and (  zh.order_liters  > #{secondStartLiters} and zh.order_liters  &lt;= #{secondEndLiters})
+                </when>
+                <when test="secondStartLiters != null and secondEndLiters == null">
+                    and  zh.order_liters  > #{secondStartLiters}
+                </when>
+                <when test="secondEndLiters != null and secondStartLiters == null">
+                    and  zh.order_liters  &lt;= #{secondEndLiters}
+                </when>
+                <otherwise>
+                </otherwise>
+            </choose>
+        </if>
+        <if test="secondLitersFlag != null and secondLitersFlag=='1'.toString() ">
+            <choose>
+                <when test="secondStartLiters != null and secondEndLiters != null">
+                    or (  zh.order_liters  > #{secondStartLiters} and zq.order_liters &lt;= #{secondEndLiters})
+                </when>
+                <when test="secondStartLiters != null and secondEndLiters == null">
+                    or  zh.order_liters  > #{secondStartLiters}
+                </when>
+                <when test="secondEndLiters != null and secondStartLiters == null">
+                    or  zh.order_liters &lt;= #{secondEndLiters}
+                </when>
+                <otherwise>
+                </otherwise>
+            </choose>
+        </if>
+        and zh.phone in (
+        SELECT zq.phone from (
+        SELECT consumer_id,sum(order_liters) order_liters,count(1) count_num,sum(amt) as amt,p.station_id,max(created_date) created_date,
+        a.mobile_phone as phone,blog_nick_name as customer_name
+        from pay_order p
+        join app_user_info a on a.user_id = p.consumer_id
+        where  p.status ="1"
+        <if test="stationId != null "> and p.station_id = #{stationId}</if>
+        <if test="oilName != null "> and oil_name = #{oilName} </if>
+        <if test="beginDate != null and beginDate != ''"><!-- 开始时间检索 -->
+            AND date_format(created_date,'%Y-%m-%d %H:%i:%s') &gt;= date_format(#{beginDate},'%Y-%m-%d %H:%i:%s')
+        </if>
+        <if test="endDate != null and endDate != ''"><!-- 结束时间检索 -->
+            AND date_format(created_date,'%Y-%m-%d %H:%i:%s') &lt;= date_format(#{endDate},'%Y-%m-%d %H:%i:%s')
+        </if>
+        group by consumer_id,p.station_id,a.mobile_phone,blog_nick_name
+        ORDER BY created_date desc) zq
+        left join customer_label l on zq.station_id = l.station_id and zq.phone = l.phone and l.del_flag ="0"
+        left join label_rule r on r.id = l.label_id
+        <where>
+            <if test="labelId != null "> and l.label_id = #{labelId}</if>
+            <if test="stationId != null "> and zq.station_id = #{stationId}</if>
+            <if test="startCountNum != null "> and zq.count_num >= #{startCountNum}</if>
+            <if test="endCountNum != null "> and zq.count_num &lt; #{endCountNum}</if>
+            <if test="amtFlag != null and amtFlag=='2'.toString() ">
+                <choose>
+                    <when test="startAmt != null and endAmt != null">
+                        and (  zq.amt >= #{startAmt} and zq.amt &lt; #{endAmt})
+                    </when>
+                    <when test="startAmt != null and endAmt == null">
+                        and  zq.amt >= #{startAmt}
+                    </when>
+                    <when test="endAmt != null and startAmt == null">
+                        and  zq.amt &lt; #{endAmt}
+                    </when>
+                    <otherwise>
+                    </otherwise>
+                </choose>
+            </if>
+            <if test="amtFlag != null and amtFlag=='1'.toString() ">
+                <choose>
+                    <when test="startAmt != null and endAmt != null">
+                        or (  zq.amt >= #{startAmt} and zq.amt &lt; #{endAmt})
+                    </when>
+                    <when test="startAmt != null and endAmt == null">
+                        or  zq.amt >= #{startAmt}
+                    </when>
+                    <when test="endAmt != null and startAmt == null">
+                        or  zq.amt &lt; #{endAmt}
+                    </when>
+                    <otherwise>
+                    </otherwise>
+                </choose>
+            </if>
+            <if test="litersFlag != null and litersFlag=='2'.toString() ">
+                <choose>
+                    <when test="startLiters != null and endLiters != null">
+                        and (  zq.order_liters >= #{startLiters} and zq.order_liters &lt; #{endLiters})
+                    </when>
+                    <when test="startLiters != null and endLiters == null">
+                        and  zq.order_liters >= #{startLiters}
+                    </when>
+                    <when test="endLiters != null and startLiters == null">
+                        and  zq.order_liters &lt; #{endLiters}
+                    </when>
+                    <otherwise>
+                    </otherwise>
+                </choose>
+            </if>
+            <if test="litersFlag != null and litersFlag=='1'.toString() ">
+                <choose>
+                    <when test="startLiters != null and endLiters != null">
+                        or (  zq.order_liters >= #{startLiters} and zq.order_liters &lt; #{endLiters})
+                    </when>
+                    <when test="startLiters != null and endLiters == null">
+                        or  zq.order_liters >= #{startLiters}
+                    </when>
+                    <when test="endLiters != null and startLiters == null">
+                        or  zq.order_liters &lt; #{endLiters}
+                    </when>
+                    <otherwise>
+                    </otherwise>
+                </choose>
+            </if>
+        </where> )
+    </select>
+</mapper>

+ 133 - 0
yijia-label/target/classes/mapper/label/CustomerLabelMapper.xml

@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yijia.label.mapper.CustomerLabelMapper">
+    <resultMap type="CustomerLabel" id="CustomerLabelResult">
+        <result property="id"    column="id"    />
+        <result property="phone"    column="phone"    />
+        <result property="labelId"    column="label_id"    />
+        <result property="stationId"    column="station_id"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="delFlag"    column="del_flag"    />
+        <result property="customerName"    column="customer_name"    />
+    </resultMap>
+
+    <sql id="selectCustomerLabelVo">
+        select id, phone, label_id, station_id, create_by, create_time, update_by, update_time, del_flag from customer_label
+    </sql>
+
+    <select id="selectCustomerLabelList" parameterType="CustomerLabel" resultMap="CustomerLabelResult">
+        <include refid="selectCustomerLabelVo"/>
+        <where>
+            <if test="phone != null  and phone != ''"> and phone like concat('%', #{phone}, '%')</if>
+            <if test="labelId != null "> and label_id = #{labelId}</if>
+            <if test="stationId != null "> and station_id = #{stationId}</if>
+            <if test="delFlag != null "> and del_flag = #{delFlag}</if>
+        </where>
+    </select>
+    <select id="selectNotCustomerLabelInfo" parameterType="CustomerLabel" resultMap="CustomerLabelResult">
+        SELECT	* FROM(
+        SELECT DISTINCT ( m.phone_number ) AS phone,customer_name,pay_date
+        FROM customer_manage m
+        LEFT JOIN app_user_info a ON m.mina_user_id = a.user_id
+        LEFT JOIN ( SELECT max( pay_date ) AS pay_date, po.consumer_id FROM pay_order po
+        <where>
+            <if test="stationId != null "> and po.station_id = #{stationId}</if>
+        </where>
+          GROUP BY consumer_id ) c ON c.consumer_id = a.user_id
+        <where>
+            <if test="stationId != null "> and m.station_id = #{stationId}</if>
+            <if test="phone != null  and phone != ''"> and m.phone_number like concat('%', #{phone}, '%')</if>
+            <if test="customerName != null  and customerName != ''"> and m.customer_name like concat('%', #{customerName}, '%')</if>
+        </where>
+        AND m.phone_number NOT IN ( SELECT phone FROM customer_label b
+        <where>
+            <if test="stationId != null "> and b.station_id = #{stationId}</if>
+            <if test="delFlag != null "> and del_flag = #{delFlag}</if>
+            <if test="phone != null  and phone != ''"> and b.phone like concat('%', #{phone}, '%')</if>
+        </where>
+         )) po
+        ORDER BY  po.pay_date DESC
+    </select>
+    <select id="selectPhonelist" parameterType="CustomerLabel" resultMap="CustomerLabelResult">
+        SELECT DISTINCT phone,label_id,c.station_id,m.customer_name from  customer_label	c
+        left join  customer_manage m on c.phone = m.phone_number and c.station_id = m.station_id
+        <where>
+            <if test="stationId != null "> and c.station_id = #{stationId}</if>
+            <if test="labelId != null "> and label_id = #{labelId}</if>
+            <if test="delFlag != null "> and del_flag = #{delFlag}</if>
+            <if test="phone != null  and phone != ''"> and c.phone like concat('%', #{phone}, '%')</if>
+            <if test="customerName != null  and customerName != ''"> and m.customer_name like concat('%', #{customerName}, '%')</if>
+        </where>
+    </select>
+    <select id="selectCustomerLabelById" parameterType="Integer" resultMap="CustomerLabelResult">
+        <include refid="selectCustomerLabelVo"/>
+        where id = #{id}
+    </select>
+
+    <select id="selectCustomerLabelInfo" parameterType="CustomerLabel" resultMap="CustomerLabelResult">
+        <include refid="selectCustomerLabelVo"/>
+        <where>
+            <if test="phone != null  and phone != ''"> and phone = #{phone}</if>
+            <if test="labelId != null "> and label_id = #{labelId}</if>
+            <if test="stationId != null "> and station_id = #{stationId}</if>
+            <if test="delFlag != null "> and del_flag = #{delFlag}</if>
+        </where>
+         limit 1
+    </select>
+
+    <insert id="insertCustomerLabel" parameterType="CustomerLabel" useGeneratedKeys="true" keyProperty="id">
+        insert into customer_label
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="phone != null">phone,</if>
+            <if test="labelId != null">label_id,</if>
+            <if test="stationId != null">station_id,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="delFlag != null">del_flag,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="phone != null">#{phone},</if>
+            <if test="labelId != null">#{labelId},</if>
+            <if test="stationId != null">#{stationId},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+         </trim>
+    </insert>
+
+    <update id="updateCustomerLabel" parameterType="CustomerLabel">
+        update customer_label
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="phone != null">phone = #{phone},</if>
+            <if test="labelId != null">label_id = #{labelId},</if>
+            <if test="stationId != null">station_id = #{stationId},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteCustomerLabelById" parameterType="Integer">
+        delete from customer_label where id = #{id}
+    </delete>
+
+    <delete id="deleteCustomerLabelByIds" parameterType="String">
+        delete from customer_label where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+
+</mapper>

+ 111 - 0
yijia-label/target/classes/mapper/label/LabelRuleDetailMapper.xml

@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yijia.label.mapper.LabelRuleDetailMapper">
+    
+    <resultMap type="LabelRuleDetail" id="LabelRuleDetailResult">
+        <result property="id"    column="id"    />
+        <result property="parentId"    column="parent_id"    />
+        <result property="oilName"    column="oil_name"    />
+        <result property="discountTerm"    column="discount_term"    />
+        <result property="discountLitersAmt"    column="discount_liters_amt"    />
+        <result property="discountAmt"    column="discount_amt"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="delFlag"    column="del_flag"    />
+    </resultMap>
+
+    <sql id="selectLabelRuleDetailVo">
+        select id, parent_id, oil_name, discount_term, discount_liters_amt, discount_amt, create_by, create_time, update_by, update_time, del_flag
+        from label_rule_detail
+    </sql>
+
+    <select id="selectLabelRuleDetailList" parameterType="LabelRuleDetail" resultMap="LabelRuleDetailResult">
+        <include refid="selectLabelRuleDetailVo"/>
+        <where>  
+            <if test="parentId != null "> and parent_id = #{parentId}</if>
+            <if test="oilName != null  and oilName != ''"> and oil_name like concat('%', #{oilName}, '%')</if>
+            <if test="discountTerm != null  and discountTerm != ''"> and discount_term = #{discountTerm}</if>
+            <if test="discountLitersAmt != null  and discountLitersAmt != ''"> and discount_liters_amt = #{discountLitersAmt}</if>
+            <if test="discountAmt != null  and discountAmt != ''"> and discount_amt = #{discountAmt}</if>
+            <if test="delFlag != null  and delFlag != ''"> and del_flag = #{delFlag}</if>
+        </where>
+    </select>
+
+    <select id="labelRuleDetailList" parameterType="LabelRuleDetail" resultMap="LabelRuleDetailResult">
+        select d.*,dept_name as station_name,r.station_id from label_rule r join label_rule_detail d on r.id=d.parent_id
+        join sys_dept p on r.station_id = p.dept_id
+        <where>
+            <if test="parentId != null "> and parent_id = #{parentId}</if>
+            <if test="oilName != null  and oilName != ''"> and oil_name like concat('%', #{oilName}, '%')</if>
+            <if test="discountTerm != null  and discountTerm != ''"> and discount_term = #{discountTerm}</if>
+            <if test="discountLitersAmt != null  and discountLitersAmt != ''"> and discount_liters_amt = #{discountLitersAmt}</if>
+            <if test="discountAmt != null  and discountAmt != ''"> and discount_amt = #{discountAmt}</if>
+        </where>
+    </select>
+    
+    <select id="selectLabelRuleDetailById" parameterType="Integer" resultMap="LabelRuleDetailResult">
+        <include refid="selectLabelRuleDetailVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertLabelRuleDetail" parameterType="LabelRuleDetail" useGeneratedKeys="true" keyProperty="id">
+        insert into label_rule_detail
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="parentId != null">parent_id,</if>
+            <if test="oilName != null">oil_name,</if>
+            <if test="discountTerm != null">discount_term,</if>
+            <if test="discountLitersAmt != null">discount_liters_amt,</if>
+            <if test="discountAmt != null">discount_amt,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="delFlag != null">del_flag,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="parentId != null">#{parentId},</if>
+            <if test="oilName != null">#{oilName},</if>
+            <if test="discountTerm != null">#{discountTerm},</if>
+            <if test="discountLitersAmt != null">#{discountLitersAmt},</if>
+            <if test="discountAmt != null">#{discountAmt},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+         </trim>
+    </insert>
+
+    <update id="updateLabelRuleDetail" parameterType="LabelRuleDetail">
+        update label_rule_detail
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="parentId != null">parent_id = #{parentId},</if>
+            <if test="oilName != null">oil_name = #{oilName},</if>
+            <if test="discountTerm != null">discount_term = #{discountTerm},</if>
+            <if test="discountLitersAmt != null">discount_liters_amt = #{discountLitersAmt},</if>
+            <if test="discountAmt != null">discount_amt = #{discountAmt},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteLabelRuleDetailById" parameterType="Integer">
+        delete from label_rule_detail where id = #{id}
+    </delete>
+
+    <delete id="deleteLabelRuleDetailByIds" parameterType="String">
+        delete from label_rule_detail where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+    
+</mapper>

+ 89 - 0
yijia-label/target/classes/mapper/label/LabelRuleMapper.xml

@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yijia.label.mapper.LabelRuleMapper">
+
+    <resultMap type="LabelRule" id="LabelRuleResult">
+        <result property="id"    column="id"    />
+        <result property="labelName"    column="label_name"    />
+        <result property="stationId"    column="station_id"    />
+        <result property="delFlag"    column="del_flag"    />
+        <result property="isAddLabel"    column="is_add_label"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+    </resultMap>
+
+    <sql id="selectLabelRuleVo">
+        select id, label_name, station_id, del_flag,is_add_label, create_by, create_time, update_by, update_time
+        from label_rule
+    </sql>
+
+    <select id="selectLabelRuleList" parameterType="LabelRule" resultMap="LabelRuleResult">
+        <include refid="selectLabelRuleVo"/>
+        <where>
+            <if test="labelName != null  and labelName != ''"> and label_name like concat('%', #{labelName}, '%')</if>
+            <if test="stationId != null "> and station_id = #{stationId}</if>
+            <if test="delFlag != null "> and del_flag = #{delFlag}</if>
+        </where>
+        order by create_time
+    </select>
+
+    <select id="selectLabelRuleById" parameterType="Integer" resultMap="LabelRuleResult">
+        <include refid="selectLabelRuleVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertLabelRule" parameterType="LabelRule" useGeneratedKeys="true" keyProperty="id">
+        insert into label_rule
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="labelName != null">label_name,</if>
+            <if test="stationId != null">station_id,</if>
+            <if test="delFlag != null">del_flag,</if>
+            <if test="isAddLabel != null">is_add_label,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="labelName != null">#{labelName},</if>
+            <if test="stationId != null">#{stationId},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+            <if test="isAddLabel != null">#{isAddLabel},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+         </trim>
+    </insert>
+
+    <update id="updateLabelRule" parameterType="LabelRule">
+        update label_rule
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="labelName != null">label_name = #{labelName},</if>
+            <if test="stationId != null">station_id = #{stationId},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
+            <if test="isAddLabel != null">is_add_label = #{isAddLabel},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteLabelRuleById" parameterType="Integer">
+        delete from label_rule where id = #{id}
+    </delete>
+
+    <delete id="deleteLabelRuleByIds" parameterType="String">
+        delete from label_rule where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+
+</mapper>

+ 5 - 0
yijia-label/target/maven-archiver/pom.properties

@@ -0,0 +1,5 @@
+#Generated by Maven
+#Fri Sep 24 09:53:28 CST 2021
+version=1.0.1
+groupId=com.yijia
+artifactId=yijia-label

+ 22 - 0
yijia-label/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -0,0 +1,22 @@
+com\yijia\label\service\ILabelRuleDetailService.class
+com\yijia\label\mapper\CustomerLabelMapper.class
+com\yijia\label\controller\LabelRuleDetailController.class
+com\yijia\label\domain\RequstCustomerLabel.class
+com\yijia\label\domain\CustomerLabel.class
+com\yijia\label\domain\CustomerLabelDemo.class
+com\yijia\label\domain\LabelRuleDetail.class
+com\yijia\label\domain\LabelRule.class
+com\yijia\label\service\ICustomerLabelDemoService.class
+com\yijia\label\service\ILabelRuleService.class
+com\yijia\label\controller\LabelRuleController.class
+com\yijia\label\service\impl\LabelRuleServiceImpl.class
+com\yijia\label\domain\RequsetSysDept.class
+com\yijia\label\domain\ResponeCustomerLabel.class
+com\yijia\label\service\ICustomerLabelService.class
+com\yijia\label\controller\CustomerLabelController.class
+com\yijia\label\service\impl\CustomerLabelDemoServiceImpl.class
+com\yijia\label\mapper\CustomerLabelDemoMapper.class
+com\yijia\label\service\impl\CustomerLabelServiceImpl.class
+com\yijia\label\mapper\LabelRuleDetailMapper.class
+com\yijia\label\service\impl\LabelRuleDetailServiceImpl.class
+com\yijia\label\mapper\LabelRuleMapper.class

+ 22 - 0
yijia-label/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -0,0 +1,22 @@
+D:\java项目\SAAS-AFTEREND2\yijia-label\src\main\java\com\yijia\label\domain\CustomerLabelDemo.java
+D:\java项目\SAAS-AFTEREND2\yijia-label\src\main\java\com\yijia\label\mapper\LabelRuleDetailMapper.java
+D:\java项目\SAAS-AFTEREND2\yijia-label\src\main\java\com\yijia\label\controller\CustomerLabelController.java
+D:\java项目\SAAS-AFTEREND2\yijia-label\src\main\java\com\yijia\label\service\impl\CustomerLabelServiceImpl.java
+D:\java项目\SAAS-AFTEREND2\yijia-label\src\main\java\com\yijia\label\service\ICustomerLabelService.java
+D:\java项目\SAAS-AFTEREND2\yijia-label\src\main\java\com\yijia\label\domain\LabelRuleDetail.java
+D:\java项目\SAAS-AFTEREND2\yijia-label\src\main\java\com\yijia\label\service\ILabelRuleService.java
+D:\java项目\SAAS-AFTEREND2\yijia-label\src\main\java\com\yijia\label\domain\RequsetSysDept.java
+D:\java项目\SAAS-AFTEREND2\yijia-label\src\main\java\com\yijia\label\controller\LabelRuleController.java
+D:\java项目\SAAS-AFTEREND2\yijia-label\src\main\java\com\yijia\label\domain\LabelRule.java
+D:\java项目\SAAS-AFTEREND2\yijia-label\src\main\java\com\yijia\label\mapper\LabelRuleMapper.java
+D:\java项目\SAAS-AFTEREND2\yijia-label\src\main\java\com\yijia\label\controller\LabelRuleDetailController.java
+D:\java项目\SAAS-AFTEREND2\yijia-label\src\main\java\com\yijia\label\service\ILabelRuleDetailService.java
+D:\java项目\SAAS-AFTEREND2\yijia-label\src\main\java\com\yijia\label\domain\RequstCustomerLabel.java
+D:\java项目\SAAS-AFTEREND2\yijia-label\src\main\java\com\yijia\label\service\impl\LabelRuleDetailServiceImpl.java
+D:\java项目\SAAS-AFTEREND2\yijia-label\src\main\java\com\yijia\label\domain\ResponeCustomerLabel.java
+D:\java项目\SAAS-AFTEREND2\yijia-label\src\main\java\com\yijia\label\domain\CustomerLabel.java
+D:\java项目\SAAS-AFTEREND2\yijia-label\src\main\java\com\yijia\label\service\impl\CustomerLabelDemoServiceImpl.java
+D:\java项目\SAAS-AFTEREND2\yijia-label\src\main\java\com\yijia\label\mapper\CustomerLabelMapper.java
+D:\java项目\SAAS-AFTEREND2\yijia-label\src\main\java\com\yijia\label\service\ICustomerLabelDemoService.java
+D:\java项目\SAAS-AFTEREND2\yijia-label\src\main\java\com\yijia\label\service\impl\LabelRuleServiceImpl.java
+D:\java项目\SAAS-AFTEREND2\yijia-label\src\main\java\com\yijia\label\mapper\CustomerLabelDemoMapper.java

BIN
yijia-label/target/yijia-label-1.0.1.jar


BIN
yijia-market/target/classes/com/yijia/markert/controller/MarkertPlanController.class


BIN
yijia-market/target/classes/com/yijia/markert/controller/MarketCouponController.class


BIN
yijia-market/target/classes/com/yijia/markert/domain/MarkertPlan.class


BIN
yijia-market/target/classes/com/yijia/markert/domain/MarketCoupon.class


BIN
yijia-market/target/classes/com/yijia/markert/mapper/MarkertPlanMapper.class


BIN
yijia-market/target/classes/com/yijia/markert/mapper/MarketCouponMapper.class


BIN
yijia-market/target/classes/com/yijia/markert/service/IMarkertPlanService.class


BIN
yijia-market/target/classes/com/yijia/markert/service/IMarketCouponService.class


BIN
yijia-market/target/classes/com/yijia/markert/service/impl/MarkertPlanServiceImpl.class


BIN
yijia-market/target/classes/com/yijia/markert/service/impl/MarketCouponServiceImpl.class


この差分においてかなりの量のファイルが変更されているため、一部のファイルを表示していません