diff --git a/han-hai-module-pay/src/main/java/org/jeecg/modules/pay/MpWxPayService.java b/han-hai-module-pay/src/main/java/org/jeecg/modules/pay/MpWxPayService.java index 3bd4e4c..9ab7705 100644 --- a/han-hai-module-pay/src/main/java/org/jeecg/modules/pay/MpWxPayService.java +++ b/han-hai-module-pay/src/main/java/org/jeecg/modules/pay/MpWxPayService.java @@ -119,6 +119,52 @@ public class MpWxPayService { + /** + * 微信吊起支付 + * @param productName + * @param clientIp + * @param productId + * @param price + * @param orderNo + * @param openId + * @param body + * @return + */ + public Object createOrderGo(String productName, String clientIp, + String productId, Integer price, String orderNo, + String openId, String body){ + WxPayUnifiedOrderRequest request = new WxPayUnifiedOrderRequest(); + request.setDeviceInfo("WEB"); //设备号 + request.setTradeType("JSAPI"); //交易类型 + request.setBody(productName); //商品描述 + request.setOutTradeNo(orderNo); //商户订单号 + request.setDetail(productName); //商品详情 + request.setTotalFee(price); //总金额|分计 + request.setSpbillCreateIp(clientIp); //终端IP +// request.setNotifyUrl(wxPay.notifyUrl);//设置回调路径 + request.setNotifyUrl("http://h5.xzaiyp.top/a-notice-api/pay-api/info/notify");//设置回调路径 + request.setProductId(productId); //商品id + request.setOpenid(openId); //JSAPI OPENID + if (dev){ + request.setTotalFee(price); +// request.setNotifyUrl(wxPay.notifyUrlDev); + request.setNotifyUrl("http://h5.xzaiyp.top/a-notice-api/pay-api/info/notify");//设置回调路径 + } + try { + Object order = wxPayService.createOrder(request); + return order; + } catch (WxPayException e) { + e.printStackTrace(); + return e.getLocalizedMessage(); + } + } + + + + + + + diff --git a/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/target/classes/org/jeecg/common/system/api/ISysBaseAPI.class b/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/target/classes/org/jeecg/common/system/api/ISysBaseAPI.class index 9e14957..86eaa3b 100644 Binary files a/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/target/classes/org/jeecg/common/system/api/ISysBaseAPI.class and b/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/target/classes/org/jeecg/common/system/api/ISysBaseAPI.class differ diff --git a/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/target/classes/org/jeecg/common/system/api/fallback/SysBaseAPIFallback.class b/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/target/classes/org/jeecg/common/system/api/fallback/SysBaseAPIFallback.class index 10b580c..649ad53 100644 Binary files a/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/target/classes/org/jeecg/common/system/api/fallback/SysBaseAPIFallback.class and b/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/target/classes/org/jeecg/common/system/api/fallback/SysBaseAPIFallback.class differ diff --git a/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/target/jeecg-system-cloud-api-3.2.0.jar b/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/target/jeecg-system-cloud-api-3.2.0.jar index 0fba5b7..de52203 100644 Binary files a/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/target/jeecg-system-cloud-api-3.2.0.jar and b/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/target/jeecg-system-cloud-api-3.2.0.jar differ diff --git a/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-local-api/target/jeecg-system-local-api-3.2.0.jar b/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-local-api/target/jeecg-system-local-api-3.2.0.jar index b52c2d9..109627c 100644 Binary files a/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-local-api/target/jeecg-system-local-api-3.2.0.jar and b/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-local-api/target/jeecg-system-local-api-3.2.0.jar differ diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java index 9d0aa6c..d4650d4 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java @@ -79,6 +79,16 @@ public class ShiroConfig { filterChainDefinitionMap.put("/cheer/login/**", "anon"); filterChainDefinitionMap.put("/cheer/info/**", "anon"); + filterChainDefinitionMap.put("/api/order/**", "anon"); + filterChainDefinitionMap.put("/school/login/**", "anon"); + + filterChainDefinitionMap.put("/pay-api/info/notify", "anon"); + + + + + + diff --git a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/config/shiro/ShiroConfig.class b/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/config/shiro/ShiroConfig.class index 7e83e9b..dfbd4e1 100644 Binary files a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/config/shiro/ShiroConfig.class and b/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/config/shiro/ShiroConfig.class differ diff --git a/jeecg-boot-base/jeecg-boot-base-core/target/jeecg-boot-base-core-3.2.0.jar b/jeecg-boot-base/jeecg-boot-base-core/target/jeecg-boot-base-core-3.2.0.jar index 9acaafc..8919ebd 100644 Binary files a/jeecg-boot-base/jeecg-boot-base-core/target/jeecg-boot-base-core-3.2.0.jar and b/jeecg-boot-base/jeecg-boot-base-core/target/jeecg-boot-base-core-3.2.0.jar differ diff --git a/jeecg-boot-base/jeecg-boot-base-core/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/jeecg-boot-base/jeecg-boot-base-core/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst index 5db6c40..f6232fb 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst +++ b/jeecg-boot-base/jeecg-boot-base-core/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -8,6 +8,7 @@ org/jeecg/modules/hanHaiBank/service/IHanHaiBankService.class org/jeecg/common/util/YouBianCodeUtil.class org/jeecg/common/system/vo/SysCategoryModel.class org/jeecg/common/aspect/annotation/AutoLog.class +org/jeecg/modules/payShop/entity/PayShop.class org/jeecg/modules/atTrends/mapper/AtTrendsMapper.class org/jeecg/common/constant/ProvinceCityArea.class org/jeecg/common/system/vo/DictQuery.class @@ -21,10 +22,12 @@ org/jeecg/common/exception/JeecgBoot401Exception.class org/jeecg/common/util/oConvertUtils.class org/jeecg/modules/atTrends/controller/AtTrendsController.class org/jeecg/modules/bean/ConvertUtils.class +org/jeecg/modules/shcoolSub/entity/ShcoolSub.class org/jeecg/common/exception/JeecgBootExceptionHandler.class org/jeecg/config/shiro/filters/JwtFilter.class org/jeecg/common/util/encryption/EncryptedString.class org/jeecg/config/oss/MinioConfig.class +org/jeecg/modules/cheerRecharge/service/ICheerRechargeService.class org/jeecg/common/handler/IFillRuleHandler.class org/jeecg/modules/hanHanBanner/service/IHanHaiBannerService.class org/jeecg/modules/hanHaiConf/mapper/HanHaiConfMapper.class @@ -36,6 +39,7 @@ org/jeecg/modules/hanHaiWater/mapper/HanHaiWaterMapper.class org/jeecg/config/Swagger2Config.class org/jeecg/modules/atPromotion/service/impl/AtPromotionServiceImpl.class org/jeecg/common/aspect/PermissionDataAspect.class +org/jeecg/modules/cheerConf/service/impl/CheerConfServiceImpl.class org/jeecg/common/constant/ServiceNameConstants.class org/jeecg/config/thirdapp/ThirdAppTypeItemVo.class org/jeecg/common/api/dto/message/TemplateMessageDTO.class @@ -53,16 +57,21 @@ org/jeecg/common/util/security/entity/SecurityReq.class org/jeecg/modules/atComplaintReason/controller/AtComplaintReasonController.class org/jeecg/modules/hanHaiRealName/entity/HanHaiRealName.class org/jeecg/config/mybatis/MybatisPlusSaasConfig.class +org/jeecg/modules/payShop/controller/PayShopController.class org/jeecg/modules/hanHaiConf/service/impl/HanHaiConfServiceImpl.class org/jeecg/config/JeecgCloudCondition.class org/jeecg/common/util/PathMatcherUtil$1.class +org/jeecg/modules/cheerConf/controller/CheerConfController.class org/jeecg/modules/atPromotion/controller/AtPromotionController.class org/jeecg/common/aspect/AutoLogAspect$1.class org/jeecg/common/util/security/SecurityTools.class org/jeecg/common/util/HTMLUtils.class +org/jeecg/modules/cheerConf/entity/CheerConf.class org/jeecg/common/util/security/AbstractQueryBlackListHandler.class org/jeecg/modules/atComplaintReason/entity/AtComplaintReason.class org/jeecg/common/api/vo/Result.class +org/jeecg/modules/cheerRecharge/service/impl/CheerRechargeServiceImpl.class +org/jeecg/modules/cheerRecharge/entity/CheerRecharge.class org/jeecg/common/system/query/QueryCondition.class org/jeecg/common/util/DateUtils$5.class org/jeecg/modules/atTrends/service/impl/AtTrendsServiceImpl.class @@ -74,17 +83,22 @@ org/jeecg/common/util/DateUtils$4.class org/jeecg/common/util/oss/OssBootUtil.class org/jeecg/common/api/dto/FileUploadDTO.class org/jeecg/modules/atPerformer/service/IAtPerformerService.class +org/jeecg/modules/cheerWater/mapper/CheerWaterMapper.class org/jeecg/common/constant/enums/LowAppAopEnum.class org/jeecg/common/api/dto/message/TemplateDTO.class org/jeecg/common/constant/CommonSendStatus.class org/jeecg/modules/atTrends/service/IAtTrendsService.class +org/jeecg/modules/cheerRecharge/mapper/CheerRechargeMapper.class org/jeecg/common/util/DateUtils$1.class org/jeecg/common/constant/WebsocketConst.class org/jeecg/common/util/MinioUtil.class org/jeecg/common/es/QueryStringBuilder.class +org/jeecg/modules/payOrder/service/IPayOrderService.class org/jeecg/modules/atPerformer/service/impl/AtPerformerServiceImpl.class +org/jeecg/modules/cheerWater/entity/CheerWater.class org/jeecg/common/system/query/MatchTypeEnum.class org/jeecg/common/aspect/annotation/Dict.class +org/jeecg/modules/shcoolSub/service/impl/ShcoolSubServiceImpl.class org/jeecg/config/shiro/filters/CustomShiroFilterFactoryBean.class org/jeecg/config/WebSocketConfig.class org/jeecg/modules/atPromotion/mapper/AtPromotionMapper.class @@ -92,6 +106,7 @@ org/jeecg/config/vo/Shiro.class org/jeecg/config/thirdapp/ThirdAppConfig.class org/jeecg/common/aspect/DictAspect.class org/jeecg/modules/atPerformer/mapper/AtPerformerMapper.class +org/jeecg/modules/cheerWater/service/ICheerWaterService.class org/jeecg/common/util/DateUtils$2.class org/jeecg/modules/service/ApiLoginService.class org/jeecg/common/system/vo/DictModel.class @@ -99,12 +114,16 @@ org/jeecg/common/constant/VxeSocketConst.class org/jeecg/common/util/ImportExcelUtil.class org/jeecg/common/system/query/QueryGenerator.class org/jeecg/common/util/security/entity/MyKeyPair.class +org/jeecg/modules/service/AppletLoginService.class org/jeecg/common/util/filter/FileTypeFilter.class +org/jeecg/modules/cheerConf/mapper/CheerConfMapper.class +org/jeecg/modules/service/impl/AppletLoginServiceImpl.class org/jeecg/common/util/security/AbstractQueryBlackListHandler$QueryTable.class org/jeecg/common/util/PathMatcherUtil$Matcher.class org/jeecg/modules/atMasterPiece/service/impl/AtMasterPieceServiceImpl.class org/jeecg/common/api/dto/message/BusMessageDTO.class org/jeecg/common/constant/SymbolConstant.class +org/jeecg/modules/payShop/service/impl/PayShopServiceImpl.class org/jeecg/common/api/dto/message/BusTemplateMessageDTO.class org/jeecg/modules/hanHaiRealEnterprise/mapper/HanHaiRealEnterpriseMapper.class org/jeecg/modules/bean/HttpConf.class @@ -124,15 +143,19 @@ org/jeecg/modules/bean/LoginReq.class org/jeecg/modules/hanHaiRealEnterprise/entity/HanHaiRealEnterprise.class org/jeecg/modules/atComplaintReason/mapper/AtComplaintReasonMapper.class org/jeecg/common/system/query/QueryRuleEnum.class +org/jeecg/modules/cheerConf/service/ICheerConfService.class org/jeecg/common/aspect/annotation/OnlineAuth.class org/jeecg/common/util/RestDesformUtil.class org/jeecg/common/system/vo/DictModelMany.class +org/jeecg/modules/cheerRecharge/controller/CheerRechargeController.class +org/jeecg/modules/payShop/mapper/PayShopMapper.class org/jeecg/config/mybatis/MybatisInterceptor.class org/jeecg/config/sign/util/BodyReaderHttpServletRequestWrapper$1.class org/jeecg/common/util/BrowserUtils.class org/jeecg/modules/hanHaiWater/controller/HanHaiWaterController.class org/jeecg/modules/hanHaiWater/entity/HanHaiWater.class org/jeecg/common/util/CommonUtils.class +org/jeecg/modules/cheerWater/controller/CheerWaterController.class org/jeecg/common/util/DateUtils$3.class org/jeecg/modules/base/mapper/BaseCommonMapper.class org/jeecg/modules/hanHaiRealEnterprise/service/IHanHaiRealEnterpriseService.class @@ -161,6 +184,7 @@ org/jeecg/common/util/dynamic/db/DataSourceCachePool.class org/jeecg/common/constant/FillRuleConstant.class org/jeecg/common/system/query/QueryGenerator$1.class org/jeecg/common/util/ReflectHelper.class +org/jeecg/modules/payShop/service/IPayShopService.class org/jeecg/common/system/base/controller/JeecgController.class org/jeecg/modules/hanHaiMember/controller/HanHaiMemberController.class org/jeecg/modules/hanHaiWater/service/impl/HanHaiWaterServiceImpl.class @@ -186,6 +210,7 @@ org/jeecg/modules/hanHaiBank/entity/HanHaiBank.class org/jeecg/modules/atMasterPiece/entity/AtMasterPiece.class org/jeecg/common/util/IpUtils.class org/jeecg/common/aspect/annotation/PermissionData.class +org/jeecg/modules/cheerWater/service/impl/CheerWaterServiceImpl.class org/jeecg/modules/atMasterPiece/controller/AtMasterPieceController.class org/jeecg/common/system/vo/SysUserCacheInfo.class org/jeecg/modules/hanHanBanner/controller/HanHaiBannerController.class @@ -198,8 +223,11 @@ org/jeecg/config/StaticConfig.class org/jeecg/config/shiro/filters/ResourceCheckFilter.class org/jeecg/common/util/dynamic/db/DbTypeUtils.class org/jeecg/modules/hanHaiMember/mapper/HanHaiMemberMapper.class +org/jeecg/modules/shcoolSub/mapper/ShcoolSubMapper.class org/jeecg/common/api/CommonAPI.class +org/jeecg/modules/payOrder/service/impl/PayOrderServiceImpl.class org/jeecg/config/AutoPoiConfig.class +org/jeecg/modules/payOrder/entity/PayOrder.class org/jeecg/common/aspect/AutoLogAspect.class org/jeecg/config/sign/interceptor/SignAuthConfiguration.class org/jeecg/common/util/dynamic/db/FreemarkerParseFactory.class @@ -212,9 +240,11 @@ org/jeecg/modules/hanHaiRealEnterprise/controller/HanHaiRealEnterpriseController org/jeecg/common/util/dynamic/db/DynamicDBUtil.class org/jeecg/common/util/DySmsEnum.class org/jeecg/modules/atActorCollection/controller/AtActorCollectionController.class +org/jeecg/modules/payOrder/mapper/PayOrderMapper.class org/jeecg/modules/atActorCollection/entity/AtActorCollection.class org/jeecg/config/RestTemplateConfig.class org/jeecg/config/shiro/ShiroConfig.class +org/jeecg/modules/payOrder/controller/PayOrderController.class org/jeecg/modules/hanHaiWater/service/IHanHaiWaterService.class org/jeecg/common/util/SqlInjectionUtil.class org/jeecg/modules/hanHanBanner/entity/HanHaiBanner.class @@ -222,5 +252,7 @@ org/jeecg/common/system/vo/ComboModel.class org/jeecg/common/util/Md5Util.class org/jeecg/common/util/filter/StrAttackFilter.class org/jeecg/modules/hanHaiBank/controller/HanHaiBankController.class +org/jeecg/modules/shcoolSub/controller/ShcoolSubController.class org/jeecg/common/system/base/service/impl/JeecgServiceImpl.class +org/jeecg/modules/shcoolSub/service/IShcoolSubService.class org/jeecg/modules/hanHaiRealEnterprise/service/impl/HanHaiRealEnterpriseServiceImpl.class diff --git a/jeecg-boot-base/jeecg-boot-base-core/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/jeecg-boot-base/jeecg-boot-base-core/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst index 235eee3..a0970e7 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ b/jeecg-boot-base/jeecg-boot-base-core/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -1,3 +1,5 @@ +/Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/controller/CheerWaterController.java +/Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/service/impl/ShcoolSubServiceImpl.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/entity/HanHaiMember.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/VxeSocketConst.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/DictQuery.java @@ -11,6 +13,7 @@ /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/service/impl/ApiLoginServiceImpl.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHanBanner/service/IHanHaiBannerService.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/util/JwtUtil.java +/Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerConf/controller/CheerConfController.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/SpringContextUtils.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/dynamic/db/FreemarkerParseFactory.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/RestTemplateConfig.java @@ -20,18 +23,23 @@ /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/WebsocketConst.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/security/entity/MyKeyPair.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/Swagger2Config.java +/Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payOrder/service/impl/PayOrderServiceImpl.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/dynamic/db/DynamicDBUtil.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiWater/mapper/HanHaiWaterMapper.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/dynamic/db/DbTypeUtils.java +/Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/service/impl/AppletLoginServiceImpl.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/OperateTypeEnum.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/DictModel.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/dto/message/TemplateMessageDTO.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/security/entity/SecurityResp.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/filters/CustomShiroFilterFactoryBean.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atMasterPiece/entity/AtMasterPiece.java +/Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/service/impl/CheerWaterServiceImpl.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/SymbolConstant.java +/Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payOrder/controller/PayOrderController.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/annotation/OnlineAuth.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atPerformer/controller/AtPerformerController.java +/Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/service/AppletLoginService.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/thirdapp/ThirdAppTypeItemVo.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/JeecgTenantParser.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHanBanner/controller/HanHaiBannerController.java @@ -43,6 +51,7 @@ /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/BrowserType.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiWater/entity/HanHaiWater.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/dynamic/db/DataSourceCachePool.java +/Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/controller/ShcoolSubController.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/JeeccgBaseConfig.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/dto/OnlineAuthDTO.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atMasterPiece/mapper/AtMasterPieceMapper.java @@ -53,8 +62,10 @@ /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHanBanner/service/impl/HanHaiBannerServiceImpl.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/StaticConfig.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/PathMatcherUtil.java +/Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payShop/service/IPayShopService.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/query/QueryRuleEnum.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/DySmsHelper.java +/Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/service/IShcoolSubService.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/sign/interceptor/SignAuthInterceptor.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/base/entity/JeecgEntity.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/AutoPoiDictConfig.java @@ -64,6 +75,7 @@ /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atComplaintReason/service/IAtComplaintReasonService.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/MybatisInterceptor.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/PmsUtil.java +/Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payOrder/mapper/PayOrderMapper.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/impl/HanHaiMemberServiceImpl.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/MyClassLoader.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/base/service/JeecgService.java @@ -79,27 +91,34 @@ /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiWater/service/IHanHaiWaterService.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/CommonConstant.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atTrends/service/IAtTrendsService.java +/Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payOrder/service/IPayOrderService.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/LoginUser.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/dto/LogDTO.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/dto/FileDownDTO.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/SqlInjectionUtil.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/DictAspect.java +/Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/mapper/CheerRechargeMapper.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiBank/service/IHanHaiBankService.java +/Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/service/ICheerWaterService.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroRealm.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/encryption/EncryptedString.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atPromotion/controller/AtPromotionController.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/bean/LoginReq.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/mapper/HanHaiRealEnterpriseMapper.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/filters/JwtFilter.java +/Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerConf/service/impl/CheerConfServiceImpl.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atPromotion/service/IAtPromotionService.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/JeecgCloudCondition.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/thirdapp/ThirdAppTypeConfig.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/DruidConfig.java +/Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payShop/service/impl/PayShopServiceImpl.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atMasterPiece/service/impl/AtMasterPieceServiceImpl.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atMasterPiece/controller/AtMasterPieceController.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/sign/interceptor/SignAuthConfiguration.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealName/mapper/HanHaiRealNameMapper.java +/Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payShop/mapper/PayShopMapper.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/CommonSendStatus.java +/Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/entity/ShcoolSub.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/WebMvcConfiguration.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/DynamicDataSourceModel.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atPerformer/entity/AtPerformer.java @@ -123,6 +142,7 @@ /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/DySmsEnum.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atComplaintReason/mapper/AtComplaintReasonMapper.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atActorCollection/entity/AtActorCollection.java +/Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/mapper/ShcoolSubMapper.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/query/QueryGenerator.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/HTMLUtils.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/sign/util/BodyReaderHttpServletRequestWrapper.java @@ -130,6 +150,7 @@ /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/query/QueryCondition.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiBank/controller/HanHaiBankController.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/JwtToken.java +/Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payShop/controller/PayShopController.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/YouBianCodeUtil.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/service/impl/BaseCommonServiceImpl.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atActorCollection/mapper/AtActorCollectionMapper.java @@ -142,6 +163,7 @@ /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/security/AbstractQueryBlackListHandler.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/security/entity/SecurityReq.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/CgformEnum.java +/Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/entity/CheerWater.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiConf/service/impl/HanHaiConfServiceImpl.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atActorCollection/service/IAtActorCollectionService.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/CorsFilterCondition.java @@ -149,12 +171,16 @@ /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/filter/StrAttackFilter.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/mapper/BaseCommonMapper.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/AutoPoiConfig.java +/Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/entity/CheerRecharge.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/IpUtils.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/sign/util/SignUtil.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/oss/MinioConfig.java +/Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payOrder/entity/PayOrder.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/SysCategoryModel.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/bean/HttpConf.java +/Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/service/ICheerRechargeService.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/LowAppAopEnum.java +/Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerConf/mapper/CheerConfMapper.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiWater/controller/HanHaiWaterController.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHanBanner/entity/HanHaiBanner.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/SysDepartModel.java @@ -183,6 +209,7 @@ /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/oss/OssBootUtil.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/util/JeecgDataAutorUtils.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/dto/message/BusMessageDTO.java +/Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/service/impl/CheerRechargeServiceImpl.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/TokenUtils.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atComplaintReason/service/impl/AtComplaintReasonServiceImpl.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/FillRuleUtil.java @@ -195,13 +222,18 @@ /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/SysAnnmentTypeEnum.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/service/ApiLoginService.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/filter/FileTypeFilter.java +/Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerConf/entity/CheerConf.java +/Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payShop/entity/PayShop.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/annotation/AutoDict.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/UUIDGenerator.java +/Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/mapper/CheerWaterMapper.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/mapper/HanHaiMemberMapper.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atActorCollection/controller/AtActorCollectionController.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/Md5Util.java +/Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/controller/CheerRechargeController.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/superSearch/QueryRuleEnum.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/FillRuleConstant.java +/Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerConf/service/ICheerConfService.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/service/impl/HanHaiRealEnterpriseServiceImpl.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/annotation/PermissionData.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/entity/HanHaiRealEnterprise.java diff --git a/jeecg-boot-base/jeecg-boot-base-tools/target/jeecg-boot-base-tools-3.2.0.jar b/jeecg-boot-base/jeecg-boot-base-tools/target/jeecg-boot-base-tools-3.2.0.jar index c9e04df..c5100ea 100644 Binary files a/jeecg-boot-base/jeecg-boot-base-tools/target/jeecg-boot-base-tools-3.2.0.jar and b/jeecg-boot-base/jeecg-boot-base-tools/target/jeecg-boot-base-tools-3.2.0.jar differ diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/noticeapicontroller/OrderApiController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/noticeapicontroller/OrderApiController.java index d6da348..3d22663 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/noticeapicontroller/OrderApiController.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/noticeapicontroller/OrderApiController.java @@ -2,16 +2,42 @@ package org.jeecg.modules.api.noticeapicontroller; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.jeecg.common.api.vo.Result; +import org.jeecg.modules.apiservice.LoginApiService; +import org.jeecg.modules.apiservice.OrderApiService; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.annotation.Resource; + @Api(tags="小程序-订单相关接口") @RestController @RequestMapping("/api/order") @Slf4j public class OrderApiController { + //订单相关接口 + @Resource + private OrderApiService orderApiService; + + //创建订单 + @ApiOperation(value = "创建订单",notes = "创建订单") + @PostMapping("/createOrder") + public Result createOrder(){ + return orderApiService.createOrder(); + } + + //立即支付 + @ApiOperation(value = "立即支付",notes = "立即支付") + @PostMapping("/payOrder") + public Result payOrder(){ + return orderApiService.payOrder(); + } + + } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/payController/PayApiIndexController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/payController/PayApiIndexController.java index 2393dc6..a179725 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/payController/PayApiIndexController.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/payController/PayApiIndexController.java @@ -71,6 +71,12 @@ public class PayApiIndexController { } + //支付回调 + @PostMapping("/notify") + public Object createNotify(@RequestBody String requestBody){ + return indexApiService.createNotify(requestBody); + } + } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/schoolcontroller/SchoolApiController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/schoolcontroller/SchoolApiController.java index d79e974..008ec1a 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/schoolcontroller/SchoolApiController.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/schoolcontroller/SchoolApiController.java @@ -57,10 +57,4 @@ public class SchoolApiController { } - - - - - - } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/schoolcontroller/SchoolLoginController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/schoolcontroller/SchoolLoginController.java new file mode 100644 index 0000000..4b79a44 --- /dev/null +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/schoolcontroller/SchoolLoginController.java @@ -0,0 +1,58 @@ +package org.jeecg.modules.api.schoolcontroller; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.jeecg.common.api.vo.Result; +import org.jeecg.modules.apiservice.LoginApiService; +import org.jeecg.modules.bean.LoginReq; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + + +@Api(tags="小程序-学校报修登录相关接口") +@RestController +@RequestMapping("/school/login") +@Slf4j +public class SchoolLoginController { + + + //授权登录 + @Resource + private LoginApiService loginApiService; + + + //小程序授权登录 + @ApiOperation(value="小程序-登录接口", notes="小程序-登录接口") + @GetMapping("/login") + public Result login(LoginReq loginReq){ + return loginApiService.login(loginReq); + } + + + //获取用户协议 + @ApiOperation(value="小程序-获取用户协议", notes="小程序-获取用户协议") + @GetMapping("/getUserAgreement") + public Result getUserAgreement(){ + return loginApiService.getUserAgreement(); + } + + + //获取隐私政策 + @ApiOperation(value="小程序-获取隐私政策", notes="小程序-获取隐私政策") + @GetMapping("/getPrivacyPolicy") + public Result getPrivacyPolicy(){ + return loginApiService.getPrivacyPolicy(); + } + + + + + + + + +} diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/IndexApiService.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/IndexApiService.java index 259e59d..e9d5788 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/IndexApiService.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/IndexApiService.java @@ -61,8 +61,8 @@ public interface IndexApiService { Result getSchoolOrderPage(String state,WaterPageBean bean); - - + //支付回调 + Object createNotify(String requestBody); } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/OrderApiService.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/OrderApiService.java new file mode 100644 index 0000000..a0c69b4 --- /dev/null +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/OrderApiService.java @@ -0,0 +1,12 @@ +package org.jeecg.modules.apiservice; + +import org.jeecg.common.api.vo.Result; + +public interface OrderApiService { + + //创建订单 + Result createOrder(); + + //立即支付 + Result payOrder(); +} diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/impl/IndexApiServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/impl/IndexApiServiceImpl.java index 6e5eefe..210a0ff 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/impl/IndexApiServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/impl/IndexApiServiceImpl.java @@ -1,12 +1,14 @@ package org.jeecg.modules.apiservice.impl; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyResult; import org.apache.commons.lang.StringUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.util.RedisUtil; import org.jeecg.config.shiro.ShiroRealm; import org.jeecg.modules.apiBean.ActorSetPageBean; import org.jeecg.modules.apiBean.TrendsBean; +import org.jeecg.modules.apiUtils.printUtil; import org.jeecg.modules.apiservice.IndexApiService; import org.jeecg.modules.atActorCollection.entity.AtActorCollection; import org.jeecg.modules.atActorCollection.service.IAtActorCollectionService; @@ -20,18 +22,22 @@ import org.jeecg.modules.atPromotion.service.IAtPromotionService; import org.jeecg.modules.atTrends.entity.AtTrends; import org.jeecg.modules.atTrends.service.IAtTrendsService; import org.jeecg.modules.bean.WaterPageBean; +import org.jeecg.modules.cheerWater.entity.CheerWater; +import org.jeecg.modules.cheerWater.service.ICheerWaterService; import org.jeecg.modules.hanHaiBank.service.IHanHaiBankService; import org.jeecg.modules.hanHaiMember.entity.HanHaiMember; import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService; import org.jeecg.modules.hanHaiWater.entity.HanHaiWater; import org.jeecg.modules.hanHanBanner.entity.HanHaiBanner; import org.jeecg.modules.hanHanBanner.service.IHanHaiBannerService; +import org.jeecg.modules.pay.MpWxPayService; import org.jeecg.modules.payOrder.entity.PayOrder; import org.jeecg.modules.payOrder.service.IPayOrderService; import org.jeecg.modules.payShop.entity.PayShop; import org.jeecg.modules.payShop.service.IPayShopService; import org.jeecg.modules.shcoolSub.entity.ShcoolSub; import org.jeecg.modules.shcoolSub.service.IShcoolSubService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -72,6 +78,12 @@ public class IndexApiServiceImpl implements IndexApiService { //获取演员集 @Resource private IAtActorCollectionService atActorCollectionService; + //支付接口 + @Autowired + private MpWxPayService mpWxPayService; + //加油小程序 + @Resource + private ICheerWaterService cheerWaterService; @@ -196,9 +208,24 @@ public class IndexApiServiceImpl implements IndexApiService { order.setNum(num); order.setUserId(hanHaiMember.getId()); order.setTitle(byId.getTitle()+"购买"); - payOrderService.save(order); - return Result.OK("订单创建成功"); + + + //吊起微信支付 + String s = new BigDecimal(0.01).multiply(new BigDecimal(100)).toString(); + int i1 = Double.valueOf(s).intValue(); + Object appOrder = mpWxPayService.createOrder( + "购买"+order.getTitle() , + "127.0.0.1", + order.getId(), + i1, + order.getId(), + hanHaiMember.getAppletOpenid(), + order.toString()); + + + + return Result.OK("订单创建成功",appOrder); } @@ -256,4 +283,34 @@ public class IndexApiServiceImpl implements IndexApiService { } + + //支付回调 + @Override + public Object createNotify(String requestBody){ + WxPayOrderNotifyResult notify = mpWxPayService.notify(requestBody); + + String outTradeNo = notify.getOutTradeNo(); + + //开始处理业务逻辑 + CheerWater byId = cheerWaterService.getById(outTradeNo); + + if(byId!=null){ + if(!byId.getState().equals("1")){ + cheerWaterService.lambdaUpdate() + .set(CheerWater::getState,"1") + .eq(CheerWater::getId,outTradeNo) + .update(); + + + //拼接打印信息 + String content = printUtil.spellMessage(); + + //客户要求打印两次 + printUtil.printBill(content); + printUtil.printBill(content); + } + } + return null; + } + } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/impl/InfoApiServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/impl/InfoApiServiceImpl.java index 77abc06..d4330f9 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/impl/InfoApiServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/impl/InfoApiServiceImpl.java @@ -28,6 +28,8 @@ import org.jeecg.modules.hanHaiRealName.entity.HanHaiRealName; import org.jeecg.modules.hanHaiRealName.service.IHanHaiRealNameService; import org.jeecg.modules.hanHaiWater.entity.HanHaiWater; import org.jeecg.modules.hanHaiWater.service.IHanHaiWaterService; +import org.jeecg.modules.pay.MpWxPayService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -77,6 +79,9 @@ public class InfoApiServiceImpl implements InfoApiService { private ICheerConfService cheerConfService; @Resource private ICheerRechargeService cheerRechargeService; + //支付接口 + @Autowired + private MpWxPayService mpWxPayService; @@ -352,6 +357,7 @@ public class InfoApiServiceImpl implements InfoApiService { Page page = new Page(bean.getPageNo(), bean.getPageSize()); Page page1 = cheerWaterService.lambdaQuery() .eq(CheerWater::getUserId, hanHaiMember.getId()) + .eq(CheerWater::getState, "1") .orderByDesc(CheerWater::getCreateTime) .page(page); @@ -397,9 +403,33 @@ public class InfoApiServiceImpl implements InfoApiService { cheerWaterService.save(cheerWater); - return Result.OK("支付成功"); + + //吊起微信支付 + String s = bean.getMoney().multiply(new BigDecimal(100)).toString(); + int i1 = Double.valueOf(s).intValue(); + Object appOrder = mpWxPayService.createOrderGo( + "购买"+cheerWater.getName() , + "127.0.0.1", + cheerWater.getId(), + i1, + cheerWater.getId(), + hanHaiMember.getAppletOpenid(), + cheerWater.toString()); + + + + return Result.OK("支付成功",appOrder); } + + + + + + + + + //获取充值套餐列表 @Override public Result getRechargePage(OrderRechargeBean bean) { diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/impl/OrderApiServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/impl/OrderApiServiceImpl.java new file mode 100644 index 0000000..2a78cce --- /dev/null +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/impl/OrderApiServiceImpl.java @@ -0,0 +1,52 @@ +package org.jeecg.modules.apiservice.impl; + +import org.jeecg.common.api.vo.Result; +import org.jeecg.modules.apiservice.OrderApiService; +import org.jeecg.modules.pay.MpWxPayService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.math.BigDecimal; + + +@Service +public class OrderApiServiceImpl implements OrderApiService { + + + //支付接口 + @Autowired + private MpWxPayService mpWxPayService; + + + + //创建订单 + @Override + public Result createOrder() + { + return null; + } + + //立即支付 + @Override + public Result payOrder() + { + + String s = new BigDecimal(0.01).multiply(new BigDecimal(100)).toString(); + int i1 = Double.valueOf(s).intValue(); + Object appOrder = mpWxPayService.createOrder( + "购买测试" , + "127.0.0.1", + System.currentTimeMillis()+"", + i1, + System.currentTimeMillis()+"", + "ozfsp7eFo_CvJdX5jl5fi4pR5AhI", + "{}"); + //返回支付结果 + return Result.OK("微信支付回调成功",appOrder); + } + + + + + +} diff --git a/jeecg-boot-module-system/src/main/resources/pay_weixin.properties b/jeecg-boot-module-system/src/main/resources/pay_weixin.properties index e61ec46..0e4cd94 100644 --- a/jeecg-boot-module-system/src/main/resources/pay_weixin.properties +++ b/jeecg-boot-module-system/src/main/resources/pay_weixin.properties @@ -1,5 +1,5 @@ -pay.mchId=1681494138 -pay.appId=wx15be4225a7e41a1e +pay.mchId=1684030364 +pay.appId=wx3c24e397e3b132ea pay.mchKey=0fdb77429ffdf206c151af76a663041c pay.keyPath=classpath:apiclient_cert.pem pay.notifyUrl=http://h5.xzaiyp.top/massage-api/post/create