diff --git a/.gitignore b/.gitignore
index cb1cab34..d64f5332 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,7 +25,8 @@ hs_err_pid*
#maven忽略文件
HELP.md
target/
-target
+/target/
+**/target/**
!.mvn/wrapper/maven-wrapper.jar
!**/src/main/**
!**/src/test/**
diff --git a/mall-account/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/mall-account/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
index 54c02ff9..e69de29b 100644
--- a/mall-account/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
+++ b/mall-account/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
@@ -1,89 +0,0 @@
-com/suisung/mall/account/listener/DealUserInfoListener.class
-com/suisung/mall/account/controller/admin/AccountController.class
-com/suisung/mall/account/controller/admin/AccountUserSnsController.class
-com/suisung/mall/account/service/impl/AccountUserInfoServiceImpl.class
-com/suisung/mall/account/mapper/AnalyticsUserDao.class
-com/suisung/mall/account/service/AccountUserAnalyticsService.class
-com/suisung/mall/account/config/ThreadConfig.class
-com/suisung/mall/account/service/impl/AccountUserChainServiceImpl.class
-com/suisung/mall/account/service/AccountUserLevelLogService.class
-com/suisung/mall/account/service/impl/AnalyticsUserServiceImpl.class
-com/suisung/mall/account/service/AccountUserBaseService.class
-com/suisung/mall/account/service/impl/WeiXinServiceImpl.class
-com/suisung/mall/account/mapper/AccountUserChannelMapper.class
-com/suisung/mall/account/controller/admin/AccountBaseConfigController.class
-com/suisung/mall/account/config/FeignConfig.class
-com/suisung/mall/account/service/impl/AccountUserChannelCodeServiceImpl.class
-com/suisung/mall/account/service/impl/AccountUserChannelServiceImpl.class
-com/suisung/mall/account/controller/admin/AccountUserBaseController.class
-com/suisung/mall/account/service/AccountBaseRoleLevelService.class
-com/suisung/mall/account/controller/mobile/UserController.class
-com/suisung/mall/account/service/AccountUserChannelService.class
-com/suisung/mall/account/controller/admin/AccountUserChainController.class
-com/suisung/mall/account/service/impl/AccountUserBaseServiceImpl.class
-com/suisung/mall/account/mapper/AccountUserAnalyticsMapper.class
-com/suisung/mall/account/config/UserInfoConfig.class
-com/suisung/mall/account/mapper/AccountUserChainMapper.class
-com/suisung/mall/account/mapper/AccountUserLoginMapper.class
-com/suisung/mall/account/service/AccountBaseConfigService.class
-com/suisung/mall/account/service/WeiXinService.class
-com/suisung/mall/account/service/AccountUserInfoService.class
-com/suisung/mall/account/mapper/AccountUserChannelBringMapper.class
-com/suisung/mall/account/listener/UpgradeUserLevelListener.class
-com/suisung/mall/account/service/impl/AccountBaseUserLevelServiceImpl.class
-com/suisung/mall/account/service/AccountUserLoginService.class
-com/suisung/mall/account/mapper/AccountUserBindConnectMapper.class
-com/suisung/mall/account/service/AccountBaseUserLevelService.class
-com/suisung/mall/account/controller/mobile/ConfigController.class
-com/suisung/mall/account/service/impl/AccountBaseConfigServiceImpl.class
-com/suisung/mall/account/listener/DealUserAnalyticsListener.class
-com/suisung/mall/account/controller/mobile/UserSecurityController.class
-com/suisung/mall/account/service/impl/AccountUserAnalyticsServiceImpl.class
-com/suisung/mall/account/service/impl/AccountUserBindConnectServiceImpl.class
-com/suisung/mall/account/controller/admin/AccountOpenController.class
-com/suisung/mall/account/service/ShopUserExpHistoryService.class
-com/suisung/mall/account/mapper/ShopUserExpHistoryMapper.class
-com/suisung/mall/account/service/AccountUserChannelCodeService.class
-com/suisung/mall/account/service/impl/AccountUserLoginServiceImpl.class
-com/suisung/mall/account/service/AnalyticsUserService.class
-com/suisung/mall/account/config/FeignConfig$1.class
-com/suisung/mall/account/mapper/AccountBaseRoleLevelMapper.class
-com/suisung/mall/account/controller/mobile/WeiXinController.class
-com/suisung/mall/account/controller/LoginController.class
-com/suisung/mall/account/controller/admin/AccountUserChannelBringController.class
-com/suisung/mall/account/service/impl/AccountUserChannelBringServiceImpl.class
-com/suisung/mall/account/config/RedisConfig.class
-com/suisung/mall/account/config/SwaggerConfig.class
-com/suisung/mall/account/controller/admin/AccountBaseUserLevelController.class
-com/suisung/mall/account/mapper/AccountBaseConfigMapper.class
-com/suisung/mall/account/config/RabbitMqConfig.class
-com/suisung/mall/account/controller/admin/AnalyticsController.class
-com/suisung/mall/account/mapper/AccountUserInfoMapper.class
-com/suisung/mall/account/config/CookieUtil.class
-com/suisung/mall/account/mapper/AccountUserChannelCodeMapper.class
-com/suisung/mall/account/controller/mobile/GoogleController.class
-com/suisung/mall/account/controller/admin/AccountUserChannelCodeController.class
-com/suisung/mall/account/service/AccountUserTypeService.class
-com/suisung/mall/account/controller/admin/AccountUserInfoController.class
-com/suisung/mall/account/service/impl/ShopUserExpHistoryServiceImpl.class
-com/suisung/mall/account/listener/ExperienceListener.class
-com/suisung/mall/account/config/MyBatisConfig.class
-com/suisung/mall/account/service/impl/AccountBaseRoleLevelServiceImpl.class
-com/suisung/mall/account/MallAccountApplication.class
-com/suisung/mall/account/controller/admin/AccountUserBindConnectController.class
-com/suisung/mall/account/controller/admin/AccountUserChannelController.class
-com/suisung/mall/account/controller/admin/AccountUserLevelLogController.class
-com/suisung/mall/account/controller/mobile/UserLevelController.class
-com/suisung/mall/account/config/I18nConfig.class
-com/suisung/mall/account/mapper/AccountBaseUserLevelMapper.class
-com/suisung/mall/account/mapper/AccountUserBaseMapper.class
-com/suisung/mall/account/mapper/AccountUserTypeMapper.class
-com/suisung/mall/account/service/AccountUserSnsService.class
-com/suisung/mall/account/service/impl/AccountUserLevelLogServiceImpl.class
-com/suisung/mall/account/service/AccountUserChainService.class
-com/suisung/mall/account/mapper/AccountUserSnsMapper.class
-com/suisung/mall/account/service/impl/AccountUserTypeServiceImpl.class
-com/suisung/mall/account/mapper/AccountUserLevelLogMapper.class
-com/suisung/mall/account/service/impl/AccountUserSnsServiceImpl.class
-com/suisung/mall/account/service/AccountUserBindConnectService.class
-com/suisung/mall/account/service/AccountUserChannelBringService.class
diff --git a/mall-admin/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/mall-admin/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
index a751ecf6..e69de29b 100644
--- a/mall-admin/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
+++ b/mall-admin/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
@@ -1,64 +0,0 @@
-com/suisung/mall/admin/service/impl/AccountBaseConfigServiceImpl.class
-com/suisung/mall/admin/service/impl/AdminLogActionServiceImpl.class
-com/suisung/mall/admin/oss/dto/OssCallbackParam.class
-com/suisung/mall/admin/service/impl/AdminBaseMenuServiceImpl.class
-com/suisung/mall/admin/controller/mobile/AdminBaseMenuController.class
-com/suisung/mall/admin/mapper/ShopStoreMediaMapper.class
-com/suisung/mall/admin/service/AdminBaseProtocolService.class
-com/suisung/mall/admin/oss/service/OssService.class
-com/suisung/mall/admin/service/impl/AdminLogErrorServiceImpl.class
-com/suisung/mall/admin/config/I18nConfig.class
-com/suisung/mall/admin/utils/VideoUtil.class
-com/suisung/mall/admin/mapper/AdminRightsGroupMapper.class
-com/suisung/mall/admin/service/AccountBaseConfigService.class
-com/suisung/mall/admin/mapper/AccountBaseConfigMapper.class
-com/suisung/mall/admin/service/ShopPlantformMediaGalleryService.class
-com/suisung/mall/admin/mapper/AdminBaseMenuMapper.class
-com/suisung/mall/admin/service/ShopPlantformMediaService.class
-com/suisung/mall/admin/MallAdminApplication.class
-com/suisung/mall/admin/service/impl/ShopStoreMediaServiceImpl.class
-com/suisung/mall/admin/config/FeignConfig.class
-com/suisung/mall/admin/mapper/AdminRightsBaseMapper.class
-com/suisung/mall/admin/service/AdminRightsGroupService.class
-com/suisung/mall/admin/oss/controller/OssUploadController.class
-com/suisung/mall/admin/mapper/AdminLogErrorMapper.class
-com/suisung/mall/admin/utils/VideoUtil$1.class
-com/suisung/mall/admin/service/impl/AdminRightsBaseServiceImpl.class
-com/suisung/mall/admin/config/FeignConfig$1.class
-com/suisung/mall/admin/service/AdminLogErrorService.class
-com/suisung/mall/admin/controller/admin/AdminBaseProtocolController.class
-com/suisung/mall/admin/config/RedisConfig.class
-com/suisung/mall/admin/service/ShopStoreMediaGalleryService.class
-com/suisung/mall/admin/service/impl/AdminRightsGroupServiceImpl.class
-com/suisung/mall/admin/controller/admin/AdminBaseMenuController.class
-com/suisung/mall/admin/service/AdminRightsBaseService.class
-com/suisung/mall/admin/service/AdminBaseMenuService.class
-com/suisung/mall/admin/mapper/ShopPlantformMediaGalleryMapper.class
-com/suisung/mall/admin/controller/admin/AdminRightsGroupController.class
-com/suisung/mall/admin/controller/admin/AdminRightsBaseController.class
-com/suisung/mall/admin/service/impl/ShopPlantformMediaGalleryServiceImpl.class
-com/suisung/mall/admin/controller/admin/AdminLogErrorController.class
-com/suisung/mall/admin/config/SwaggerConfig.class
-com/suisung/mall/admin/service/impl/ShopStoreMediaGalleryServiceImpl.class
-com/suisung/mall/admin/config/OssConfig.class
-com/suisung/mall/admin/utils/InputStreamRunnable.class
-com/suisung/mall/admin/service/AdminLogActionService.class
-com/suisung/mall/admin/oss/controller/UploadController.class
-com/suisung/mall/admin/mapper/AdminLogActionMapper.class
-com/suisung/mall/admin/oss/service/impl/OssServiceImpl.class
-com/suisung/mall/admin/mapper/ShopStoreMediaGalleryMapper.class
-com/suisung/mall/admin/mapper/AdminBaseProtocolMapper.class
-com/suisung/mall/admin/config/UserInfoConfig.class
-com/suisung/mall/admin/component/ResourceRoleRulesHolder.class
-com/suisung/mall/admin/service/impl/ShopPlantformMediaServiceImpl.class
-com/suisung/mall/admin/service/impl/AdminBaseProtocolServiceImpl.class
-com/suisung/mall/admin/utils/AudioUtil.class
-com/suisung/mall/admin/service/ShopStoreMediaService.class
-com/suisung/mall/admin/oss/dto/OssCallbackResult.class
-com/suisung/mall/admin/controller/admin/AdminLogActionController.class
-com/suisung/mall/admin/validator/FlagValidatorClass.class
-com/suisung/mall/admin/mapper/ShopPlantformMediaMapper.class
-com/suisung/mall/admin/validator/FlagValidator.class
-com/suisung/mall/admin/oss/controller/OssController.class
-com/suisung/mall/admin/oss/dto/OssPolicyResult.class
-com/suisung/mall/admin/config/MyBatisConfig.class
diff --git a/mall-auth/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/mall-auth/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
index 468b87ff..e69de29b 100644
--- a/mall-auth/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
+++ b/mall-auth/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
@@ -1,18 +0,0 @@
-com/suisung/mall/auth/component/MyAuthenticationProvider.class
-com/suisung/mall/auth/controller/KeyPairController.class
-com/suisung/mall/auth/config/Oauth2ServerConfig.class
-com/suisung/mall/auth/domain/Oauth2TokenDto.class
-com/suisung/mall/auth/MallAuthApplication.class
-com/suisung/mall/auth/service/impl/UserServiceImpl.class
-com/suisung/mall/auth/service/AccountService.class
-com/suisung/mall/auth/config/FeignConfig$1.class
-com/suisung/mall/auth/exception/Oauth2ExceptionHandler.class
-com/suisung/mall/auth/component/JwtTokenEnhancer.class
-com/suisung/mall/auth/constant/MessageConstant.class
-com/suisung/mall/auth/domain/SecurityUser.class
-com/suisung/mall/auth/component/Md5PasswordEncoder.class
-com/suisung/mall/auth/config/SwaggerConfig.class
-com/suisung/mall/auth/config/WebSecurityConfig.class
-com/suisung/mall/auth/config/FeignConfig.class
-com/suisung/mall/auth/controller/AuthController.class
-com/suisung/mall/auth/domain/Oauth2TokenDto$Oauth2TokenDtoBuilder.class
diff --git a/mall-cms/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/mall-cms/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
index b2fd1fa0..e69de29b 100644
--- a/mall-cms/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
+++ b/mall-cms/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
@@ -1,46 +0,0 @@
-com/suisung/mall/cms/service/impl/CmsArticleCommentHelpfulServiceImpl.class
-com/suisung/mall/cms/config/UserInfoConfig.class
-com/suisung/mall/cms/service/impl/AccountBaseConfigServiceImpl.class
-com/suisung/mall/cms/config/SwaggerConfig.class
-com/suisung/mall/cms/service/CmsArticleCommentService.class
-com/suisung/mall/cms/service/CmsArticleCommentReplyService.class
-com/suisung/mall/cms/controller/mobile/ArticleController.class
-com/suisung/mall/cms/service/CmsArticleBaseService.class
-com/suisung/mall/cms/controller/admin/CmsArticleCategoryController.class
-com/suisung/mall/cms/MallCmsApplication.class
-com/suisung/mall/cms/mapper/CmsArticleBaseMapper.class
-com/suisung/mall/cms/controller/admin/CmsArticleBaseController.class
-com/suisung/mall/cms/config/MyBatisConfig.class
-com/suisung/mall/cms/service/CmsArticleCommentReplyHelpfulService.class
-com/suisung/mall/cms/service/impl/CmsArticleCommentServiceImpl.class
-com/suisung/mall/cms/mapper/CmsArticleCommentReplyMapper.class
-com/suisung/mall/cms/mapper/CmsArticleCommentMapper.class
-com/suisung/mall/cms/service/impl/CmsArticleCategoryServiceImpl.class
-com/suisung/mall/cms/controller/admin/CmsArticleTagController.class
-com/suisung/mall/cms/controller/mobile/ArticleCategoryController.class
-com/suisung/mall/cms/service/AccountBaseConfigService.class
-com/suisung/mall/cms/service/CmsArticleCommentHelpfulService.class
-com/suisung/mall/cms/mapper/CmsArticleCategoryMapper.class
-com/suisung/mall/cms/mapper/AccountBaseConfigMapper.class
-com/suisung/mall/cms/mapper/CmsArticleAnalyticsMapper.class
-com/suisung/mall/cms/controller/admin/CmsArticleCommentController.class
-com/suisung/mall/cms/service/impl/CmsArticleBaseServiceImpl.class
-com/suisung/mall/cms/service/impl/CmsArticleTagServiceImpl.class
-com/suisung/mall/cms/mapper/ShopStoreProductTagMapper.class
-com/suisung/mall/cms/config/FeignConfig$1.class
-com/suisung/mall/cms/config/RedisConfig.class
-com/suisung/mall/cms/mapper/CmsArticleTagMapper.class
-com/suisung/mall/cms/service/impl/CmsArticleCommentReplyServiceImpl.class
-com/suisung/mall/cms/config/I18nConfig.class
-com/suisung/mall/cms/mapper/CmsArticleCommentHelpfulMapper.class
-com/suisung/mall/cms/mapper/CmsArticleCommentReplyHelpfulMapper.class
-com/suisung/mall/cms/service/CmsArticleAnalyticsService.class
-com/suisung/mall/cms/config/FeignConfig.class
-com/suisung/mall/cms/controller/admin/CmsController.class
-com/suisung/mall/cms/service/impl/ShopStoreProductTagServiceImpl.class
-com/suisung/mall/cms/config/CacheConfig.class
-com/suisung/mall/cms/service/impl/CmsArticleAnalyticsServiceImpl.class
-com/suisung/mall/cms/service/CmsArticleCategoryService.class
-com/suisung/mall/cms/service/CmsArticleTagService.class
-com/suisung/mall/cms/service/impl/CmsArticleCommentReplyHelpfulServiceImpl.class
-com/suisung/mall/cms/service/ShopStoreProductTagService.class
diff --git a/mall-common/pom.xml b/mall-common/pom.xml
index 9b3c8b26..adc90098 100644
--- a/mall-common/pom.xml
+++ b/mall-common/pom.xml
@@ -194,12 +194,12 @@
sentinel-web-servlet
-
org.springframework.boot
spring-boot-starter-freemarker
+
diff --git a/mall-common/src/main/java/com/suisung/mall/common/modules/store/ShopStorePrinterTemplate.java b/mall-common/src/main/java/com/suisung/mall/common/modules/store/ShopStorePrinterTemplate.java
new file mode 100644
index 00000000..b5e83145
--- /dev/null
+++ b/mall-common/src/main/java/com/suisung/mall/common/modules/store/ShopStorePrinterTemplate.java
@@ -0,0 +1,68 @@
+package com.suisung.mall.common.modules.store;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ *
+ * 门店打票模版表
+ *
+ *
+ * @author panjunjie
+ * @since 2024-11-4
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("shop_store_printer_template")
+@ApiModel(value = "ShopStorePrinterTemplate对象", description = "门店打票模版表")
+public class ShopStorePrinterTemplate implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(value = "模版自增ID")
+ @TableId(value = "template_id", type = IdType.INPUT)
+ private Long template_id;
+
+ @ApiModelProperty(value = "业务分类：1-订单下单模版；2-退单模版；")
+ private Integer category;
+
+ @ApiModelProperty(value = "门店ID，0-门店公用的模版")
+ private Integer store_id;
+
+ @ApiModelProperty(value = "模版名称")
+ private String template_name;
+
+ @ApiModelProperty(value = "模版值")
+ private String template_value;
+
+ @ApiModelProperty(value = "默认模版值")
+ private String template_value_def;
+
+ @ApiModelProperty(value = "模版说明")
+ private String intro;
+
+ @ApiModelProperty(value = "状态：1-有效；2-无效；")
+ private Integer status;
+
+ @ApiModelProperty(value = "新增用户ID")
+ private Integer created_by;
+
+ @ApiModelProperty(value = "更新用户ID")
+ private Integer updated_by;
+
+ @ApiModelProperty(value = "新增时间")
+ private Date created_at;
+
+ @ApiModelProperty(value = "修改时间")
+ private Date updated_at;
+}
diff --git a/mall-common/src/main/java/com/suisung/mall/common/utils/FreeMakerUtils.java b/mall-common/src/main/java/com/suisung/mall/common/utils/FreeMakerUtils.java
index 8caa54a6..07f0389d 100644
--- a/mall-common/src/main/java/com/suisung/mall/common/utils/FreeMakerUtils.java
+++ b/mall-common/src/main/java/com/suisung/mall/common/utils/FreeMakerUtils.java
@@ -5,29 +5,31 @@ import freemarker.template.Configuration;
import freemarker.template.Template;
import freemarker.template.TemplateException;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
import java.io.IOException;
import java.io.StringWriter;
import java.util.Map;
@Slf4j
+@Component
public class FreeMakerUtils {
/**
- * 配置 freemark configuration
+ * 配置 freemarker configuration
*
* @return
*/
- private Configuration stringTempConfiguration() {
- Configuration cfg = new Configuration(Configuration.VERSION_2_3_23);
+ private static Configuration stringTempConfiguration() {
+ Configuration cfg = new Configuration(Configuration.getVersion());
StringTemplateLoader stringLoader = new StringTemplateLoader();
- stringTempConfiguration().setTemplateLoader(stringLoader);
+ cfg.setTemplateLoader(stringLoader);
cfg.setDefaultEncoding("UTF-8");
return cfg;
}
/**
- * 解析模版
+ * freemarker 解析模版
*
* @param configuration
* @param templateName
@@ -37,17 +39,26 @@ public class FreeMakerUtils {
* @throws IOException
* @throws TemplateException
*/
- public String processTemplate(Configuration configuration, String templateName, String templateValue, Map binding) throws IOException, TemplateException {
+ public static String processTemplate(Configuration configuration, String templateName, String templateValue, Map binding) {
StringWriter stringWriter = new StringWriter();
- Template template = new Template(templateName, templateValue, configuration);
- template.process(binding, stringWriter);
- return stringWriter.toString();
+ try {
+ Template template = new Template(templateName, templateValue, configuration);
+ template.process(binding, stringWriter);
+ return stringWriter.toString();
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ } finally {
+ if (stringWriter != null) {
+ try {
+ stringWriter.close();
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+ }
}
- public String processTemplate(String templateName, String templateValue, Map binding) throws IOException, TemplateException {
- StringWriter stringWriter = new StringWriter();
- Template template = new Template(templateName, templateValue, stringTempConfiguration());
- template.process(binding, stringWriter);
- return stringWriter.toString();
+ public static String processTemplate(String templateName, String templateValue, Map binding) {
+ return processTemplate(stringTempConfiguration(), templateName, templateValue, binding);
}
}
diff --git a/mall-common/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/mall-common/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
index 30d43734..e69de29b 100644
--- a/mall-common/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
+++ b/mall-common/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
@@ -1,475 +0,0 @@
-com/suisung/mall/common/utils/JChardetFacadeUtil$nsUCS2LEVerifier.class
-com/suisung/mall/common/utils/CoordinateTransformUtil.class
-com/suisung/mall/common/pojo/input/TimelineInput.class
-com/suisung/mall/common/modules/product/ShopProductData.class
-com/suisung/mall/common/modules/order/ShopOrderReturn.class
-com/suisung/mall/common/config/MybatisPlusConfig.class
-com/suisung/mall/common/utils/JChardetFacadeUtil$nsGB2312Verifier.class
-com/suisung/mall/common/utils/JChardetFacadeUtil$EUCKRStatistics.class
-com/suisung/mall/common/modules/user/ShopUserVoucher.class
-com/suisung/mall/common/pojo/input/AnalyticsProductInput.class
-com/suisung/mall/common/utils/UserInfoService.class
-com/suisung/mall/common/pojo/vo/UserLoginVo.class
-com/suisung/mall/common/modules/store/ShopStoreEmployeeDepartment.class
-com/suisung/mall/common/support/AuthInterceptor.class
-com/suisung/mall/common/modules/product/ShopProductItemSeq.class
-com/suisung/mall/common/constant/ConstantError.class
-com/suisung/mall/common/modules/hall/HallSupplyOrderBase.class
-com/suisung/mall/common/utils/JChardetFacadeUtil$Big5Statistics.class
-com/suisung/mall/common/modules/invoicing/InvoicingStockBillItem.class
-com/suisung/mall/common/modules/edu/EduLecturerStore.class
-com/suisung/mall/common/modules/sns/LiveUserRoom.class
-com/suisung/mall/common/modules/store/ShopStoreConfig.class
-com/suisung/mall/common/pojo/vo/DistrictVo.class
-com/suisung/mall/common/modules/sns/WxLiveRoom.class
-com/suisung/mall/common/modules/base/ShopBaseStateCode.class
-com/suisung/mall/common/feignService/ImService.class
-com/suisung/mall/common/feignService/CmsService.class
-com/suisung/mall/common/modules/base/ShopBaseLangMeta.class
-com/suisung/mall/common/modules/product/ShopProductPreSale.class
-com/suisung/mall/common/modules/plantform/ShopPlantformSubsiteUser.class
-com/suisung/mall/common/modules/user/ShopUserFavoritesBrand.class
-com/suisung/mall/common/modules/store/dto/MediaDTO.class
-com/suisung/mall/common/domain/QueryParamBase.class
-com/suisung/mall/common/modules/mq/MqMessage.class
-com/suisung/mall/common/service/IBaseController.class
-com/suisung/mall/common/utils/JChardetFacadeUtil$ICodepageDetector.class
-com/suisung/mall/common/pojo/to/MsgTO.class
-com/suisung/mall/common/modules/activity/ShopActivityCutpriceHistory.class
-com/suisung/mall/common/service/impl/MessageServiceImpl.class
-com/suisung/mall/common/modules/distribution/ShopPlantformHighReturnUser.class
-com/suisung/mall/common/modules/edu/EduTopicCategory.class
-com/suisung/mall/common/modules/base/ShopBaseDistrict.class
-com/suisung/mall/common/config/SentinelConfig.class
-com/suisung/mall/common/modules/activity/ShopActivityMarketingHistory.class
-com/suisung/mall/common/modules/admin/AdminBaseProtocol.class
-com/suisung/mall/common/modules/pay/PayConsumeDeposit.class
-com/suisung/mall/common/modules/edu/EduExamBase.class
-com/suisung/mall/common/modules/store/ShopStoreEmployeeRightsBase.class
-com/suisung/mall/common/modules/product/ShopProductValidPeriod.class
-com/suisung/mall/common/modules/store/ShopStoreTransportType.class
-com/suisung/mall/common/modules/user/ShopUserExpHistory.class
-com/suisung/mall/common/modules/store/ShopStoreActivityBase.class
-com/suisung/mall/common/modules/pay/PayConsumeWithdraw.class
-com/suisung/mall/common/modules/pay/PayConsumeTradeCombine.class
-com/suisung/mall/common/pojo/dto/OssCallbackResultDTO.class
-com/suisung/mall/common/modules/edu/vo/EduCourseChapterVO.class
-com/suisung/mall/common/utils/JChardetFacadeUtil$nsDetector.class
-com/suisung/mall/common/utils/pojo/dto/SmsDTO.class
-com/suisung/mall/common/modules/plantform/ShopPlantformMedia.class
-com/suisung/mall/common/pojo/input/AccessItemTimelineInput.class
-com/suisung/mall/common/modules/edu/EduUserLearnStock.class
-com/suisung/mall/common/modules/order/ShopOrderDeliveryAddress.class
-com/suisung/mall/common/modules/base/ShopBaseSiteNav.class
-com/suisung/mall/common/pojo/req/OrderItemNumTimelineReq.class
-com/suisung/mall/common/modules/base/ShopBaseConfig.class
-com/suisung/mall/common/modules/store/ShopStoreContract.class
-com/suisung/mall/common/utils/JChardetFacadeUtil$nsGB18030Verifier.class
-com/suisung/mall/common/utils/constbank/MCipherDecode.class
-com/suisung/mall/common/modules/edu/EduTopicBase.class
-com/suisung/mall/common/modules/account/AccountUserBindConnect.class
-com/suisung/mall/common/utils/constbank/MD5Util.class
-com/suisung/mall/common/modules/base/ShopPageModule.class
-com/suisung/mall/common/pojo/req/AnalyticsVoucherReq.class
-com/suisung/mall/common/modules/chain/ShopChainUserRightsGroup.class
-com/suisung/mall/common/modules/activity/ShopActivityGroupbuyStore.class
-com/suisung/mall/common/log/WebLogAspect.class
-com/suisung/mall/common/utils/JChardetFacadeUtil$nsISO2022CNVerifier.class
-com/suisung/mall/common/utils/JChardetFacadeUtil$AbstractCodepageDetector.class
-com/suisung/mall/common/modules/store/ShopStoreProductCategory.class
-com/suisung/mall/common/utils/JChardetFacadeUtil$nsISO2022KRVerifier.class
-com/suisung/mall/common/modules/distribution/ShopDistributionUserCommission.class
-com/suisung/mall/common/utils/WxHttpUtil$WxType.class
-com/suisung/mall/common/feignService/AuthService.class
-com/suisung/mall/common/feignService/SearchService.class
-com/suisung/mall/common/weblog/IgnoreLog.class
-com/suisung/mall/common/modules/product/ShopProductAssistIndex.class
-com/suisung/mall/common/modules/store/ShopStorePrinterRegion.class
-com/suisung/mall/common/modules/edu/EduClassesCycle.class
-com/suisung/mall/common/modules/edu/EduCourseContractCategory.class
-com/suisung/mall/common/modules/wechat/ShopWechatMenu.class
-com/suisung/mall/common/pojo/to/UserLevelTO.class
-com/suisung/mall/common/modules/chain/ShopChainItem.class
-com/suisung/mall/common/domain/OssDto.class
-com/suisung/mall/common/modules/pay/PayUserResource.class
-com/suisung/mall/common/modules/pay/PayConsumeTrade.class
-com/suisung/mall/common/modules/cms/CmsArticleBase.class
-com/suisung/mall/common/modules/cms/CmsArticleAnalytics.class
-com/suisung/mall/common/api/ResultCode.class
-com/suisung/mall/common/modules/invoicing/InvoicingWarehouseBase.class
-com/suisung/mall/common/utils/I18nUtil.class
-com/suisung/mall/common/utils/JChardetFacadeUtil$EUCJPStatistics.class
-com/suisung/mall/common/pojo/res/DashboardTopRes.class
-com/suisung/mall/common/modules/distribution/ShopDistributionUserWithdraw.class
-com/suisung/mall/common/utils/excel/ExcelSelected.class
-com/suisung/mall/common/modules/store/ShopStorePrinter.class
-com/suisung/mall/common/modules/edu/EduClassesUser.class
-com/suisung/mall/common/pojo/dto/ProductSearchDTO.class
-com/suisung/mall/common/modules/distribution/ShopDistributionPlantformUserGeneratedCommission.class
-com/suisung/mall/common/modules/account/AccountUserChannel.class
-com/suisung/mall/common/modules/edu/EduPaperTopic.class
-com/suisung/mall/common/modules/product/ShopProductComment.class
-com/suisung/mall/common/pojo/res/FeiePrinterApiRes.class
-com/suisung/mall/common/modules/product/ShopProductPricingPolicyWholesale.class
-com/suisung/mall/common/modules/sns/SnsBaseFilterKeyword.class
-com/suisung/mall/common/pojo/dto/OrderCheckoutDTO.class
-com/suisung/mall/common/modules/sns/SnsStoryCommentReplyHelpful.class
-com/suisung/mall/common/modules/page/ShopPageBase.class
-com/suisung/mall/common/utils/JChardetFacadeUtil$nsUCS2BEVerifier.class
-com/suisung/mall/common/modules/edu/EduUserPaperTopicDetail.class
-com/suisung/mall/common/modules/base/ShopBaseMarketCategory.class
-com/suisung/mall/common/utils/ContextUtil.class
-com/suisung/mall/common/modules/hall/HallPurchaseOrderBase.class
-com/suisung/mall/common/pojo/output/TimelineOutput.class
-com/suisung/mall/common/utils/StringUtils$RandomType.class
-com/suisung/mall/common/modules/edu/EduUserPaperInfo.class
-com/suisung/mall/common/utils/JChardetFacadeUtil$nsEUCStatistics.class
-com/suisung/mall/common/pojo/vo/TradeAmountVo.class
-com/suisung/mall/common/modules/user/ShopUserPointsHistory.class
-com/suisung/mall/common/modules/order/ShopOrderStateLog.class
-com/suisung/mall/common/modules/sns/SnsStoryComment.class
-com/suisung/mall/common/modules/sns/LiveAnchor.class
-com/suisung/mall/common/utils/TimeUtil.class
-com/suisung/mall/common/api/LevelCode.class
-com/suisung/mall/common/modules/product/ShopProductImage.class
-com/suisung/mall/common/modules/store/ShopStoreExpressLogistics.class
-com/suisung/mall/common/modules/base/ShopBaseLangStandard.class
-com/suisung/mall/common/modules/order/ShopOrderReturnItem.class
-com/suisung/mall/common/modules/sns/SnsStoryAdvertisement.class
-com/suisung/mall/common/modules/account/AccountUserLogin.class
-com/suisung/mall/common/utils/JChardetFacadeUtil$nsISO2022JPVerifier.class
-com/suisung/mall/common/modules/account/AccountUserChannelBring.class
-com/suisung/mall/common/constant/SignConstant.class
-com/suisung/mall/common/utils/JChardetFacadeUtil$nsBIG5Verifier.class
-com/suisung/mall/common/modules/sns/SnsUserGroup.class
-com/suisung/mall/common/modules/pay/PayBaseRechargeLevel.class
-com/suisung/mall/common/modules/edu/EduExamAward.class
-com/suisung/mall/common/pojo/res/BaseListRes.class
-com/suisung/mall/common/utils/HideStrUtil.class
-com/suisung/mall/common/utils/excel/ExcelSelectedResolve.class
-com/suisung/mall/common/feignService/EduService.class
-com/suisung/mall/common/modules/store/ShopStoreTransportItem.class
-com/suisung/mall/common/pojo/res/TimelineRes.class
-com/suisung/mall/common/modules/sns/SnsUserGroupRel.class
-com/suisung/mall/common/modules/message/ShopMessageTemplate.class
-com/suisung/mall/common/pojo/to/ExperienceTO.class
-com/suisung/mall/common/config/MyWebConfig.class
-com/suisung/mall/common/domain/TokenDto$TokenDtoBuilder.class
-com/suisung/mall/common/modules/edu/EduCourseContract.class
-com/suisung/mall/common/modules/plantform/ShopPlantformActivity.class
-com/suisung/mall/common/modules/activity/ShopActivityCutprice.class
-com/suisung/mall/common/modules/base/ShopBaseProductSpec.class
-com/suisung/mall/common/modules/edu/EduLecturerCategory.class
-com/suisung/mall/common/modules/pay/PayCardType.class
-com/suisung/mall/common/utils/JChardetFacadeUtil$nsICharsetDetectionObserver.class
-com/suisung/mall/common/utils/AesEncryptUtil.class
-com/suisung/mall/common/modules/city/CityPaotuiOrderBase.class
-com/suisung/mall/common/modules/admin/AdminRightsGroup.class
-com/suisung/mall/common/api/CommonPage.class
-com/suisung/mall/common/modules/store/ShopStoreEmployeeRightsGroup.class
-com/suisung/mall/common/service/MessageService.class
-com/suisung/mall/common/api/PayType.class
-com/suisung/mall/common/modules/user/ShopUserInvoice.class
-com/suisung/mall/common/modules/order/ShopOrderData.class
-com/suisung/mall/common/modules/store/ShopStorePrinterModel.class
-com/suisung/mall/common/modules/edu/EduPaperBase.class
-com/suisung/mall/common/pojo/input/AnalyticsVoucherInput.class
-com/suisung/mall/common/modules/city/CityPaotuiOrderInfo.class
-com/suisung/mall/common/modules/store/ShopStoreAnalytics.class
-com/suisung/mall/common/pojo/dto/ProductRecommendDTO.class
-com/suisung/mall/common/pojo/req/TimelineReq.class
-com/suisung/mall/common/modules/store/ShopStoreEmployee.class
-com/suisung/mall/common/modules/edu/EduStoreLecturer.class
-com/suisung/mall/common/modules/store/ShopStoreMediaGallery.class
-com/suisung/mall/common/constant/AuthConstant.class
-com/suisung/mall/common/utils/AudioUtil.class
-com/suisung/mall/common/pojo/dto/OssCallbackParamDTO.class
-com/suisung/mall/common/modules/edu/EduCourseCategory.class
-com/suisung/mall/common/modules/edu/EduClassesCategory.class
-com/suisung/mall/common/utils/JChardetFacadeUtil$nsPSMDetector.class
-com/suisung/mall/common/modules/product/ShopProductAnalytics.class
-com/suisung/mall/common/modules/store/ShopStoreFestival.class
-com/suisung/mall/common/modules/account/AccountBaseRoleLevel.class
-com/suisung/mall/common/utils/PropertiesUtil.class
-com/suisung/mall/common/modules/sns/SnsUserFriend.class
-com/suisung/mall/common/pojo/vo/RegUserVo.class
-com/suisung/mall/common/modules/account/AccountUserChannelCode.class
-com/suisung/mall/common/domain/UserDto.class
-com/suisung/mall/common/modules/cms/CmsArticleCommentReply.class
-com/suisung/mall/common/modules/edu/EduUserLearnTarget.class
-com/suisung/mall/common/utils/constbank/RSAUtil.class
-com/suisung/mall/common/modules/pay/dto/ItemActivityInfoDTO.class
-com/suisung/mall/common/utils/phone/PhoneNumberUtils.class
-com/suisung/mall/common/modules/product/ShopProductIndex.class
-com/suisung/mall/common/modules/pay/PayPlantformResource.class
-com/suisung/mall/common/modules/store/ShopStoreEmployeeKefu.class
-com/suisung/mall/common/config/BaseSwaggerConfig.class
-com/suisung/mall/common/modules/edu/vo/EduCourseDetailVO.class
-com/suisung/mall/common/modules/order/ShopOrderItem.class
-com/suisung/mall/common/utils/VideoUtil.class
-com/suisung/mall/common/modules/sns/SnsStoryCategory.class
-com/suisung/mall/common/modules/order/ShopPurchaseInvoice.class
-com/suisung/mall/common/utils/HttpServletUtils.class
-com/suisung/mall/common/modules/user/ShopUserProductBuy.class
-com/suisung/mall/common/modules/pay/PayPaymentChannel.class
-com/suisung/mall/common/feignService/PayService.class
-com/suisung/mall/common/api/CommonResult.class
-com/suisung/mall/common/modules/chain/ShopChainCategory.class
-com/suisung/mall/common/modules/invoicing/InvoicingCustomerBase.class
-com/suisung/mall/common/modules/admin/AdminLogError.class
-com/suisung/mall/common/modules/edu/EduCertTemplate.class
-com/suisung/mall/common/modules/city/CityUserPaotuier.class
-com/suisung/mall/common/pojo/vo/PayConsumeWithdrawOrderVo.class
-com/suisung/mall/common/modules/account/AccountUserLevelLog.class
-com/suisung/mall/common/config/BaseUserInfoConfig.class
-com/suisung/mall/common/modules/distribution/ShopPlantformHighReturn.class
-com/suisung/mall/common/modules/user/ShopUserSearchHistory.class
-com/suisung/mall/common/modules/invoicing/InvoicingWarehouseItem.class
-com/suisung/mall/common/modules/base/ShopBaseProductTag.class
-com/suisung/mall/common/modules/edu/EduSubscribeLecturer.class
-com/suisung/mall/common/modules/account/AccountUserInfo.class
-com/suisung/mall/common/modules/base/ShopBaseStoreCategory.class
-com/suisung/mall/common/modules/base/ShopBaseExpress.class
-com/suisung/mall/common/modules/edu/EduUserLecturer.class
-com/suisung/mall/common/pojo/vo/CommonNumVo.class
-com/suisung/mall/common/modules/city/CityMarketOrderBase.class
-com/suisung/mall/common/modules/base/ShopBaseCrontab.class
-com/suisung/mall/common/config/DruidConfig.class
-com/suisung/mall/common/domain/SwaggerProperties.class
-com/suisung/mall/common/modules/activity/ShopStoreActivityShare.class
-com/suisung/mall/common/modules/product/ShopProductDetail.class
-com/suisung/mall/common/modules/account/AccountUserSns.class
-com/suisung/mall/common/modules/account/AccountUserBase.class
-com/suisung/mall/common/utils/FontUtil.class
-com/suisung/mall/common/support/Auth.class
-com/suisung/mall/common/modules/pay/PayConsumeRecord.class
-com/suisung/mall/common/weblog/ControllerLogAspect.class
-com/suisung/mall/common/modules/edu/EduUserCert.class
-com/suisung/mall/common/modules/sns/SnsUserZone.class
-com/suisung/mall/common/api/PaymentType.class
-com/suisung/mall/common/modules/user/ShopUserServiceMessage.class
-com/suisung/mall/common/modules/base/ShopBaseActivityType.class
-com/suisung/mall/common/modules/distribution/ShopPlantformActivityZerobuy.class
-com/suisung/mall/common/modules/wechat/ShopWechatKeyword.class
-com/suisung/mall/common/pojo/res/AdminDashBoardRes.class
-com/suisung/mall/common/modules/base/ShopBaseProductCategory.class
-com/suisung/mall/common/modules/base/ShopBaseCurrency.class
-com/suisung/mall/common/utils/InputStreamRunnable.class
-com/suisung/mall/common/modules/chain/ShopChainDetail.class
-com/suisung/mall/common/modules/edu/EduLecturerExamine.class
-com/suisung/mall/common/modules/page/ShopPageApp.class
-com/suisung/mall/common/weblog/RequestNoContext.class
-META-INF/spring-configuration-metadata.json
-com/suisung/mall/common/modules/distribution/ShopDistributionUserOrder.class
-com/suisung/mall/common/pojo/output/AnalyticsNumOutput.class
-com/suisung/mall/common/modules/order/ShopOrderReturnReason.class
-com/suisung/mall/common/modules/distribution/ShopDistributionUser.class
-com/suisung/mall/common/pojo/vo/UserChannelBringVO.class
-com/suisung/mall/common/modules/product/ShopProductMeta.class
-com/suisung/mall/common/modules/sns/SnsStoryBase.class
-com/suisung/mall/common/utils/CompressionUtils.class
-com/suisung/mall/common/constant/ConfigConstant.class
-com/suisung/mall/common/exception/GlobalExceptionHandler.class
-com/suisung/mall/common/pojo/to/PayPointTO.class
-com/suisung/mall/common/modules/admin/AdminRightsBase.class
-com/suisung/mall/common/annotation/CacheException.class
-com/suisung/mall/common/modules/sns/SnsStoryCommentReply.class
-com/suisung/mall/common/modules/activity/ShopActivityGroupbookingHistory.class
-com/suisung/mall/common/modules/analytics/AnalyticsAccessHistory.class
-com/suisung/mall/common/modules/chain/ShopChainUser.class
-com/suisung/mall/common/modules/product/ShopPageUserForm.class
-com/suisung/mall/common/modules/store/ShopStoreActivityItem.class
-com/suisung/mall/common/pojo/res/FeiePrinterApiDataRes$NoGuide.class
-com/suisung/mall/common/utils/JChardetFacadeUtil$nsHZVerifier.class
-com/suisung/mall/common/modules/plantform/ShopPlantformFeedback.class
-com/suisung/mall/common/modules/cms/CmsArticleTag.class
-com/suisung/mall/common/modules/pay/PayCardMedia.class
-com/suisung/mall/common/utils/JChardetFacadeUtil$nsSJISVerifier.class
-com/suisung/mall/common/pojo/req/AccessItemTimelineReq.class
-com/suisung/mall/common/utils/excel/ExcelDynamicSelect.class
-com/suisung/mall/common/utils/IdUtil.class
-com/suisung/mall/common/pojo/to/PayMoneyTO.class
-com/suisung/mall/common/feignService/SnsService.class
-com/suisung/mall/common/pojo/output/AnalyticsAccessItemOutput.class
-com/suisung/mall/common/modules/sns/SnsStoryCollection.class
-com/suisung/mall/common/modules/order/ShopOrderInvoice.class
-com/suisung/mall/common/modules/base/ShopBaseProductUnit.class
-com/suisung/mall/common/constant/MqConstant.class
-com/suisung/mall/common/modules/activity/ShopActivityPfGroupbuyStoreHistory.class
-com/suisung/mall/common/modules/order/ShopOrderInfo.class
-com/suisung/mall/common/pojo/vo/AnalyticsNumVo.class
-com/suisung/mall/common/modules/edu/EduCourseDetail.class
-com/suisung/mall/common/modules/account/AccountBaseUserLevel.class
-com/suisung/mall/common/modules/edu/EduCertificate.class
-com/suisung/mall/common/utils/JChardetFacadeUtil$nsVerifier.class
-com/suisung/mall/common/pojo/res/AmountRes.class
-com/suisung/mall/common/utils/WxHttpUtil$MethodType.class
-com/suisung/mall/common/annotation/OssMedia.class
-com/suisung/mall/common/api/BindCode.class
-com/suisung/mall/common/utils/JChardetFacadeUtil$nsEUCKRVerifier.class
-com/suisung/mall/common/utils/CommonUtil.class
-com/suisung/mall/common/modules/admin/ElTree.class
-com/suisung/mall/common/modules/edu/EduCourseChapter.class
-com/suisung/mall/common/modules/order/ShopOrderBase.class
-com/suisung/mall/common/utils/excel/ExcelUtil.class
-com/suisung/mall/common/domain/SwaggerProperties$SwaggerPropertiesBuilder.class
-com/suisung/mall/common/modules/number/ShopNumberSeq.class
-com/suisung/mall/common/modules/cms/CmsArticleCategory.class
-com/suisung/mall/common/modules/user/ShopUserFavoritesStore.class
-com/suisung/mall/common/modules/pay/PayBaseBank.class
-com/suisung/mall/common/modules/account/AccountBaseConfig.class
-com/suisung/mall/common/api/MobileResult.class
-com/suisung/mall/common/modules/user/ShopUserFavoritesItem.class
-com/suisung/mall/common/modules/product/ShopProductCommentHelpful.class
-com/suisung/mall/common/modules/admin/AdminLogAction.class
-com/suisung/mall/common/utils/JChardetFacadeUtil$nsEUCJPVerifier.class
-com/suisung/mall/common/modules/cms/CmsArticleComment.class
-com/suisung/mall/common/feignService/AccountService.class
-com/suisung/mall/common/modules/base/ShopBaseProductType.class
-com/suisung/mall/common/modules/product/ShopProductBase.class
-com/suisung/mall/common/modules/store/ShopStoreBusinessCategory.class
-com/suisung/mall/common/pojo/input/AnalyticsReturnInput.class
-com/suisung/mall/common/modules/pay/PayCardInfo.class
-com/suisung/mall/common/modules/pay/PayCardHistory.class
-com/suisung/mall/common/modules/edu/EduClassesCoursesCategory.class
-com/suisung/mall/common/modules/cms/CmsArticleCommentReplyHelpful.class
-com/suisung/mall/common/modules/wechat/ShopWechatTplmsg.class
-com/suisung/mall/common/modules/product/ShopProductCommentReply.class
-com/suisung/mall/common/modules/chain/ShopChainTn.class
-com/suisung/mall/common/modules/edu/EduPaperCategory.class
-com/suisung/mall/common/utils/LogUtil.class
-com/suisung/mall/common/utils/JChardetFacadeUtil$nsICharsetDetector.class
-com/suisung/mall/common/modules/activity/ShopActivityLotteryHistory.class
-com/suisung/mall/common/modules/plantform/ShopPlantformFeedbackType.class
-com/suisung/mall/common/modules/product/ShopProductInfo.class
-com/suisung/mall/common/utils/pojo/dto/EmailDTO.class
-com/suisung/mall/common/utils/JChardetFacadeUtil$nsEUCTWVerifier.class
-com/suisung/mall/common/utils/RegexUtil.class
-com/suisung/mall/common/pojo/dto/BaiduAiBriefDTO.class
-com/suisung/mall/common/modules/pay/PayUserPay.class
-com/suisung/mall/common/modules/order/ShopOrderComment.class
-com/suisung/mall/common/modules/distribution/ShopDistributionStoreDirectsellerProduct.class
-com/suisung/mall/common/modules/edu/EduUserCourseStock.class
-com/suisung/mall/common/modules/pay/dto/WithdrawDTO.class
-com/suisung/mall/common/modules/order/ShopOrderShippingAddress.class
-com/suisung/mall/common/modules/user/ShopUserCart.class
-com/suisung/mall/common/utils/DateTimeUtils.class
-com/suisung/mall/common/utils/VideoUtil$1.class
-com/suisung/mall/common/modules/store/ShopStoreShippingAddress.class
-com/suisung/mall/common/service/impl/BaseControllerImpl.class
-com/suisung/mall/common/utils/WxHttpUtil.class
-com/suisung/mall/common/domain/TokenDto.class
-com/suisung/mall/common/modules/base/ShopBaseProductCategoryNav.class
-com/suisung/mall/common/modules/base/ShopBaseStoreGrade.class
-com/suisung/mall/common/modules/invoicing/InvoicingStockBill.class
-com/suisung/mall/common/feignService/AdminService.class
-com/suisung/mall/common/pojo/dto/EduCourseDetailDTO.class
-com/suisung/mall/common/modules/admin/Meta.class
-com/suisung/mall/common/pojo/output/AnalyticsOrderItemNumOutput.class
-com/suisung/mall/common/modules/base/ShopBaseContractType.class
-com/suisung/mall/common/modules/distribution/ShopDistributionUserOrderItem.class
-com/suisung/mall/common/utils/TimeRange.class
-com/suisung/mall/common/pojo/req/AnalyticsReturnReq.class
-com/suisung/mall/common/modules/order/ShopOrderChainCode.class
-com/suisung/mall/common/modules/store/ShopStoreBase.class
-com/suisung/mall/common/utils/JChardetFacadeUtil$GB2312Statistics.class
-com/suisung/mall/common/domain/WebLog.class
-com/suisung/mall/common/pojo/req/AnalyticsOrderReq.class
-com/suisung/mall/common/modules/invoicing/InvoicingCustomerLevel.class
-com/suisung/mall/common/modules/admin/AdminBaseMenu.class
-com/suisung/mall/common/utils/CookieUtils.class
-com/suisung/mall/common/utils/JChardetFacadeUtil$EUCTWStatistics.class
-com/suisung/mall/common/modules/plantform/ShopPlantformFeedbackCategory.class
-com/suisung/mall/common/pojo/res/DashBoardTimelineRes.class
-com/suisung/mall/common/modules/distribution/ShopDistributionStoreBase.class
-com/suisung/mall/common/modules/store/ShopStoreInfo.class
-com/suisung/mall/common/modules/order/ShopOrderUserForm.class
-com/suisung/mall/common/modules/store/ShopStoreCustomService.class
-com/suisung/mall/common/modules/activity/ShopActivityGroupbuyStoreHistory.class
-com/suisung/mall/common/pojo/dto/ProductSimpleInfo.class
-com/suisung/mall/common/modules/product/ShopProductSpecItem.class
-com/suisung/mall/common/utils/CheckUtil.class
-com/suisung/mall/common/constant/RedisConstant.class
-com/suisung/mall/common/modules/admin/Router.class
-com/suisung/mall/common/modules/plantform/ShopPlantformActivityItem.class
-com/suisung/mall/common/modules/product/ShopProductPricingPolicy.class
-com/suisung/mall/common/modules/order/ShopOrderCb.class
-com/suisung/mall/common/exception/ExceptionErrorDecoder.class
-com/suisung/mall/common/modules/user/ShopUserProductBrowse.class
-com/suisung/mall/common/pojo/vo/ShopStoreActivityCodeVo.class
-com/suisung/mall/common/modules/pay/PayUserBankCard.class
-com/suisung/mall/common/modules/product/ShopProductItem.class
-com/suisung/mall/common/modules/cms/CmsArticleCommentHelpful.class
-com/suisung/mall/common/exception/ApiException.class
-com/suisung/mall/common/domain/RoleIdEnum.class
-com/suisung/mall/common/modules/plantform/ShopPlantformMediaGallery.class
-com/suisung/mall/common/pojo/vo/VisitorVo.class
-com/suisung/mall/common/modules/edu/EduUserChapterStock.class
-com/suisung/mall/common/modules/chain/vo/ShopChainCategoryVO.class
-com/suisung/mall/common/modules/product/ShopProductAskBase.class
-com/suisung/mall/common/modules/store/ShopStoreMedia.class
-com/suisung/mall/common/modules/edu/dto/ProductDataDTO.class
-com/suisung/mall/common/modules/sns/WxLiveGood.class
-com/suisung/mall/common/modules/edu/EduClassesBase.class
-com/suisung/mall/common/utils/excel/SelectedSheetWriteHandler.class
-com/suisung/mall/common/modules/chain/ShopChainBase.class
-com/suisung/mall/common/modules/invoicing/InvoicingSupplierContacter.class
-com/suisung/mall/common/modules/base/ShopBaseProductAssistItem.class
-com/suisung/mall/common/utils/ExecutorUtil.class
-com/suisung/mall/common/modules/sns/SnsUserMessage.class
-com/suisung/mall/common/modules/activity/ShopActivityGroupbooking.class
-com/suisung/mall/common/modules/order/ShopOrderLogistics.class
-com/suisung/mall/common/modules/store/ShopStoreProductTag.class
-com/suisung/mall/common/utils/JChardetFacadeUtil$nsUTF8Verifier.class
-com/suisung/mall/common/modules/edu/dto/LecturerDataDTO.class
-com/suisung/mall/common/modules/store/ShopStoreCompany.class
-com/suisung/mall/common/modules/account/AccountUserAnalytics.class
-com/suisung/mall/common/modules/base/ShopBaseProductBrand.class
-com/suisung/mall/common/modules/user/ShopUserDeliveryAddress.class
-com/suisung/mall/common/modules/activity/ShopStoreActivityCode.class
-com/suisung/mall/common/modules/account/AccountUserType.class
-com/suisung/mall/common/utils/CSVUtils.class
-com/suisung/mall/common/pojo/res/FeiePrinterApiDataRes.class
-com/suisung/mall/common/utils/EmailUtil.class
-com/suisung/mall/common/utils/JChardetFacadeUtil.class
-com/suisung/mall/common/modules/invoicing/InvoicingSupplierBase.class
-com/suisung/mall/common/modules/account/AccountUserChain.class
-com/suisung/mall/common/modules/sns/SnsStoryLike.class
-com/suisung/mall/common/modules/product/ShopProductPricingPolicyLevel.class
-com/suisung/mall/common/pojo/dto/OssPolicyResultDTO.class
-com/suisung/mall/common/utils/SmsUtil.class
-com/suisung/mall/common/modules/sns/LiveUserHistory.class
-com/suisung/mall/common/mybatisplus/SqlLogInterceptor.class
-com/suisung/mall/common/modules/invoicing/InvoicingCustomerContacter.class
-com/suisung/mall/common/modules/distribution/ShopDistributionPlantformUser.class
-com/suisung/mall/common/exception/Asserts.class
-com/suisung/mall/common/modules/store/ShopStoreTransportAmount.class
-com/suisung/mall/common/modules/sns/SnsStoryCommentHelpful.class
-com/suisung/mall/common/utils/StringUtils.class
-com/suisung/mall/common/utils/phone/PhoneModel.class
-com/suisung/mall/common/pojo/req/AnalyticsProductReq.class
-com/suisung/mall/common/pojo/vo/ShopStorePrinterVO.class
-com/suisung/mall/common/api/StateCode.class
-com/suisung/mall/common/modules/base/ShopBaseProductCategoryMobile.class
-com/suisung/mall/common/utils/MybatisPlusQueryUtil.class
-com/suisung/mall/common/utils/JChardetFacadeUtil$nsCP1252Verifier.class
-com/suisung/mall/common/pojo/input/AnalyticsOrderInput.class
-com/suisung/mall/common/utils/JChardetFacadeUtil$JChardetFacade.class
-com/suisung/mall/common/modules/plantform/ShopPlantformSubsite.class
-com/suisung/mall/common/modules/base/ShopBaseProductAssist.class
-com/suisung/mall/common/exception/ApiUserException.class
-com/suisung/mall/common/utils/UploadUtil.class
-com/suisung/mall/common/utils/JChardetFacadeUtil$nsEUCSampler.class
-com/suisung/mall/common/pojo/vo/OrderNumVo.class
-com/suisung/mall/common/pojo/input/OrderItemNumTimelineInput.class
-com/suisung/mall/common/feignService/ShopService.class
-com/suisung/mall/common/modules/chain/ShopChainUserRightsBase.class
-com/suisung/mall/common/modules/product/ShopProductDriveModel.class
-com/suisung/mall/common/modules/sns/LiveLiveTag.class
-com/suisung/mall/common/utils/excel/EasyExcelUtil.class
-com/suisung/mall/common/api/PointsType.class
-com/suisung/mall/common/api/IErrorCode.class
-com/suisung/mall/common/modules/sns/SnsUserZoneRel.class
-com/suisung/mall/common/utils/excel/ExportFactory.class
-com/suisung/mall/common/utils/JsonUtil.class
-com/suisung/mall/common/modules/chain/ShopChainProject.class
diff --git a/mall-common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/mall-common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
index 6be65f7d..8dca235e 100644
--- a/mall-common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
+++ b/mall-common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
@@ -120,6 +120,7 @@
/Users/panjunjie/code/java-mall/mall-common/src/main/java/com/suisung/mall/common/modules/pay/PayUserResource.java
/Users/panjunjie/code/java-mall/mall-common/src/main/java/com/suisung/mall/common/modules/store/ShopStoreActivityItem.java
/Users/panjunjie/code/java-mall/mall-common/src/main/java/com/suisung/mall/common/domain/RoleIdEnum.java
+/Users/panjunjie/code/java-mall/mall-common/src/main/java/com/suisung/mall/common/utils/FreeMakerUtils.java
/Users/panjunjie/code/java-mall/mall-common/src/main/java/com/suisung/mall/common/modules/account/AccountUserSns.java
/Users/panjunjie/code/java-mall/mall-common/src/main/java/com/suisung/mall/common/modules/edu/vo/EduCourseDetailVO.java
/Users/panjunjie/code/java-mall/mall-common/src/main/java/com/suisung/mall/common/modules/account/AccountUserChain.java
@@ -164,6 +165,7 @@
/Users/panjunjie/code/java-mall/mall-common/src/main/java/com/suisung/mall/common/utils/excel/ExportFactory.java
/Users/panjunjie/code/java-mall/mall-common/src/main/java/com/suisung/mall/common/modules/account/AccountUserLogin.java
/Users/panjunjie/code/java-mall/mall-common/src/main/java/com/suisung/mall/common/modules/user/ShopUserInvoice.java
+/Users/panjunjie/code/java-mall/mall-common/src/main/java/com/suisung/mall/common/pojo/vo/ShopStoreOrderProductPrintVO.java
/Users/panjunjie/code/java-mall/mall-common/src/main/java/com/suisung/mall/common/pojo/req/TimelineReq.java
/Users/panjunjie/code/java-mall/mall-common/src/main/java/com/suisung/mall/common/modules/edu/EduUserPaperTopicDetail.java
/Users/panjunjie/code/java-mall/mall-common/src/main/java/com/suisung/mall/common/modules/store/ShopStoreBase.java
@@ -174,6 +176,7 @@
/Users/panjunjie/code/java-mall/mall-common/src/main/java/com/suisung/mall/common/pojo/res/AmountRes.java
/Users/panjunjie/code/java-mall/mall-common/src/main/java/com/suisung/mall/common/modules/admin/ElTree.java
/Users/panjunjie/code/java-mall/mall-common/src/main/java/com/suisung/mall/common/constant/AuthConstant.java
+/Users/panjunjie/code/java-mall/mall-common/src/main/java/com/suisung/mall/common/pojo/vo/ShopStoreOrderPrintVO.java
/Users/panjunjie/code/java-mall/mall-common/src/main/java/com/suisung/mall/common/modules/edu/EduCourseContract.java
/Users/panjunjie/code/java-mall/mall-common/src/main/java/com/suisung/mall/common/modules/store/ShopStoreMedia.java
/Users/panjunjie/code/java-mall/mall-common/src/main/java/com/suisung/mall/common/modules/product/ShopProductInfo.java
@@ -216,7 +219,6 @@
/Users/panjunjie/code/java-mall/mall-common/src/main/java/com/suisung/mall/common/modules/city/CityMarketOrderBase.java
/Users/panjunjie/code/java-mall/mall-common/src/main/java/com/suisung/mall/common/pojo/res/FeiePrinterApiRes.java
/Users/panjunjie/code/java-mall/mall-common/src/main/java/com/suisung/mall/common/modules/product/ShopProductAssistIndex.java
-/Users/panjunjie/code/java-mall/mall-common/src/main/java/com/suisung/mall/common/pojo/dto/ProductSimpleInfo.java
/Users/panjunjie/code/java-mall/mall-common/src/main/java/com/suisung/mall/common/pojo/dto/ProductSearchDTO.java
/Users/panjunjie/code/java-mall/mall-common/src/main/java/com/suisung/mall/common/utils/JChardetFacadeUtil.java
/Users/panjunjie/code/java-mall/mall-common/src/main/java/com/suisung/mall/common/modules/pay/PayConsumeTrade.java
@@ -304,6 +306,7 @@
/Users/panjunjie/code/java-mall/mall-common/src/main/java/com/suisung/mall/common/modules/sns/SnsUserGroup.java
/Users/panjunjie/code/java-mall/mall-common/src/main/java/com/suisung/mall/common/modules/admin/Router.java
/Users/panjunjie/code/java-mall/mall-common/src/main/java/com/suisung/mall/common/api/CommonResult.java
+/Users/panjunjie/code/java-mall/mall-common/src/main/java/com/suisung/mall/common/modules/store/ShopStorePrinterTemplate.java
/Users/panjunjie/code/java-mall/mall-common/src/main/java/com/suisung/mall/common/modules/distribution/ShopDistributionUserOrderItem.java
/Users/panjunjie/code/java-mall/mall-common/src/main/java/com/suisung/mall/common/modules/product/ShopProductDriveModel.java
/Users/panjunjie/code/java-mall/mall-common/src/main/java/com/suisung/mall/common/modules/base/ShopBaseProductType.java
diff --git a/mall-gateway/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/mall-gateway/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
index 996b14fd..e69de29b 100644
--- a/mall-gateway/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
+++ b/mall-gateway/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
@@ -1,26 +0,0 @@
-com/suisung/mall/utils/SqLinjectionRuleUtils.class
-com/suisung/mall/filter/MallSuiteXssFilter$1.class
-com/suisung/mall/filter/MallSuiteXssFilter$XssWhiteUrl$XssWhiteUrlBuilder.class
-com/suisung/mall/filter/MallSuiteXssFilter$XssWhiteUrl.class
-com/suisung/mall/MallGatewayApplication.class
-com/suisung/mall/config/SwaggerResourceConfig.class
-com/suisung/mall/config/GlobalCorsConfig.class
-com/suisung/mall/component/MyServerLogoutHandler.class
-com/suisung/mall/filter/MallSuiteXssFilter.class
-com/suisung/mall/config/UniversalUrlsConfig.class
-com/suisung/mall/filter/IgnoreUrlsRemoveJwtFilter.class
-com/suisung/mall/handler/SwaggerHandler.class
-com/suisung/mall/component/CustomWebExceptionHandler$ResponseContext.class
-com/suisung/mall/component/RestfulAccessDeniedHandler.class
-META-INF/spring-configuration-metadata.json
-com/suisung/mall/config/ExceptionConfig.class
-com/suisung/mall/config/RedisConfig.class
-com/suisung/mall/config/HttpMessageConfig.class
-com/suisung/mall/filter/AuthGlobalFilter.class
-com/suisung/mall/component/ExceptionResult.class
-com/suisung/mall/component/RestAuthenticationEntryPoint.class
-com/suisung/mall/config/IgnoreUrlsConfig.class
-com/suisung/mall/config/ResourceServerConfig.class
-com/suisung/mall/authorization/AuthorizationManager.class
-com/suisung/mall/component/CustomWebExceptionHandler$1.class
-com/suisung/mall/component/CustomWebExceptionHandler.class
diff --git a/mall-im/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/mall-im/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
index db7de96a..e69de29b 100644
--- a/mall-im/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
+++ b/mall-im/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
@@ -1,37 +0,0 @@
-com/suisung/mall/im/service/ChatHistoryService.class
-com/suisung/mall/im/config/FeignConfig$1.class
-com/suisung/mall/im/pojo/vo/LayGroupJsonData.class
-com/suisung/mall/im/config/UserInfoConfig.class
-com/suisung/mall/im/pojo/vo/LayFileJsonData.class
-com/suisung/mall/im/config/FeignConfig.class
-com/suisung/mall/im/service/impl/ChatHistoryServiceImpl.class
-com/suisung/mall/im/mapper/ChatHistoryMapper.class
-com/suisung/mall/im/MallImApplication.class
-com/suisung/mall/im/config/SwaggerConfig.class
-com/suisung/mall/im/common/websocket/service/onchat/MallsuiteImSocketHandshakeInterceptor.class
-com/suisung/mall/im/service/LayGroupService.class
-com/suisung/mall/im/pojo/vo/ToDTO.class
-com/suisung/mall/im/pojo/entity/LayGroup.class
-com/suisung/mall/im/pojo/vo/ReceiveDTO.class
-com/suisung/mall/im/pojo/vo/MineDTO.class
-com/suisung/mall/im/common/websocket/utils/SpringContextHolder.class
-com/suisung/mall/im/common/websocket/service/onchat/MallsuiteImSocketHandler.class
-com/suisung/mall/im/mapper/LayGroupMapper.class
-com/suisung/mall/im/config/RedisConfig.class
-com/suisung/mall/im/common/websocket/utils/Constants.class
-com/suisung/mall/im/common/websocket/service/system/SystemInfoSocketHandler.class
-com/suisung/mall/im/controller/admin/LayGroupController.class
-com/suisung/mall/im/pojo/entity/ChatHistory.class
-com/suisung/mall/im/pojo/vo/LayJsonData.class
-com/suisung/mall/im/pojo/vo/FriendGroup.class
-com/suisung/mall/im/controller/admin/ChatHistoryController.class
-com/suisung/mall/im/common/websocket/service/system/SystemInfoSocketHandshakeInterceptor.class
-com/suisung/mall/im/pojo/vo/LayJson.class
-com/suisung/mall/im/mapper/LayGroupUserMapper.class
-com/suisung/mall/im/controller/admin/ChatSocketInfoController.class
-com/suisung/mall/im/config/MyBatisConfig.class
-com/suisung/mall/im/service/impl/LayGroupServiceImpl.class
-com/suisung/mall/im/common/websocket/config/WebSocketConfig.class
-com/suisung/mall/im/pojo/vo/Friend.class
-com/suisung/mall/im/pojo/vo/SendVO.class
-com/suisung/mall/im/pojo/entity/LayGroupUser.class
diff --git a/mall-pay/src/main/resources/payKey/wx/apiclient_cert.p12 b/mall-pay/src/main/resources/payKey/wx/apiclient_cert.p12
index a53b474f..c9c1fff7 100644
Binary files a/mall-pay/src/main/resources/payKey/wx/apiclient_cert.p12 and b/mall-pay/src/main/resources/payKey/wx/apiclient_cert.p12 differ
diff --git a/mall-pay/src/main/resources/payKey/wx/apiclient_cert.pem b/mall-pay/src/main/resources/payKey/wx/apiclient_cert.pem
index 94df1992..7c726697 100644
--- a/mall-pay/src/main/resources/payKey/wx/apiclient_cert.pem
+++ b/mall-pay/src/main/resources/payKey/wx/apiclient_cert.pem
@@ -1,25 +1,25 @@
-----BEGIN CERTIFICATE-----
-MIIEKDCCAxCgAwIBAgIUcLG0VgX3HmCMv2+mG+Zbj3tMHC4wDQYJKoZIhvcNAQEL
+MIIEITCCAwmgAwIBAgIUMDFLk7OUNSxqRha3YRwjQCBBreIwDQYJKoZIhvcNAQEL
BQAwXjELMAkGA1UEBhMCQ04xEzARBgNVBAoTClRlbnBheS5jb20xHTAbBgNVBAsT
FFRlbnBheS5jb20gQ0EgQ2VudGVyMRswGQYDVQQDExJUZW5wYXkuY29tIFJvb3Qg
-Q0EwHhcNMjQwODI5MDg1NDI0WhcNMjkwODI4MDg1NDI0WjCBgTETMBEGA1UEAwwK
-MTY4NDE5OTE3MTEbMBkGA1UECgwS5b6u5L+h5ZWG5oi357O757ufMS0wKwYDVQQL
-DCTkuIrmtbfmvpzpqbDmlbDlrZfnp5HmioDmnInpmZDlhazlj7gxCzAJBgNVBAYT
-AkNOMREwDwYDVQQHDAhTaGVuWmhlbjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBALwC78n77a1Dvz6M/6uyYjJ4PIGXx30Q1nvqpMF793A8ds+eNbXrewzn
-ZENv5sHl2i+P0aezWbn0f5Gp92LUm/DaGsiFpFuVny29JYXa/kd2j/SnNPwfVi03
-c7D8q9U/I2JrAhDkQ8sgkJ3a+UaLfRYDjLgKyIT7C7tpaSne8oKLGcK19IydamZ/
-sePP/1AbSHABaFS5UAqFia3VlCV3ffiqZjvYj+EyfYuKzkwp+fhP2ohIGyceFEEZ
-/2t9x9Lq2GqMev5RAYMz/lUmhZmELvRa7DFR1nfLzLciW6o4qWrw8jH0qNpF5jow
-CoAP5p0QicZ15qWt2sTSgc1LhR4RjZkCAwEAAaOBuTCBtjAJBgNVHRMEAjAAMAsG
-A1UdDwQEAwID+DCBmwYDVR0fBIGTMIGQMIGNoIGKoIGHhoGEaHR0cDovL2V2Y2Eu
-aXRydXMuY29tLmNuL3B1YmxpYy9pdHJ1c2NybD9DQT0xQkQ0MjIwRTUwREJDMDRC
-MDZBRDM5NzU0OTg0NkMwMUMzRThFQkQyJnNnPUhBQ0M0NzFCNjU0MjJFMTJCMjdB
-OUQzM0E4N0FEMUNERjU5MjZFMTQwMzcxMA0GCSqGSIb3DQEBCwUAA4IBAQCjwUBK
-Rc/05NT7fvHB9IGSUy3iW7gyiB5FNTlou/TwFBxmJJ6aigyBZX2XeLs87gxa3biY
-20C4E2fJ3Rw/8EJYQH21nus7grMCmjrS4RDId42GnpWJhjOZ+80r2aS9a/XnhdqW
-57pveS9SEGok5cdashF/MmIXo8j05+5fo71mu0/aI48XZy9GSqbnUD6tGQHRIKh8
-u461Tjxh8pyOmN/0HV4DwJozjBl0/Er1NlljIIbS55KArk03n6VyHuETptylPiLP
-61zRjh/ULaqjUp9V36euheQMEurvrNnWsmqcKtIBhSxKZCAeWlkWoSgy+ov1DWnx
-YuDfZRo38OtsGg3Y
+Q0EwHhcNMjQxMTA0MDQwMzE5WhcNMjkxMTAzMDQwMzE5WjB7MRMwEQYDVQQDDAox
+Njg0ODMzNDgxMRswGQYDVQQKDBLlvq7kv6HllYbmiLfns7vnu58xJzAlBgNVBAsM
+HuahguW5s+WPkeWPkee9kee7nOaciemZkOWFrOWPuDELMAkGA1UEBhMCQ04xETAP
+BgNVBAcMCFNoZW5aaGVuMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+np8v9TIfSSnfM8yBOWvPgNUDZyom+NzVEy545s9KolmeAIyhZVjGLuddDfQnQjHm
+SFhlzY13B6WFox6f7rMVyxJTWVorhdgQ3GHtObjsxrnZNgjG8Z4zE7N33NUwxph7
+DLZRF7s2xueRKoxMzUskj8LmPm54IyBrT/MDRrNByek/5zzledT2EnsSrFhfG0X+
+fn1+iCh+SAB4Phn5A9vkYGmdDmrKI9uqjqk2VQfbFD3mRkRC+sUzVxKkwAgH/TxM
+oweak5FZYJujKzUvIgF2z2acPR/XqF0gx95aqxscxCsAim6mQrjKM/AZ3YKuRN9f
+iH6U3xH6TzFahsyD2nVNoQIDAQABo4G5MIG2MAkGA1UdEwQCMAAwCwYDVR0PBAQD
+AgP4MIGbBgNVHR8EgZMwgZAwgY2ggYqggYeGgYRodHRwOi8vZXZjYS5pdHJ1cy5j
+b20uY24vcHVibGljL2l0cnVzY3JsP0NBPTFCRDQyMjBFNTBEQkMwNEIwNkFEMzk3
+NTQ5ODQ2QzAxQzNFOEVCRDImc2c9SEFDQzQ3MUI2NTQyMkUxMkIyN0E5RDMzQTg3
+QUQxQ0RGNTkyNkUxNDAzNzEwDQYJKoZIhvcNAQELBQADggEBAEegG9pWXMvup472
+3eX+B1c/K/pyIJrP4gH/n06iQXhAkdNq2cyKuVE/P+oZkVGpyt9LGuqcYdPOpm+B
+6Zh6HYqA4TjjjuFcE4pZMWTmWmHFYwBRFneb/IYWwjOpwhvr+2PlRdZjU2hFXf45
+fHRH214KGLYjFng3aa7IbLNleN/cfRL0HfAbvMp77NanTcND2Vpy0YPXc3a89rRw
+l+UhlfBs0uuemsVWJVOS3WS/ZV0LIhVF2/NIO2/mOpQaKdPBDcOVKnjZRc93kmPh
+TMPfPWCwpYBNswnNNytTK2GDya/MqUI5dWMJNheVKcSbCSJdomFWQPtzxMmhfFlu
+sw5XAOM=
-----END CERTIFICATE-----
diff --git a/mall-pay/src/main/resources/payKey/wx/apiclient_key.pem b/mall-pay/src/main/resources/payKey/wx/apiclient_key.pem
index 07424e74..b7e70cc9 100644
--- a/mall-pay/src/main/resources/payKey/wx/apiclient_key.pem
+++ b/mall-pay/src/main/resources/payKey/wx/apiclient_key.pem
@@ -1,28 +1,28 @@
-----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC8Au/J++2tQ78+
-jP+rsmIyeDyBl8d9ENZ76qTBe/dwPHbPnjW163sM52RDb+bB5dovj9Gns1m59H+R
-qfdi1Jvw2hrIhaRblZ8tvSWF2v5Hdo/0pzT8H1YtN3Ow/KvVPyNiawIQ5EPLIJCd
-2vlGi30WA4y4CsiE+wu7aWkp3vKCixnCtfSMnWpmf7Hjz/9QG0hwAWhUuVAKhYmt
-1ZQld334qmY72I/hMn2Lis5MKfn4T9qISBsnHhRBGf9rfcfS6thqjHr+UQGDM/5V
-JoWZhC70WuwxUdZ3y8y3IluqOKlq8PIx9KjaReY6MAqAD+adEInGdealrdrE0oHN
-S4UeEY2ZAgMBAAECggEASeuBqdGCXjgfrhEzyKbnEt7RM0agqVyAZ9IWmvgJjjhH
-olOa3H7ML4OemSEbAitEAKU0EhJi+cjWi0ffOx1KfoTSOPrKZzPJlOskIJ+8kA5e
-hRtkqqgLctW1h+WgDcS4Pc7Czi9hNDEGivn4PjNDp+8XWZjrw9UMhM/qCAtfH9Gw
-/VEdxNs5j9X71MRuNxW0MOK/PkmoxKh1jmt+AomxQnTkIuELGbaOAUXYP71de41A
-LIQIWiyPhPtpupbDbV4RhFiaLnCc1wtJ3yGiY3o+HUx1USxx1eFJCsWduy4romMO
-DOiRAKcqx1KdMmUpCt5NQfrYqtAldrm/ysmPllhigQKBgQD6E+1iEtKEo7u5YfzR
-myEcCUbWprHoVjaOIaLv/uNIqkTPAWVXsuIXECi3XQbcXBhZJGcoMfFfJRjbnWPT
-SDoqaxvDZlc3qX57pqNeJRGaA6BES+7DJwZh73GUIyNkRafQ8mSmOMveH/pWZY2H
-OgPV44MEB3ayp7m/t6JWAckLqQKBgQDAdrzv7Sj4Os6Vts6CWYE4P4Pk+eAICQYL
-17HgfJ7hcRvgLLzb+Y/HmaMmYzGmDQ2ry702p27Cd4IZ+qpuvkdWiMNnCeoeLwf5
-Lze4k7orPAg7zgqsC8KYpnXyulb2odssPKpPQjnyBYLJFin+qFqkmnh1GIydzqLr
-8jfy7xkocQKBgDUxT+jwf/7epOuFwDUFfkFsZ7j4tBbrX6dT2EicOtQWA5TUgy3o
-StcFBOQb0X3FyRgM+jQ+i0zloyfzjmw+jMDBD6K8fgjE8LZ0d4Nq9xd/dfORAzRX
-dLAYMlyELN8DQfLb3DTPF+4jdygxaa091dsFDbUpsUHHE2eIM+t/bbghAoGAPkat
-gB0HQrsUmZEbZUY878xtiyvnd/IjiLV0kyT/7AbDdFhFjBBGm9l01zkFmatjnxE/
-2m13A2nUKT/Y4hij0LZUNAUbQkUJmXHT39+9P7wfFernvR/ZCbfjNnVhKlDZMIk4
-uoi9YzixRwvq7sHfAqARFiKpbW6tfRdVT0BaraECgYEAiDop2ZWfjjxSF2Kn/+yb
-oTIQ08zJ4NavSp6wQOAF0c1qDKiqo4do41STfz4U9UYaMyQ0gmDSbnexky/64x9U
-oX+3fRiSd0RapreUZuBxRlckAGrn8J59xYjQvU6kAvsOUp8OMgmu6xaO4hk+n/Qv
-jueoIPMR6Ka29XNynz8Cr0c=
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCeny/1Mh9JKd8z
+zIE5a8+A1QNnKib43NUTLnjmz0qiWZ4AjKFlWMYu510N9CdCMeZIWGXNjXcHpYWj
+Hp/usxXLElNZWiuF2BDcYe05uOzGudk2CMbxnjMTs3fc1TDGmHsMtlEXuzbG55Eq
+jEzNSySPwuY+bngjIGtP8wNGs0HJ6T/nPOV51PYSexKsWF8bRf5+fX6IKH5IAHg+
+GfkD2+RgaZ0Oasoj26qOqTZVB9sUPeZGREL6xTNXEqTACAf9PEyjB5qTkVlgm6Mr
+NS8iAXbPZpw9H9eoXSDH3lqrGxzEKwCKbqZCuMoz8Bndgq5E31+IfpTfEfpPMVqG
+zIPadU2hAgMBAAECggEAF88TFr3APm4fh5nhp6nMCq1uhlSoZuBWxztJgHOK41WK
+RtDVBO5PSQkHSanlHqV4yFEkbrcWL7qjlXlqThzpX4LPqfDD6aIl3b6BKhHc0HNi
+7B5jJi81wXZFvorteFG43o6bG3HJZg+qFXXbrVDjGwUJJEPWmocqNGToj/smG9U/
+ccaqD3LRsFKiv5zAHateDG2RdKOwA2RUQNSb1um36OpF1w76wgVPmHeXh7O4GL09
+v+xdbSrAwQK8leLEQdMJJEsFar9pcmG5H8bUbwzBoEaYoGVyULgL/20qpZVJW+nN
+n3WdqqqlMn4oo7YeILxdgCFGOEIKta78HGtees9C8QKBgQDPpyvTxk1AWg2cAsta
+lKJz/EdjbeoUxczM0VwCBNlc0BXMJIrTwcUWRNh9y+kn0p+S2J4OG3pd7EMFJuF9
+oW7qm01trkb6E0NaTAs6uLUFwQmyREtiUYW/rJIse2frihQgUg+6Mi3hxuaMmJCR
+z+nzEOQmghyEfaTflFa30hbLpQKBgQDDjZcFGkbannkYMCKPTVIrtTPll2PytMIH
+/RoSssU/RzHVuCxfzqIhhwTzk63j/NqPJkm1GwoJFNchABfVRFIiGzBpLHicuX86
+zj/V6gJinKGlefxwY+wMxqL4HVQgnkc9qo8JnumxCvgIu0IPyXJIGTgnluhsRlpw
+6tKTbOhJTQKBgAocUqb6FdLXT6hT/oDHke1h0DwIIwil5OXoH7m9cLPzMcyBzvym
+h6kg6wWdAxo8SCbHQ1LehaPDGDRNA1exn4vuyeNYQ/5zJ6li4H0Ydz/zeTxj1OPR
+oliF14ww6gtu6rH0LO3c+ZzvqVQZLZjb7cE3BlTVqvvMflWgjGRg51k9AoGAVJ9I
+4uRkFObO8DCkQ+7pyBA5zPieP8EI1fwo9D54LNHaNunkCfGZJ3kOI3mcnjQlQB0J
+eF2jEhr6nUU1CwztneS2Jk0gRHHhJMlrxl3lelbdfIY1P01+MGkkzMmkRhk4Ku9L
+xpYF+p8MhnrCM6Kw2ZJQQpGDMpefO43iYfmW62ECgYBXlvBMa+MCIoVa8EgmNX1y
+ZZ0r4tho/t7VIXMrnCErjv5er30jalnPf9LJid74H1SZbLbf80yXEKAMH5QOQQIz
+Bni3XPH4EHDnIk++H6G2NP8/22Cm95IwbRH8y5G0IJi4pocMLxmRTqp+hj4mWqP0
+5LERT/coFI3xBmwhGKIdMQ==
-----END PRIVATE KEY-----
diff --git a/mall-pay/src/main/resources/payKey/wx/bak/apiclient_cert.p12 b/mall-pay/src/main/resources/payKey/wx/bak/apiclient_cert.p12
new file mode 100644
index 00000000..a53b474f
Binary files /dev/null and b/mall-pay/src/main/resources/payKey/wx/bak/apiclient_cert.p12 differ
diff --git a/mall-pay/src/main/resources/payKey/wx/bak/apiclient_cert.pem b/mall-pay/src/main/resources/payKey/wx/bak/apiclient_cert.pem
new file mode 100644
index 00000000..94df1992
--- /dev/null
+++ b/mall-pay/src/main/resources/payKey/wx/bak/apiclient_cert.pem
@@ -0,0 +1,25 @@
+-----BEGIN CERTIFICATE-----
+MIIEKDCCAxCgAwIBAgIUcLG0VgX3HmCMv2+mG+Zbj3tMHC4wDQYJKoZIhvcNAQEL
+BQAwXjELMAkGA1UEBhMCQ04xEzARBgNVBAoTClRlbnBheS5jb20xHTAbBgNVBAsT
+FFRlbnBheS5jb20gQ0EgQ2VudGVyMRswGQYDVQQDExJUZW5wYXkuY29tIFJvb3Qg
+Q0EwHhcNMjQwODI5MDg1NDI0WhcNMjkwODI4MDg1NDI0WjCBgTETMBEGA1UEAwwK
+MTY4NDE5OTE3MTEbMBkGA1UECgwS5b6u5L+h5ZWG5oi357O757ufMS0wKwYDVQQL
+DCTkuIrmtbfmvpzpqbDmlbDlrZfnp5HmioDmnInpmZDlhazlj7gxCzAJBgNVBAYT
+AkNOMREwDwYDVQQHDAhTaGVuWmhlbjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBALwC78n77a1Dvz6M/6uyYjJ4PIGXx30Q1nvqpMF793A8ds+eNbXrewzn
+ZENv5sHl2i+P0aezWbn0f5Gp92LUm/DaGsiFpFuVny29JYXa/kd2j/SnNPwfVi03
+c7D8q9U/I2JrAhDkQ8sgkJ3a+UaLfRYDjLgKyIT7C7tpaSne8oKLGcK19IydamZ/
+sePP/1AbSHABaFS5UAqFia3VlCV3ffiqZjvYj+EyfYuKzkwp+fhP2ohIGyceFEEZ
+/2t9x9Lq2GqMev5RAYMz/lUmhZmELvRa7DFR1nfLzLciW6o4qWrw8jH0qNpF5jow
+CoAP5p0QicZ15qWt2sTSgc1LhR4RjZkCAwEAAaOBuTCBtjAJBgNVHRMEAjAAMAsG
+A1UdDwQEAwID+DCBmwYDVR0fBIGTMIGQMIGNoIGKoIGHhoGEaHR0cDovL2V2Y2Eu
+aXRydXMuY29tLmNuL3B1YmxpYy9pdHJ1c2NybD9DQT0xQkQ0MjIwRTUwREJDMDRC
+MDZBRDM5NzU0OTg0NkMwMUMzRThFQkQyJnNnPUhBQ0M0NzFCNjU0MjJFMTJCMjdB
+OUQzM0E4N0FEMUNERjU5MjZFMTQwMzcxMA0GCSqGSIb3DQEBCwUAA4IBAQCjwUBK
+Rc/05NT7fvHB9IGSUy3iW7gyiB5FNTlou/TwFBxmJJ6aigyBZX2XeLs87gxa3biY
+20C4E2fJ3Rw/8EJYQH21nus7grMCmjrS4RDId42GnpWJhjOZ+80r2aS9a/XnhdqW
+57pveS9SEGok5cdashF/MmIXo8j05+5fo71mu0/aI48XZy9GSqbnUD6tGQHRIKh8
+u461Tjxh8pyOmN/0HV4DwJozjBl0/Er1NlljIIbS55KArk03n6VyHuETptylPiLP
+61zRjh/ULaqjUp9V36euheQMEurvrNnWsmqcKtIBhSxKZCAeWlkWoSgy+ov1DWnx
+YuDfZRo38OtsGg3Y
+-----END CERTIFICATE-----
diff --git a/mall-pay/src/main/resources/payKey/wx/bak/apiclient_key.pem b/mall-pay/src/main/resources/payKey/wx/bak/apiclient_key.pem
new file mode 100644
index 00000000..07424e74
--- /dev/null
+++ b/mall-pay/src/main/resources/payKey/wx/bak/apiclient_key.pem
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC8Au/J++2tQ78+
+jP+rsmIyeDyBl8d9ENZ76qTBe/dwPHbPnjW163sM52RDb+bB5dovj9Gns1m59H+R
+qfdi1Jvw2hrIhaRblZ8tvSWF2v5Hdo/0pzT8H1YtN3Ow/KvVPyNiawIQ5EPLIJCd
+2vlGi30WA4y4CsiE+wu7aWkp3vKCixnCtfSMnWpmf7Hjz/9QG0hwAWhUuVAKhYmt
+1ZQld334qmY72I/hMn2Lis5MKfn4T9qISBsnHhRBGf9rfcfS6thqjHr+UQGDM/5V
+JoWZhC70WuwxUdZ3y8y3IluqOKlq8PIx9KjaReY6MAqAD+adEInGdealrdrE0oHN
+S4UeEY2ZAgMBAAECggEASeuBqdGCXjgfrhEzyKbnEt7RM0agqVyAZ9IWmvgJjjhH
+olOa3H7ML4OemSEbAitEAKU0EhJi+cjWi0ffOx1KfoTSOPrKZzPJlOskIJ+8kA5e
+hRtkqqgLctW1h+WgDcS4Pc7Czi9hNDEGivn4PjNDp+8XWZjrw9UMhM/qCAtfH9Gw
+/VEdxNs5j9X71MRuNxW0MOK/PkmoxKh1jmt+AomxQnTkIuELGbaOAUXYP71de41A
+LIQIWiyPhPtpupbDbV4RhFiaLnCc1wtJ3yGiY3o+HUx1USxx1eFJCsWduy4romMO
+DOiRAKcqx1KdMmUpCt5NQfrYqtAldrm/ysmPllhigQKBgQD6E+1iEtKEo7u5YfzR
+myEcCUbWprHoVjaOIaLv/uNIqkTPAWVXsuIXECi3XQbcXBhZJGcoMfFfJRjbnWPT
+SDoqaxvDZlc3qX57pqNeJRGaA6BES+7DJwZh73GUIyNkRafQ8mSmOMveH/pWZY2H
+OgPV44MEB3ayp7m/t6JWAckLqQKBgQDAdrzv7Sj4Os6Vts6CWYE4P4Pk+eAICQYL
+17HgfJ7hcRvgLLzb+Y/HmaMmYzGmDQ2ry702p27Cd4IZ+qpuvkdWiMNnCeoeLwf5
+Lze4k7orPAg7zgqsC8KYpnXyulb2odssPKpPQjnyBYLJFin+qFqkmnh1GIydzqLr
+8jfy7xkocQKBgDUxT+jwf/7epOuFwDUFfkFsZ7j4tBbrX6dT2EicOtQWA5TUgy3o
+StcFBOQb0X3FyRgM+jQ+i0zloyfzjmw+jMDBD6K8fgjE8LZ0d4Nq9xd/dfORAzRX
+dLAYMlyELN8DQfLb3DTPF+4jdygxaa091dsFDbUpsUHHE2eIM+t/bbghAoGAPkat
+gB0HQrsUmZEbZUY878xtiyvnd/IjiLV0kyT/7AbDdFhFjBBGm9l01zkFmatjnxE/
+2m13A2nUKT/Y4hij0LZUNAUbQkUJmXHT39+9P7wfFernvR/ZCbfjNnVhKlDZMIk4
+uoi9YzixRwvq7sHfAqARFiKpbW6tfRdVT0BaraECgYEAiDop2ZWfjjxSF2Kn/+yb
+oTIQ08zJ4NavSp6wQOAF0c1qDKiqo4do41STfz4U9UYaMyQ0gmDSbnexky/64x9U
+oX+3fRiSd0RapreUZuBxRlckAGrn8J59xYjQvU6kAvsOUp8OMgmu6xaO4hk+n/Qv
+jueoIPMR6Ka29XNynz8Cr0c=
+-----END PRIVATE KEY-----
diff --git a/mall-pay/target/classes/payKey/wx/apiclient_cert.p12 b/mall-pay/target/classes/payKey/wx/apiclient_cert.p12
index a53b474f..c9c1fff7 100644
Binary files a/mall-pay/target/classes/payKey/wx/apiclient_cert.p12 and b/mall-pay/target/classes/payKey/wx/apiclient_cert.p12 differ
diff --git a/mall-pay/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/mall-pay/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
index 5a8bebc6..e69de29b 100644
--- a/mall-pay/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
+++ b/mall-pay/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
@@ -1,102 +0,0 @@
-com/suisung/mall/pay/controller/admin/PayController.class
-com/suisung/mall/pay/service/PayBaseBankService.class
-com/suisung/mall/pay/excel/topic/PayCardHistoryTempListener.class
-com/suisung/mall/pay/service/impl/PayCardTypeServiceImpl.class
-com/suisung/mall/pay/controller/admin/PayBaseBankController.class
-com/suisung/mall/pay/controller/admin/PayUserResourceController.class
-com/suisung/mall/pay/service/ShopBaseStateCodeService.class
-com/suisung/mall/pay/mapper/ShopBaseStateCodeMapper.class
-com/suisung/mall/pay/service/PayConsumeRecordService.class
-com/suisung/mall/pay/controller/admin/PayPaymentChannelController.class
-com/suisung/mall/pay/mapper/ShopUserPointsHistoryMapper.class
-com/suisung/mall/pay/service/PayCardMediaService.class
-com/suisung/mall/pay/mapper/PayConsumeDepositMapper.class
-com/suisung/mall/pay/mapper/PayUserPayMapper.class
-com/suisung/mall/pay/service/PayCardTypeService.class
-com/suisung/mall/pay/mapper/PayUserResourceMapper.class
-com/suisung/mall/pay/mapper/PayBaseRechargeLevelMapper.class
-com/suisung/mall/pay/service/impl/PayCardMediaServiceImpl.class
-com/suisung/mall/pay/listener/PayPointListener.class
-com/suisung/mall/pay/controller/admin/PayConsumeDepositController.class
-com/suisung/mall/pay/service/impl/PayCardHistoryServiceImpl.class
-com/suisung/mall/pay/service/PayConsumeWithdrawService.class
-com/suisung/mall/pay/service/impl/PayConsumeTradeServiceImpl.class
-com/suisung/mall/pay/mapper/PayPlantformResourceMapper.class
-com/suisung/mall/pay/controller/mobile/PaymentChannelController.class
-com/suisung/mall/pay/config/MyBatisConfig.class
-com/suisung/mall/pay/service/PayUserPayService.class
-com/suisung/mall/pay/service/PayConsumeDepositService.class
-com/suisung/mall/pay/config/UserInfoConfig.class
-com/suisung/mall/pay/config/PayConfig.class
-com/suisung/mall/pay/service/PayConsumeTradeService.class
-com/suisung/mall/pay/controller/admin/PayCardMediaController.class
-com/suisung/mall/pay/mapper/PayCardMediaMapper.class
-com/suisung/mall/pay/service/impl/PayUserResourceServiceImpl.class
-com/suisung/mall/pay/service/impl/PayPaymentChannelServiceImpl.class
-com/suisung/mall/pay/controller/mobile/UserBankController.class
-com/suisung/mall/pay/controller/admin/PayConsumeWithdrawController.class
-com/suisung/mall/pay/listener/PayMoneyListener.class
-com/suisung/mall/pay/service/ShopUserPointsHistoryService.class
-com/suisung/mall/pay/config/SwaggerConfig.class
-com/suisung/mall/pay/service/impl/PayUserBankCardServiceImpl.class
-com/suisung/mall/pay/controller/admin/PayBaseRechargeLevelController.class
-com/suisung/mall/pay/entity/H5SceneInfo$H5.class
-com/suisung/mall/pay/mapper/PayConsumeTradeMapper.class
-com/suisung/mall/pay/service/impl/PayConsumeWithdrawServiceImpl.class
-com/suisung/mall/pay/controller/mobile/UserResourceController.class
-com/suisung/mall/pay/controller/mobile/IndexController.class
-com/suisung/mall/pay/excel/topic/UserPayTemp.class
-com/suisung/mall/pay/excel/topic/UserPayTempListener.class
-com/suisung/mall/pay/controller/admin/PayConsumeTradeController.class
-com/suisung/mall/pay/config/RedisConfig.class
-com/suisung/mall/pay/mapper/PayPaymentChannelMapper.class
-com/suisung/mall/pay/mapper/PayConsumeTradeCombineMapper.class
-com/suisung/mall/pay/entity/AliPayBean.class
-com/suisung/mall/pay/service/PayBaseRechargeLevelService.class
-com/suisung/mall/pay/service/impl/PayBaseBankServiceImpl.class
-com/suisung/mall/pay/service/impl/PayConsumeRecordServiceImpl.class
-com/suisung/mall/pay/controller/admin/PayConsumeRecordController.class
-com/suisung/mall/pay/service/impl/AccountBaseConfigServiceImpl.class
-com/suisung/mall/pay/entity/PayTypeBean.class
-com/suisung/mall/pay/service/impl/PayPlantformResourceServiceImpl.class
-com/suisung/mall/pay/config/RabbitMqConfig.class
-com/suisung/mall/pay/controller/admin/PayCardHistoryController.class
-com/suisung/mall/pay/service/PayUserBankCardService.class
-com/suisung/mall/pay/listener/PayTradeListener.class
-com/suisung/mall/pay/service/PayCardHistoryService.class
-com/suisung/mall/pay/service/impl/PayConsumeTradeCombineServiceImpl.class
-com/suisung/mall/pay/mapper/AccountBaseConfigMapper.class
-com/suisung/mall/pay/excel/topic/PayCardHistoryTemp.class
-com/suisung/mall/pay/mapper/PayCardHistoryMapper.class
-com/suisung/mall/pay/mapper/PayUserBankCardMapper.class
-com/suisung/mall/pay/mapper/AnalytiscTradeDao.class
-com/suisung/mall/pay/controller/admin/PayCardTypeController.class
-com/suisung/mall/pay/service/impl/PayUserPayServiceImpl.class
-com/suisung/mall/pay/service/PayUserResourceService.class
-com/suisung/mall/pay/MallPayApplication.class
-com/suisung/mall/pay/controller/admin/AnalyticsController.class
-com/suisung/mall/pay/service/impl/ShopBaseStateCodeServiceImpl.class
-com/suisung/mall/pay/service/PayCardInfoService.class
-com/suisung/mall/pay/config/FeignConfig$1.class
-com/suisung/mall/pay/service/impl/PayBaseRechargeLevelServiceImpl.class
-com/suisung/mall/pay/mapper/PayCardInfoMapper.class
-com/suisung/mall/pay/service/PayPlantformResourceService.class
-com/suisung/mall/pay/service/impl/PayConsumeDepositServiceImpl.class
-com/suisung/mall/pay/mapper/PayBaseBankMapper.class
-com/suisung/mall/pay/service/AccountBaseConfigService.class
-com/suisung/mall/pay/service/impl/AnalytiscTradeServiceImpl.class
-com/suisung/mall/pay/mapper/PayCardTypeMapper.class
-com/suisung/mall/pay/service/impl/ShopUserPointsHistoryServiceImpl.class
-com/suisung/mall/pay/controller/admin/PayCardInfoController.class
-com/suisung/mall/pay/entity/H5SceneInfo.class
-com/suisung/mall/pay/service/PayPaymentChannelService.class
-com/suisung/mall/pay/config/I18nConfig.class
-com/suisung/mall/pay/listener/PayRefundListener.class
-com/suisung/mall/pay/service/AnalytiscTradeService.class
-com/suisung/mall/pay/config/FeignConfig.class
-com/suisung/mall/pay/entity/WxPayBean.class
-com/suisung/mall/pay/service/impl/PayCardInfoServiceImpl.class
-com/suisung/mall/pay/service/impl/PayUserPayServiceImpl$1.class
-com/suisung/mall/pay/mapper/PayConsumeWithdrawMapper.class
-com/suisung/mall/pay/service/PayConsumeTradeCombineService.class
-com/suisung/mall/pay/mapper/PayConsumeRecordMapper.class
diff --git a/mall-search/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/mall-search/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
index 6cbb13dd..e69de29b 100644
--- a/mall-search/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
+++ b/mall-search/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
@@ -1,14 +0,0 @@
-com/suisung/mall/search/domain/EsProduct.class
-com/suisung/mall/search/config/I18nConfig.class
-com/suisung/mall/search/domain/EsProductRelatedInfo.class
-com/suisung/mall/search/domain/EsProductRelatedInfo$ProductAttr.class
-com/suisung/mall/search/domain/EsProductAttributeValue.class
-com/suisung/mall/search/controller/EsProductController.class
-com/suisung/mall/search/MallSearchApplication.class
-com/suisung/mall/search/config/SwaggerConfig.class
-com/suisung/mall/search/dao/EsProductDao.class
-com/suisung/mall/search/service/EsProductService.class
-com/suisung/mall/search/service/impl/EsProductServiceImpl.class
-com/suisung/mall/search/domain/ProductSearchDTO.class
-com/suisung/mall/search/repository/EsProductRepository.class
-com/suisung/mall/search/config/MyBatisConfig.class
diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/store/controller/admin/ShopStorePrinterController.java b/mall-shop/src/main/java/com/suisung/mall/shop/store/controller/admin/ShopStorePrinterController.java
index 85fb887d..9a5fe432 100644
--- a/mall-shop/src/main/java/com/suisung/mall/shop/store/controller/admin/ShopStorePrinterController.java
+++ b/mall-shop/src/main/java/com/suisung/mall/shop/store/controller/admin/ShopStorePrinterController.java
@@ -23,7 +23,7 @@ public class ShopStorePrinterController {
@ApiOperation(value = "测试打印模版消息", notes = "测试打印模版消息")
@RequestMapping(value = "/print/order", method = {RequestMethod.POST})
public CommonResult printOrder() {
- return shopStorePrinterService.printOrderInfo();
+ return shopStorePrinterService.printOrderInfo2();
}
@ApiOperation(value = "门店打票机分页列表查询", notes = "门店打票机分页列表查询")
@@ -34,14 +34,20 @@ public class ShopStorePrinterController {
return CommonResult.success(shopStorePrinterService.shopStorePrinterPageList(keyword,pageNum,pageSize));
}
+ @ApiOperation(value = "门店一个打票机详情", notes = "门店一个打票机详情")
+ @RequestMapping(value = "/detail", method = {RequestMethod.GET})
+ public CommonResult shopStorePrinterDetail(@RequestParam(name = "printer_id" , required = true) Long printer_id) {
+ return shopStorePrinterService.shopStorePrinterDetail(printer_id);
+ }
+
@ApiOperation(value = "门店新增一个打票机", notes = "门店新增一个打票机")
@RequestMapping(value = "/add/new", method = {RequestMethod.POST})
public CommonResult addNewShopStorePrinter(@RequestParam(name = "model_id" , required = true) Long model_id,
- @RequestParam(name = "printer_name", required = true) String printer_name,
- @RequestParam(name = "printer_sn", required = true) String printer_sn,
- @RequestParam(name = "printer_key", required = true) String printer_key,
- @RequestParam(name = "region_id", required = true) Integer region_id,
- @RequestParam(name = "paper_with", defaultValue = "58") Integer paper_with) {
+ @RequestParam(name = "printer_name", required = true) String printer_name,
+ @RequestParam(name = "printer_sn", required = true) String printer_sn,
+ @RequestParam(name = "printer_key", required = true) String printer_key,
+ @RequestParam(name = "region_id", required = true) Integer region_id,
+ @RequestParam(name = "paper_with", defaultValue = "58") Integer paper_with) {
ShopStorePrinter shopStorePrinter = new ShopStorePrinter();
shopStorePrinter.setModel_id(model_id);
diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/store/controller/admin/ShopStorePrinterModelController.java b/mall-shop/src/main/java/com/suisung/mall/shop/store/controller/admin/ShopStorePrinterModelController.java
index daa0737f..98696930 100644
--- a/mall-shop/src/main/java/com/suisung/mall/shop/store/controller/admin/ShopStorePrinterModelController.java
+++ b/mall-shop/src/main/java/com/suisung/mall/shop/store/controller/admin/ShopStorePrinterModelController.java
@@ -33,6 +33,12 @@ public class ShopStorePrinterModelController {
return shopStorePrinterModelService.shopStorePrinterModelList(count);
}
+ @ApiOperation(value = "门店一个打票机型号详情", notes = "门店一个打票机型号详情")
+ @RequestMapping(value = "/detail", method = {RequestMethod.GET})
+ public CommonResult shopStorePrinterModelDetail(@RequestParam(name = "model_id" , required = true) Long printer_id) {
+ return shopStorePrinterModelService.shopStorePrinterModelDetail(printer_id);
+ }
+
@ApiOperation(value = "门店新增一个打票机型号", notes = "门店新增一个打票机型号")
@RequestMapping(value = "/add/new", method = {RequestMethod.POST})
public CommonResult addNewShopStorePrinterModel(
diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/store/controller/admin/ShopStorePrinterTemplateController.java b/mall-shop/src/main/java/com/suisung/mall/shop/store/controller/admin/ShopStorePrinterTemplateController.java
new file mode 100644
index 00000000..82e0a0b1
--- /dev/null
+++ b/mall-shop/src/main/java/com/suisung/mall/shop/store/controller/admin/ShopStorePrinterTemplateController.java
@@ -0,0 +1,31 @@
+package com.suisung.mall.shop.store.controller.admin;
+
+import com.suisung.mall.common.api.CommonResult;
+import com.suisung.mall.common.modules.store.ShopStorePrinterRegion;
+import com.suisung.mall.shop.store.service.ShopStorePrinterRegionService;
+import com.suisung.mall.shop.store.service.ShopStorePrinterTemplateService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+@Api(tags = "门店打票机打印模版")
+@RestController
+@RequestMapping("/admin/shop/store/printer/template")
+public class ShopStorePrinterTemplateController {
+
+ @Autowired
+ private ShopStorePrinterTemplateService shopStorePrinterTemplateService;
+
+ @ApiOperation(value = "获取门店打票机下单打印模版", notes = "获取门店打票机下单打印模版")
+ @RequestMapping(value = "/order", method = {RequestMethod.GET})
+ public CommonResult shopStorePrinterRegionPageList(
+ @RequestParam(name = "store_id", defaultValue = "0") Integer storeId,
+ @RequestParam(name = "category", defaultValue = "1") Integer category) {
+ return shopStorePrinterTemplateService.getShopStorePrinterTemplate(storeId, category);
+ }
+
+}
\ No newline at end of file
diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/store/mapper/ShopStorePrinterTemplateMapper.java b/mall-shop/src/main/java/com/suisung/mall/shop/store/mapper/ShopStorePrinterTemplateMapper.java
new file mode 100644
index 00000000..df704205
--- /dev/null
+++ b/mall-shop/src/main/java/com/suisung/mall/shop/store/mapper/ShopStorePrinterTemplateMapper.java
@@ -0,0 +1,25 @@
+package com.suisung.mall.shop.store.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.suisung.mall.common.modules.store.ShopStorePrinter;
+import com.suisung.mall.common.modules.store.ShopStorePrinterTemplate;
+import com.suisung.mall.common.pojo.vo.ShopStorePrinterVO;
+import io.lettuce.core.dynamic.annotation.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.Map;
+
+/**
+ *
+ * 店铺打票机 mapper 接口
+ *
+ *
+ * @author panjunjie
+ * @since 2024-10-28
+ */
+
+@Repository
+public interface ShopStorePrinterTemplateMapper extends BaseMapper{
+}
diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/store/service/ShopStorePrinterModelService.java b/mall-shop/src/main/java/com/suisung/mall/shop/store/service/ShopStorePrinterModelService.java
index 9c25f6ea..0ac5e51d 100644
--- a/mall-shop/src/main/java/com/suisung/mall/shop/store/service/ShopStorePrinterModelService.java
+++ b/mall-shop/src/main/java/com/suisung/mall/shop/store/service/ShopStorePrinterModelService.java
@@ -26,7 +26,15 @@ public interface ShopStorePrinterModelService extends IBaseService
IPage shopStorePrinterPageList2(String keyword, Integer pageNum, Integer pageSize);
+ /**
+ * 获取一个打印机详情信息
+ * @param printer_id
+ * @return
+ */
+ CommonResult shopStorePrinterDetail(Long printer_id);
+
/**
* 门店新增一个打票机
*
@@ -58,4 +65,11 @@ public interface ShopStorePrinterService extends IBaseService
* @return
*/
CommonResult printOrderInfo();
+
+ /**
+ * 测试打印订单
+ * @return
+ */
+ CommonResult printOrderInfo2();
}
+
diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/store/service/ShopStorePrinterTemplateService.java b/mall-shop/src/main/java/com/suisung/mall/shop/store/service/ShopStorePrinterTemplateService.java
new file mode 100644
index 00000000..fb2fa0b5
--- /dev/null
+++ b/mall-shop/src/main/java/com/suisung/mall/shop/store/service/ShopStorePrinterTemplateService.java
@@ -0,0 +1,20 @@
+package com.suisung.mall.shop.store.service;
+
+import com.suisung.mall.common.api.CommonResult;
+import com.suisung.mall.common.modules.store.ShopStorePrinterTemplate;
+import com.suisung.mall.core.web.service.IBaseService;
+
+public interface ShopStorePrinterTemplateService extends IBaseService {
+
+ /**
+ * 根据门店ID和业务分类获取一个模版
+ *
+ * @param storeId
+ * @param category
+ * @return
+ */
+ CommonResult getShopStorePrinterTemplate(Integer storeId, Integer category);
+
+ ShopStorePrinterTemplate getShopStorePrinterTemplateInner(Integer storeId, Integer category);
+
+}
diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStorePrinterModelServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStorePrinterModelServiceImpl.java
index 3db83073..b39ec0b1 100644
--- a/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStorePrinterModelServiceImpl.java
+++ b/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStorePrinterModelServiceImpl.java
@@ -4,6 +4,7 @@ import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.suisung.mall.common.api.CommonResult;
+import com.suisung.mall.common.modules.store.ShopStorePrinter;
import com.suisung.mall.common.modules.store.ShopStorePrinterModel;
import com.suisung.mall.core.web.service.impl.BaseServiceImpl;
import com.suisung.mall.shop.store.mapper.ShopStorePrinterModelMapper;
@@ -39,6 +40,20 @@ public class ShopStorePrinterModelServiceImpl extends BaseServiceImpl implements ShopStorePrinterService {
+ private static final Logger logger = LoggerFactory.getLogger(ShopStorePrinterServiceImpl.class);
@Autowired
private ShopStorePrinterMapper shopStorePrinterMapper;
@Autowired
private FeieUtil feieUtil;
+ @Autowired
+ private FreeMakerUtils freeMakerUtils;
+ @Autowired
+ private ShopStorePrinterTemplateService shopStorePrinterTemplateService;
@Override
public IPage