From 14a7d49c8140e58bccd3310782d9611273e96d32 Mon Sep 17 00:00:00 2001 From: yixian Date: Tue, 17 Mar 2020 17:30:41 +0800 Subject: [PATCH 01/11] build: 2.0.0 integration --- pom.xml | 12 +- .../ManagerPersistenceConfiguration.java | 12 ++ .../manage/PaymentManageApplication.java | 6 +- .../payment/manage/WebConfiguration.java | 20 +- .../core/impls/DashboardServiceImpl.java | 2 +- .../analysis/mappers/BDAnalysisMapper.java | 2 +- .../mappers/ClientAnalysisMapper.java | 10 +- .../CustomerAndOrdersStatisticsMapper.java | 10 +- .../mappers/EstimateAnalysisMapper.java | 10 +- .../analysis/mappers/OrderAnalysisMapper.java | 2 +- .../mappers/TransactionAnalysisMapper.java | 4 +- .../manage/mappers/act/ActAppMapper.java | 18 +- .../manage/mappers/act/ActChairtyMapper.java | 10 +- .../mappers/act/ActDietAttendMapper.java | 14 +- .../mappers/act/ActDietOrderMapper.java | 14 +- .../mappers/act/ActMonDelayClientMapper.java | 12 +- .../mappers/act/ActMonDelaySettleMapper.java | 14 +- .../act/ActMonDelaySettleRedPackMapper.java | 10 +- .../act/ActSignEventsSignLogMapper.java | 10 +- .../manage/mappers/bill/BillMapper.java | 16 +- .../manage/mappers/bill/BillOrderMapper.java | 14 +- .../billqrcode/DirectedBillCodeMapper.java | 20 +- .../cashback/CashbackDrawDepositsMapper.java | 10 +- .../cashback/CashbackRecordsMapper.java | 12 +- .../mappers/cashiers/CashierMapper.java | 18 +- .../mappers/cashiers/CashierOrderMapper.java | 14 +- .../mappers/client/AuthAppMessageMapper.java | 8 +- .../mappers/client/AuthHistoryMapper.java | 8 +- .../mappers/client/ClientCustomersMapper.java | 12 +- .../client/ClientSubMerchantIdMapper.java | 18 +- .../manage/mappers/client/GoodMapper.java | 16 +- .../mappers/client/GoodOrderMapper.java | 16 +- .../custom/CustomReportDetailsMapper.java | 8 +- .../mappers/custom/CustomReportsMapper.java | 10 +- .../customers/CusRewardConfigMapper.java | 8 +- .../customers/CusRewardCouponMapper.java | 10 +- .../customers/CusRewardLogsMapper.java | 14 +- .../CustomerEncourageConfigMapper.java | 14 +- ...CustomerEncourageMoneyAccessLogMapper.java | 12 +- .../CustomerEncourageMoneyUseLogMapper.java | 12 +- .../customers/CustomerMembershipMapper.java | 14 +- .../customers/CustomerPointsMapper.java | 16 +- .../FinancialAgentCommissionDetailMapper.java | 10 +- .../FinancialAgentCommissionMapper.java | 10 +- .../FinancialBDCommissionConfigMapper.java | 12 +- .../financial/FinancialBDConfigMapper.java | 12 +- .../FinancialBDPrizeDetailMapper.java | 8 +- .../financial/FinancialBDPrizeLogMapper.java | 16 +- .../FinancialBDPrizeRecordMapper.java | 12 +- .../FinancialBDRateConfigMapper.java | 10 +- .../FinancialLeaderPrizeLogMapper.java | 10 +- ...inancialPartnerCommissionDetailMapper.java | 12 +- .../FinancialPartnerCommissionMapper.java | 12 +- ...nancialReferrerCommissionDetailMapper.java | 10 +- .../FinancialReferrerCommissionMapper.java | 10 +- ...alSeniorPartnerCommissionDetailMapper.java | 12 +- ...inancialSeniorPartnerCommissionMapper.java | 12 +- .../mappers/funds/FundsConfigMapper.java | 12 +- .../funds/XPlanInterestClientLogMapper.java | 8 +- .../mappers/funds/XPlanInterestLogMapper.java | 12 +- .../mappers/funds/XPlanMerchantMapper.java | 12 +- .../funds/XPlanOperationLogMapper.java | 8 +- .../mappers/funds/XPlanTransactionMapper.java | 14 +- .../mappers/log/AppMessageLogMapper.java | 12 +- .../log/ClearingDetailAnalysisMapper.java | 10 +- .../mappers/log/ClearingDetailMapper.java | 20 +- .../manage/mappers/log/ClearingLogMapper.java | 16 +- .../mappers/log/ClientConfigLogMapper.java | 8 +- .../mappers/log/ClientLoginLogMapper.java | 10 +- .../mappers/log/ClientReviewLogMapper.java | 10 +- .../log/ClientsOperationLogMapper.java | 8 +- .../mappers/log/CouponAccuessLogMapper.java | 20 +- .../manage/mappers/log/DailyReportMapper.java | 12 +- .../GatewayClientApplyNotifyLogMapper.java | 16 +- .../log/LogClientSubMerchantIdMapper.java | 10 +- .../manage/mappers/log/LogRiskMapper.java | 8 +- .../mappers/log/LogSettleMailMapper.java | 10 +- .../mappers/log/ManagerLoginLogMapper.java | 10 +- .../mappers/log/NotifyErrorLogMapper.java | 14 +- .../mappers/log/PlatformSettlementMapper.java | 18 +- .../mappers/log/PreSettleTaskMapper.java | 2 +- .../log/StatisticsBDSalesReportMapper.java | 10 +- .../mappers/log/ValidationLogMapper.java | 8 +- .../log/WechatTemplateMsgSendLogMapper.java | 12 +- .../manage/mappers/log/WeekReportMapper.java | 12 +- .../mappers/notice/ActPartnerReadMapper.java | 12 +- .../mappers/notice/NoticeManageMapper.java | 14 +- .../mappers/notice/NoticePartnerMapper.java | 16 +- .../manage/mappers/ofei/TopUpOrderMapper.java | 12 +- .../mappers/payment/AustracDataMapper.java | 12 +- .../payment/CommonSubMerchantIdMapper.java | 16 +- .../manage/mappers/payment/OrderMapper.java | 22 +- .../payment/PaySuccessCountMapper.java | 8 +- .../mappers/payment/RefundAuditionMapper.java | 16 +- .../manage/mappers/payment/RefundMapper.java | 24 +-- .../mappers/payment/RefundReviewMapper.java | 16 +- .../payment/TaskManualSettleMapper.java | 16 +- .../mappers/payment/TransactionMapper.java | 22 +- .../preapply/PreApplyHandleLogMapper.java | 12 +- .../preapply/SysClientPreMapperMapper.java | 16 +- .../mappers/redpack/ActBlackListMapper.java | 16 +- .../mappers/redpack/ActClientApplyMapper.java | 14 +- .../ActClientInvitationCodeMapper.java | 18 +- .../redpack/ActPartnerLMLogMapper.java | 16 +- .../mappers/redpack/ActPartnerLMMapper.java | 14 +- .../ActPartnerWechatRelationMapper.java | 14 +- .../redpack/ActPrizeTypeCustomerMapper.java | 8 +- .../mappers/redpack/ActPrizeTypeMapper.java | 12 +- .../redpack/ActRedPacketsCustomerMapper.java | 18 +- .../ActRedPacketsCustomerOrdersMapper.java | 16 +- .../mappers/redpack/RedPackConfigMapper.java | 14 +- .../mappers/redpack/RedPackLogMapper.java | 12 +- .../risk/RiskAttentionMerchantsMapper.java | 18 +- .../risk/RiskCustomerBlackListMapper.java | 16 +- .../risk/RiskMerchantDetailLogMapper.java | 10 +- .../risk/RiskMerchantRecordMapper.java | 10 +- .../risk/RiskTransactionLogMapper.java | 10 +- .../mappers/risk/RiskWhiteListMapper.java | 12 +- .../mappers/riskbusiness/RiskEventMapper.java | 16 +- .../mappers/riskbusiness/RiskFileMapper.java | 10 +- .../riskbusiness/RiskMaterialMapper.java | 10 +- .../riskbusiness/RiskOrdersMapper.java | 10 +- .../riskbusiness/RiskProcessLogMapper.java | 10 +- .../mappers/system/BusinessMemberMapper.java | 14 +- .../system/CityPartnerRegisterMapper.java | 14 +- .../ClearingDistributedSurchargeMapper.java | 12 +- .../mappers/system/ClientAccountMapper.java | 48 ++--- .../system/ClientAndCustomerLocation.java | 10 +- .../mappers/system/ClientApplyMapper.java | 16 +- .../system/ClientAuditProcessMapper.java | 12 +- .../manage/mappers/system/ClientBDMapper.java | 12 +- .../system/ClientBankAccountMapper.java | 16 +- .../system/ClientComplianceCompanyMapper.java | 18 +- .../mappers/system/ClientConfigMapper.java | 14 +- .../mappers/system/ClientDeviceMapper.java | 22 +- .../system/ClientDeviceTokenMapper.java | 12 +- .../mappers/system/ClientFilesMapper.java | 22 +- .../system/ClientIncrementalMapper.java | 16 +- .../mappers/system/ClientLocationsMapper.java | 10 +- .../manage/mappers/system/ClientMapper.java | 42 ++-- .../mappers/system/ClientRateMapper.java | 12 +- .../system/ClientServicesApplyMapper.java | 16 +- .../system/ClientSettleDelayConfMapper.java | 16 +- .../mappers/system/ClientsContractMapper.java | 12 +- .../ClientsSurchargeAccountsMapper.java | 16 +- .../mappers/system/CommoditiesMapper.java | 14 +- .../manage/mappers/system/CustomerMapper.java | 20 +- .../mappers/system/CustomerMemberMapper.java | 14 +- .../mappers/system/ExchangeRateMapper.java | 12 +- ...FinancialSurchargeAccountDetailMapper.java | 12 +- .../mappers/system/IndustryLookupMapper.java | 8 +- .../manage/mappers/system/MailSendMapper.java | 14 +- .../mappers/system/MailUnsubMapper.java | 14 +- .../system/ManageDeviceTokenMapper.java | 10 +- .../ManagerCustomerRelationAlipayMapper.java | 12 +- .../manage/mappers/system/ManagerMapper.java | 22 +- .../system/MerchantSignInfoMapper.java | 12 +- .../manage/mappers/system/OrgMapper.java | 22 +- .../mappers/system/OrgSignInfoMapper.java | 14 +- .../system/PermissionFunctionMapper.java | 16 +- .../system/PermissionModuleMapper.java | 16 +- .../PermissionPartnerFunctionMapper.java | 16 +- .../system/PermissionPartnerModuleMapper.java | 18 +- .../mappers/system/ReportConfigMapper.java | 12 +- .../manage/mappers/system/SysAppsMapper.java | 10 +- .../system/SysChannelConfigMapper.java | 12 +- .../system/SysClientLegalPersonMapper.java | 14 +- .../system/SysCustomerCommentMapper.java | 8 +- .../system/SysCustomerPaymentInfoMapper.java | 14 +- .../system/SysCustomerServiceMapper.java | 16 +- .../system/SysCustomerSubscribeMapper.java | 12 +- .../SysPermissionClientModulesMapper.java | 20 +- .../system/SysRpayMerchantApplyMapper.java | 12 +- .../system/SysWxMerchantApplyMapper.java | 12 +- .../vipcustomer/VipCustomerMapper.java | 20 +- .../vipcustomer/VipCustomerOrderMapper.java | 12 +- .../resources/application-alipay.properties | 15 -- src/main/resources/application-alipay.yml | 17 ++ .../resources/application-bestpay.properties | 9 - src/main/resources/application-bestpay.yml | 10 + src/main/resources/application-dev.properties | 16 -- src/main/resources/application-dev.yml | 15 ++ .../resources/application-devproxy.properties | 7 - src/main/resources/application-devproxy.yml | 8 + src/main/resources/application-jd.properties | 6 - src/main/resources/application-jd.yml | 8 + .../resources/application-lakala.properties | 5 - src/main/resources/application-lakala.yml | 9 + .../resources/application-local.properties | 6 - src/main/resources/application-local.yml | 8 + .../application-officedev.properties | 18 -- src/main/resources/application-officedev.yml | 23 +++ .../application-production.properties | 7 - src/main/resources/application-production.yml | 8 + .../resources/application-proxy.properties | 12 -- src/main/resources/application-proxy.yml | 15 ++ .../resources/application-rpay.properties | 3 - src/main/resources/application-rpay.yml | 5 + .../resources/application-wechat.properties | 20 -- src/main/resources/application-wechat.yml | 23 +++ .../resources/application-yeepay.properties | 15 -- src/main/resources/application-yeepay.yml | 20 ++ src/main/resources/application.properties | 158 -------------- src/main/resources/application.yml | 195 ++++++++++++++++++ .../templates/settlement_send_check_code.html | 3 +- .../payment/manage/process/ABAGenerator.java | 3 +- 206 files changed, 1535 insertions(+), 1474 deletions(-) create mode 100644 src/main/java/au/com/royalpay/payment/manage/ManagerPersistenceConfiguration.java delete mode 100644 src/main/resources/application-alipay.properties create mode 100644 src/main/resources/application-alipay.yml delete mode 100644 src/main/resources/application-bestpay.properties create mode 100644 src/main/resources/application-bestpay.yml delete mode 100644 src/main/resources/application-dev.properties create mode 100644 src/main/resources/application-dev.yml delete mode 100644 src/main/resources/application-devproxy.properties create mode 100644 src/main/resources/application-devproxy.yml delete mode 100644 src/main/resources/application-jd.properties create mode 100644 src/main/resources/application-jd.yml delete mode 100644 src/main/resources/application-lakala.properties create mode 100644 src/main/resources/application-lakala.yml delete mode 100644 src/main/resources/application-local.properties create mode 100644 src/main/resources/application-local.yml delete mode 100644 src/main/resources/application-officedev.properties create mode 100644 src/main/resources/application-officedev.yml delete mode 100644 src/main/resources/application-production.properties create mode 100644 src/main/resources/application-production.yml delete mode 100644 src/main/resources/application-proxy.properties create mode 100644 src/main/resources/application-proxy.yml delete mode 100644 src/main/resources/application-rpay.properties create mode 100644 src/main/resources/application-rpay.yml delete mode 100644 src/main/resources/application-wechat.properties create mode 100644 src/main/resources/application-wechat.yml delete mode 100644 src/main/resources/application-yeepay.properties create mode 100644 src/main/resources/application-yeepay.yml delete mode 100644 src/main/resources/application.properties create mode 100644 src/main/resources/application.yml diff --git a/pom.xml b/pom.xml index 49e05e119..c17a7e8d3 100644 --- a/pom.xml +++ b/pom.xml @@ -5,11 +5,11 @@ au.com.royalpay.payment payment-parent - 1.1.13 + 2.0.0 4.0.0 manage - 1.3.98 + 2.0.0 UTF-8 1.8.0 @@ -69,17 +69,11 @@ org.springframework.boot spring-boot-starter-web - - - com.fasterxml.jackson.core - jackson-databind - - com.alibaba fastjson - 1.2.58 + 1.2.62 org.springframework.boot diff --git a/src/main/java/au/com/royalpay/payment/manage/ManagerPersistenceConfiguration.java b/src/main/java/au/com/royalpay/payment/manage/ManagerPersistenceConfiguration.java new file mode 100644 index 000000000..fdf4efd7c --- /dev/null +++ b/src/main/java/au/com/royalpay/payment/manage/ManagerPersistenceConfiguration.java @@ -0,0 +1,12 @@ +package au.com.royalpay.payment.manage; + +import com.yixsoft.support.mybatis.spring.annotation.MapperScanner; +import org.springframework.context.annotation.Configuration; + +/** + * Create by davep at 2020-03-17 16:53 + */ +@Configuration +@MapperScanner({".**.mapper", ".**.mappers"}) +public class ManagerPersistenceConfiguration { +} diff --git a/src/main/java/au/com/royalpay/payment/manage/PaymentManageApplication.java b/src/main/java/au/com/royalpay/payment/manage/PaymentManageApplication.java index d2ce602a1..3fcbe051a 100644 --- a/src/main/java/au/com/royalpay/payment/manage/PaymentManageApplication.java +++ b/src/main/java/au/com/royalpay/payment/manage/PaymentManageApplication.java @@ -27,9 +27,9 @@ import java.util.concurrent.ScheduledExecutorService; * exclude = {DataSourceAutoConfiguration.class} * 禁用springboot默认加载的application.properties单数据源配置 */ -@SpringBootApplication(scanBasePackages = {"au.com.royalpay.payment", "cn.yixblog"},exclude = {DataSourceAutoConfiguration.class}) +@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class}) @EnableScheduling -@EnableCaching( proxyTargetClass=true ) +@EnableCaching(proxyTargetClass = true) public class PaymentManageApplication { public static void main(String[] args) { @@ -48,7 +48,7 @@ public class PaymentManageApplication { if (StringUtils.isNotEmpty(datFile) && new File(datFile).exists()) { return new LookupService(datFile); } - }catch (IOException e){ + } catch (IOException e) { e.printStackTrace(); } return new LookupService(geoCityFile.getFile()); diff --git a/src/main/java/au/com/royalpay/payment/manage/WebConfiguration.java b/src/main/java/au/com/royalpay/payment/manage/WebConfiguration.java index cddb1584c..dea796892 100644 --- a/src/main/java/au/com/royalpay/payment/manage/WebConfiguration.java +++ b/src/main/java/au/com/royalpay/payment/manage/WebConfiguration.java @@ -1,12 +1,9 @@ package au.com.royalpay.payment.manage; import au.com.royalpay.payment.manage.permission.manager.ManagerUserInterceptor; -import au.com.royalpay.payment.tools.permission.RequestInfoInterceptor; import au.com.royalpay.payment.tools.permission.alipay.AlipayUserInterceptor; import au.com.royalpay.payment.tools.permission.consumer.ConsumersInterceptor; import au.com.royalpay.payment.tools.permission.wechat.WechatUserInterceptor; -import au.com.royalpay.payment.tools.secure.impls.ApplyFirewallCheckInterceptor; -import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.web.servlet.config.annotation.InterceptorRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; @@ -18,8 +15,6 @@ import javax.annotation.Resource; */ @Configuration public class WebConfiguration implements WebMvcConfigurer { - @Resource - private RequestInfoInterceptor requestInfoInterceptor; @Resource private ManagerUserInterceptor managerUserInterceptor; @Resource @@ -32,17 +27,10 @@ public class WebConfiguration implements WebMvcConfigurer { @Override public void addInterceptors(InterceptorRegistry registry) { - registry.addInterceptor(requestInfoInterceptor); - registry.addInterceptor(managerUserInterceptor); - registry.addInterceptor(wechatUserInterceptor); - registry.addInterceptor(alipayUserInterceptor); - registry.addInterceptor(consumersInterceptor); - registry.addInterceptor(applyFirewallCheckInterceptor()); - } - - @Bean - public ApplyFirewallCheckInterceptor applyFirewallCheckInterceptor() { - return new ApplyFirewallCheckInterceptor(); + registry.addInterceptor(managerUserInterceptor).order(1); + registry.addInterceptor(wechatUserInterceptor).order(1); + registry.addInterceptor(alipayUserInterceptor).order(1); + registry.addInterceptor(consumersInterceptor).order(1); } diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/DashboardServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/DashboardServiceImpl.java index 5071c1b04..b4d267dec 100644 --- a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/DashboardServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/DashboardServiceImpl.java @@ -527,7 +527,7 @@ public class DashboardServiceImpl implements DashboardService,DashboardAnalysisT params.put("client_id",client.getIntValue("client_id")); } List records = transactionAnalysisMapper.getCustomersAndOrdersInDaysUseInScheduled(params); - if (!records.isEmpty() && records.size()>0){ + if (!records.isEmpty()){ JSONObject deleteParams = new JSONObject(); deleteParams.put("begin",params.getDate("begin")); deleteParams.put("end",params.getDate("end")); diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/mappers/BDAnalysisMapper.java b/src/main/java/au/com/royalpay/payment/manage/analysis/mappers/BDAnalysisMapper.java index b705509f5..3ab55aaa0 100644 --- a/src/main/java/au/com/royalpay/payment/manage/analysis/mappers/BDAnalysisMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/analysis/mappers/BDAnalysisMapper.java @@ -1,6 +1,6 @@ package au.com.royalpay.payment.manage.analysis.mappers; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; import com.alibaba.fastjson.JSONObject; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/mappers/ClientAnalysisMapper.java b/src/main/java/au/com/royalpay/payment/manage/analysis/mappers/ClientAnalysisMapper.java index d2c05d82d..8352d4d3a 100644 --- a/src/main/java/au/com/royalpay/payment/manage/analysis/mappers/ClientAnalysisMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/analysis/mappers/ClientAnalysisMapper.java @@ -1,9 +1,9 @@ package au.com.royalpay.payment.manage.analysis.mappers; -import cn.yixblog.support.mybatis.autosql.annotations.AdvanceSelect; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AdvanceSelect; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import com.github.miemiedev.mybatis.paginator.domain.PageBounds; import org.apache.ibatis.annotations.Param; @@ -30,7 +30,7 @@ public interface ClientAnalysisMapper { // 统计一段时期新增的商户数 List listNewClients(JSONObject params); - @AutoSql(type = SqlType.COUNT) + @AutoSql(SqlType.COUNT) @AdvanceSelect(addonWhereClause = "sub_merchant_id is not null") int countTotalPartners(); diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/mappers/CustomerAndOrdersStatisticsMapper.java b/src/main/java/au/com/royalpay/payment/manage/analysis/mappers/CustomerAndOrdersStatisticsMapper.java index fa5a79a3c..bdc4efe2e 100644 --- a/src/main/java/au/com/royalpay/payment/manage/analysis/mappers/CustomerAndOrdersStatisticsMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/analysis/mappers/CustomerAndOrdersStatisticsMapper.java @@ -1,9 +1,9 @@ package au.com.royalpay.payment.manage.analysis.mappers; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; -import cn.yixblog.support.mybatis.paginator.annotations.CountRef; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.paginator.annotations.CountRef; import com.alibaba.fastjson.JSONObject; import com.github.miemiedev.mybatis.paginator.domain.PageBounds; import com.github.miemiedev.mybatis.paginator.domain.PageList; @@ -16,7 +16,7 @@ import java.util.List; */ @AutoMapper(tablename = "statistics_customer_order", pkName = "id") public interface CustomerAndOrdersStatisticsMapper { - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject jsonObject); List getCustomerAndOrderStatistics(JSONObject params); diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/mappers/EstimateAnalysisMapper.java b/src/main/java/au/com/royalpay/payment/manage/analysis/mappers/EstimateAnalysisMapper.java index 74a37d1a2..64871bf53 100644 --- a/src/main/java/au/com/royalpay/payment/manage/analysis/mappers/EstimateAnalysisMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/analysis/mappers/EstimateAnalysisMapper.java @@ -1,8 +1,8 @@ package au.com.royalpay.payment.manage.analysis.mappers; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import org.apache.ibatis.annotations.Param; @@ -24,12 +24,12 @@ public interface EstimateAnalysisMapper { JSONObject findClearAmountByDate(@Param("report_date") String report_date, @Param("client_list") List client_list); - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject estimate); JSONObject findByLogDate(@Param("date") String date, @Param("log_type") int log_type); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) void update(JSONObject estimate); JSONObject getCleanAmount(@Param("start_date") String start_date, @Param("end") String end_date); diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/mappers/OrderAnalysisMapper.java b/src/main/java/au/com/royalpay/payment/manage/analysis/mappers/OrderAnalysisMapper.java index 0b3a84463..ba15b6022 100644 --- a/src/main/java/au/com/royalpay/payment/manage/analysis/mappers/OrderAnalysisMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/analysis/mappers/OrderAnalysisMapper.java @@ -1,6 +1,6 @@ package au.com.royalpay.payment.manage.analysis.mappers; -import cn.yixblog.support.mybatis.paginator.annotations.CountRef; +import com.yixsoft.support.mybatis.paginator.annotations.CountRef; import com.alibaba.fastjson.JSONObject; import com.github.miemiedev.mybatis.paginator.domain.PageBounds; import com.github.miemiedev.mybatis.paginator.domain.PageList; diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.java b/src/main/java/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.java index 3be3a6e55..20a9f8af3 100644 --- a/src/main/java/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.java @@ -1,7 +1,7 @@ package au.com.royalpay.payment.manage.analysis.mappers; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.paginator.annotations.CountRef; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.paginator.annotations.CountRef; import com.alibaba.fastjson.JSONObject; import com.github.miemiedev.mybatis.paginator.domain.PageBounds; import com.github.miemiedev.mybatis.paginator.domain.PageList; diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/act/ActAppMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/act/ActAppMapper.java index 052cae98a..1aef2f278 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/act/ActAppMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/act/ActAppMapper.java @@ -1,9 +1,9 @@ package au.com.royalpay.payment.manage.mappers.act; -import cn.yixblog.support.mybatis.autosql.annotations.AdvanceSelect; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AdvanceSelect; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import com.github.miemiedev.mybatis.paginator.domain.PageBounds; import com.github.miemiedev.mybatis.paginator.domain.PageList; @@ -15,20 +15,20 @@ import java.util.List; @AutoMapper(tablename = "act_app_list", pkName = "act_id") public interface ActAppMapper { - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) @AdvanceSelect(addonWhereClause = "is_valid=1") List listActs (); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) PageList listAppActs (JSONObject params,PageBounds pagination); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject getActDetail(String act_id); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) void updateAct(JSONObject params); - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void newAppAct(JSONObject params); JSONObject getLatestWindowNotice(@Param("now") Date now); diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/act/ActChairtyMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/act/ActChairtyMapper.java index de5793c77..6327e0565 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/act/ActChairtyMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/act/ActChairtyMapper.java @@ -1,8 +1,8 @@ package au.com.royalpay.payment.manage.mappers.act; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import com.github.miemiedev.mybatis.paginator.domain.PageBounds; import com.github.miemiedev.mybatis.paginator.domain.PageList; @@ -17,10 +17,10 @@ import java.util.List; @AutoMapper(tablename = "act_charity", pkName = "client_moniker") public interface ActChairtyMapper { - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject findChairtyClient(@Param("client_moniker") String clientMoniker); - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject chairtyClient); PageList chairtyClientNum(PageBounds pageBounds); diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/act/ActDietAttendMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/act/ActDietAttendMapper.java index 7b83f1a15..202fccc69 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/act/ActDietAttendMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/act/ActDietAttendMapper.java @@ -1,9 +1,9 @@ package au.com.royalpay.payment.manage.mappers.act; -import cn.yixblog.support.mybatis.autosql.annotations.AdvanceSelect; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AdvanceSelect; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import com.github.miemiedev.mybatis.paginator.domain.PageBounds; import com.github.miemiedev.mybatis.paginator.domain.PageList; @@ -18,16 +18,16 @@ import java.util.List; @AutoMapper(tablename = "act_diet_attend", pkName = "attend_id", keyGenerator = Jdbc3KeyGenerator.class) public interface ActDietAttendMapper { - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) @AdvanceSelect(addonWhereClause = "enabled=1") JSONObject findClientAttend(@Param("client_id") String clientId); PageList listMerchants(@Param("city") String city, @Param("name") String name, PageBounds pageBounds); - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject attend); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) void update(JSONObject attend); PageList listMerchantsDetail(PageBounds pageBounds); diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/act/ActDietOrderMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/act/ActDietOrderMapper.java index 50b05ee06..17aed0757 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/act/ActDietOrderMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/act/ActDietOrderMapper.java @@ -1,8 +1,8 @@ package au.com.royalpay.payment.manage.mappers.act; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import org.apache.ibatis.annotations.Param; @@ -14,16 +14,16 @@ import java.util.List; */ @AutoMapper(tablename = "act_diet_orders", pkName = "order_id") public interface ActDietOrderMapper { - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject dietOrderInfo); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject findOrder(@Param("order_id") String orderId); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) void setTransactionId(@Param("order_id") String orderId, @Param("transaction_id") String transactionId, @Param("pay_time") Date time); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) void updateRefund(@Param("order_id") String orderId, @Param("refund_transaction") String transactionId, @Param("refund_time") Date transactionTime); List getAppendAmountInDays(JSONObject params); diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/act/ActMonDelayClientMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/act/ActMonDelayClientMapper.java index 413390973..7fa72cae9 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/act/ActMonDelayClientMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/act/ActMonDelayClientMapper.java @@ -1,20 +1,20 @@ package au.com.royalpay.payment.manage.mappers.act; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import org.apache.ibatis.annotations.Param; @AutoMapper(tablename = "act_mon_delay_read_logs", pkName = "id") public interface ActMonDelayClientMapper { - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject clientlog); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) void update(JSONObject clientlog); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject actClient(@Param("client_id") int client_id); } diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/act/ActMonDelaySettleMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/act/ActMonDelaySettleMapper.java index eba4a60fe..c1d7d689f 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/act/ActMonDelaySettleMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/act/ActMonDelaySettleMapper.java @@ -1,9 +1,9 @@ package au.com.royalpay.payment.manage.mappers.act; -import cn.yixblog.support.mybatis.autosql.annotations.AdvanceSelect; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AdvanceSelect; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import com.github.miemiedev.mybatis.paginator.domain.PageBounds; import com.github.miemiedev.mybatis.paginator.domain.PageList; @@ -13,13 +13,13 @@ import java.util.List; @AutoMapper(tablename = "act_mon_delay_settle", pkName = "id") public interface ActMonDelaySettleMapper { - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject clientlog); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) void update(JSONObject clientlog); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) @AdvanceSelect(addonWhereClause = "is_valid=1") List clientLog (@Param("client_id") int client_id); diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/act/ActMonDelaySettleRedPackMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/act/ActMonDelaySettleRedPackMapper.java index 0d0a508d2..06075c8ff 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/act/ActMonDelaySettleRedPackMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/act/ActMonDelaySettleRedPackMapper.java @@ -1,8 +1,8 @@ package au.com.royalpay.payment.manage.mappers.act; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import com.github.miemiedev.mybatis.paginator.domain.PageBounds; import com.github.miemiedev.mybatis.paginator.domain.PageList; @@ -13,12 +13,12 @@ import java.util.List; @AutoMapper(tablename = "act_mon_delay_settle_redpack", pkName = "id") public interface ActMonDelaySettleRedPackMapper { - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject dietOrderInfo); BigDecimal getTotalRedPack(int client_id); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) PageList listRedpacks(@Param("client_id") int client_id, PageBounds pagination); PageList getMonDelayRank(JSONObject params, PageBounds pageBounds); diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/act/ActSignEventsSignLogMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/act/ActSignEventsSignLogMapper.java index 22cc61c38..381f32408 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/act/ActSignEventsSignLogMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/act/ActSignEventsSignLogMapper.java @@ -7,9 +7,9 @@ import org.apache.ibatis.annotations.Param; import java.util.Date; import java.util.List; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; /** * Created by yixian on 2017-04-11. @@ -19,9 +19,9 @@ public interface ActSignEventsSignLogMapper { List checkUnsigned(@Param("client_id") int clientId); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) void updateSignInfo(@Param("sign_id") String signId, @Param("sign_time") Date signTime, @Param("sign_user_id") String userId, @Param("sign_ip") String clientIp); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject find(@Param("sign_id") String signId); } diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/bill/BillMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/bill/BillMapper.java index 89effa887..e7929ec70 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/bill/BillMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/bill/BillMapper.java @@ -8,28 +8,28 @@ import com.alibaba.fastjson.JSONObject; import com.github.miemiedev.mybatis.paginator.domain.PageBounds; import com.github.miemiedev.mybatis.paginator.domain.PageList; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; /** * Create by yixian at 2017-12-19 19:09 */ @AutoMapper(tablename = "pmt_bill", pkName = "bill_id") public interface BillMapper { - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) int save(JSONObject record); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject findOne(@Param("bill_id") String bill_id); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) int update(JSONObject record); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) List findByClientId(@Param("client_id") int client_id); - @AutoSql(type = SqlType.DELETE) + @AutoSql(SqlType.DELETE) void delete(@Param("bill_id") String billId); PageList listWithOrderAnalysis(@Param("param") JSONObject jsonObject, PageBounds pageBounds); diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/bill/BillOrderMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/bill/BillOrderMapper.java index e23b783d9..7d65229db 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/bill/BillOrderMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/bill/BillOrderMapper.java @@ -1,8 +1,8 @@ package au.com.royalpay.payment.manage.mappers.bill; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import com.github.miemiedev.mybatis.paginator.domain.PageBounds; import com.github.miemiedev.mybatis.paginator.domain.PageList; @@ -15,20 +15,20 @@ import java.util.List; */ @AutoMapper(tablename = "pmt_bill_order_relation", pkName = "bill_id") public interface BillOrderMapper { - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) JSONObject save(JSONObject record); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) int update(JSONObject record); List findByBillIdWithWechatInfo(@Param("bill_id") String bill_id); List findByBillIdWithAlipayInfo(@Param("bill_id") String bill_id); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject findByClientId(@Param("client_id") int client_id); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) List findByBillId(@Param("bill_id") String bill_id); List findOrderIdByStatus(@Param("order_status")String order_status); diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/billqrcode/DirectedBillCodeMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/billqrcode/DirectedBillCodeMapper.java index 95b64f29e..794e23604 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/billqrcode/DirectedBillCodeMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/billqrcode/DirectedBillCodeMapper.java @@ -1,9 +1,9 @@ package au.com.royalpay.payment.manage.mappers.billqrcode; -import cn.yixblog.support.mybatis.autosql.annotations.AdvanceSelect; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AdvanceSelect; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import com.github.miemiedev.mybatis.paginator.domain.PageBounds; import org.apache.ibatis.annotations.Param; @@ -12,22 +12,22 @@ import java.util.List; @AutoMapper(tablename = "pmt_directed_bill_code", pkName = "bill_code_id") public interface DirectedBillCodeMapper { - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) int save(JSONObject record); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject findOne(@Param("client_order_id") String client_order_id); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject findOneByBillCodeId(@Param("bill_code_id") String bill_code_id); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) int update(JSONObject record); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) List findByClientId(JSONObject params, PageBounds pageBounds); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) @AdvanceSelect(addonWhereClause = "status=1") List listAllBills(); } diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/cashback/CashbackDrawDepositsMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/cashback/CashbackDrawDepositsMapper.java index 1436355be..900b18ebb 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/cashback/CashbackDrawDepositsMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/cashback/CashbackDrawDepositsMapper.java @@ -1,8 +1,8 @@ package au.com.royalpay.payment.manage.mappers.cashback; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import com.github.miemiedev.mybatis.paginator.domain.PageBounds; import com.github.miemiedev.mybatis.paginator.domain.PageList; @@ -16,10 +16,10 @@ import java.math.BigDecimal; public interface CashbackDrawDepositsMapper { - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject object); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) PageList getDrawLogs(JSONObject params, PageBounds pageBounds); BigDecimal getDrawTotal(JSONObject params); diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/cashback/CashbackRecordsMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/cashback/CashbackRecordsMapper.java index 888339d22..7c9bb8ff7 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/cashback/CashbackRecordsMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/cashback/CashbackRecordsMapper.java @@ -1,8 +1,8 @@ package au.com.royalpay.payment.manage.mappers.cashback; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import com.github.miemiedev.mybatis.paginator.domain.PageBounds; import com.github.miemiedev.mybatis.paginator.domain.PageList; @@ -20,10 +20,10 @@ public interface CashbackRecordsMapper { BigDecimal getCashTotal(JSONObject params); - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject object); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) void update(JSONObject object); PageList getCashbackRecores(JSONObject params, PageBounds pageBounds); @@ -38,7 +38,7 @@ public interface CashbackRecordsMapper { PageList getPartnerTotalCashback(JSONObject params, PageBounds pageBounds); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) List findByOrderId(@Param("order_id") String orderId); List findBySurchargeDiscountLog(@Param("client_id") int clientId, @Param("settle_date") Date settleDate); diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/cashiers/CashierMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/cashiers/CashierMapper.java index bdcd1239d..c495ca7b6 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/cashiers/CashierMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/cashiers/CashierMapper.java @@ -1,8 +1,8 @@ package au.com.royalpay.payment.manage.mappers.cashiers; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import com.github.miemiedev.mybatis.paginator.domain.PageBounds; import com.github.miemiedev.mybatis.paginator.domain.PageList; @@ -17,21 +17,21 @@ import java.util.List; @AutoMapper(tablename = "cashier", pkName = "cashier_id") public interface CashierMapper { - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) List listCashiers(JSONObject params); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) PageList listCashiers(JSONObject params, PageBounds pageBounds); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject findOne(@Param("cashier_id") String cashier_id); - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject cashier); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) void update(JSONObject cashier); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject findCashierByCode(@Param("client_id") int client_id, @Param("code") String code); } diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/cashiers/CashierOrderMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/cashiers/CashierOrderMapper.java index 9c9e756a2..b00da97be 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/cashiers/CashierOrderMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/cashiers/CashierOrderMapper.java @@ -1,8 +1,8 @@ package au.com.royalpay.payment.manage.mappers.cashiers; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import com.github.miemiedev.mybatis.paginator.domain.PageBounds; import com.github.miemiedev.mybatis.paginator.domain.PageList; @@ -14,15 +14,15 @@ import org.apache.ibatis.annotations.Param; */ @AutoMapper(tablename = "cashier_orders", pkName = "cashier_order_id") public interface CashierOrderMapper { - @AutoSql(type= SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject jsonObject); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) void update(JSONObject updateaObj); - @AutoSql(type= SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject findOrder(@Param("cashier_order_id") String cashier_order_id); PageList listOrders(JSONObject params, PageBounds pageBounds); - @AutoSql(type= SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject findOrderByOrderId(@Param("order_id") String cashier_order_id); diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/client/AuthAppMessageMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/client/AuthAppMessageMapper.java index 63c492ed0..2ef5936e9 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/client/AuthAppMessageMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/client/AuthAppMessageMapper.java @@ -1,8 +1,8 @@ package au.com.royalpay.payment.manage.mappers.client; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; /** @@ -10,6 +10,6 @@ import com.alibaba.fastjson.JSONObject; */ @AutoMapper(tablename = "log_client_app_messages",pkName = "message_id") public interface AuthAppMessageMapper { - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject msg); } diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/client/AuthHistoryMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/client/AuthHistoryMapper.java index 7f218c7fe..ccd162527 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/client/AuthHistoryMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/client/AuthHistoryMapper.java @@ -1,8 +1,8 @@ package au.com.royalpay.payment.manage.mappers.client; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import org.apache.ibatis.annotations.Param; @@ -13,7 +13,7 @@ import org.apache.ibatis.annotations.Param; public interface AuthHistoryMapper { - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject find(@Param("auth_id") String authId); } diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/client/ClientCustomersMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/client/ClientCustomersMapper.java index 4fad42598..6212c8e49 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/client/ClientCustomersMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/client/ClientCustomersMapper.java @@ -6,24 +6,24 @@ import com.alibaba.fastjson.JSONObject; import com.github.miemiedev.mybatis.paginator.domain.PageBounds; import com.github.miemiedev.mybatis.paginator.domain.PageList; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; /** * Created by yuan on 2017/9/12. */ @AutoMapper(tablename = "sys_clients_customers", pkName = {"client_id","customer_id"}) public interface ClientCustomersMapper { - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) public JSONObject getClientCustomer(@Param("client_id") int client_id, @Param("customer_id") String customer_id); public JSONObject getClientCustomerWithNull(@Param("client_id") int client_id, @Param("customer_id") String customer_id); - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) public void insert(JSONObject obj); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) public void update(JSONObject obj); public void updateAfterPaymentFinish(JSONObject obj); diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/client/ClientSubMerchantIdMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/client/ClientSubMerchantIdMapper.java index 4cf108e6b..cb62cc2f3 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/client/ClientSubMerchantIdMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/client/ClientSubMerchantIdMapper.java @@ -1,9 +1,9 @@ package au.com.royalpay.payment.manage.mappers.client; -import cn.yixblog.support.mybatis.autosql.annotations.AdvanceSelect; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AdvanceSelect; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import com.github.miemiedev.mybatis.paginator.domain.PageBounds; import org.apache.ibatis.annotations.Param; @@ -13,20 +13,20 @@ import java.util.List; @AutoMapper(tablename = "cli_sub_merchant_id", pkName = "sub_merchant_id") public interface ClientSubMerchantIdMapper { - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) List listSubMerchantId(PageBounds pageBounds); List listSubMerchantIdByDiffDays(@Param("begin") int begin,@Param("end") int end); - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject subMerchantId); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) void update(JSONObject subMerchantId); - @AutoSql(type = SqlType.DELETE) + @AutoSql(SqlType.DELETE) void delete(@Param("sub_merchant_id") String sub_merchant_id); - @AutoSql(type = SqlType.DELETE) + @AutoSql(SqlType.DELETE) void deleteAll(); } diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/client/GoodMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/client/GoodMapper.java index 24cc81a1c..bb137225d 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/client/GoodMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/client/GoodMapper.java @@ -1,9 +1,9 @@ package au.com.royalpay.payment.manage.mappers.client; -import cn.yixblog.support.mybatis.autosql.annotations.AdvanceSelect; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AdvanceSelect; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import com.github.miemiedev.mybatis.paginator.domain.PageBounds; import com.github.miemiedev.mybatis.paginator.domain.PageList; @@ -14,16 +14,16 @@ import org.apache.ibatis.annotations.Param; */ @AutoMapper(tablename = "pat_goods", pkName = "id") public interface GoodMapper { - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject findGood(@Param("id") String goodId); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) @AdvanceSelect(addonWhereClause = "is_using=1") PageList listGoods(JSONObject params, PageBounds pagination); - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject good); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) void update(JSONObject good); } diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/client/GoodOrderMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/client/GoodOrderMapper.java index 017844951..22fb124d8 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/client/GoodOrderMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/client/GoodOrderMapper.java @@ -1,8 +1,8 @@ package au.com.royalpay.payment.manage.mappers.client; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import com.github.miemiedev.mybatis.paginator.domain.PageBounds; import com.github.miemiedev.mybatis.paginator.domain.PageList; @@ -15,18 +15,18 @@ import java.util.List; */ @AutoMapper(tablename = "pat_goods_sale", pkName = "id") public interface GoodOrderMapper { - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject findGoodOrder(@Param("id") String goodOrderId); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) PageList listGoodOrder(JSONObject params, PageBounds pagination); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) List getGoodOrderList(JSONObject params); - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject goodOrder); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) void update(JSONObject goodOrder); } diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/custom/CustomReportDetailsMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/custom/CustomReportDetailsMapper.java index 1d148ba56..b26de402d 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/custom/CustomReportDetailsMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/custom/CustomReportDetailsMapper.java @@ -8,16 +8,16 @@ import org.apache.ibatis.annotations.Param; import java.util.List; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; /** * Created by yishuqian on 9/1/16. */ @AutoMapper(tablename = "pmt_custom_report_detail", pkName = "sub_order_no") public interface CustomReportDetailsMapper { - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) List findByReportId(@Param("report_id") String report_id); } diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/custom/CustomReportsMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/custom/CustomReportsMapper.java index f331db759..2e9833522 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/custom/CustomReportsMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/custom/CustomReportsMapper.java @@ -1,8 +1,8 @@ package au.com.royalpay.payment.manage.mappers.custom; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import com.github.miemiedev.mybatis.paginator.domain.PageBounds; import com.github.miemiedev.mybatis.paginator.domain.PageList; @@ -13,10 +13,10 @@ import org.apache.ibatis.annotations.Param; */ @AutoMapper(tablename = "pmt_custom_report", pkName = "report_id") public interface CustomReportsMapper { - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject findOne(@Param("report_id") String report_id); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject findByOrderId(@Param("order_id")String order_id); PageList queryWithTrans(JSONObject param,PageBounds pagination); diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/customers/CusRewardConfigMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/customers/CusRewardConfigMapper.java index 23f1606fe..edf2d8747 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/customers/CusRewardConfigMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/customers/CusRewardConfigMapper.java @@ -1,8 +1,8 @@ package au.com.royalpay.payment.manage.mappers.customers; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import org.apache.ibatis.annotations.Param; @@ -13,6 +13,6 @@ import org.apache.ibatis.annotations.Param; */ @AutoMapper(tablename = "cus_reward_config",pkName = "key") public interface CusRewardConfigMapper { - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject getValue(@Param("key") String key); } diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/customers/CusRewardCouponMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/customers/CusRewardCouponMapper.java index 131976b23..fe0d43c59 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/customers/CusRewardCouponMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/customers/CusRewardCouponMapper.java @@ -1,9 +1,9 @@ package au.com.royalpay.payment.manage.mappers.customers; -import cn.yixblog.support.mybatis.autosql.annotations.AdvanceSelect; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AdvanceSelect; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -14,6 +14,6 @@ public interface CusRewardCouponMapper { @Select("SELECT * FROM cus_reward_coupon WHERE type =2 or type =3 order by rand() limit 1") JSONObject randomType(); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject getCoupon(@Param("type") int type); } diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/customers/CusRewardLogsMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/customers/CusRewardLogsMapper.java index ee6bacb48..82f78555c 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/customers/CusRewardLogsMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/customers/CusRewardLogsMapper.java @@ -1,8 +1,8 @@ package au.com.royalpay.payment.manage.mappers.customers; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -13,16 +13,16 @@ import java.util.List; @AutoMapper(tablename = "cus_reward_log",pkName = "reward_id") public interface CusRewardLogsMapper { - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject params); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject findRewardByFakeOpenId(@Param("openid")String fakeOpenId); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject findRewardByRewardId(@Param("reward_id")String reward_id); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) void update(JSONObject params); int openIdReceivedCount(@Param("openid") String openid, @Param("send_time") Date send_time); diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/customers/CustomerEncourageConfigMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/customers/CustomerEncourageConfigMapper.java index 3d473c4b1..39d19b107 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/customers/CustomerEncourageConfigMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/customers/CustomerEncourageConfigMapper.java @@ -1,8 +1,8 @@ package au.com.royalpay.payment.manage.mappers.customers; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import com.github.miemiedev.mybatis.paginator.domain.PageBounds; import org.apache.ibatis.annotations.Param; @@ -17,16 +17,16 @@ public interface CustomerEncourageConfigMapper { JSONObject currentConfig(); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) List listConfigs(PageBounds pagination); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject findConfig(@Param("event_id") String eventId); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) void update(JSONObject config); - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void newEvent(JSONObject event); } diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/customers/CustomerEncourageMoneyAccessLogMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/customers/CustomerEncourageMoneyAccessLogMapper.java index 469a62172..cfd872d3e 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/customers/CustomerEncourageMoneyAccessLogMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/customers/CustomerEncourageMoneyAccessLogMapper.java @@ -1,8 +1,8 @@ package au.com.royalpay.payment.manage.mappers.customers; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import com.github.miemiedev.mybatis.paginator.domain.PageBounds; import com.github.miemiedev.mybatis.paginator.domain.PageList; @@ -19,13 +19,13 @@ public interface CustomerEncourageMoneyAccessLogMapper { int countOrders(@Param("member_id") String memberId, @Param("date") Date queryDate); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject findByOrderId(@Param("order_id") String orderId); - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject log); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) void update(JSONObject log); PageList list(JSONObject params, PageBounds pageBounds); diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/customers/CustomerEncourageMoneyUseLogMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/customers/CustomerEncourageMoneyUseLogMapper.java index a82dc96c7..7e7265cd1 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/customers/CustomerEncourageMoneyUseLogMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/customers/CustomerEncourageMoneyUseLogMapper.java @@ -1,8 +1,8 @@ package au.com.royalpay.payment.manage.mappers.customers; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import com.github.miemiedev.mybatis.paginator.domain.PageBounds; import com.github.miemiedev.mybatis.paginator.domain.PageList; @@ -18,13 +18,13 @@ import java.util.List; @AutoMapper(tablename = "cus_encourage_money_use_log", pkName = "use_id") public interface CustomerEncourageMoneyUseLogMapper { - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject findByOrderId(@Param("order_id") String orderId); - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject useLog); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) void update(JSONObject useLogUpdate); BigDecimal sumUsed(@Param("member_id") String memberId, @Param("from_date") Date fromDate, @Param("to_date") Date toDate); diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/customers/CustomerMembershipMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/customers/CustomerMembershipMapper.java index d9324c5db..06ce4f028 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/customers/CustomerMembershipMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/customers/CustomerMembershipMapper.java @@ -1,8 +1,8 @@ package au.com.royalpay.payment.manage.mappers.customers; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import org.apache.ibatis.annotations.Param; @@ -16,16 +16,16 @@ import java.util.List; @AutoMapper(tablename = "cus_membership",pkName = "member_id") public interface CustomerMembershipMapper { - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject findByPaymentOpenId(@Param("payment_openid") String openid); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject findByMemberId(@Param("member_id") String memberId); - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void saveMember(JSONObject member); - @AutoSql(type= SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) int updateCustomerPoints(@Param("member_id") String memberId, @Param("member_point") int memberPoints); void useEncourage(@Param("memberId") String memberId, @Param("amount") BigDecimal amount); diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/customers/CustomerPointsMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/customers/CustomerPointsMapper.java index 582676e8b..ab7fe6ceb 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/customers/CustomerPointsMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/customers/CustomerPointsMapper.java @@ -1,9 +1,9 @@ package au.com.royalpay.payment.manage.mappers.customers; -import cn.yixblog.support.mybatis.autosql.annotations.AdvanceSelect; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AdvanceSelect; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import org.apache.ibatis.annotations.Param; @@ -15,17 +15,17 @@ import java.util.Date; @AutoMapper(tablename = "cus_points_access_log",pkName = "point_id") public interface CustomerPointsMapper { - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject findPointLog(@Param("point_id") String pointId); - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject pointLog); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) @AdvanceSelect(addonWhereClause = "refund_id is null") JSONObject getPointLog(@Param("order_id") String order_id, @Param("member_id") String member_id); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) void update(JSONObject pointLog); int getOuttimePoints(@Param("member_id") String memberId, @Param("expire_date") Date date); diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialAgentCommissionDetailMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialAgentCommissionDetailMapper.java index 394ed637d..f3ea05881 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialAgentCommissionDetailMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialAgentCommissionDetailMapper.java @@ -6,19 +6,19 @@ import org.apache.ibatis.annotations.Param; import com.alibaba.fastjson.JSONObject; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; /** * Created by yixian on 2017-03-08. */ @AutoMapper(tablename = "financial_agent_commission_detail", pkName = "detail_id") public interface FinancialAgentCommissionDetailMapper { - @AutoSql(type = SqlType.DELETE) + @AutoSql(SqlType.DELETE) void clearData(@Param("year") int year, @Param("month") int month); - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject detail); List listDetails(@Param("record_id") String recordId); diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialAgentCommissionMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialAgentCommissionMapper.java index 96e129bd7..bdd86c121 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialAgentCommissionMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialAgentCommissionMapper.java @@ -6,19 +6,19 @@ import org.apache.ibatis.annotations.Param; import com.alibaba.fastjson.JSONObject; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; /** * Created by yixian on 2017-03-08. */ @AutoMapper(tablename = "financial_agent_commission", pkName = "record_id") public interface FinancialAgentCommissionMapper { - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject commissionAnalysis); - @AutoSql(type = SqlType.DELETE) + @AutoSql(SqlType.DELETE) void clearData(@Param("year") int year, @Param("month") int month); List listAvailableMonths(@Param("year") int year); diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialBDCommissionConfigMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialBDCommissionConfigMapper.java index ffb064e72..652fb0162 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialBDCommissionConfigMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialBDCommissionConfigMapper.java @@ -1,8 +1,8 @@ package au.com.royalpay.payment.manage.mappers.financial; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import org.apache.ibatis.annotations.Param; @@ -22,13 +22,13 @@ public interface FinancialBDCommissionConfigMapper { //获取历史月份 Leader 、Manager信息 List listBDLeMaInfoHistory(String month); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) void updateCommissionConfig(JSONObject configInfo); - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void insertCommissionConfig(JSONObject configInfo); - @AutoSql(type = SqlType.DELETE) + @AutoSql(SqlType.DELETE) void deleteConfig(@Param("bc_config_id") String configInfo); JSONObject findCurrentCommissionRate(@Param("month") String month, @Param("amount") String amount, @Param("bd_type") int bd_type); diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialBDConfigMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialBDConfigMapper.java index eeb7296e9..ca32fe856 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialBDConfigMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialBDConfigMapper.java @@ -1,8 +1,8 @@ package au.com.royalpay.payment.manage.mappers.financial; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import org.apache.ibatis.annotations.Param; @@ -16,13 +16,13 @@ import java.util.List; */ @AutoMapper(tablename = "financial_bd_config",pkName = "manager_id") public interface FinancialBDConfigMapper { - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject getBdConfig(@Param("manager_id") String userId); - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void saveBDConfig(JSONObject config); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) void updateBDConfig(JSONObject config); List listBDConfig(); diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialBDPrizeDetailMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialBDPrizeDetailMapper.java index 13b0d7868..067df7116 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialBDPrizeDetailMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialBDPrizeDetailMapper.java @@ -1,8 +1,8 @@ package au.com.royalpay.payment.manage.mappers.financial; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import com.github.miemiedev.mybatis.paginator.domain.PageBounds; import org.apache.ibatis.annotations.Param; @@ -15,7 +15,7 @@ import java.util.List; @AutoMapper(tablename = "financial_bd_prize_detail", pkName = "detail_id") public interface FinancialBDPrizeDetailMapper { - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject detail); List listDetails(@Param("prize_log_id") String prizeLogId, PageBounds order); diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialBDPrizeLogMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialBDPrizeLogMapper.java index 8e0dd60cd..a30339cbc 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialBDPrizeLogMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialBDPrizeLogMapper.java @@ -1,9 +1,9 @@ package au.com.royalpay.payment.manage.mappers.financial; -import cn.yixblog.support.mybatis.autosql.annotations.AdvanceSelect; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AdvanceSelect; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import com.github.miemiedev.mybatis.paginator.domain.PageBounds; import org.apache.ibatis.annotations.Param; @@ -17,7 +17,7 @@ import java.util.List; */ @AutoMapper(tablename = "financial_bd_prize_log", pkName = "prize_log_id") public interface FinancialBDPrizeLogMapper { - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject log); @Select("SELECT fbpl.prize_log_id,fbpl.record_id,fbpl.manager_id,fbpl.bd_name,fbpl.kpi_amount,fbpl.bd_level,SUM(fbpl.total_amount) total_amount, " + @@ -29,7 +29,7 @@ public interface FinancialBDPrizeLogMapper { "GROUP BY fbpl.manager_id order by total_amount desc") List listPrizeLogsForReport(@Param("prize_type") int prize_type, @Param("record_id") String recordId, PageBounds order); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) @AdvanceSelect(addonWhereClause = "prize_type=0") List findByReportAndBD(@Param("record_id") String recordId, @Param("manager_id") String managerId); @@ -68,7 +68,7 @@ public interface FinancialBDPrizeLogMapper { "GROUP BY fbpl.manager_id ") JSONObject findByReportAndGroup(@Param("record_id") String recordId, @Param("manager_id") String managerId); - @AutoSql(type = SqlType.DELETE) + @AutoSql(SqlType.DELETE) void clearLogsOfReport(@Param("record_id") String recordId); @Select("select bpl.record_id,bpl.manager_id,bpl.bd_name,sum(bpl.total_amount) total_amount,sum(bpl.total_prize) total_prize,sum(bpl.total_donation) total_donation,sum(bpl.send_prize) send_prize,sum(bpl.hold_prize) hold_prize," + @@ -80,7 +80,7 @@ public interface FinancialBDPrizeLogMapper { "ORDER BY bpr.month desc") List listBdPrizeLogByOne(@Param("manager_id") String manager_id); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) List findReportByOne(@Param("record_id") String recordId, @Param("manager_id") String managerId); @Select("SELECT c.manager_id, SUM(total_amount) total_amount, c.bd_type\n" + diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialBDPrizeRecordMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialBDPrizeRecordMapper.java index 91ef5d252..cedf3df70 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialBDPrizeRecordMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialBDPrizeRecordMapper.java @@ -1,8 +1,8 @@ package au.com.royalpay.payment.manage.mappers.financial; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import org.apache.ibatis.annotations.Param; @@ -14,10 +14,10 @@ import java.util.List; @AutoMapper(tablename = "financial_bd_prize_records", pkName = "record_id") public interface FinancialBDPrizeRecordMapper { - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject record); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject findByMonth(@Param("month") String month); List listRecordsInYear(@Param("year") String year); @@ -28,7 +28,7 @@ public interface FinancialBDPrizeRecordMapper { JSONObject getChannelReport(@Param("record_id") String recordId, @Param("channel") String channel); - @AutoSql(type = SqlType.DELETE) + @AutoSql(SqlType.DELETE) void delete(@Param("record_id") String recordId); List getReportByManagerId(@Param("manager_id") String managerId); diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialBDRateConfigMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialBDRateConfigMapper.java index aefd33df5..daad69cba 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialBDRateConfigMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialBDRateConfigMapper.java @@ -1,8 +1,8 @@ package au.com.royalpay.payment.manage.mappers.financial; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import org.apache.ibatis.executor.keygen.Jdbc3KeyGenerator; @@ -13,9 +13,9 @@ import java.util.List; */ @AutoMapper(tablename = "financial_bd_prize_rate_config", pkName = "config_id", keyGenerator = Jdbc3KeyGenerator.class) public interface FinancialBDRateConfigMapper { - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) List listAllConfig(); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) int update(JSONObject update); } diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialLeaderPrizeLogMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialLeaderPrizeLogMapper.java index c52de5f97..575db43f7 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialLeaderPrizeLogMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialLeaderPrizeLogMapper.java @@ -1,8 +1,8 @@ package au.com.royalpay.payment.manage.mappers.financial; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import org.apache.ibatis.annotations.Param; @@ -11,9 +11,9 @@ import java.util.List; @AutoMapper(tablename = "financial_leader_prize_log", pkName = "leader_prize_log") public interface FinancialLeaderPrizeLogMapper { - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) List listLeaderPrizeLog(@Param(value = "record_id") String record_id); - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject prizeLog); } diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialPartnerCommissionDetailMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialPartnerCommissionDetailMapper.java index 3efb8de35..2d45c59ae 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialPartnerCommissionDetailMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialPartnerCommissionDetailMapper.java @@ -1,8 +1,8 @@ package au.com.royalpay.payment.manage.mappers.financial; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import org.apache.ibatis.annotations.Param; @@ -13,16 +13,16 @@ import java.util.List; */ @AutoMapper(tablename = "financial_partner_commission_detail", pkName = "detail_id") public interface FinancialPartnerCommissionDetailMapper { - @AutoSql(type = SqlType.DELETE) + @AutoSql(SqlType.DELETE) void clearData(@Param("year") int year, @Param("month") int month,@Param("commission_type") int commission_type); - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject detail); List listDetails(@Param("record_id") String recordId); List listDetailsByRecordIds(List recordId); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) List listDetailByMonth(@Param("year") int year, @Param("month") int month); } diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialPartnerCommissionMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialPartnerCommissionMapper.java index 3e2ce8b3d..2b50513ac 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialPartnerCommissionMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialPartnerCommissionMapper.java @@ -1,8 +1,8 @@ package au.com.royalpay.payment.manage.mappers.financial; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import com.github.miemiedev.mybatis.paginator.domain.PageBounds; import com.github.miemiedev.mybatis.paginator.domain.PageList; @@ -16,13 +16,13 @@ import java.util.List; */ @AutoMapper(tablename = "financial_partner_commission", pkName = "record_id") public interface FinancialPartnerCommissionMapper { - @AutoSql(type = SqlType.DELETE) + @AutoSql(SqlType.DELETE) void clearData(@Param("year") int year, @Param("month") int month,@Param("commission_type") int commission_type); - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject commissionAnalysis); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) void update(JSONObject commission); List getOrgPrizeList(@Param("org_id") String orgId); diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialReferrerCommissionDetailMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialReferrerCommissionDetailMapper.java index 062b0ce27..ecda7b446 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialReferrerCommissionDetailMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialReferrerCommissionDetailMapper.java @@ -1,8 +1,8 @@ package au.com.royalpay.payment.manage.mappers.financial; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import org.apache.ibatis.annotations.Param; @@ -13,10 +13,10 @@ import java.util.List; */ @AutoMapper(tablename = "financial_referrer_commission_detail", pkName = "detail_id") public interface FinancialReferrerCommissionDetailMapper { - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject commissionAnalysis); - @AutoSql(type = SqlType.DELETE) + @AutoSql(SqlType.DELETE) void clearData(@Param("year") int year, @Param("month") int month); List listDetailsByRecordIds(List recordId); diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialReferrerCommissionMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialReferrerCommissionMapper.java index dadbe332f..502db0b8f 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialReferrerCommissionMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialReferrerCommissionMapper.java @@ -1,8 +1,8 @@ package au.com.royalpay.payment.manage.mappers.financial; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import org.apache.ibatis.annotations.Param; @@ -13,10 +13,10 @@ import java.util.List; */ @AutoMapper(tablename = "financial_referrer_commission", pkName = "record_id") public interface FinancialReferrerCommissionMapper { - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject commissionAnalysis); - @AutoSql(type = SqlType.DELETE) + @AutoSql(SqlType.DELETE) void clearData(@Param("year") int year, @Param("month") int month); List listAvailableMonths(@Param("year") int year); diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialSeniorPartnerCommissionDetailMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialSeniorPartnerCommissionDetailMapper.java index cfa7eeaa0..408aea59a 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialSeniorPartnerCommissionDetailMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialSeniorPartnerCommissionDetailMapper.java @@ -6,25 +6,25 @@ import org.apache.ibatis.annotations.Param; import com.alibaba.fastjson.JSONObject; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; /** * Created by yixian on 2017-03-08. */ @AutoMapper(tablename = "financial_senior_partner_commission_detail", pkName = "id") public interface FinancialSeniorPartnerCommissionDetailMapper { - @AutoSql(type = SqlType.DELETE) + @AutoSql(SqlType.DELETE) void clearData(@Param("year") int year, @Param("month") int month,@Param("commission_type") int commission_type); - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject detail); List listDetails(@Param("record_id") String recordId); List listDetailsByRecordIds(List recordId); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) List listDetailByMonth(@Param("year") int year, @Param("month") int month); } diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialSeniorPartnerCommissionMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialSeniorPartnerCommissionMapper.java index 5702875c6..f6dbbaf82 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialSeniorPartnerCommissionMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialSeniorPartnerCommissionMapper.java @@ -6,21 +6,21 @@ import org.apache.ibatis.annotations.Param; import com.alibaba.fastjson.JSONObject; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; /** * Created by yixian on 2017-03-08. */ @AutoMapper(tablename = "financial_senior_partner_commission", pkName = "id") public interface FinancialSeniorPartnerCommissionMapper { - @AutoSql(type = SqlType.DELETE) + @AutoSql(SqlType.DELETE) void clearData(@Param("year") int year, @Param("month") int month); - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject commissionAnalysis); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject find(@Param("year") int year, @Param("month") int month, @Param("org_id") String orgId); } diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/funds/FundsConfigMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/funds/FundsConfigMapper.java index 2c24d19a8..97942b399 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/funds/FundsConfigMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/funds/FundsConfigMapper.java @@ -1,8 +1,8 @@ package au.com.royalpay.payment.manage.mappers.funds; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import org.apache.ibatis.annotations.Param; @@ -14,12 +14,12 @@ import java.util.List; */ @AutoMapper(tablename = "fund_basic_config", pkName = "type_id") public interface FundsConfigMapper { - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) List listAll(); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject find(@Param("type_id") String typeId); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) void updateRate(@Param("type_id") String typeId, @Param("rate") BigDecimal rate); } diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/funds/XPlanInterestClientLogMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/funds/XPlanInterestClientLogMapper.java index c90919b33..b9be76959 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/funds/XPlanInterestClientLogMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/funds/XPlanInterestClientLogMapper.java @@ -1,8 +1,8 @@ package au.com.royalpay.payment.manage.mappers.funds; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import com.github.miemiedev.mybatis.paginator.domain.PageBounds; import org.apache.ibatis.annotations.Param; @@ -14,7 +14,7 @@ import java.util.List; */ @AutoMapper(tablename = "fund_xplan_interest_client_history", pkName = "detail_id") public interface XPlanInterestClientLogMapper { - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject detail); List listMerchantLogs(@Param("history_id") String historyId, PageBounds pagination); diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/funds/XPlanInterestLogMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/funds/XPlanInterestLogMapper.java index 417e35500..21b4e01ea 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/funds/XPlanInterestLogMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/funds/XPlanInterestLogMapper.java @@ -1,8 +1,8 @@ package au.com.royalpay.payment.manage.mappers.funds; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import com.github.miemiedev.mybatis.paginator.domain.PageBounds; import com.github.miemiedev.mybatis.paginator.domain.PageList; @@ -16,13 +16,13 @@ import java.util.Date; @AutoMapper(tablename = "fund_xplan_interest_history", pkName = "history_id") public interface XPlanInterestLogMapper { - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) PageList interestLog(PageBounds pagination); - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject interest); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject getTransLogByDate(@Param("date") Date date); PageList list(JSONObject params, PageBounds pagination); diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/funds/XPlanMerchantMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/funds/XPlanMerchantMapper.java index f37e3a35f..50b6e956e 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/funds/XPlanMerchantMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/funds/XPlanMerchantMapper.java @@ -1,8 +1,8 @@ package au.com.royalpay.payment.manage.mappers.funds; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import com.github.miemiedev.mybatis.paginator.domain.PageBounds; import com.github.miemiedev.mybatis.paginator.domain.PageList; @@ -16,14 +16,14 @@ import java.math.BigDecimal; @AutoMapper(tablename = "fund_xplan_merchants", pkName = "client_id") public interface XPlanMerchantMapper { - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject findMerchantConfig(@Param("client_id") int clientId); - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject config); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) void update(JSONObject update); void deposit(@Param("client_id") int clientId, @Param("amount") BigDecimal amount); diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/funds/XPlanOperationLogMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/funds/XPlanOperationLogMapper.java index 772cc30c0..0936abdf6 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/funds/XPlanOperationLogMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/funds/XPlanOperationLogMapper.java @@ -1,8 +1,8 @@ package au.com.royalpay.payment.manage.mappers.funds; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; /** @@ -11,6 +11,6 @@ import com.alibaba.fastjson.JSONObject; @AutoMapper(tablename = "fund_xplan_log_operation",pkName = "operation_id") public interface XPlanOperationLogMapper { - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void saveLog(JSONObject log); } diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/funds/XPlanTransactionMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/funds/XPlanTransactionMapper.java index bc4c77a4a..bf8af2555 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/funds/XPlanTransactionMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/funds/XPlanTransactionMapper.java @@ -1,8 +1,8 @@ package au.com.royalpay.payment.manage.mappers.funds; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import com.github.miemiedev.mybatis.paginator.domain.PageBounds; import com.github.miemiedev.mybatis.paginator.domain.PageList; @@ -17,19 +17,19 @@ import java.util.List; */ @AutoMapper(tablename = "fund_xplan_transactions", pkName = "transaction_id") public interface XPlanTransactionMapper { - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void saveTransaction(JSONObject transaction); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) PageList listMerchantTransactions(JSONObject params, PageBounds pagination); List listDailyTransactions(@Param("client_id") int clientId, @Param("date") Date date); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject findTransaction(@Param("transaction_id") String transactionId); BigDecimal analysisMerchantTotalAchieve(@Param("client_id") int clientId); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) List findByRequestId(@Param("client_id") int clientId, @Param("request_id") String requestId); } diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/log/AppMessageLogMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/log/AppMessageLogMapper.java index fca2f8028..517b96ae8 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/log/AppMessageLogMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/log/AppMessageLogMapper.java @@ -1,8 +1,8 @@ package au.com.royalpay.payment.manage.mappers.log; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import org.apache.ibatis.annotations.Param; @@ -11,11 +11,11 @@ import org.apache.ibatis.annotations.Param; */ @AutoMapper(tablename = "log_app_msg", pkName = "send_id") public interface AppMessageLogMapper { - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject log); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) void updateStatus(@Param("send_id") String id, @Param("status") int status, @Param("remark") String remark); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) void update(JSONObject object); } diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/log/ClearingDetailAnalysisMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/log/ClearingDetailAnalysisMapper.java index e3909408a..8d588894a 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/log/ClearingDetailAnalysisMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/log/ClearingDetailAnalysisMapper.java @@ -1,8 +1,8 @@ package au.com.royalpay.payment.manage.mappers.log; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.executor.keygen.Jdbc3KeyGenerator; @@ -16,14 +16,14 @@ import java.util.List; */ @AutoMapper(tablename = "log_clearing_detail_analysis", pkName = "detail_id", keyGenerator = Jdbc3KeyGenerator.class) public interface ClearingDetailAnalysisMapper { - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject channel); List analysisChannelReport(@Param("clearing_id") int clearingId); List analysisChannelReportDaily(@Param("settle_date") Date settleDate); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) List listReportChannels(@Param("clearing_detail_id") String clearDetailId); BigDecimal getSysCleaingAmount(@Param("settle_date") String settle_date, @Param("channel") String channel); diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/log/ClearingDetailMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/log/ClearingDetailMapper.java index 89a8d9953..070926496 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/log/ClearingDetailMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/log/ClearingDetailMapper.java @@ -1,8 +1,8 @@ package au.com.royalpay.payment.manage.mappers.log; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import com.github.miemiedev.mybatis.paginator.domain.PageBounds; import com.github.miemiedev.mybatis.paginator.domain.PageList; @@ -17,13 +17,13 @@ import java.util.List; */ @AutoMapper(tablename = "log_clearing_detail", keyGenerator = Jdbc3KeyGenerator.class, pkName = "clear_detail_id") public interface ClearingDetailMapper { - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject detail); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject find(@Param("client_id") int clientId, @Param("clearing_id") int clearId); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject findByDetailId(@Param("clear_detail_id") int clearDetailId); List listReports(@Param("client_id") int clientId, @Param("month") Date month); @@ -34,20 +34,20 @@ public interface ClearingDetailMapper { PageList listReportsOfSettlementLogs(JSONObject params, PageBounds pagination); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject listReport(@Param("clear_detail_id") String clearDetailId, @Param("client_id") int client_id); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject listReportByDate(@Param("report_date") Date date, @Param("client_id") int clientId); PageList listClientSettlementLog(JSONObject params, PageBounds pagination); void updateAllBanks(@Param("settle_bank") String bank, @Param("clearing_id") int clearingId); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) void updateBanks(@Param("settle_bank") String bank,@Param("clear_detail_id") List clearingDetailIds); - @AutoSql(type = SqlType.DELETE) + @AutoSql(SqlType.DELETE) void deleteSettleLogs(@Param("clearing_id") int clearingId); List batchReport(@Param("clearing_id") int clearingId); diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/log/ClearingLogMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/log/ClearingLogMapper.java index 8b6bbebfc..32e9bf29e 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/log/ClearingLogMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/log/ClearingLogMapper.java @@ -1,8 +1,8 @@ package au.com.royalpay.payment.manage.mappers.log; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.executor.keygen.Jdbc3KeyGenerator; @@ -16,7 +16,7 @@ import java.util.List; @AutoMapper(tablename = "log_clearing", pkName = "clearing_id", keyGenerator = Jdbc3KeyGenerator.class) public interface ClearingLogMapper { - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject clearingLog); List findByDate(Date date); @@ -29,7 +29,7 @@ public interface ClearingLogMapper { JSONObject getTotalPlatformCharge(@Param("year") int year, @Param("month") int month); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) void update(JSONObject update); List getSettlementChannelsMonthReport(@Param("year") int year, @Param("month") int month); @@ -44,12 +44,12 @@ public interface ClearingLogMapper { void lockSettlementsById(@Param("clearing_ids") List clearingIds); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject findById(@Param("clearing_id") int clearingId); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) void setLogEditable(@Param("editable") boolean editable, @Param("clearing_id") int clearingId); - @AutoSql(type = SqlType.DELETE) + @AutoSql(SqlType.DELETE) void deleteSettleLogs(@Param("clearing_id") int clearingId); } diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/log/ClientConfigLogMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/log/ClientConfigLogMapper.java index fffd8b28b..9d9de007c 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/log/ClientConfigLogMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/log/ClientConfigLogMapper.java @@ -6,15 +6,15 @@ import com.alibaba.fastjson.JSONObject; import com.github.miemiedev.mybatis.paginator.domain.PageBounds; import com.github.miemiedev.mybatis.paginator.domain.PageList; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; /** * Created by yixian on 2016-10-14. */ @AutoMapper(tablename = "log_client_config", pkName = "id") public interface ClientConfigLogMapper { - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void saveLog(JSONObject log); } diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/log/ClientLoginLogMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/log/ClientLoginLogMapper.java index ea3ca624d..893251020 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/log/ClientLoginLogMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/log/ClientLoginLogMapper.java @@ -1,8 +1,8 @@ package au.com.royalpay.payment.manage.mappers.log; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import com.github.miemiedev.mybatis.paginator.domain.PageBounds; import com.github.miemiedev.mybatis.paginator.domain.PageList; @@ -14,10 +14,10 @@ import org.apache.ibatis.annotations.Param; @AutoMapper(tablename = "log_client_login", pkName = "id") public interface ClientLoginLogMapper { - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void saveLog(JSONObject log); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) PageList listAccountLog(@Param("account_id") String accountId, PageBounds pagination); PageList listClientLog(JSONObject params, PageBounds pagination); diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/log/ClientReviewLogMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/log/ClientReviewLogMapper.java index 5343b63c6..ea2d79219 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/log/ClientReviewLogMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/log/ClientReviewLogMapper.java @@ -1,8 +1,8 @@ package au.com.royalpay.payment.manage.mappers.log; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import org.apache.ibatis.annotations.Param; @@ -14,10 +14,10 @@ import java.util.List; */ @AutoMapper(tablename = "log_client_review",pkName = "review_id") public interface ClientReviewLogMapper { - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject review); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject findReviewLog(@Param("client_id") int clientId, @Param("review_date") Date date); List listReviewLogs(@Param("clientId") int clientId, @Param("from") Date from, @Param("to") Date to); diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/log/ClientsOperationLogMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/log/ClientsOperationLogMapper.java index c69f68e87..0ad9378ab 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/log/ClientsOperationLogMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/log/ClientsOperationLogMapper.java @@ -2,15 +2,15 @@ package au.com.royalpay.payment.manage.mappers.log; import com.alibaba.fastjson.JSONObject; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; /** * Created by yixian on 2017-04-18. */ @AutoMapper(tablename = "log_clients_operation",pkName = "id") public interface ClientsOperationLogMapper { - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject review); } diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/log/CouponAccuessLogMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/log/CouponAccuessLogMapper.java index cb60bf3df..406f9a436 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/log/CouponAccuessLogMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/log/CouponAccuessLogMapper.java @@ -8,34 +8,34 @@ import org.apache.ibatis.annotations.Param; import com.alibaba.fastjson.JSONObject; -import cn.yixblog.support.mybatis.autosql.annotations.AdvanceSelect; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AdvanceSelect; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; @AutoMapper(tablename = "cus_coupon_accuess_log", pkName = "accuess_id") public interface CouponAccuessLogMapper { - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject params); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) void update(JSONObject params); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) @AdvanceSelect(addonWhereClause = "is_valid = 1") JSONObject findUsedCouponByOrderId(@Param("order_id") String order_id); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) List findCouponByOrderId(@Param("order_id") String order_id); PageList getCouponAccuessLog(@Param("client_id")int client_id, @Param("keyword")String keyword, PageBounds pageBounds); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) @AdvanceSelect(addonWhereClause = "is_valid = 0") List findAccuessLogByOrderId(@Param("order_id") String order_id, PageBounds pageBounds); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) @AdvanceSelect(addonWhereClause = "is_valid = 1") List findUsedCouponByOrderIdList(@Param("order_id") String order_id); } diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/log/DailyReportMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/log/DailyReportMapper.java index 0bb14c885..5d3f4bcae 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/log/DailyReportMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/log/DailyReportMapper.java @@ -1,8 +1,8 @@ package au.com.royalpay.payment.manage.mappers.log; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import org.apache.ibatis.annotations.Param; @@ -11,12 +11,12 @@ import org.apache.ibatis.annotations.Param; */ @AutoMapper(tablename = "log_daily_report", pkName = "report_id") public interface DailyReportMapper { - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject report); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject findOne(@Param("report_id") String reportId); - @AutoSql(type = SqlType.DELETE) + @AutoSql(SqlType.DELETE) void delete(@Param("report_id") String reportId); } diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/log/GatewayClientApplyNotifyLogMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/log/GatewayClientApplyNotifyLogMapper.java index 0085819fb..273cd1c77 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/log/GatewayClientApplyNotifyLogMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/log/GatewayClientApplyNotifyLogMapper.java @@ -1,9 +1,9 @@ package au.com.royalpay.payment.manage.mappers.log; -import cn.yixblog.support.mybatis.autosql.annotations.AdvanceSelect; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AdvanceSelect; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import org.apache.ibatis.annotations.Param; @@ -15,16 +15,16 @@ import java.util.List; @AutoMapper(tablename = "gateway_clientApply_notify_log", pkName = "id") public interface GatewayClientApplyNotifyLogMapper { - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void saveLog(JSONObject log); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) void update(JSONObject notice); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) @AdvanceSelect(addonWhereClause = "success=0 and addtime(`addtime`,'24:00:00')>now()") List listErrorLogsIn24Hour(); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject findHistoryByClientId(@Param("client_id") int clientId); } diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/log/LogClientSubMerchantIdMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/log/LogClientSubMerchantIdMapper.java index d1d46b979..d3a91775a 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/log/LogClientSubMerchantIdMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/log/LogClientSubMerchantIdMapper.java @@ -1,8 +1,8 @@ package au.com.royalpay.payment.manage.mappers.log; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import com.github.miemiedev.mybatis.paginator.domain.PageBounds; import org.apache.ibatis.annotations.Param; @@ -12,9 +12,9 @@ import java.util.List; @AutoMapper(tablename = "log_client_sub_merchant_id", pkName = "id") public interface LogClientSubMerchantIdMapper { - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject log); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) List listLogsByClientId(@Param("client_id") int client_id, PageBounds pageBounds); } diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/log/LogRiskMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/log/LogRiskMapper.java index 3b344e532..a6e5ce44b 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/log/LogRiskMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/log/LogRiskMapper.java @@ -1,8 +1,8 @@ package au.com.royalpay.payment.manage.mappers.log; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import com.github.miemiedev.mybatis.paginator.domain.PageBounds; import com.github.miemiedev.mybatis.paginator.domain.PageList; @@ -15,7 +15,7 @@ import java.util.List; @AutoMapper(tablename = "log_risk", pkName = "id") public interface LogRiskMapper { - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject cashier); PageList listWithClientInfo(JSONObject params, PageBounds pagination); diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/log/LogSettleMailMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/log/LogSettleMailMapper.java index bc1177425..0f4f6a6ae 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/log/LogSettleMailMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/log/LogSettleMailMapper.java @@ -1,8 +1,8 @@ package au.com.royalpay.payment.manage.mappers.log; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import java.util.Date; @@ -14,11 +14,11 @@ import java.util.List; @AutoMapper(tablename = "log_settle_send", pkName = "id") public interface LogSettleMailMapper { - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject clearingLog); List findByDate(Date date); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) void update(JSONObject update); } diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/log/ManagerLoginLogMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/log/ManagerLoginLogMapper.java index 3f45db50f..fce799530 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/log/ManagerLoginLogMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/log/ManagerLoginLogMapper.java @@ -1,8 +1,8 @@ package au.com.royalpay.payment.manage.mappers.log; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import com.github.miemiedev.mybatis.paginator.domain.PageBounds; import com.github.miemiedev.mybatis.paginator.domain.PageList; @@ -13,10 +13,10 @@ import org.apache.ibatis.annotations.Param; */ @AutoMapper(tablename = "log_manager_login", pkName = "id") public interface ManagerLoginLogMapper { - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void saveLog(JSONObject log); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) PageList listAccountLoginLog(@Param("manager_id") String managerId, PageBounds pagination); PageList listManagerLoginLog(JSONObject params, PageBounds pagination); diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/log/NotifyErrorLogMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/log/NotifyErrorLogMapper.java index 18861931e..771f3fb05 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/log/NotifyErrorLogMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/log/NotifyErrorLogMapper.java @@ -1,9 +1,9 @@ package au.com.royalpay.payment.manage.mappers.log; -import cn.yixblog.support.mybatis.autosql.annotations.AdvanceSelect; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AdvanceSelect; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import com.github.miemiedev.mybatis.paginator.domain.PageBounds; import com.github.miemiedev.mybatis.paginator.domain.PageList; @@ -18,14 +18,14 @@ import java.util.List; @AutoMapper(tablename = "log_notify_error", pkName = "id") public interface NotifyErrorLogMapper { - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void saveLog(JSONObject log); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) @AdvanceSelect(addonWhereClause = "success=0 and `addtime`>addtime(now(),'-24:00:00')") List listErrorLogsInOneHour(); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) void update(JSONObject notice); PageList listErrorLogs(JSONObject params, PageBounds pageBounds); diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/log/PlatformSettlementMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/log/PlatformSettlementMapper.java index 75120ceb8..f609a7fa1 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/log/PlatformSettlementMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/log/PlatformSettlementMapper.java @@ -1,8 +1,8 @@ package au.com.royalpay.payment.manage.mappers.log; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import com.github.miemiedev.mybatis.paginator.domain.PageBounds; import com.github.miemiedev.mybatis.paginator.domain.PageList; @@ -15,19 +15,19 @@ import java.util.List; @AutoMapper(tablename = "log_clearing_platform_analysis", pkName = "log_id") public interface PlatformSettlementMapper { - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject params); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) void update(JSONObject params); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) List findBySettleDate(@Param("settle_date") Date settle_date, @Param("channel") String channel); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject findByDateMerchant(@Param("settle_date") String settle_date, @Param("channel") String channel, @Param("merchants") String merchants); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) List findByDate(@Param("settle_date") String settle_date); PageList findSettleLogsAllMerchant(@Param("channel") String channel, PageBounds pageBounds); @@ -38,6 +38,6 @@ public interface PlatformSettlementMapper { BigDecimal calculateRmbCharge(@Param("start_date") String start_date, @Param("end_date") String end_date, @Param("channel") String channel,@Param("ali_rate") BigDecimal ali_rate); - @AutoSql(type = SqlType.DELETE) + @AutoSql(SqlType.DELETE) void delete(JSONObject params); } diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/log/PreSettleTaskMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/log/PreSettleTaskMapper.java index 228190034..1a74e031d 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/log/PreSettleTaskMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/log/PreSettleTaskMapper.java @@ -1,6 +1,6 @@ package au.com.royalpay.payment.manage.mappers.log; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; import org.apache.ibatis.annotations.Param; /** diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/log/StatisticsBDSalesReportMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/log/StatisticsBDSalesReportMapper.java index 8c268d83c..964228f5c 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/log/StatisticsBDSalesReportMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/log/StatisticsBDSalesReportMapper.java @@ -1,8 +1,8 @@ package au.com.royalpay.payment.manage.mappers.log; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import org.apache.ibatis.annotations.Param; @@ -15,7 +15,7 @@ import java.util.List; @AutoMapper(tablename = "statistics_bd_sales", pkName = "log_id") public interface StatisticsBDSalesReportMapper { - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject report); List getBDSaleList(JSONObject params); @@ -24,6 +24,6 @@ public interface StatisticsBDSalesReportMapper { JSONObject findByBDIdAndLogDate(@Param("org_id") String org_id,@Param("bd_id") String bd_id, @Param("log_date")Date beginTime,@Param("isOrg") int isOrg); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) void update(JSONObject existBDSalesReport); } diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/log/ValidationLogMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/log/ValidationLogMapper.java index ed936be28..ac05821b4 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/log/ValidationLogMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/log/ValidationLogMapper.java @@ -1,8 +1,8 @@ package au.com.royalpay.payment.manage.mappers.log; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.executor.keygen.Jdbc3KeyGenerator; @@ -16,7 +16,7 @@ import java.util.List; @AutoMapper(tablename = "log_order_validation", pkName = "valid_id", keyGenerator = Jdbc3KeyGenerator.class) public interface ValidationLogMapper { - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject valid); void removeByDate(@Param("valid_date") Date validDate); diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/log/WechatTemplateMsgSendLogMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/log/WechatTemplateMsgSendLogMapper.java index 3eee17562..f82f2940a 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/log/WechatTemplateMsgSendLogMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/log/WechatTemplateMsgSendLogMapper.java @@ -1,8 +1,8 @@ package au.com.royalpay.payment.manage.mappers.log; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import com.github.miemiedev.mybatis.paginator.domain.PageBounds; import org.apache.ibatis.annotations.Param; @@ -14,13 +14,13 @@ import java.util.List; */ @AutoMapper(tablename = "log_wechat_template_msg", pkName = "send_id") public interface WechatTemplateMsgSendLogMapper { - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject log); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) void updateStatus(@Param("send_id") String id, @Param("status") int status); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) void updateLog(@Param("send_id") String id, @Param("status") int status, @Param("remark") String remark); List listWechatMsg(JSONObject params, PageBounds pageBounds); diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/log/WeekReportMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/log/WeekReportMapper.java index 433265e6a..c4aa5bf38 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/log/WeekReportMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/log/WeekReportMapper.java @@ -1,8 +1,8 @@ package au.com.royalpay.payment.manage.mappers.log; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import org.apache.ibatis.annotations.Param; @@ -11,12 +11,12 @@ import org.apache.ibatis.annotations.Param; */ @AutoMapper(tablename = "log_week_report", pkName = "report_id") public interface WeekReportMapper { - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject report); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject findOne(@Param("report_id") String reportId); - @AutoSql(type = SqlType.DELETE) + @AutoSql(SqlType.DELETE) void delete(@Param("report_id") String reportId); } diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/notice/ActPartnerReadMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/notice/ActPartnerReadMapper.java index d03ea973d..d9b98c6e1 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/notice/ActPartnerReadMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/notice/ActPartnerReadMapper.java @@ -1,8 +1,8 @@ package au.com.royalpay.payment.manage.mappers.notice; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import org.apache.ibatis.annotations.Param; @@ -12,12 +12,12 @@ import org.apache.ibatis.annotations.Param; */ @AutoMapper(tablename = "sys_act_client_display", pkName = "display_client_id") public interface ActPartnerReadMapper { - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject displayInfo); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) void update(JSONObject displayInfo); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject displayInfo(@Param("act_id") String actId, @Param("client_id") int clientId, @Param("account_id") String accountId); } diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/notice/NoticeManageMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/notice/NoticeManageMapper.java index bc32c666e..fca7bee4d 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/notice/NoticeManageMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/notice/NoticeManageMapper.java @@ -8,22 +8,22 @@ import com.alibaba.fastjson.JSONObject; import com.github.miemiedev.mybatis.paginator.domain.PageBounds; import com.github.miemiedev.mybatis.paginator.domain.PageList; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; /** * Created by yishuqian on 10/10/2016. */ @AutoMapper(tablename = "sys_notice", pkName = "notice_id") public interface NoticeManageMapper { - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) PageList listPageNotices(JSONObject params, PageBounds pagination); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject getNoticeDetailById(String noticeId); - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void createNotice(JSONObject notice); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) void updateNotice(JSONObject notice); JSONObject getLatestWindowNotice(@Param("client_id") int client_id,@Param("end_time")Date end_time); diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/notice/NoticePartnerMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/notice/NoticePartnerMapper.java index 9ac1e6185..cc2086c86 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/notice/NoticePartnerMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/notice/NoticePartnerMapper.java @@ -1,8 +1,8 @@ package au.com.royalpay.payment.manage.mappers.notice; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import com.github.miemiedev.mybatis.paginator.domain.PageBounds; import com.github.miemiedev.mybatis.paginator.domain.PageList; @@ -15,21 +15,21 @@ import java.util.List; */ @AutoMapper(tablename = "sys_notice_client", pkName = "notice_client_id") public interface NoticePartnerMapper{ - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject noticePartner); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) void update(JSONObject noticePartner); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) List listNoticePartner(JSONObject noticePartner); PageList listNoticesByClientId(JSONObject params, PageBounds pagination); - @AutoSql(type = SqlType.COUNT) + @AutoSql(SqlType.COUNT) int countNoticePartner(JSONObject params); - @AutoSql(type = SqlType.COUNT) + @AutoSql(SqlType.COUNT) int countClientsByNoticeId(JSONObject params); PageList listClientsByNoticeId(JSONObject params, PageBounds pagination); diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/ofei/TopUpOrderMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/ofei/TopUpOrderMapper.java index 3077394ac..6f843c8f6 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/ofei/TopUpOrderMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/ofei/TopUpOrderMapper.java @@ -8,22 +8,22 @@ import com.alibaba.fastjson.JSONObject; import com.github.miemiedev.mybatis.paginator.domain.PageBounds; import com.github.miemiedev.mybatis.paginator.domain.PageList; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; /** * Created by yixian on 2016-06-25. */ @AutoMapper(tablename = "top_up_order", pkName = "id") public interface TopUpOrderMapper { - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject order); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) void update(JSONObject order); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject findById(@Param("id") String id); List findOrderIdByStatus(@Param("status") String status); diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/payment/AustracDataMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/payment/AustracDataMapper.java index 57a2d42c5..22119c490 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/payment/AustracDataMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/payment/AustracDataMapper.java @@ -1,8 +1,8 @@ package au.com.royalpay.payment.manage.mappers.payment; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import org.apache.ibatis.annotations.Param; @@ -15,15 +15,15 @@ import java.util.List; */ @AutoMapper(tablename = "austrac_data", pkName = "id") public interface AustracDataMapper { - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) List getTransactionTotal(JSONObject params); - @AutoSql(type = SqlType.DELETE) + @AutoSql(SqlType.DELETE) void delete(@Param("client_id") int client_id, @Param("clearing_time") Date clearing_time); BigDecimal getClientLastTransactionTotal(@Param("client_id") int client_id, @Param("clearing_time") Date clearing_time); - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject data); List getAustracData(JSONObject params); diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/payment/CommonSubMerchantIdMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/payment/CommonSubMerchantIdMapper.java index b21d68e15..3d541898b 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/payment/CommonSubMerchantIdMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/payment/CommonSubMerchantIdMapper.java @@ -1,32 +1,32 @@ package au.com.royalpay.payment.manage.mappers.payment; -import cn.yixblog.support.mybatis.autosql.annotations.AdvanceSelect; +import com.yixsoft.support.mybatis.autosql.annotations.AdvanceSelect; import org.apache.ibatis.annotations.Param; import com.alibaba.fastjson.JSONObject; import com.github.miemiedev.mybatis.paginator.domain.PageBounds; import com.github.miemiedev.mybatis.paginator.domain.PageList; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; /** * Create by yixian at 2017-12-05 23:13 */ @AutoMapper(tablename = "pmt_sub_merchant_id", pkName = "sub_merchant_id") public interface CommonSubMerchantIdMapper { - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) PageList list(@Param("is_valid") boolean is_valid, @Param("sub_merchant_id") String sub_merchant_id,PageBounds pageBounds); - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject record); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) void update(JSONObject record); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) @AdvanceSelect(addonWhereClause = "is_valid = 1") JSONObject find(@Param("sub_merchant_id") String subMerchantId); } diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.java index 57d95ccaf..90d33bf7f 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.java @@ -1,9 +1,9 @@ package au.com.royalpay.payment.manage.mappers.payment; -import cn.yixblog.support.mybatis.autosql.annotations.AdvanceSelect; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AdvanceSelect; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import com.github.miemiedev.mybatis.paginator.domain.PageBounds; import com.github.miemiedev.mybatis.paginator.domain.PageList; @@ -16,16 +16,16 @@ import java.util.List; */ @AutoMapper(tablename = "pmt_orders", pkName = "order_id") public interface OrderMapper { - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject order); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) void update(JSONObject order); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject find(@Param("order_id") String orderId); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) List listOrdersByMerchantOrderId(@Param("client_id") int clientId, @Param("client_order_id") String clientOrderId, PageBounds pagination); PageList listOrders(JSONObject params, PageBounds pagination); @@ -42,14 +42,14 @@ public interface OrderMapper { JSONObject getOrderDetail(@Param("order_id") String orderId); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) PageList list(JSONObject params, PageBounds pagination); void updateRefundAmount(@Param("order_id") String orderId); List listOrdersWithNoTransactions(); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) void setOrderErrorInfo(@Param("order_id") String orderId, @Param("error_code") String errCode, @Param("error_message") String errMsg); void updateOrderCreationError(@Param("order_id") String orderId, @Param("status") int status, @Param("error_code") String errorCode, @Param("error_message") String errorMessage); @@ -70,7 +70,7 @@ public interface OrderMapper { List listHalloweenActOrder(JSONObject param); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) @AdvanceSelect(addonWhereClause = "status in (5,6,7) AND channel in('Wechat','Alipay')") List listNewYearOrdersByOpenId(@Param("customer_id") String open_id,@Param("transaction_date") String date); diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/payment/PaySuccessCountMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/payment/PaySuccessCountMapper.java index ac0b29330..3cb89c838 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/payment/PaySuccessCountMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/payment/PaySuccessCountMapper.java @@ -1,9 +1,9 @@ package au.com.royalpay.payment.manage.mappers.payment; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import org.apache.ibatis.annotations.Param; @@ -16,6 +16,6 @@ import java.util.List; @AutoMapper(tablename = "paysuccess_count", pkName = "id") public interface PaySuccessCountMapper { - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) List findCount(@Param("in_time") String time); } diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/payment/RefundAuditionMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/payment/RefundAuditionMapper.java index a86b144f3..8eb16a101 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/payment/RefundAuditionMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/payment/RefundAuditionMapper.java @@ -1,9 +1,9 @@ package au.com.royalpay.payment.manage.mappers.payment; -import cn.yixblog.support.mybatis.autosql.annotations.AdvanceSelect; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AdvanceSelect; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import org.apache.ibatis.annotations.Param; @@ -14,17 +14,17 @@ import java.util.List; */ @AutoMapper(tablename = "pmt_refund_applies", pkName = "id") public interface RefundAuditionMapper { - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject apply); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) void update(JSONObject apply); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) @AdvanceSelect(addonWhereClause = "audit_result is null") List listAuditingRefundsOfOrder(@Param("order_id") String orderId); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject find(@Param("id") String refundAuditId); List listAuditingRefundsOfClient(@Param("client_id") int clientId); diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/payment/RefundMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/payment/RefundMapper.java index 64ff2ecd8..6284d9064 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/payment/RefundMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/payment/RefundMapper.java @@ -10,42 +10,42 @@ import com.alibaba.fastjson.JSONObject; import com.github.miemiedev.mybatis.paginator.domain.PageBounds; import com.github.miemiedev.mybatis.paginator.domain.PageList; -import cn.yixblog.support.mybatis.autosql.annotations.AdvanceSelect; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AdvanceSelect; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; /** * Created by yixian on 2016-06-25. */ @AutoMapper(tablename = "pmt_refunds", pkName = "refund_id") public interface RefundMapper { - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject refundOrder); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) void update(JSONObject refundOrder); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject find(@Param("refund_id") String refundOrderId); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject findByClientRefundId(@Param("client_refund_id") String clientRefundId); List listOrderRefunds(@Param("order_id") String orderId, PageBounds pagination); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) @AdvanceSelect(addonWhereClause = "status=2") List listUnConfirmedRefunds(); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) @AdvanceSelect(addonWhereClause = "status=4 and confirm_time is not null") List listConfirmedRefunds(); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject findByOutRefundId(@Param("out_refund_id") String outRefundNo); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) @AdvanceSelect(addonWhereClause = "status=4 and confirm_time is not null and refund_id not in (select refund_id from pmt_transactions where refund_id is not null)") List listConfirmedRefundsWithNoTransactions(); diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/payment/RefundReviewMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/payment/RefundReviewMapper.java index ef133fc12..fef322cab 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/payment/RefundReviewMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/payment/RefundReviewMapper.java @@ -1,9 +1,9 @@ package au.com.royalpay.payment.manage.mappers.payment; -import cn.yixblog.support.mybatis.autosql.annotations.AdvanceSelect; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AdvanceSelect; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import com.github.miemiedev.mybatis.paginator.domain.PageBounds; import com.github.miemiedev.mybatis.paginator.domain.PageList; @@ -15,19 +15,19 @@ import org.apache.ibatis.annotations.Param; @AutoMapper(tablename = "pmt_refunds_review", pkName = "review_id") public interface RefundReviewMapper { - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject review); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) @AdvanceSelect(addonWhereClause = "status=0 and is_valid=1") JSONObject findUnResolveByOrderId(@Param("order_id") String orderId); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) @AdvanceSelect(addonWhereClause = "status=0 and is_valid=1") JSONObject findUnResolveByReviewId(@Param("review_id") String reviewId); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject findByReviewId(@Param("review_id") String reviewId); PageList listNeedReviewOrders(JSONObject reviewBean, PageBounds page); diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/payment/TaskManualSettleMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/payment/TaskManualSettleMapper.java index 5116e391d..3cd6dd169 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/payment/TaskManualSettleMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/payment/TaskManualSettleMapper.java @@ -1,9 +1,9 @@ package au.com.royalpay.payment.manage.mappers.payment; -import cn.yixblog.support.mybatis.autosql.annotations.AdvanceSelect; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AdvanceSelect; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import org.apache.ibatis.annotations.Param; @@ -15,18 +15,18 @@ import java.util.List; @AutoMapper(tablename = "task_client_manual_settle", pkName = "task_id") public interface TaskManualSettleMapper { - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) @AdvanceSelect(addonWhereClause = "request_time>curdate()") JSONObject findTodayTask(@Param("client_id") int clientId); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) @AdvanceSelect(addonWhereClause = "clearing_order is null or disable_flag=1") List listActiveTasks(@Param("client_id") int clientId); - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject task); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) void update(JSONObject task); List getEveryLatestRecord(); diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.java index 9ba8b8f93..9f1b89813 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.java @@ -1,10 +1,10 @@ package au.com.royalpay.payment.manage.mappers.payment; -import cn.yixblog.support.mybatis.autosql.annotations.AdvanceSelect; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; -import cn.yixblog.support.mybatis.paginator.annotations.CountRef; +import com.yixsoft.support.mybatis.autosql.annotations.AdvanceSelect; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.paginator.annotations.CountRef; import com.alibaba.fastjson.JSONObject; import com.github.miemiedev.mybatis.paginator.domain.PageBounds; import com.github.miemiedev.mybatis.paginator.domain.PageList; @@ -20,7 +20,7 @@ import java.util.List; */ @AutoMapper(tablename = "pmt_transactions", pkName = "transaction_id", keyGenerator = Jdbc3KeyGenerator.class) public interface TransactionMapper { - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject transaction); @CountRef(".countTransFlowPage") @@ -34,11 +34,11 @@ public interface TransactionMapper { Double analysisBalance(JSONObject params); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) @AdvanceSelect(addonWhereClause = "transaction_type = 'Credit'") JSONObject findByOrderId(@Param("order_id") String orderId); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) void update(JSONObject transaction); JSONObject findLastIncome(); @@ -104,7 +104,7 @@ public interface TransactionMapper { BigDecimal checkBalance(@Param("end") Date endDate); - @AutoSql(type = SqlType.COUNT) + @AutoSql(SqlType.COUNT) @AdvanceSelect(addonWhereClause = "transaction_type='Credit'") int countOrders(@Param("client_id") int clientId); @@ -112,7 +112,7 @@ public interface TransactionMapper { JSONObject analysisRetailDailyReport(@Param("from") Date from, @Param("to") Date to, @Param("dev_id") String devId, @Param("client_id") int clientId, @Param("client_ids") String[] client_ids); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) @AdvanceSelect(addonWhereClause = "system_generate=1") List findTransactionsBySysGen(@Param("order_id") String orderId); @@ -141,7 +141,7 @@ public interface TransactionMapper { * @param systemTransactionId * @return */ - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) PageList findByClientIdAndSystemTransactionId(@Param("client_id") int clientId, @Param("system_transaction_id") String systemTransactionId, PageBounds pageBounds); diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/preapply/PreApplyHandleLogMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/preapply/PreApplyHandleLogMapper.java index 5902e73e2..b202aa03e 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/preapply/PreApplyHandleLogMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/preapply/PreApplyHandleLogMapper.java @@ -1,8 +1,8 @@ package au.com.royalpay.payment.manage.mappers.preapply; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import com.github.miemiedev.mybatis.paginator.domain.PageBounds; import com.github.miemiedev.mybatis.paginator.domain.PageList; @@ -12,12 +12,12 @@ import java.util.List; @AutoMapper(tablename = "pre_apply_handle_log", pkName = "id") public interface PreApplyHandleLogMapper { - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) void update(JSONObject data); - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject data); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) PageList listHandleLogs(JSONObject params, PageBounds pagination); } diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/preapply/SysClientPreMapperMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/preapply/SysClientPreMapperMapper.java index cf7f8a7d0..b915db7a3 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/preapply/SysClientPreMapperMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/preapply/SysClientPreMapperMapper.java @@ -8,27 +8,27 @@ import org.apache.ibatis.annotations.Param; import java.util.List; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import org.apache.ibatis.executor.keygen.Jdbc3KeyGenerator; @AutoMapper(tablename = "sys_client_pre_apply", pkName = "client_pre_apply_id",keyGenerator = Jdbc3KeyGenerator.class) public interface SysClientPreMapperMapper { - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) void update(JSONObject data); - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject data); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject findByUserName(@Param("username") String username); List query(JSONObject param); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) PageList listApplies(JSONObject params, PageBounds pagination); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject findOneByClientPreApplyId(@Param("client_pre_apply_id")String client_pre_apply_id); } diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/redpack/ActBlackListMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/redpack/ActBlackListMapper.java index bc0af37d2..145b67830 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/redpack/ActBlackListMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/redpack/ActBlackListMapper.java @@ -1,8 +1,8 @@ package au.com.royalpay.payment.manage.mappers.redpack; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import org.apache.ibatis.annotations.Param; @@ -13,19 +13,19 @@ import java.util.List; */ @AutoMapper(tablename = "act_black_list", pkName = {"act_id", "client_id"}) public interface ActBlackListMapper { - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject blackObj); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) List list(JSONObject params); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) List listByActId(@Param("act_id") String act_id); - @AutoSql(type = SqlType.DELETE) + @AutoSql(SqlType.DELETE) void delete(@Param("act_id") String act_id, @Param("client_id") int client_id); - @AutoSql(type = SqlType.DELETE) + @AutoSql(SqlType.DELETE) void delete(@Param("act_id") String act_id); } diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/redpack/ActClientApplyMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/redpack/ActClientApplyMapper.java index 376541861..3e8799d01 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/redpack/ActClientApplyMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/redpack/ActClientApplyMapper.java @@ -1,8 +1,8 @@ package au.com.royalpay.payment.manage.mappers.redpack; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import org.apache.ibatis.annotations.Param; @@ -13,20 +13,20 @@ import java.util.List; */ @AutoMapper(tablename = "act_client_apply", pkName = "id") public interface ActClientApplyMapper { - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject apply); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject findActivity(@Param("act_id") String actId, @Param("client_id") int clientId); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) void update(JSONObject apply); List listAttendClients(@Param("act_id") String actId); List search(@Param("clientMoniker") String clientMoniker); - @AutoSql(type = SqlType.DELETE) + @AutoSql(SqlType.DELETE) void remove(@Param("act_id") String actId, @Param("client_id") int clientId); } diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/redpack/ActClientInvitationCodeMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/redpack/ActClientInvitationCodeMapper.java index 9d9d40a68..7e120e6ac 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/redpack/ActClientInvitationCodeMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/redpack/ActClientInvitationCodeMapper.java @@ -1,8 +1,8 @@ package au.com.royalpay.payment.manage.mappers.redpack; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import org.apache.ibatis.annotations.Param; @@ -13,22 +13,22 @@ import java.util.List; */ @AutoMapper(tablename = "act_client_invitation_code", pkName = {"act_id", "client_moniker"}) public interface ActClientInvitationCodeMapper { - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject jsonObject); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject getInvitationCode(@Param("act_id") String act_id, @Param("client_moniker") String client_moniker); - @AutoSql(type = SqlType.DELETE) + @AutoSql(SqlType.DELETE) void deleteInvitaionCode(@Param("act_id") String act_id); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) void changeClientInvitationCode(JSONObject data); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) List getInvitationCodes(@Param("act_id") String act_id); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject getInvitationClient(@Param("act_id") String act_id, @Param("client_id") int client_id); } diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/redpack/ActPartnerLMLogMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/redpack/ActPartnerLMLogMapper.java index 9ccac54e3..0876a0027 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/redpack/ActPartnerLMLogMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/redpack/ActPartnerLMLogMapper.java @@ -1,8 +1,8 @@ package au.com.royalpay.payment.manage.mappers.redpack; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import com.github.miemiedev.mybatis.paginator.domain.PageBounds; import com.github.miemiedev.mybatis.paginator.domain.PageList; @@ -17,13 +17,13 @@ import java.util.List; */ @AutoMapper(tablename = "act_red_packets_orders", pkName = "red_packet_order_id") public interface ActPartnerLMLogMapper { - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void saveLog(JSONObject sendLog); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) int update(JSONObject lucky_money); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) PageList listSendLogs(JSONObject params, PageBounds pageBounds); List sendList(JSONObject params); @@ -36,7 +36,7 @@ public interface ActPartnerLMLogMapper { List listUnsendRedpacks(); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject findOne(@Param("red_packet_id") String red_packet_id); JSONObject analysisLuckyMoney(JSONObject params); @@ -44,7 +44,7 @@ public interface ActPartnerLMLogMapper { int lockPrize(@Param("act_id") String act_id, @Param("lock_key") String lock, @Param("red_pack_type_id") String prizeType, @Param("open_id") String open_id, @Param("client_id") int client_id, @Param("order_id") String order_id, @Param("order_amount") Double order_amount, @Param("event_time") Date date); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject findLockedPrize(@Param("lock_key") String lock, @Param("open_id") String openid); void clearUnsendRedpacks(@Param("act_id") String actId, @Param("red_pack_type_id") String typeId); diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/redpack/ActPartnerLMMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/redpack/ActPartnerLMMapper.java index a72b10e36..13feeb55e 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/redpack/ActPartnerLMMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/redpack/ActPartnerLMMapper.java @@ -1,8 +1,8 @@ package au.com.royalpay.payment.manage.mappers.redpack; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import com.github.miemiedev.mybatis.paginator.domain.PageBounds; import com.github.miemiedev.mybatis.paginator.domain.PageList; @@ -15,20 +15,20 @@ import java.util.List; */ @AutoMapper(tablename = "act_red_packets", pkName = "act_id") public interface ActPartnerLMMapper { - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject act); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject findOne(@Param("act_id") String act_id); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) void update(JSONObject act); void closePartnerActivities(); PageList listActivities(JSONObject params, PageBounds pageBounds); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) List actList(JSONObject params); List listActivitiesNoPage(); diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/redpack/ActPartnerWechatRelationMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/redpack/ActPartnerWechatRelationMapper.java index 8dfc2e71a..f29ce77be 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/redpack/ActPartnerWechatRelationMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/redpack/ActPartnerWechatRelationMapper.java @@ -6,25 +6,25 @@ import com.github.miemiedev.mybatis.paginator.domain.PageList; import java.util.List; -import cn.yixblog.support.mybatis.autosql.annotations.AdvanceSelect; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AdvanceSelect; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; /** * Created by yishuqian on 08/12/2016. */ @AutoMapper(tablename = "act_red_packets_wechat",pkName = "relation_id") public interface ActPartnerWechatRelationMapper { - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject relation); //@Param("act_id") String act_id,@Param("client_id") int client_id,@Param("wechat_openid") String wechat_openid void deleteBindWehcat(JSONObject update); -// @AutoSql(type = SqlType.SELECT) +// @AutoSql(SqlType.SELECT) // List relationList(@Param("act_id") String act_id,@Param("client_id") int client_id,@Param("channel") String channel); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) @AdvanceSelect(addonWhereClause = "is_valid=1") List relationList(JSONObject rel); diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/redpack/ActPrizeTypeCustomerMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/redpack/ActPrizeTypeCustomerMapper.java index afec5bd73..b522434b5 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/redpack/ActPrizeTypeCustomerMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/redpack/ActPrizeTypeCustomerMapper.java @@ -1,8 +1,8 @@ package au.com.royalpay.payment.manage.mappers.redpack; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import org.apache.ibatis.annotations.Param; @@ -13,7 +13,7 @@ import java.util.List; */ @AutoMapper(tablename = "act_prize_type_customer", pkName = "type_id") public interface ActPrizeTypeCustomerMapper { - @AutoSql(type= SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) void update(JSONObject prize_type); List listAvailableTypes(@Param("act_id") String act_id); diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/redpack/ActPrizeTypeMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/redpack/ActPrizeTypeMapper.java index bc94cf0ae..cbae57fbd 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/redpack/ActPrizeTypeMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/redpack/ActPrizeTypeMapper.java @@ -1,9 +1,9 @@ package au.com.royalpay.payment.manage.mappers.redpack; -import cn.yixblog.support.mybatis.autosql.annotations.AdvanceSelect; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AdvanceSelect; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import com.github.miemiedev.mybatis.paginator.domain.PageBounds; import org.apache.ibatis.annotations.Param; @@ -16,12 +16,12 @@ import java.util.List; */ @AutoMapper(tablename = "act_prize_type", pkName = "type_id") public interface ActPrizeTypeMapper { - @AutoSql(type= SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) void update(JSONObject prize_type); List listAvailableTypes(@Param("rate") BigDecimal rate, @Param("act_id") String act_id); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) @AdvanceSelect(addonWhereClause = "is_valid=1") List listPrizeTypes(@Param("act_id") String act_id, PageBounds pageBounds); } diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/redpack/ActRedPacketsCustomerMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/redpack/ActRedPacketsCustomerMapper.java index 0900812d2..d0e1ceb1f 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/redpack/ActRedPacketsCustomerMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/redpack/ActRedPacketsCustomerMapper.java @@ -1,9 +1,9 @@ package au.com.royalpay.payment.manage.mappers.redpack; -import cn.yixblog.support.mybatis.autosql.annotations.AdvanceSelect; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AdvanceSelect; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import com.github.miemiedev.mybatis.paginator.domain.PageBounds; import com.github.miemiedev.mybatis.paginator.domain.PageList; @@ -16,23 +16,23 @@ import java.util.List; */ @AutoMapper(tablename = "act_red_packets_customer", pkName = "act_id") public interface ActRedPacketsCustomerMapper { - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject act); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject findOne(@Param("act_id") String act_id); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) void update(JSONObject act); PageList listActivities(JSONObject params, PageBounds pageBounds); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) List actList(JSONObject params); void closePartnerActivities(); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) @AdvanceSelect(addonWhereClause = "start_time<=curdate() and end_time>=curdate() and status=1") List findCurrentActivity(); diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/redpack/ActRedPacketsCustomerOrdersMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/redpack/ActRedPacketsCustomerOrdersMapper.java index 631a78ca6..81361a2e6 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/redpack/ActRedPacketsCustomerOrdersMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/redpack/ActRedPacketsCustomerOrdersMapper.java @@ -1,8 +1,8 @@ package au.com.royalpay.payment.manage.mappers.redpack; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import com.github.miemiedev.mybatis.paginator.domain.PageBounds; import com.github.miemiedev.mybatis.paginator.domain.PageList; @@ -17,28 +17,28 @@ import java.util.List; */ @AutoMapper(tablename = "act_red_packets_customer_orders", pkName = "red_packet_customer_order_id") public interface ActRedPacketsCustomerOrdersMapper { - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void saveLog(JSONObject sendLog); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) int update(JSONObject lucky_money); int count(JSONObject params); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject findOne(@Param("red_packet_id") String red_packet_id); int lockPrize(@Param("act_id") String act_id, @Param("lock_key") String lock, @Param("red_pack_type_id") String prizeType, @Param("open_id") String open_id, @Param("client_id") int client_id, @Param("order_id") String order_id, @Param("order_amount") BigDecimal order_amount, @Param("event_time") Date date); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject findLockedPrize(@Param("lock_key") String lock, @Param("open_id") String openid); int getRedPacketsByOpenid(@Param("open_id") String openid, @Param("event_date") Date date, @Param("act_id") String actId); void clearUnsendRedpacks(@Param("act_id") String actId, @Param("red_pack_type_id") String typeId); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject findByRedpackOrderId(@Param("red_packet_customer_order_id") String redpackOrderId); PageList listOrders(JSONObject jsonObject, PageBounds pageBounds); diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/redpack/RedPackConfigMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/redpack/RedPackConfigMapper.java index be870542a..a5593a6c8 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/redpack/RedPackConfigMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/redpack/RedPackConfigMapper.java @@ -1,8 +1,8 @@ package au.com.royalpay.payment.manage.mappers.redpack; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import org.apache.ibatis.annotations.Param; @@ -11,15 +11,15 @@ import org.apache.ibatis.annotations.Param; */ @AutoMapper(tablename = "cli_config_redpack", pkName = "client_id") public interface RedPackConfigMapper { - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void saveConfig(JSONObject redpackConfig); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) void updateConfig(JSONObject config); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject findRedpackConfig(@Param("client_id") int clientId); - @AutoSql(type = SqlType.DELETE) + @AutoSql(SqlType.DELETE) void removeConfig(@Param("client_id") int clientId); } diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/redpack/RedPackLogMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/redpack/RedPackLogMapper.java index 9269a0ba0..8c3c543ff 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/redpack/RedPackLogMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/redpack/RedPackLogMapper.java @@ -1,8 +1,8 @@ package au.com.royalpay.payment.manage.mappers.redpack; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import com.github.miemiedev.mybatis.paginator.domain.PageBounds; import com.github.miemiedev.mybatis.paginator.domain.PageList; @@ -13,16 +13,16 @@ import org.apache.ibatis.annotations.Param; */ @AutoMapper(tablename = "log_redpack_send", pkName = "redpack_id") public interface RedPackLogMapper { - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void saveLog(JSONObject redpackLog); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) void updateLog(JSONObject redpackLog); int countSendedToUser(@Param("client_id") int clientId, @Param("open_id") String openId); PageList sendLogs(JSONObject params, PageBounds pagination); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject find(@Param("redpack_id") String redpackId); } diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/risk/RiskAttentionMerchantsMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/risk/RiskAttentionMerchantsMapper.java index 62b3f0ed7..6fd522160 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/risk/RiskAttentionMerchantsMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/risk/RiskAttentionMerchantsMapper.java @@ -1,9 +1,9 @@ package au.com.royalpay.payment.manage.mappers.risk; -import cn.yixblog.support.mybatis.autosql.annotations.AdvanceSelect; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AdvanceSelect; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import com.github.miemiedev.mybatis.paginator.domain.PageBounds; import com.github.miemiedev.mybatis.paginator.domain.PageList; @@ -17,19 +17,19 @@ import java.util.List; */ @AutoMapper(tablename = "risk_attention_merchants", pkName = "client_id") public interface RiskAttentionMerchantsMapper { - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) void update(JSONObject client); - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject client); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject findById(@Param("id") String id); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject findByClientMoniker(@Param("client_moniker") String clientMoniker); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) @AdvanceSelect(addonWhereClause = "is_valid=1") PageList query(JSONObject params, PageBounds pagination); diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/risk/RiskCustomerBlackListMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/risk/RiskCustomerBlackListMapper.java index 042aa2a3d..fe229d161 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/risk/RiskCustomerBlackListMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/risk/RiskCustomerBlackListMapper.java @@ -1,9 +1,9 @@ package au.com.royalpay.payment.manage.mappers.risk; -import cn.yixblog.support.mybatis.autosql.annotations.AdvanceSelect; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AdvanceSelect; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import com.github.miemiedev.mybatis.paginator.domain.PageBounds; import com.github.miemiedev.mybatis.paginator.domain.PageList; @@ -14,16 +14,16 @@ import org.apache.ibatis.annotations.Param; */ @AutoMapper(tablename = "risk_customer_black_list", pkName = "openid") public interface RiskCustomerBlackListMapper { - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject findByOpenid(@Param("openid") String openid); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) @AdvanceSelect(addonWhereClause = "is_valid=1") PageList query(JSONObject params, PageBounds pagination); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) void update(JSONObject customerBlackList); - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject customerBlackList); } \ No newline at end of file diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/risk/RiskMerchantDetailLogMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/risk/RiskMerchantDetailLogMapper.java index 4c0db3b16..ad1b5a808 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/risk/RiskMerchantDetailLogMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/risk/RiskMerchantDetailLogMapper.java @@ -4,19 +4,19 @@ import com.alibaba.fastjson.JSONObject; import com.github.miemiedev.mybatis.paginator.domain.PageBounds; import com.github.miemiedev.mybatis.paginator.domain.PageList; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; /** * Create by yixian at 2017-12-21 11:45 */ @AutoMapper(tablename = "risk_merchant_detail_log", pkName = "id") public interface RiskMerchantDetailLogMapper { - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject record); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) void update(JSONObject record); PageList query(JSONObject params, PageBounds pagination); diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/risk/RiskMerchantRecordMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/risk/RiskMerchantRecordMapper.java index 0aa2f7465..b8b856055 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/risk/RiskMerchantRecordMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/risk/RiskMerchantRecordMapper.java @@ -6,19 +6,19 @@ import com.alibaba.fastjson.JSONObject; import com.github.miemiedev.mybatis.paginator.domain.PageBounds; import com.github.miemiedev.mybatis.paginator.domain.PageList; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; /** * Create by yixian at 2017-12-21 11:45 */ @AutoMapper(tablename = "risk_merchant_record", pkName = "id") public interface RiskMerchantRecordMapper { - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) void update(JSONObject record); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject findById(@Param("id") String id); PageList query(JSONObject params, PageBounds pagination); diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/risk/RiskTransactionLogMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/risk/RiskTransactionLogMapper.java index c3b4cbc41..a4b924623 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/risk/RiskTransactionLogMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/risk/RiskTransactionLogMapper.java @@ -8,19 +8,19 @@ import org.apache.ibatis.annotations.Param; import java.util.List; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; /** * Create by yixian at 2017-12-21 11:45 */ @AutoMapper(tablename = "risk_transaction_log", pkName = "id") public interface RiskTransactionLogMapper { - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject findByOrderId(@Param("order_id") String order_id); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) List findByRecordId(@Param("record_id") String record_id); PageList query(JSONObject params, PageBounds pagination); diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/risk/RiskWhiteListMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/risk/RiskWhiteListMapper.java index 20b8a13bb..31491e358 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/risk/RiskWhiteListMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/risk/RiskWhiteListMapper.java @@ -4,22 +4,22 @@ import com.alibaba.fastjson.JSONObject; import org.apache.ibatis.annotations.Param; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; /** * Create by yixian at 2017-12-21 11:45 */ @AutoMapper(tablename = "risk_white_list", pkName = "client_id") public interface RiskWhiteListMapper { - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject findByClientMoniker(@Param("client_moniker") String client_moniker); - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject record); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) void update(JSONObject record); diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/riskbusiness/RiskEventMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/riskbusiness/RiskEventMapper.java index 3cfed3757..bbbb37213 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/riskbusiness/RiskEventMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/riskbusiness/RiskEventMapper.java @@ -1,8 +1,8 @@ package au.com.royalpay.payment.manage.mappers.riskbusiness; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import com.github.miemiedev.mybatis.paginator.domain.PageBounds; import com.github.miemiedev.mybatis.paginator.domain.PageList; @@ -17,13 +17,13 @@ import java.util.List; @AutoMapper(tablename = "risk_event", pkName = "risk_id") public interface RiskEventMapper { - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject riskEvent); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) void update(JSONObject riskEvent); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) List findAll(JSONObject params); PageList listRisksByPage(JSONObject params, PageBounds pageBounds); @@ -32,10 +32,10 @@ public interface RiskEventMapper { List analysisByAmount(JSONObject params); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject findById(@Param("risk_id") String riskId); - @AutoSql(type = SqlType.DELETE) + @AutoSql(SqlType.DELETE) void deleteRiskEvent(@Param("risk_id") String risk_id); } diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/riskbusiness/RiskFileMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/riskbusiness/RiskFileMapper.java index 6120db3cd..4857032f8 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/riskbusiness/RiskFileMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/riskbusiness/RiskFileMapper.java @@ -1,8 +1,8 @@ package au.com.royalpay.payment.manage.mappers.riskbusiness; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import org.apache.ibatis.annotations.Param; @@ -10,9 +10,9 @@ import java.util.List; @AutoMapper(tablename = "risk_file", pkName = "file_id") public interface RiskFileMapper { - @AutoSql(type= SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject file); - @AutoSql(type= SqlType.SELECT) + @AutoSql(SqlType.SELECT) List findAllFiles(@Param("material_id") String material_id); } diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/riskbusiness/RiskMaterialMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/riskbusiness/RiskMaterialMapper.java index ae34f0e95..1a09a7162 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/riskbusiness/RiskMaterialMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/riskbusiness/RiskMaterialMapper.java @@ -1,9 +1,9 @@ package au.com.royalpay.payment.manage.mappers.riskbusiness; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import org.apache.ibatis.annotations.Param; @@ -12,10 +12,10 @@ import java.util.List; @AutoMapper(tablename = "risk_material", pkName = "material_id") public interface RiskMaterialMapper { - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject material); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) void update(JSONObject material); List findAllMaterials(@Param("risk_id") String risk_id); diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/riskbusiness/RiskOrdersMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/riskbusiness/RiskOrdersMapper.java index ddf743854..a2df10652 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/riskbusiness/RiskOrdersMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/riskbusiness/RiskOrdersMapper.java @@ -1,16 +1,16 @@ package au.com.royalpay.payment.manage.mappers.riskbusiness; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import org.apache.ibatis.annotations.Param; @AutoMapper(tablename = "risk_orders", pkName = "risk_order_id") public interface RiskOrdersMapper { - @AutoSql(type= SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject params); - @AutoSql(type = SqlType.DELETE) + @AutoSql(SqlType.DELETE) void clearOrders(@Param("risk_id") String riskId); } diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/riskbusiness/RiskProcessLogMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/riskbusiness/RiskProcessLogMapper.java index aeaf6848d..adb195df6 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/riskbusiness/RiskProcessLogMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/riskbusiness/RiskProcessLogMapper.java @@ -1,8 +1,8 @@ package au.com.royalpay.payment.manage.mappers.riskbusiness; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import com.github.miemiedev.mybatis.paginator.domain.PageBounds; import com.github.miemiedev.mybatis.paginator.domain.PageList; @@ -16,9 +16,9 @@ import org.apache.ibatis.annotations.Param; @AutoMapper(tablename = "risk_process_log", pkName = "risk_process_id") public interface RiskProcessLogMapper { - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) PageList getRiskProcessLogs(@Param("risk_id") String riskId, PageBounds pagination); - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void addRiskProcessLog(JSONObject log); } diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/BusinessMemberMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/BusinessMemberMapper.java index f1e287e71..9c99f62a4 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/system/BusinessMemberMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/BusinessMemberMapper.java @@ -1,8 +1,8 @@ package au.com.royalpay.payment.manage.mappers.system; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import org.apache.ibatis.annotations.Param; @@ -11,14 +11,14 @@ import org.apache.ibatis.annotations.Param; */ @AutoMapper(tablename = "sys_membership_business", pkName = "member_id") public interface BusinessMemberMapper { - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject findOne(@Param("member_id") String memberId); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject findByRelationId(@Param("relation_id") int relationId); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) void update(JSONObject member); - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject member); } diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/CityPartnerRegisterMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/CityPartnerRegisterMapper.java index 5a2281bf1..682235e2e 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/system/CityPartnerRegisterMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/CityPartnerRegisterMapper.java @@ -1,8 +1,8 @@ package au.com.royalpay.payment.manage.mappers.system; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import com.github.miemiedev.mybatis.paginator.domain.PageBounds; import com.github.miemiedev.mybatis.paginator.domain.PageList; @@ -13,15 +13,15 @@ import org.apache.ibatis.annotations.Param; */ @AutoMapper(tablename = "sys_city_partner_register", pkName = "partner_id") public interface CityPartnerRegisterMapper { - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void savePartner(JSONObject partner); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) PageList listRequests(PageBounds pageBounds); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject find(@Param("partner_id") String requestId); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) void update(JSONObject request); } diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClearingDistributedSurchargeMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClearingDistributedSurchargeMapper.java index 950877f1e..900b9cd7c 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClearingDistributedSurchargeMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClearingDistributedSurchargeMapper.java @@ -1,8 +1,8 @@ package au.com.royalpay.payment.manage.mappers.system; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import org.apache.ibatis.annotations.Param; import org.joda.time.DateTime; @@ -16,13 +16,13 @@ public interface ClearingDistributedSurchargeMapper { List findTransactions(@Param("client_id") int clientId); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) void update(JSONObject transaction); - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject transactions); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) List findByClearingId(@Param("client_id") int clientId, @Param("clearing_detail_id") String clearingDetailId); List getMonthDetailByClientId(@Param("datefrom") Date datefrom, @Param("dateto") Date dateto); diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientAccountMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientAccountMapper.java index 7da29bd8f..854e38c19 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientAccountMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientAccountMapper.java @@ -1,9 +1,9 @@ package au.com.royalpay.payment.manage.mappers.system; -import cn.yixblog.support.mybatis.autosql.annotations.AdvanceSelect; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AdvanceSelect; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import com.github.miemiedev.mybatis.paginator.domain.PageBounds; import org.apache.ibatis.annotations.Param; @@ -15,63 +15,63 @@ import java.util.List; */ @AutoMapper(tablename = "sys_accounts", pkName = "account_id") public interface ClientAccountMapper { - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) @AdvanceSelect(addonWhereClause = "is_valid=1", excludeColumns = {"salt", "password_hash", "password_aes"}) JSONObject findById(@Param("account_id") String accountId); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) @AdvanceSelect(addonWhereClause = "is_valid=1") JSONObject findByUsername(@Param("username") String username); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject findByUsernameForDuplicate(@Param("username") String username); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) @AdvanceSelect(addonWhereClause = "is_valid=1") List findByPhone(@Param("contact_phone") String contact_phone,@Param("nation_code")String nation_code); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject findDetail(@Param("account_id") String accountId); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) void update(JSONObject account); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) @AdvanceSelect(addonWhereClause = "is_valid=1", excludeColumns = {"salt", "password_hash"}) List listPartnerAccounts(@Param("client_id") int clientId); - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject account); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) @AdvanceSelect(addonWhereClause = "is_valid=1", excludeColumns = {"salt", "password_hash"}) JSONObject findByOpenId(@Param("wechat_openid") String openid); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) @AdvanceSelect(addonWhereClause = "is_valid=1", excludeColumns = {"salt", "password_hash"}) JSONObject findByAppOpenId(@Param("wxapp_openid") String openId); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) @AdvanceSelect(addonWhereClause = "is_valid=1", excludeColumns = {"salt", "password_hash"}) JSONObject findByWxUnioinId(@Param("wx_unionid") String wx_unionid); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) @AdvanceSelect(addonWhereClause = "is_valid=1 and payment_notice=1 and wechat_openid is not null", excludeColumns = {"salt", "password_hash"}) List listPaymentNoticeAccounts(@Param("client_id") int clientId); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) @AdvanceSelect(addonWhereClause = "is_valid=1 and (refund_authorised = 1 OR role = 1) and wechat_openid is not null", excludeColumns = {"salt", "password_hash"}) List listRefundAuditAccounts(@Param("client_id") int clientId); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) @AdvanceSelect(addonWhereClause = "is_valid=1 and role=1", excludeColumns = {"salt", "password_hash"}) List listAdminAccounts(@Param("client_id") int clientId); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) @AdvanceSelect(addonWhereClause = "is_valid=1 and role=1 and (client_id is null or client_id=0)", excludeColumns = {"salt", "password_hash"}) List listUnRegisterClientAccounts(PageBounds pageBounds); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) @AdvanceSelect(addonWhereClause = "is_valid=1 and role=1 and wechat_openid is not null and wx_unionid is null", excludeColumns = {"salt", "password_hash"}) List listNullUnionIdAccounts(); @@ -79,7 +79,7 @@ public interface ClientAccountMapper { List partnerAndSubPartnerAccounts(@Param("client_id") int clientId); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) @AdvanceSelect(addonWhereClause = "is_valid=1 and (role=1 or role=2) and wechat_openid is not null", excludeColumns = {"salt", "password_hash"}) List listRiskNoticeAccounts(@Param("client_id") int clientId); @@ -92,15 +92,15 @@ public interface ClientAccountMapper { JSONObject findOneByPhoneAndCreateTimeDesc(@Param("contact_phone")String contactPhone,@Param("nation_code")String nationCode); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) @AdvanceSelect(addonWhereClause = "is_valid=1", excludeColumns = {"salt", "password_hash"}) List findByWechatOpenId(@Param("wechat_openid")String openid); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) @AdvanceSelect(addonWhereClause = "is_valid=1", excludeColumns = {"salt", "password_hash"}) List findByWechatUnionId(@Param("wx_unionid")String unionId); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject findRSvcClientInfo(@Param("account_id")String accountId); } diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientAndCustomerLocation.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientAndCustomerLocation.java index c9a560b25..692a732da 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientAndCustomerLocation.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientAndCustomerLocation.java @@ -1,17 +1,17 @@ package au.com.royalpay.payment.manage.mappers.system; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import org.apache.ibatis.annotations.Param; @AutoMapper(tablename = "sys_clients_customer_locations", pkName = {"id"}) public interface ClientAndCustomerLocation { - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject findByIp(@Param(value = "ip") String ip); - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject params); } diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientApplyMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientApplyMapper.java index 5e221cd6e..055e64434 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientApplyMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientApplyMapper.java @@ -1,8 +1,8 @@ package au.com.royalpay.payment.manage.mappers.system; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import com.github.miemiedev.mybatis.paginator.domain.PageBounds; import com.github.miemiedev.mybatis.paginator.domain.PageList; @@ -18,21 +18,21 @@ import java.util.List; @AutoMapper(tablename = "sys_clients_apply", pkName = "client_apply_id") public interface ClientApplyMapper { - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject clientApply); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject findClientApplicationById(@Param("client_apply_id") String client_apply_id); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject findClientApplicationByClientMoniker(@Param("client_moniker") String client_moniker); PageList listPartnerApplications(JSONObject params, PageBounds pageBounds); - @AutoSql(type = SqlType.COUNT) + @AutoSql(SqlType.COUNT) int countNewApplications(JSONObject params); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) void updatePartnerApplication(JSONObject obj); List analysisByDate(@Param("begin") Date begin, @Param("end") Date end); diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientAuditProcessMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientAuditProcessMapper.java index 9b943aca6..9ebfae667 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientAuditProcessMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientAuditProcessMapper.java @@ -1,8 +1,8 @@ package au.com.royalpay.payment.manage.mappers.system; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import com.github.miemiedev.mybatis.paginator.domain.PageBounds; import com.github.miemiedev.mybatis.paginator.domain.PageList; @@ -13,12 +13,12 @@ import org.apache.ibatis.annotations.Param; */ @AutoMapper(tablename = "sys_clients_audit_process", pkName = "merchant_audit_id") public interface ClientAuditProcessMapper { - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject partner); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) int update(JSONObject partner); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) PageList getAuditLog(@Param("client_id") int client_id, PageBounds pagination); } diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientBDMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientBDMapper.java index aa609ab36..b7eb25b88 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientBDMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientBDMapper.java @@ -1,8 +1,8 @@ package au.com.royalpay.payment.manage.mappers.system; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import com.github.miemiedev.mybatis.paginator.domain.PageBounds; import org.apache.ibatis.annotations.Param; @@ -15,10 +15,10 @@ import java.util.List; */ @AutoMapper(tablename = "sys_client_bd", pkName = "client_bd_id") public interface ClientBDMapper { - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void saveBD(JSONObject jsonObject); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) List listClientDB(JSONObject params, PageBounds pageBounds); List listClientBDAvailable(@Param("client_id") int clientId, @Param("date") Date date); @@ -29,7 +29,7 @@ public interface ClientBDMapper { void updateClientDB(JSONObject jsonObject); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) void update(JSONObject json); int checkBDPermission(@Param("client_id") int clientId, @Param("bd_id") String bdId); diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientBankAccountMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientBankAccountMapper.java index 26933d2d9..07c43f172 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientBankAccountMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientBankAccountMapper.java @@ -1,8 +1,8 @@ package au.com.royalpay.payment.manage.mappers.system; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.executor.keygen.Jdbc3KeyGenerator; @@ -15,18 +15,18 @@ import java.util.List; @AutoMapper(tablename = "sys_bank_accounts", keyGenerator = Jdbc3KeyGenerator.class, pkName = "bank_account_id") public interface ClientBankAccountMapper { - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) List clientBankAccounts(@Param("client_id") int clientId); - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject bankAccount); - @AutoSql(type = SqlType.DELETE) + @AutoSql(SqlType.DELETE) void deleteClientAccounts(@Param("client_id") int clientId); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) List listClientAccounts(JSONObject params); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) void update(JSONObject bankAccount); } diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientComplianceCompanyMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientComplianceCompanyMapper.java index 6ddc6dfc6..2529b20bc 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientComplianceCompanyMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientComplianceCompanyMapper.java @@ -1,9 +1,9 @@ package au.com.royalpay.payment.manage.mappers.system; -import cn.yixblog.support.mybatis.autosql.annotations.AdvanceSelect; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AdvanceSelect; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import com.github.miemiedev.mybatis.paginator.domain.PageBounds; import com.github.miemiedev.mybatis.paginator.domain.PageList; @@ -16,21 +16,21 @@ import java.util.List; */ @AutoMapper(tablename = "client_authfile_compliance", pkName = "compliance_id") public interface ClientComplianceCompanyMapper { - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject partner); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) void update(JSONObject partner); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) @AdvanceSelect(addonWhereClause = "type = 1") JSONObject findFileByClientId(@Param("client_id") int clientId); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) @AdvanceSelect(addonWhereClause = "type = 2") JSONObject findKycFileByClientId(@Param("client_id") int clientId); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) @AdvanceSelect(addonWhereClause = "type = 2 and status in (0,1,9)") JSONObject findKycFileComplete(@Param("client_id") int clientId); diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientConfigMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientConfigMapper.java index 0c6773bc3..10343d308 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientConfigMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientConfigMapper.java @@ -9,22 +9,22 @@ import com.alibaba.fastjson.JSONObject; import com.github.miemiedev.mybatis.paginator.domain.PageBounds; import com.github.miemiedev.mybatis.paginator.domain.PageList; -import cn.yixblog.support.mybatis.autosql.annotations.AdvanceSelect; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AdvanceSelect; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; /** * Created by wangning on 2018-04-08. */ @AutoMapper(tablename = "sys_client_config", pkName = "client_id") public interface ClientConfigMapper { - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject partner); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) int update(JSONObject partner); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject find(@Param("client_id") int client_id); } diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientDeviceMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientDeviceMapper.java index 62563ac3d..8844c2c59 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientDeviceMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientDeviceMapper.java @@ -1,9 +1,9 @@ package au.com.royalpay.payment.manage.mappers.system; -import cn.yixblog.support.mybatis.autosql.annotations.AdvanceSelect; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AdvanceSelect; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import com.github.miemiedev.mybatis.paginator.domain.PageBounds; import com.github.miemiedev.mybatis.paginator.domain.PageList; @@ -17,31 +17,31 @@ import java.util.List; @AutoMapper(tablename = "sys_clients_devices", pkName = "dev_id") public interface ClientDeviceMapper { - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) @AdvanceSelect(addonWhereClause = "is_valid=1") JSONObject findValid(@Param("dev_id") String devId); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject find(@Param("dev_id") String devId); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) @AdvanceSelect(addonWhereClause = "is_valid=1") JSONObject findByClientDevIdAndClient(@Param("client_id") int clientId, @Param("client_dev_id") String clientDevId, @Param("client_type") String clientType); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) @AdvanceSelect(addonWhereClause = "is_valid=1") JSONObject findByClientDevIdAndClientType(@Param("client_dev_id") String clientDevId, @Param("client_type") String clientType); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) @AdvanceSelect(addonWhereClause = "is_valid=1") JSONObject findDeviceInfoByDeviceNo(@Param("client_dev_id") String clientDevId,@Param("dev_type") String devType); PageList listClientDevices(JSONObject params, PageBounds pagination); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) void update(JSONObject devInfo); - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject devInfo); PageList listDevices(JSONObject params, PageBounds pagination); diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientDeviceTokenMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientDeviceTokenMapper.java index 1b2b301b5..c15842dd7 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientDeviceTokenMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientDeviceTokenMapper.java @@ -1,8 +1,8 @@ package au.com.royalpay.payment.manage.mappers.system; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import org.apache.ibatis.annotations.Param; @@ -16,10 +16,10 @@ public interface ClientDeviceTokenMapper { JSONObject findByDevId(@Param("dev_id") String devDevId); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) void update(JSONObject devInfo); - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject devTokenInfo); List listTokensByClient_id(@Param("client_id") int client_id); @@ -28,6 +28,6 @@ public interface ClientDeviceTokenMapper { List listAllTokens(JSONObject devToken); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) List listAllTokensByClient_id(@Param("client_id") int client_id); } diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientFilesMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientFilesMapper.java index 751499b2e..1d036096e 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientFilesMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientFilesMapper.java @@ -1,9 +1,9 @@ package au.com.royalpay.payment.manage.mappers.system; -import cn.yixblog.support.mybatis.autosql.annotations.AdvanceSelect; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AdvanceSelect; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import org.apache.ibatis.annotations.Param; @@ -14,24 +14,24 @@ import java.util.List; */ @AutoMapper(tablename = "sys_files", pkName = "file_id") public interface ClientFilesMapper { - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject partner); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) void update(JSONObject partner); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) @AdvanceSelect(addonWhereClause = "is_valid = 1 and status = 1") List findClientFile(@Param("client_id") int clientId); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject findFileByIdAndvalue(@Param("client_id") int clientId,@Param("file_name") String fileType); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) @AdvanceSelect(addonWhereClause = "is_valid = 1 and (status = 1 or status = 2) and file_name='client_agree_file'") List findClientPassAggreeFile(@Param("client_id") int clientId); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) @AdvanceSelect(addonWhereClause = "is_valid = 1 and (status = 0 or status = 3) and file_name='client_agree_file'") List findClientAggreeFileCommit(@Param("client_id") int clientId); @@ -45,7 +45,7 @@ public interface ClientFilesMapper { List findRepetitiveFilesForDelete(@Param("client_id") int clientId,@Param("file_name") String fileType); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject findFileById(@Param("file_id") String file_id); List findFileByClientAndType(@Param("client_id") int client_id, @Param("file_name") String file_name); diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientIncrementalMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientIncrementalMapper.java index 0e237c899..f16e458a8 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientIncrementalMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientIncrementalMapper.java @@ -1,8 +1,8 @@ package au.com.royalpay.payment.manage.mappers.system; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -22,7 +22,7 @@ public interface ClientIncrementalMapper { * @param clientId * @return */ - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) List findAllByclientMoniker(@Param("client_id") int clientId); @Select("select ci.*, " + @@ -42,15 +42,15 @@ public interface ClientIncrementalMapper { " and ci.is_valid = 1") JSONObject findByClinetIdAndChannelIsValid(@Param("client_id")int clientId, @Param("channel")String channel); - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject saveIncrementalService); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) void update(JSONObject saveIncrementalService); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) String findByChannelAndClientId(@Param("client_id") int clientId,@Param("channel") String channel); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) List find(@Param("client_id") int clientId); } diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientLocationsMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientLocationsMapper.java index d4e875cdd..ead84a118 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientLocationsMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientLocationsMapper.java @@ -1,8 +1,8 @@ package au.com.royalpay.payment.manage.mappers.system; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -41,9 +41,9 @@ public interface ClientLocationsMapper { " and sysc.client_id in (${merchant_list})") List getMerchantLocationsByList(@Param("merchant_list") String merchant_list); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) void update(JSONObject params); - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject params); } diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientMapper.java index ab1c62220..a49330f20 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientMapper.java @@ -1,9 +1,9 @@ package au.com.royalpay.payment.manage.mappers.system; -import cn.yixblog.support.mybatis.autosql.annotations.AdvanceSelect; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AdvanceSelect; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import com.github.miemiedev.mybatis.paginator.domain.PageBounds; import com.github.miemiedev.mybatis.paginator.domain.PageList; @@ -19,11 +19,11 @@ import java.util.List; */ @AutoMapper(tablename = "sys_clients", pkName = "client_id", keyGenerator = Jdbc3KeyGenerator.class) public interface ClientMapper { - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) @AdvanceSelect(addonWhereClause = "is_valid=1") JSONObject findClient(@Param("client_id") int clientId); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) @AdvanceSelect(addonWhereClause = "is_valid=1 and length( client_moniker ) > 5") List findApClient(); @@ -41,19 +41,19 @@ public interface ClientMapper { JSONObject findSameAddress(@Param("address") String address); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject findClientIgnoreInvalid(int clientId); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) @AdvanceSelect(addonWhereClause = "is_valid=1") JSONObject findClientByMoniker(@Param("client_moniker") String clientMoniker); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject findClientByMonikerAll(@Param("client_moniker") String clientMoniker); List listNeedOpenCbpayMerchant(); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) @AdvanceSelect(addonWhereClause = "is_valid=1") List getClientBySubMerchantId(@Param("sub_merchant_id") String subMerchantId); @@ -72,33 +72,33 @@ public interface ClientMapper { List listPartnerSelection(JSONObject params, PageBounds pagination); - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject partner); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) int update(JSONObject partner); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) @AdvanceSelect(addonWhereClause = "is_valid=1") List listChildClients(@Param("parent_client_id") int parentClientId); PageList listChildClientsByPage(JSONObject params, PageBounds pageBounds); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) @AdvanceSelect(addonWhereClause = "is_valid=1") List listChildClients(@Param("parent_client_id") int parentClientId, PageBounds pagination); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) void updateCleanDays(@Param("client_id") int clientId, @Param("clean_days") int cleanDays); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) void updateClientEmail(@Param("client_id") int clientId, @Param("contact_email") String contact_email); List listClientsForSettlement(); List listClientsForSettlementWithDetail(); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) @AdvanceSelect(addonWhereClause = "is_valid=1 and approve_email_id is not null and approve_email_send=3") List listClientsWithEmailNotVerify(); @@ -116,21 +116,21 @@ public interface ClientMapper { List listClientsWithTransactionsSettled(@Param("from") Date fromDate, @Param("to") Date toDate); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) List AllClients(); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) @AdvanceSelect(addonWhereClause = "is_valid=1") List listClientsByBD(@Param("bd_user") String bd_user); PageList simpleQuery(JSONObject params, PageBounds pagination); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject findByWechatInstitutionMerchantId(@Param("wechat_institution_merchant_id") String wechat_institution_merchant_id); List findByhfPayUrlNotNull(); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) void updateRpayEnterpriseId(@Param("client_id") int clientId, @Param("rpay_enterprise_id") String rpayEnterpriseId); List findByrpayNotNull(); diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientRateMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientRateMapper.java index 75b8a166a..98ecbd655 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientRateMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientRateMapper.java @@ -1,8 +1,8 @@ package au.com.royalpay.payment.manage.mappers.system; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.executor.keygen.Jdbc3KeyGenerator; @@ -20,10 +20,10 @@ public interface ClientRateMapper { List listClientRates(@Param("client_id") int clientId, @Param("rate_name") String rateName); - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void saveRate(JSONObject rateConfig); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) void updateConfig(JSONObject rateConfig); List listClientRatesOfTime(@Param("client_id") int clientId, @Param("rate_name") String rateName, @@ -33,7 +33,7 @@ public interface ClientRateMapper { List listClientsWithRateExpiring(@Param("warning_days") int warningDays); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) List listClientRatesForSaving(@Param("client_id") int clientId, @Param("active_time") Date activeTime, @Param("expiry_time") Date expiryTime, @Param("rate_value") Double rateValue, @Param("clean_days") Integer cleanDays, @Param("rate_name") String rateName); diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientServicesApplyMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientServicesApplyMapper.java index bd192f707..16d36b810 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientServicesApplyMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientServicesApplyMapper.java @@ -1,9 +1,9 @@ package au.com.royalpay.payment.manage.mappers.system; -import cn.yixblog.support.mybatis.autosql.annotations.AdvanceSelect; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AdvanceSelect; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import com.github.miemiedev.mybatis.paginator.domain.PageBounds; import com.github.miemiedev.mybatis.paginator.domain.PageList; @@ -14,17 +14,17 @@ import org.apache.ibatis.annotations.Param; */ @AutoMapper(tablename = "sys_client_services_apply", pkName = "apply_id") public interface ClientServicesApplyMapper { - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject partner); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) void update(JSONObject partner); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) @AdvanceSelect(addonWhereClause = "is_valid = 1") JSONObject findApplyByApplyId(@Param("apply_id") String applyId); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) @AdvanceSelect(addonWhereClause = "is_valid = 1 and status = 0") JSONObject findApplyByClientIdAndChannel(@Param("client_id") int clientId,@Param("channel") String channel); diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientSettleDelayConfMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientSettleDelayConfMapper.java index e1948e92e..eb8448be4 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientSettleDelayConfMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientSettleDelayConfMapper.java @@ -1,9 +1,9 @@ package au.com.royalpay.payment.manage.mappers.system; -import cn.yixblog.support.mybatis.autosql.annotations.AdvanceSelect; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AdvanceSelect; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import com.github.miemiedev.mybatis.paginator.domain.PageBounds; import com.github.miemiedev.mybatis.paginator.domain.PageList; @@ -15,19 +15,19 @@ import org.apache.ibatis.annotations.Param; @AutoMapper(tablename = "sys_clients_settle_delay_conf", pkName = "config_id") public interface ClientSettleDelayConfMapper { - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) @AdvanceSelect(addonWhereClause = "enabled=1") JSONObject findClientConf(@Param("client_id") int clientId); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject findClientConfIncludingDisabled(@Param("client_id") int clientId); PageList listClients(JSONObject params, PageBounds pageBounds); - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject conf); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) void update(JSONObject conf); diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientsContractMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientsContractMapper.java index 1b1f105ac..1f19363f5 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientsContractMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientsContractMapper.java @@ -8,24 +8,24 @@ import com.alibaba.fastjson.JSONObject; import com.github.miemiedev.mybatis.paginator.domain.PageBounds; import com.github.miemiedev.mybatis.paginator.domain.PageList; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; /** * Created by yishuqian on 06/03/2017. */ @AutoMapper(tablename = "sys_clients_contract", pkName = "id") public interface ClientsContractMapper { - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject partner); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) void update(JSONObject partner); JSONObject findByClientId(@Param("client_id") int clientId); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) List list(); PageList listWithClientInfo(JSONObject param,PageBounds pagination); diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientsSurchargeAccountsMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientsSurchargeAccountsMapper.java index 69884bfcd..4ea9ba5e9 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientsSurchargeAccountsMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientsSurchargeAccountsMapper.java @@ -1,9 +1,9 @@ package au.com.royalpay.payment.manage.mappers.system; -import cn.yixblog.support.mybatis.autosql.annotations.AdvanceSelect; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AdvanceSelect; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import org.apache.ibatis.annotations.Param; @@ -13,16 +13,16 @@ import java.math.BigDecimal; @AutoMapper(tablename = "sys_clients_surcharge_accounts", pkName = "client_id") public interface ClientsSurchargeAccountsMapper { - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) @AdvanceSelect(addonWhereClause = "is_valid=1") JSONObject find(@Param("client_id") int clientId); - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject surchargeAccount); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) void update(JSONObject surchargeAccount); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) void updateBalance(@Param("client_id") int clientId, @Param("balance") BigDecimal balance); } diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/CommoditiesMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/CommoditiesMapper.java index cbab1303d..48a2741bb 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/system/CommoditiesMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/CommoditiesMapper.java @@ -1,9 +1,9 @@ package au.com.royalpay.payment.manage.mappers.system; -import cn.yixblog.support.mybatis.autosql.annotations.AdvanceSelect; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AdvanceSelect; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import com.github.miemiedev.mybatis.paginator.domain.PageBounds; import com.github.miemiedev.mybatis.paginator.domain.PageList; @@ -19,15 +19,15 @@ public interface CommoditiesMapper { PageList listProduct(JSONObject params, PageBounds pagination); - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void saveProduct(JSONObject params); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) void updateProduct(JSONObject params); int checkProduct(@Param("client_id") int client_id); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) @AdvanceSelect(addonWhereClause = "is_valid=1") JSONObject findOne(@Param("name") String name); diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/CustomerMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/CustomerMapper.java index fe417250c..458563f66 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/system/CustomerMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/CustomerMapper.java @@ -1,9 +1,9 @@ package au.com.royalpay.payment.manage.mappers.system; -import cn.yixblog.support.mybatis.autosql.annotations.AdvanceSelect; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AdvanceSelect; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.executor.keygen.Jdbc3KeyGenerator; @@ -14,22 +14,22 @@ import org.apache.ibatis.executor.keygen.Jdbc3KeyGenerator; @AutoMapper(tablename = "sys_customer_relation", pkName = "relation_id", keyGenerator = Jdbc3KeyGenerator.class) public interface CustomerMapper { - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject customer); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) void update(JSONObject customer); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject findCustomerByOpenId(@Param("wechat_openid") String openId); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject findCustomerGlobalpayByOpenId(@Param("globalpay_openid") String openId); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) @AdvanceSelect(addonWhereClause = "wechat_openid like 'o32%'") JSONObject findCustomerBykangaOpenid(@Param("kanga_openid") String openId); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject findCustomerBykangaId(@Param("kanga_openid") String openId); } diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/CustomerMemberMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/CustomerMemberMapper.java index 036c5d41e..437a71d3b 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/system/CustomerMemberMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/CustomerMemberMapper.java @@ -1,8 +1,8 @@ package au.com.royalpay.payment.manage.mappers.system; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import org.apache.ibatis.annotations.Param; @@ -11,15 +11,15 @@ import org.apache.ibatis.annotations.Param; */ @AutoMapper(tablename = "sys_membership_customer", pkName = "member_id") public interface CustomerMemberMapper { - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject findOne(@Param("member_id") String memberId); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject findByRelationId(@Param("relation_id") int relationId); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) void update(JSONObject member); - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject member); } diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ExchangeRateMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ExchangeRateMapper.java index dc086e7d7..3fc270a4b 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ExchangeRateMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ExchangeRateMapper.java @@ -7,21 +7,21 @@ import org.apache.ibatis.annotations.Param; import com.alibaba.fastjson.JSONObject; -import cn.yixblog.support.mybatis.autosql.annotations.AdvanceSelect; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AdvanceSelect; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; /** * Create by yixian at 2017-12-19 19:09 */ @AutoMapper(tablename = "sys_exchange_rate", pkName = "id") public interface ExchangeRateMapper { - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) @AdvanceSelect(addonWhereClause = "type = 1") JSONObject findMaxRate(@Param("create_date") Date create_time); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) @AdvanceSelect(addonWhereClause = "type = 2") JSONObject findMinRate(@Param("create_date") Date create_time); diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/FinancialSurchargeAccountDetailMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/FinancialSurchargeAccountDetailMapper.java index 776fae644..effbdad27 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/system/FinancialSurchargeAccountDetailMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/FinancialSurchargeAccountDetailMapper.java @@ -1,8 +1,8 @@ package au.com.royalpay.payment.manage.mappers.system; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import org.apache.ibatis.annotations.Param; @@ -12,17 +12,17 @@ import java.util.List; @AutoMapper(tablename = "financial_surcharge_account_detail", pkName = "detail_id") public interface FinancialSurchargeAccountDetailMapper { - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject findByDetailId(@Param("detail_id") String detail_id); List findDetailsByMonth(@Param("settle_month") String settle_month); List findDetailsByClientId(@Param("client_id") int client_id); - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject detail); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) void update(JSONObject detail); List listSettlementDatesInMonth(@Param("month") String month); diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/IndustryLookupMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/IndustryLookupMapper.java index aa3b99ebe..dffe61351 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/system/IndustryLookupMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/IndustryLookupMapper.java @@ -1,8 +1,8 @@ package au.com.royalpay.payment.manage.mappers.system; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.executor.keygen.Jdbc3KeyGenerator; @@ -13,6 +13,6 @@ import org.apache.ibatis.executor.keygen.Jdbc3KeyGenerator; */ @AutoMapper(tablename = "industry_lookup", pkName = "client_id", keyGenerator = Jdbc3KeyGenerator.class) public interface IndustryLookupMapper { - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject findByLookupCode(@Param("lookup_code") String code); } diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/MailSendMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/MailSendMapper.java index f8c399329..1f8085272 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/system/MailSendMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/MailSendMapper.java @@ -6,24 +6,24 @@ import org.apache.ibatis.annotations.Param; import java.util.List; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; /** * Create by yixian at 2017-12-13 19:10 */ @AutoMapper(tablename = "sys_mail_send", pkName = {"id", "mail_address"}) public interface MailSendMapper { - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject record); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) void update(JSONObject record); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) void updateStatus(JSONObject record); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject find(@Param("id") String id, @Param("mail_address")String mail_address); } \ No newline at end of file diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/MailUnsubMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/MailUnsubMapper.java index 07f08af4c..3196cac13 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/system/MailUnsubMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/MailUnsubMapper.java @@ -8,9 +8,9 @@ import com.alibaba.fastjson.JSONObject; import com.github.miemiedev.mybatis.paginator.domain.PageBounds; import com.github.miemiedev.mybatis.paginator.domain.PageList; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; /** * Created by davep on 2016-08-03. @@ -18,16 +18,16 @@ import cn.yixblog.support.mybatis.autosql.annotations.SqlType; @AutoMapper(tablename = "sys_mail_unsub", pkName = "id") public interface MailUnsubMapper { - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject record); - @AutoSql(type = SqlType.DELETE) + @AutoSql(SqlType.DELETE) void delete(@Param("id") Long id); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject getOne(@Param("id") Long id,@Param("address") String address); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject findOneByClientMoniker(@Param("client_moniker") String client_moniker); PageList queryPageable(JSONObject params, PageBounds pagination); diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ManageDeviceTokenMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ManageDeviceTokenMapper.java index 7a758ad85..77802773a 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ManageDeviceTokenMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ManageDeviceTokenMapper.java @@ -1,8 +1,8 @@ package au.com.royalpay.payment.manage.mappers.system; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import org.apache.ibatis.annotations.Param; @@ -16,10 +16,10 @@ public interface ManageDeviceTokenMapper { JSONObject findByDevId(@Param("dev_id") String devDevId); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) void update(JSONObject devInfo); - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject devTokenInfo); } diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ManagerCustomerRelationAlipayMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ManagerCustomerRelationAlipayMapper.java index aedc27d49..a4d5032f2 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ManagerCustomerRelationAlipayMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ManagerCustomerRelationAlipayMapper.java @@ -1,8 +1,8 @@ package au.com.royalpay.payment.manage.mappers.system; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import org.apache.ibatis.annotations.Param; @@ -12,13 +12,13 @@ import org.apache.ibatis.annotations.Param; @AutoMapper(tablename = "sys_customer_relation_alipay", pkName = "relation_id") public interface ManagerCustomerRelationAlipayMapper { - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject customer); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) void update(JSONObject customer); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject findCustomerByUserId(@Param("alipay_uid") String userId); } diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ManagerMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ManagerMapper.java index 693904996..b2b9cfbe3 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ManagerMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ManagerMapper.java @@ -1,9 +1,9 @@ package au.com.royalpay.payment.manage.mappers.system; -import cn.yixblog.support.mybatis.autosql.annotations.AdvanceSelect; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AdvanceSelect; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import com.github.miemiedev.mybatis.paginator.domain.PageBounds; import com.github.miemiedev.mybatis.paginator.domain.PageList; @@ -17,26 +17,26 @@ import java.util.List; */ @AutoMapper(tablename = "sys_managers", pkName = "manager_id") public interface ManagerMapper { - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) @AdvanceSelect(addonWhereClause = "is_valid=1", excludeColumns = {"salt", "username", "password_hash"}) JSONObject findById(@Param("manager_id") String managerId); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject findDetail(@Param("manager_id") String managerId); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) @AdvanceSelect(addonWhereClause = "is_valid=1") JSONObject findAvailableByLoginId(@Param("username") String loginId); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject findByLoginId(@Param("username") String loginId); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) void update(JSONObject account); PageList listAvailable(JSONObject params, PageBounds pageBounds); - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject manager); List listByRole(@Param("org_id") Integer orgId, @Param("mask") int mask); @@ -45,7 +45,7 @@ public interface ManagerMapper { List listByRole(JSONObject params); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) @AdvanceSelect(addonWhereClause = "is_valid=1") JSONObject findByWxOpenId(@Param("wx_openid") String openid); diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/MerchantSignInfoMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/MerchantSignInfoMapper.java index 6f8b5b2e7..7005b3a06 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/system/MerchantSignInfoMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/MerchantSignInfoMapper.java @@ -1,8 +1,8 @@ package au.com.royalpay.payment.manage.mappers.system; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.executor.keygen.Jdbc3KeyGenerator; @@ -10,12 +10,12 @@ import org.apache.ibatis.executor.keygen.Jdbc3KeyGenerator; @AutoMapper(tablename = "merchant_sign_info", pkName = "client_moniker", keyGenerator = Jdbc3KeyGenerator.class) public interface MerchantSignInfoMapper { - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject findClientSign(@Param("client_moniker") String clientMoniker); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) void update(JSONObject signInfo); - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void insert(JSONObject signInfo); } diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/OrgMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/OrgMapper.java index 4b5b60f5c..07801df2f 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/system/OrgMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/OrgMapper.java @@ -1,9 +1,9 @@ package au.com.royalpay.payment.manage.mappers.system; -import cn.yixblog.support.mybatis.autosql.annotations.AdvanceSelect; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AdvanceSelect; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import com.github.miemiedev.mybatis.paginator.domain.PageBounds; import com.github.miemiedev.mybatis.paginator.domain.PageList; @@ -17,11 +17,11 @@ import java.util.List; */ @AutoMapper(tablename = "sys_org", pkName = "org_id", keyGenerator = Jdbc3KeyGenerator.class) public interface OrgMapper { - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) @AdvanceSelect(addonWhereClause = "type != 1") List listOrgsWithDetail(PageBounds order); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) List listsOrgWithDetail(PageBounds order); List listOrgs(@Param("type") int type, PageBounds order); @@ -30,20 +30,20 @@ public interface OrgMapper { List listOrgsWithChid(JSONObject params); - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void saveOrg(JSONObject org); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject findOne(@Param("org_id") int orgId); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) void updateOrg(JSONObject org); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) @AdvanceSelect(addonWhereClause = "is_valid=1 AND parent_org_id is null") List listAllOrgs(); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) @AdvanceSelect(addonWhereClause = "is_valid=1 AND senior_parent_org_id=0") List listSeniorOrgs(); diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/OrgSignInfoMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/OrgSignInfoMapper.java index a3c13b628..dba29c321 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/system/OrgSignInfoMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/OrgSignInfoMapper.java @@ -1,8 +1,8 @@ package au.com.royalpay.payment.manage.mappers.system; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.executor.keygen.Jdbc3KeyGenerator; @@ -10,18 +10,18 @@ import org.apache.ibatis.executor.keygen.Jdbc3KeyGenerator; @AutoMapper(tablename = "org_sign_info", pkName = "org_id", keyGenerator = Jdbc3KeyGenerator.class) public interface OrgSignInfoMapper { - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject findByOrgId(@Param("org_id") int orgId); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject findOrgSignInfo(@Param("gateway_short_id") String orgId); int getPartnercode(@Param("codes") String codes); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) void update(JSONObject signInfo); - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void insert(JSONObject signInfo); } diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/PermissionFunctionMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/PermissionFunctionMapper.java index 4e5914005..2492f1081 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/system/PermissionFunctionMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/PermissionFunctionMapper.java @@ -1,8 +1,8 @@ package au.com.royalpay.payment.manage.mappers.system; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import org.apache.ibatis.annotations.Param; @@ -14,26 +14,26 @@ import java.util.List; @AutoMapper(tablename = "sys_permission_functions", pkName = "func_id") public interface PermissionFunctionMapper { - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject func); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) void update(JSONObject func); List listByRoleMask(@Param("mask") int mask); List listAll(); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) List listByModule(@Param("module") String moduleName); - @AutoSql(type = SqlType.DELETE) + @AutoSql(SqlType.DELETE) void delete(@Param("func_id") String funcId); void clearRolePermission(@Param("mask") int mask); void authorizeRole(@Param("mask") int mask, @Param("func_ids") List functions); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject find(@Param("func_id") String funcId); } diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/PermissionModuleMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/PermissionModuleMapper.java index f2571e500..1f55fcff7 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/system/PermissionModuleMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/PermissionModuleMapper.java @@ -1,8 +1,8 @@ package au.com.royalpay.payment.manage.mappers.system; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import org.apache.ibatis.annotations.Param; @@ -13,18 +13,18 @@ import java.util.List; */ @AutoMapper(tablename = "sys_permission_modules", pkName = "module_name") public interface PermissionModuleMapper { - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject module); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) void update(JSONObject module); - @AutoSql(type = SqlType.DELETE) + @AutoSql(SqlType.DELETE) void delete(@Param("module_name") String moduleName); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) List list(); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject find(@Param("module_name") String moduleName); } diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/PermissionPartnerFunctionMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/PermissionPartnerFunctionMapper.java index 962f462fa..3e261915b 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/system/PermissionPartnerFunctionMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/PermissionPartnerFunctionMapper.java @@ -6,9 +6,9 @@ import org.apache.ibatis.annotations.Param; import com.alibaba.fastjson.JSONObject; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; /** * Created by yixian on 2017-02-28. @@ -16,26 +16,26 @@ import cn.yixblog.support.mybatis.autosql.annotations.SqlType; @AutoMapper(tablename = "sys_permission_partner_functions", pkName = "func_id") public interface PermissionPartnerFunctionMapper { - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject func); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) void update(JSONObject func); List listByRoleMask(@Param("mask") int mask); List listAll(); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) List listByModule(@Param("module") String moduleName); - @AutoSql(type = SqlType.DELETE) + @AutoSql(SqlType.DELETE) void delete(@Param("func_id") String funcId); void clearRolePermission(@Param("mask") int mask); void authorizeRole(@Param("mask") int mask, @Param("func_ids") List functions); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject find(@Param("func_id") String funcId); } diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/PermissionPartnerModuleMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/PermissionPartnerModuleMapper.java index 8382c9ee9..e0044cea2 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/system/PermissionPartnerModuleMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/PermissionPartnerModuleMapper.java @@ -1,8 +1,8 @@ package au.com.royalpay.payment.manage.mappers.system; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.executor.keygen.Jdbc3KeyGenerator; @@ -14,22 +14,22 @@ import java.util.List; */ @AutoMapper(tablename = "sys_permission_partner_modules", pkName = "id",keyGenerator = Jdbc3KeyGenerator.class) public interface PermissionPartnerModuleMapper { - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject module); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) void update(JSONObject module); - @AutoSql(type = SqlType.DELETE) + @AutoSql(SqlType.DELETE) void delete(@Param("module_name") String moduleName); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) List list(); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject find(@Param("module_name") String moduleName); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject listModuleId(@Param("module_name") String moduleName); } diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ReportConfigMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ReportConfigMapper.java index e650d3624..3c7ad9c3f 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ReportConfigMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ReportConfigMapper.java @@ -1,8 +1,8 @@ package au.com.royalpay.payment.manage.mappers.system; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.executor.keygen.Jdbc3KeyGenerator; @@ -14,11 +14,11 @@ import java.util.List; */ @AutoMapper(tablename = "austrac_report_config", pkName = "pkid", keyGenerator = Jdbc3KeyGenerator.class) public interface ReportConfigMapper { - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) void update(JSONObject jsonObject); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) List listReportConfig(); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject findOne(@Param("pkid") int pkid); } diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/SysAppsMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/SysAppsMapper.java index 3c7a2d5fc..e48a54e17 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/system/SysAppsMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/SysAppsMapper.java @@ -1,9 +1,9 @@ package au.com.royalpay.payment.manage.mappers.system; -import cn.yixblog.support.mybatis.autosql.annotations.AdvanceSelect; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AdvanceSelect; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import org.apache.ibatis.annotations.Param; @@ -12,7 +12,7 @@ import org.apache.ibatis.annotations.Param; */ @AutoMapper(tablename = "sys_apps",pkName = "appid") public interface SysAppsMapper { - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) @AdvanceSelect(addonWhereClause = "is_valid=1") JSONObject findApp(@Param("appid") String appid); } diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/SysChannelConfigMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/SysChannelConfigMapper.java index 9670b45d0..ea04c9d90 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/system/SysChannelConfigMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/SysChannelConfigMapper.java @@ -1,8 +1,8 @@ package au.com.royalpay.payment.manage.mappers.system; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import org.apache.ibatis.annotations.Param; @@ -11,10 +11,10 @@ import java.util.List; @AutoMapper(tablename = "cb_channel_config",pkName = "channel_id") public interface SysChannelConfigMapper { - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) List selectAll(); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject find(@Param(value = "channel_id") String channel, @Param(value = "type") int type); void updatePaymentConfig(@Param(value = "channel_id") String channel, @Param(value = "type") int type, @Param(value = "last_update_date")Date lastUpdateDate, @@ -22,6 +22,6 @@ public interface SysChannelConfigMapper { JSONObject findOne(@Param(value = "type") int type); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject selectByChannelId (@Param(value = "channel_id") String channel_id); } diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/SysClientLegalPersonMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/SysClientLegalPersonMapper.java index 3119f082b..7a8bbc56c 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/system/SysClientLegalPersonMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/SysClientLegalPersonMapper.java @@ -1,20 +1,20 @@ package au.com.royalpay.payment.manage.mappers.system; -import cn.yixblog.support.mybatis.autosql.annotations.AdvanceSelect; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AdvanceSelect; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import org.apache.ibatis.annotations.Param; @AutoMapper(tablename = "sys_client_legal_person", pkName = "client_id") public interface SysClientLegalPersonMapper{ - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject representativeInfo); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) void update(JSONObject representativeInfo); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject findRepresentativeInfo(@Param("client_id") int clientId); } diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/SysCustomerCommentMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/SysCustomerCommentMapper.java index 99e2a3f63..2055c4b5a 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/system/SysCustomerCommentMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/SysCustomerCommentMapper.java @@ -1,13 +1,13 @@ package au.com.royalpay.payment.manage.mappers.system; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; @AutoMapper(tablename = "sys_customer_comment", pkName = "id") public interface SysCustomerCommentMapper { - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject info); } diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/SysCustomerPaymentInfoMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/SysCustomerPaymentInfoMapper.java index b6ede4f64..6eefd4003 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/system/SysCustomerPaymentInfoMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/SysCustomerPaymentInfoMapper.java @@ -1,23 +1,23 @@ package au.com.royalpay.payment.manage.mappers.system; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import org.apache.ibatis.annotations.Param; @AutoMapper(tablename = "sys_customer_payment_info", pkName = "id") public interface SysCustomerPaymentInfoMapper { - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject paymentInfo); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) void update(JSONObject paymentInfo); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject selectPaymentInfo(@Param(value = "wechat_openid") String open_id); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject selectById(@Param(value = "id") String id); } diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/SysCustomerServiceMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/SysCustomerServiceMapper.java index dc31df478..0ba9b1e15 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/system/SysCustomerServiceMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/SysCustomerServiceMapper.java @@ -6,9 +6,9 @@ import org.apache.ibatis.annotations.Param; import com.alibaba.fastjson.JSONObject; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; /** * Created by yixian on 2016-06-29. @@ -17,21 +17,21 @@ import cn.yixblog.support.mybatis.autosql.annotations.SqlType; public interface SysCustomerServiceMapper { List findOnline(); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject findByManagerId(@Param("manager_id")String manager_id); - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject record); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) void update(JSONObject record); void onoff(@Param("managerId") String managerId, @Param("status") int status); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) List findAllWithDetail(); - @AutoSql(type = SqlType.COUNT) + @AutoSql(SqlType.COUNT) int countAll(); } diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/SysCustomerSubscribeMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/SysCustomerSubscribeMapper.java index a892dcb81..74363c6f0 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/system/SysCustomerSubscribeMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/SysCustomerSubscribeMapper.java @@ -1,20 +1,20 @@ package au.com.royalpay.payment.manage.mappers.system; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import org.apache.ibatis.annotations.Param; @AutoMapper(tablename = "sys_customer_subscribe", pkName = "id") public interface SysCustomerSubscribeMapper { - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject info); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject findByEmail(@Param("subscribe_email") String email); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) void update(JSONObject subscribeInfo); } diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/SysPermissionClientModulesMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/SysPermissionClientModulesMapper.java index 11d41797b..6a8de7e69 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/system/SysPermissionClientModulesMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/SysPermissionClientModulesMapper.java @@ -6,36 +6,36 @@ import org.apache.ibatis.annotations.Param; import com.alibaba.fastjson.JSONObject; -import cn.yixblog.support.mybatis.autosql.annotations.AdvanceSelect; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AdvanceSelect; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; /** * Created by yixian on 2017-02-28. */ @AutoMapper(tablename = "sys_permission_partner_modules_clients", pkName = "id") public interface SysPermissionClientModulesMapper { - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject module); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) void update(JSONObject module); void delete(@Param("module_name") String moduleName); void deleteByClientMoniker(@Param("client_moniker") String client_moniker); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) List listByClientId(@Param("client_id") int client_id); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject find(@Param("id") Long id); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) List listByClientMoniker(@Param("client_moniker")String client_moniker); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) @AdvanceSelect(addonWhereClause = "is_valid = 1") List listValidByClientId(@Param("client_id") int client_id); diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/SysRpayMerchantApplyMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/SysRpayMerchantApplyMapper.java index 23620f712..adfb90f8a 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/system/SysRpayMerchantApplyMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/SysRpayMerchantApplyMapper.java @@ -1,8 +1,8 @@ package au.com.royalpay.payment.manage.mappers.system; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import com.github.miemiedev.mybatis.paginator.domain.PageBounds; import org.apache.ibatis.annotations.Param; @@ -14,13 +14,13 @@ import java.util.List; */ @AutoMapper(tablename = "sys_rpay_merchant_apply",pkName = "merchant_app_id") public interface SysRpayMerchantApplyMapper { - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) List listRpayMerchantApplices(@Param("client_id") int client_id, PageBounds pageBounds); - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void insertRpayMerchantApply(JSONObject params); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) List listByShortName(@Param("merchant_shortname") String shortName); } diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/SysWxMerchantApplyMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/SysWxMerchantApplyMapper.java index 496860b2e..fd1158972 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/system/SysWxMerchantApplyMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/SysWxMerchantApplyMapper.java @@ -1,9 +1,9 @@ package au.com.royalpay.payment.manage.mappers.system; -import cn.yixblog.support.mybatis.autosql.annotations.AdvanceSelect; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AdvanceSelect; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import com.github.miemiedev.mybatis.paginator.domain.PageBounds; import org.apache.ibatis.annotations.Param; @@ -16,10 +16,10 @@ import java.util.List; */ @AutoMapper(tablename = "sys_wx_merchant_apply",pkName = "merchant_app_id") public interface SysWxMerchantApplyMapper { - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) List listWxMerchantApplices(@Param("client_id") int client_id, PageBounds pageBounds); - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void insertWxMerchantApply(JSONObject params); } diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/vipcustomer/VipCustomerMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/vipcustomer/VipCustomerMapper.java index cbea2c3b3..103d7c3e9 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/vipcustomer/VipCustomerMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/vipcustomer/VipCustomerMapper.java @@ -1,8 +1,8 @@ package au.com.royalpay.payment.manage.mappers.vipcustomer; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import com.github.miemiedev.mybatis.paginator.domain.PageBounds; import com.github.miemiedev.mybatis.paginator.domain.PageList; @@ -17,24 +17,24 @@ import java.util.List; @AutoMapper(tablename = "vip_customers", pkName = "vip_customer_id") public interface VipCustomerMapper { - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) List listVipCustomers(JSONObject params); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) PageList listVipCustomers(JSONObject params, PageBounds pageBounds); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject findNewVipCustomer(@Param("client_id") int client_id); - @AutoSql(type = SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject vipCustomer); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject findVipCustomer(@Param("vip_customer_id") String vip_customer_id); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) void update(JSONObject vipCustomer); - @AutoSql(type = SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject findVipCustomerByCode(@Param("vip_code") String vipCode); } diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/vipcustomer/VipCustomerOrderMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/vipcustomer/VipCustomerOrderMapper.java index 6328a10ac..68d727ed3 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/vipcustomer/VipCustomerOrderMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/vipcustomer/VipCustomerOrderMapper.java @@ -1,8 +1,8 @@ package au.com.royalpay.payment.manage.mappers.vipcustomer; -import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; -import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; -import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; import com.alibaba.fastjson.JSONObject; import com.github.miemiedev.mybatis.paginator.domain.PageBounds; import com.github.miemiedev.mybatis.paginator.domain.PageList; @@ -14,11 +14,11 @@ import org.apache.ibatis.annotations.Param; */ @AutoMapper(tablename = "vip_customer_orders", pkName = "vip_customer_order_id") public interface VipCustomerOrderMapper { - @AutoSql(type= SqlType.INSERT) + @AutoSql(SqlType.INSERT) void save(JSONObject jsonObject); - @AutoSql(type = SqlType.UPDATE) + @AutoSql(SqlType.UPDATE) void update(JSONObject updateaObj); - @AutoSql(type= SqlType.SELECT) + @AutoSql(SqlType.SELECT) JSONObject findVipOrder(@Param("vip_customer_order_id") String vip_order_id); PageList listVipOrders(JSONObject params, PageBounds pageBounds); diff --git a/src/main/resources/application-alipay.properties b/src/main/resources/application-alipay.properties deleted file mode 100644 index c8b295a23..000000000 --- a/src/main/resources/application-alipay.properties +++ /dev/null @@ -1,15 +0,0 @@ -app.alipay.host=https://mapi-hk.alipay.com/gateway.do - -app.alipay.sftp-host=sftp.alipay.com - -app.alipay.merchants.online.pid=2088821643021586 -app.alipay.merchants.online.key=hmwjrganlzb4aqgggdgdlod7l3lsjkn6 -app.alipay.merchants.online.sftp-username=openvisePTY -app.alipay.merchants.online.sftp-password=XNBB3S -app.alipay.merchants.online.private-key=classpath:data/crypt/alipay_private.pem -app.alipay.merchants.online.public-key=classpath:data/crypt/alipay_public.pem - -app.alipay.merchants.retail.pid=2088721525235246 -app.alipay.merchants.retail.key=jb5mt4vhtlzg1xlc0k967sib7v81sba6 -app.alipay.merchants.retail.sftp-username=openvisePTY -app.alipay.merchants.retail.sftp-password=XNBB3S \ No newline at end of file diff --git a/src/main/resources/application-alipay.yml b/src/main/resources/application-alipay.yml new file mode 100644 index 000000000..a9ddd3791 --- /dev/null +++ b/src/main/resources/application-alipay.yml @@ -0,0 +1,17 @@ +app: + alipay: + host: https://mapi-hk.alipay.com/gateway.do + merchants: + online: + key: hmwjrganlzb4aqgggdgdlod7l3lsjkn6 + pid: 2088821643021586 + private-key: classpath:data/crypt/alipay_private.pem + public-key: classpath:data/crypt/alipay_public.pem + sftp-password: XNBB3S + sftp-username: openvisePTY + retail: + key: jb5mt4vhtlzg1xlc0k967sib7v81sba6 + pid: 2088721525235246 + sftp-password: XNBB3S + sftp-username: openvisePTY + sftp-host: sftp.alipay.com diff --git a/src/main/resources/application-bestpay.properties b/src/main/resources/application-bestpay.properties deleted file mode 100644 index 2c3e0fed8..000000000 --- a/src/main/resources/application-bestpay.properties +++ /dev/null @@ -1,9 +0,0 @@ -app.bestpay.merchant-id=01010101010376850 -app.bestpay.production-key=924181926043 -app.bestpay.host=https://cbp.bestpay.com.cn/cashier -app.bestpay.debug=false - -app.bestpay.ftp.host=58.213.97.77 -app.bestpay.ftp.username=cbp -app.bestpay.ftp.password=cbp@oig - diff --git a/src/main/resources/application-bestpay.yml b/src/main/resources/application-bestpay.yml new file mode 100644 index 000000000..4c616ef10 --- /dev/null +++ b/src/main/resources/application-bestpay.yml @@ -0,0 +1,10 @@ +app: + bestpay: + debug: false + ftp: + host: 58.213.97.77 + password: cbp@oig + username: cbp + host: https://cbp.bestpay.com.cn/cashier + merchant-id: 1010101010376850 + production-key: 924181926043 \ No newline at end of file diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties deleted file mode 100644 index 6f4d63ef2..000000000 --- a/src/main/resources/application-dev.properties +++ /dev/null @@ -1,16 +0,0 @@ -#多数据源配置 -spring.datasource.type = com.zaxxer.hikari.HikariDataSource -#数据源master - -spring.datasource.master.schema-name=royalpay_production -spring.datasource.master.host=192.168.0.4:3306 -spring.datasource.master.jdbc-url=jdbc:mysql://${spring.datasource.master.host}/${spring.datasource.master.schema-name}?useUnicode=true&characterEncoding=utf8&useSSL=false -spring.datasource.master.username=taylor -spring.datasource.master.password=taylor - -#数据源salve -spring.datasource.slave.schema-name=royalpay_production -spring.datasource.slave.host=192.168.0.4:3306 -spring.datasource.slave.jdbc-url=jdbc:mysql://${spring.datasource.slave.host}/${spring.datasource.slave.schema-name}?useUnicode=true&characterEncoding=utf8&useSSL=false -spring.datasource.slave.username=taylor -spring.datasource.slave.password=taylor diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml new file mode 100644 index 000000000..eefc48e24 --- /dev/null +++ b/src/main/resources/application-dev.yml @@ -0,0 +1,15 @@ +spring: + datasource: + master: + host: 192.168.0.4:3306 + jdbc-url: jdbc:mysql://${spring.datasource.master.host}/${spring.datasource.master.schema-name}?useUnicode=true&characterEncoding=utf8&useSSL=false + password: taylor + schema-name: royalpay_production + username: taylor + slave: + host: 192.168.0.4:3306 + jdbc-url: jdbc:mysql://${spring.datasource.slave.host}/${spring.datasource.slave.schema-name}?useUnicode=true&characterEncoding=utf8&useSSL=false + password: taylor + schema-name: royalpay_production + username: taylor + type: com.zaxxer.hikari.HikariDataSource diff --git a/src/main/resources/application-devproxy.properties b/src/main/resources/application-devproxy.properties deleted file mode 100644 index bd531994d..000000000 --- a/src/main/resources/application-devproxy.properties +++ /dev/null @@ -1,7 +0,0 @@ - -spring.datasource.driver-class-name=com.mysql.jdbc.Driver -spring.datasource.schema-name=rppaymentdev -spring.datasource.host=119.28.3.196:3310 -spring.datasource.url=jdbc:mysql://${spring.datasource.host}/${spring.datasource.schema-name}?useUnicode=true&characterEncoding=utf8&useSSL=false -spring.datasource.username=readonly -spring.datasource.password=read0nly \ No newline at end of file diff --git a/src/main/resources/application-devproxy.yml b/src/main/resources/application-devproxy.yml new file mode 100644 index 000000000..173625c98 --- /dev/null +++ b/src/main/resources/application-devproxy.yml @@ -0,0 +1,8 @@ +spring: + datasource: + driver-class-name: com.mysql.jdbc.Driver + host: 119.28.3.196:3310 + password: read0nly + schema-name: rppaymentdev + url: jdbc:mysql://${spring.datasource.host}/${spring.datasource.schema-name}?useUnicode=true&characterEncoding=utf8&useSSL=false + username: readonly diff --git a/src/main/resources/application-jd.properties b/src/main/resources/application-jd.properties deleted file mode 100644 index 5f2b6a533..000000000 --- a/src/main/resources/application-jd.properties +++ /dev/null @@ -1,6 +0,0 @@ -app.jd.rsa-private-key-string=MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAIYEz9fiv9jVJ5swEWQ6s+UB17CLo1D717U36f0JXzqFJoIOGENQ+MW9Wo/oEbyyXgDwPFfIEnwqJ8bPj+cavMQKaKZZ1yZGJE2uCNn/dZhpEQC9hvPRFexNMoVekBdmnPpXpOZiowI7mhsO0SC5lx8knuBGQVQmz+DwRwVLVfnPAgMBAAECgYB50IvezeLVQ0IBw9o7AUScpmUXuoTSymbR+CW98rPVLEvJMOiK32GP0sIrRaRBoNri/XnLzDZJF8QZ6HYDeQETzICBDI42QID1R925zHW7p6cf66EePNnH0B6lv57o6zYpTYglW9jeUreSTOUdWnnDbW4XMzDjUUFuXHujVj2vQQJBAPiTDNOmsQFNpZ23MRB2blk9DjAnQbt3ZrHn+ZJU/up9QCfc7Iz9qelLZLifnageS7vwqb8T4pMTrJC8MXKoR2ECQQCKBbVQ65HDRoODkf/w00BnL1YgkqkkM2CMo4/BMSLMZbTIGv3uHXXfh3/1PCFQXa2+lO6jO0D2dZOCFxdg4D8vAkEA6Sn2ZCn96r0M1s3ZhhmxFKACyQRp0hEEEWkJX0u++fGW1k2SzgW69Yy048FFP0d7vsTWVNewNknEGteMgoJ6wQJAJv6934Lux9EgTwfs28mTpJOHLeTBzOyHFrUPZHHRdxY1IWQe4iuIpgLOcCbw8pfFAtdpJM0U6Y0Gg/aqMECrGQJAIEYcVNMHKj96+wOYC2DZfKLn6FK/oMDCCzUchdOB/7Q9naaGPTJhc+Upi0UKK7214vCyiRLTFcgPP3esCVDqAw== -app.jd.rsa-public-key-string=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCKE5N2xm3NIrXON8Zj19GNtLZ8xwEQ6uDIyrS3S03UhgBJMkGl4msfq4Xuxv6XUAN7oU1XhV3/xtabr9rXto4Ke3d6WwNbxwXnK5LSgsQc1BhT5NcXHXpGBdt7P8NMez5qGieOKqHGvT0qvjyYnYA29a8Z4wzNR7vAVHp36uD5RwIDAQAB -app.jd.des-key-string=ti+JnsgV/XOKBwHZE2eUTJRMO/6DtqhY -app.jd.md5-key=DI9JrGHK8W35Jeyt -app.jd.merchant-id=110519142002 -app.jd.agent-id=110519142 diff --git a/src/main/resources/application-jd.yml b/src/main/resources/application-jd.yml new file mode 100644 index 000000000..cf8a06f7a --- /dev/null +++ b/src/main/resources/application-jd.yml @@ -0,0 +1,8 @@ +app: + jd: + agent-id: 110519142 + des-key-string: ti+JnsgV/XOKBwHZE2eUTJRMO/6DtqhY + md5-key: DI9JrGHK8W35Jeyt + merchant-id: 110519142002 + rsa-private-key-string: MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAIYEz9fiv9jVJ5swEWQ6s+UB17CLo1D717U36f0JXzqFJoIOGENQ+MW9Wo/oEbyyXgDwPFfIEnwqJ8bPj+cavMQKaKZZ1yZGJE2uCNn/dZhpEQC9hvPRFexNMoVekBdmnPpXpOZiowI7mhsO0SC5lx8knuBGQVQmz+DwRwVLVfnPAgMBAAECgYB50IvezeLVQ0IBw9o7AUScpmUXuoTSymbR+CW98rPVLEvJMOiK32GP0sIrRaRBoNri/XnLzDZJF8QZ6HYDeQETzICBDI42QID1R925zHW7p6cf66EePNnH0B6lv57o6zYpTYglW9jeUreSTOUdWnnDbW4XMzDjUUFuXHujVj2vQQJBAPiTDNOmsQFNpZ23MRB2blk9DjAnQbt3ZrHn+ZJU/up9QCfc7Iz9qelLZLifnageS7vwqb8T4pMTrJC8MXKoR2ECQQCKBbVQ65HDRoODkf/w00BnL1YgkqkkM2CMo4/BMSLMZbTIGv3uHXXfh3/1PCFQXa2+lO6jO0D2dZOCFxdg4D8vAkEA6Sn2ZCn96r0M1s3ZhhmxFKACyQRp0hEEEWkJX0u++fGW1k2SzgW69Yy048FFP0d7vsTWVNewNknEGteMgoJ6wQJAJv6934Lux9EgTwfs28mTpJOHLeTBzOyHFrUPZHHRdxY1IWQe4iuIpgLOcCbw8pfFAtdpJM0U6Y0Gg/aqMECrGQJAIEYcVNMHKj96+wOYC2DZfKLn6FK/oMDCCzUchdOB/7Q9naaGPTJhc+Upi0UKK7214vCyiRLTFcgPP3esCVDqAw== + rsa-public-key-string: MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCKE5N2xm3NIrXON8Zj19GNtLZ8xwEQ6uDIyrS3S03UhgBJMkGl4msfq4Xuxv6XUAN7oU1XhV3/xtabr9rXto4Ke3d6WwNbxwXnK5LSgsQc1BhT5NcXHXpGBdt7P8NMez5qGieOKqHGvT0qvjyYnYA29a8Z4wzNR7vAVHp36uD5RwIDAQAB diff --git a/src/main/resources/application-lakala.properties b/src/main/resources/application-lakala.properties deleted file mode 100644 index d86c60022..000000000 --- a/src/main/resources/application-lakala.properties +++ /dev/null @@ -1,5 +0,0 @@ -app.lakala_pay.host=https://intl.lakala.com:7777 -app.lakala_pay.publicKey=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDPg0O4rPQJL1O+jqJ4rBjFVNRAuDmBSoii9pYfPQBaescCVY0irkWWoLyfTT65TjvnPpOx+IfNzBTlB13qCEFm7algREoeUHjFgFNHiXJ2LK/R0+VWgXe5+EDFfbrFCPnmLKG3OcKDGQszP0VOf6VVTM1t56CpgaRMm1/+Tzd2TQIDAQAB -app.lakala_pay.merchants.COPAUS000003.accountId=COPAUS000003 -app.lakala_pay.merchants.COPAUS000003.currency=AUD -app.lakala_pay.merchants.COPAUS000003.privateKey=MIICdQIBADANBgkqhkiG9w0BAQEFAASCAl8wggJbAgEAAoGBAIDjX164cAJrlsikv2aCtGendMxOi97lCU/7sLp5qpMGIIYjpN71LpYR2SBm2vzQNGP0UE6kFtOUfsPLf8CZxPHXVd2Qnz3YC+2uUGkWmafEWVkw1LnDenI9SD5vvGZYeEH5H7Ct6yYv5/JTSevRgCVllWqcPXDs8spQmbcr8/oVAgMBAAECgYAF9v/d6Vk9s276AC3fd6MTvPs5zVTJzv28VuCZ8LGFNl5g9ttVejFavp620ivGUXhrO85PpWZtCk1HkG5sInGr0pVnBb8dtsfyEzTHnguv7mNSQ6tYEsINcyYbhOnPMsECaNrdwCC7q0i82MQGTHss50F0mjxRCVz4ndiBseRXYQJBANJ9lTuyuKUmUdxsQNLy+ajFSWvVcC0IRLBT2E1EqgPBRJuTc2wlULJVAKz/+eSEjDsmJ0yD9fnISjdY1csyS20CQQCcwTBZIejjwP011sB2A91z2DSnveU4vvgFWnj0hhM4a/ChuUKoylMVYlDQ1vrqErFag96keU9BUwQ1LlmfC1hJAkANDKoW1GKsIm8Kyk9OhK/Drc96dvYIZK3VfK05RRuBNhcpyf9q4flZxPlQwGHer/T9qcTf8oJqZOds/P3sJgcVAkB/C6Sf2Pfj/3o5tH/wJlnJliW2/hVV1JE35Ye6xx+0zucMbBY2ryR/ZFuTp2ldZSEQ92fvbdJqY1o5sAM6//rhAkAMhwWEtGZ8tboADbWBnxD/maMGYlI/oGsQHWTT9/Jt2LmlR+dgpl1DVwizPbVJ0hVJZWkF/BC5bdZ9XEIZsv/K diff --git a/src/main/resources/application-lakala.yml b/src/main/resources/application-lakala.yml new file mode 100644 index 000000000..d6a74d717 --- /dev/null +++ b/src/main/resources/application-lakala.yml @@ -0,0 +1,9 @@ +app: + lakalapay: + host: https://intl.lakala.com:7777 + merchants: + COPAUS000003: + accountId: COPAUS000003 + currency: AUD + privateKey: MIICdQIBADANBgkqhkiG9w0BAQEFAASCAl8wggJbAgEAAoGBAIDjX164cAJrlsikv2aCtGendMxOi97lCU/7sLp5qpMGIIYjpN71LpYR2SBm2vzQNGP0UE6kFtOUfsPLf8CZxPHXVd2Qnz3YC+2uUGkWmafEWVkw1LnDenI9SD5vvGZYeEH5H7Ct6yYv5/JTSevRgCVllWqcPXDs8spQmbcr8/oVAgMBAAECgYAF9v/d6Vk9s276AC3fd6MTvPs5zVTJzv28VuCZ8LGFNl5g9ttVejFavp620ivGUXhrO85PpWZtCk1HkG5sInGr0pVnBb8dtsfyEzTHnguv7mNSQ6tYEsINcyYbhOnPMsECaNrdwCC7q0i82MQGTHss50F0mjxRCVz4ndiBseRXYQJBANJ9lTuyuKUmUdxsQNLy+ajFSWvVcC0IRLBT2E1EqgPBRJuTc2wlULJVAKz/+eSEjDsmJ0yD9fnISjdY1csyS20CQQCcwTBZIejjwP011sB2A91z2DSnveU4vvgFWnj0hhM4a/ChuUKoylMVYlDQ1vrqErFag96keU9BUwQ1LlmfC1hJAkANDKoW1GKsIm8Kyk9OhK/Drc96dvYIZK3VfK05RRuBNhcpyf9q4flZxPlQwGHer/T9qcTf8oJqZOds/P3sJgcVAkB/C6Sf2Pfj/3o5tH/wJlnJliW2/hVV1JE35Ye6xx+0zucMbBY2ryR/ZFuTp2ldZSEQ92fvbdJqY1o5sAM6//rhAkAMhwWEtGZ8tboADbWBnxD/maMGYlI/oGsQHWTT9/Jt2LmlR+dgpl1DVwizPbVJ0hVJZWkF/BC5bdZ9XEIZsv/K + publicKey: MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDPg0O4rPQJL1O+jqJ4rBjFVNRAuDmBSoii9pYfPQBaescCVY0irkWWoLyfTT65TjvnPpOx+IfNzBTlB13qCEFm7algREoeUHjFgFNHiXJ2LK/R0+VWgXe5+EDFfbrFCPnmLKG3OcKDGQszP0VOf6VVTM1t56CpgaRMm1/+Tzd2TQIDAQAB diff --git a/src/main/resources/application-local.properties b/src/main/resources/application-local.properties deleted file mode 100644 index 3455edb96..000000000 --- a/src/main/resources/application-local.properties +++ /dev/null @@ -1,6 +0,0 @@ -spring.datasource.driver-class-name=com.mysql.jdbc.Driver -spring.datasource.schema-name=royalpay_production -spring.datasource.host=127.0.0.1:3306 -spring.datasource.url=jdbc:mysql://${spring.datasource.host}/${spring.datasource.schema-name}?useUnicode=true&characterEncoding=utf8&useSSL=false -spring.datasource.username=root -spring.datasource.password=root \ No newline at end of file diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml new file mode 100644 index 000000000..fb015fde5 --- /dev/null +++ b/src/main/resources/application-local.yml @@ -0,0 +1,8 @@ +spring: + datasource: + driver-class-name: com.mysql.jdbc.Driver + host: 127.0.0.1:3306 + password: root + schema-name: royalpay_production + url: jdbc:mysql://${spring.datasource.host}/${spring.datasource.schema-name}?useUnicode=true&characterEncoding=utf8&useSSL=false + username: root diff --git a/src/main/resources/application-officedev.properties b/src/main/resources/application-officedev.properties deleted file mode 100644 index 13dbe1448..000000000 --- a/src/main/resources/application-officedev.properties +++ /dev/null @@ -1,18 +0,0 @@ -spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver -spring.datasource.master.driver-class-name=com.mysql.cj.jdbc.Driver -spring.datasource.schema-name=royalpay -spring.datasource.user=root -spring.datasource.pwd=rpayplus -spring.datasource.host=192.168.0.84:3306 -spring.datasource.master.jdbc-url=jdbc:mysql://${spring.datasource.host}/${spring.datasource.schema-name}?useUnicode=true&characterEncoding=utf8&useSSL=false -spring.datasource.master.username=${spring.datasource.user} -spring.datasource.master.password=${spring.datasource.pwd} - -spring.datasource.slave.driver-class-name=com.mysql.cj.jdbc.Driver -spring.datasource.slave.jdbc-url=jdbc:mysql://${spring.datasource.host}/${spring.datasource.schema-name}?useUnicode=true&characterEncoding=utf8&useSSL=false -spring.datasource.slave.username=${spring.datasource.user} -spring.datasource.slave.password=${spring.datasource.pwd} - -spring.redis.host=192.168.0.84 -spring.redis.port=6379 -spring.redis.database=9 \ No newline at end of file diff --git a/src/main/resources/application-officedev.yml b/src/main/resources/application-officedev.yml new file mode 100644 index 000000000..587cd4368 --- /dev/null +++ b/src/main/resources/application-officedev.yml @@ -0,0 +1,23 @@ +spring: + datasource: + driver-class-name: com.mysql.cj.jdbc.Driver + host: 192.168.0.84:3306 + master: + driver-class-name: com.mysql.cj.jdbc.Driver + jdbc-url: jdbc:mysql://${spring.datasource.host}/${spring.datasource.schema-name}?useUnicode=true&characterEncoding=utf8&useSSL=false + password: ${spring.datasource.pwd} + username: ${spring.datasource.user} + pwd: rpayplus + schema-name: royalpay + slave: + driver-class-name: com.mysql.cj.jdbc.Driver + jdbc-url: jdbc:mysql://${spring.datasource.host}/${spring.datasource.schema-name}?useUnicode=true&characterEncoding=utf8&useSSL=false + password: ${spring.datasource.pwd} + username: ${spring.datasource.user} + user: root + redis: + database: 9 + host: 192.168.0.84 + port: 6379 +app: + debug: true \ No newline at end of file diff --git a/src/main/resources/application-production.properties b/src/main/resources/application-production.properties deleted file mode 100644 index 9659d8bb5..000000000 --- a/src/main/resources/application-production.properties +++ /dev/null @@ -1,7 +0,0 @@ - -spring.datasource.driver-class-name=com.mysql.jdbc.Driver -spring.datasource.schema-name=royalpay_production -spring.datasource.host=10.0.0.30:3306 -spring.datasource.url=jdbc:mysql://${spring.datasource.host}/${spring.datasource.schema-name}?useUnicode=true&characterEncoding=utf8&useSSL=false -spring.datasource.username=ap_prod_user -spring.datasource.password=Pine@ppl321 \ No newline at end of file diff --git a/src/main/resources/application-production.yml b/src/main/resources/application-production.yml new file mode 100644 index 000000000..43912f208 --- /dev/null +++ b/src/main/resources/application-production.yml @@ -0,0 +1,8 @@ +spring: + datasource: + driver-class-name: com.mysql.jdbc.Driver + host: 10.0.0.30:3306 + password: Pine@ppl321 + schema-name: royalpay_production + url: jdbc:mysql://${spring.datasource.host}/${spring.datasource.schema-name}?useUnicode=true&characterEncoding=utf8&useSSL=false + username: ap_prod_user diff --git a/src/main/resources/application-proxy.properties b/src/main/resources/application-proxy.properties deleted file mode 100644 index 642c67f86..000000000 --- a/src/main/resources/application-proxy.properties +++ /dev/null @@ -1,12 +0,0 @@ -spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver -spring.datasource.master.driver-class-name=com.mysql.cj.jdbc.Driver -spring.datasource.schema-name=royalpay_production -spring.datasource.host=119.28.3.196:3310 -spring.datasource.master.jdbc-url=jdbc:mysql://${spring.datasource.host}/${spring.datasource.schema-name}?useUnicode=true&characterEncoding=utf8&useSSL=false -spring.datasource.master.username=readonly -spring.datasource.master.password=read0nly - -spring.datasource.slave.driver-class-name=com.mysql.cj.jdbc.Driver -spring.datasource.slave.jdbc-url=jdbc:mysql://${spring.datasource.host}/${spring.datasource.schema-name}?useUnicode=true&characterEncoding=utf8&useSSL=false -spring.datasource.slave.username=readonly -spring.datasource.slave.password=read0nly \ No newline at end of file diff --git a/src/main/resources/application-proxy.yml b/src/main/resources/application-proxy.yml new file mode 100644 index 000000000..ea2691494 --- /dev/null +++ b/src/main/resources/application-proxy.yml @@ -0,0 +1,15 @@ +spring: + datasource: + driver-class-name: com.mysql.cj.jdbc.Driver + host: 119.28.3.196:3310 + master: + driver-class-name: com.mysql.cj.jdbc.Driver + jdbc-url: jdbc:mysql://${spring.datasource.host}/${spring.datasource.schema-name}?useUnicode=true&characterEncoding=utf8&useSSL=false + password: read0nly + username: readonly + schema-name: royalpay_production + slave: + driver-class-name: com.mysql.cj.jdbc.Driver + jdbc-url: jdbc:mysql://${spring.datasource.host}/${spring.datasource.schema-name}?useUnicode=true&characterEncoding=utf8&useSSL=false + password: read0nly + username: readonly diff --git a/src/main/resources/application-rpay.properties b/src/main/resources/application-rpay.properties deleted file mode 100644 index 5d75a4c07..000000000 --- a/src/main/resources/application-rpay.properties +++ /dev/null @@ -1,3 +0,0 @@ -app.rpay.privateKey=MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAKikZJwvKZ3dj5QsRy6xN/cPinAZa3leg8X40YzGrMEYWc2nmZY/EczYPq/kUp1uL2uikweDO35fuVpA4rALmJwXhHzsZyhVk4lEjHaqH8rNpVpmrwKP9rMmbFD23Mfvvt+BkKWan2T2dAMbSdjPY0+DTS4sN1ZrqzycRFxKFpohAgMBAAECgYBoO0Mb7WJxehFV6ZANYedPQkG0S2HL4AjeAY2yztDTf/NxUpdw74ZW74i/OgV93C5e/lqVmBzbXNq418XEPUaSohOqbcv+QRlEdlTAtn82aAUp/c9oSogPiHWs2VKiGoutejwVXQ6V9BAGMMegLwVphUu9dgrPC4dnfGO11fvLiQJBANt0VPmdqdG52rNVllKhF5+d+dIamOOQewWZf7HnkW0uYt9kWSbZCYyey4nP7NlONL7NEdUxn9exg/DYzegB99sCQQDEudve+jV2Ay6gbOS+ylHoCxSroF6jlkBQ0q7LIsWAAzIVLOuo5skC+wJmHzKXDoQBLXcFerP/T/iUSzisKqSzAkEAmjRVXY02/gLttWQnm+pMckGMgOFlm0oz18xzmSwR2TlmCnk12AFcH26ZsT3kvRGiKIxqwnb7TZIUF1IQ5b00TwJALD7xKNF1vLkyf3p+aDrw+ROk7oT/RCPDC2qXTbDgYs5VMVYNGsvtYfI6s+VIZ5koL2ueXWkfmsjNy+yvLmnY6QJADV9xlAa1+mWN2TfzAugd3L0fNLqPJPHBKQS5/bBKcoZlwfXwByrcCceKaCntJRZ056eQ7IeqkJfxjkEo/kgaRg== -app.rpay.rpayPublicKey=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxRx80vX64kSu5nrHbwPX/3SctyFIGrjBEJ9NEBOQPP4KHRQ49QyhVZ1fu7NvtD98n+PGR0ULUrK6S4KsYw6Huaga2RwbSVVkYPFGEFZ70XvjlGSzBG7fkbU8nscWAPOP+k5STD5sOZ35+9ko2H7IBz5RAclREoyB4/JaorQiBrEqS8RmX2TCjtx2lgi9TTcLinMDmULcg5qz44xpn08RwjuVpwRXyWFraxSaF0AcnpqstHON9AEyYanBjpQzR7yvj1IUGPMVNKpu/f4Z0ABvGZ9iAe3lyYESkkZ93ajy4vylY3YQvQsgHAsgazVsg2b25TC6TvAp9xPcaO0U8aoLLQIDAQAB -app.rpay.appId=8850afd2-6183-4cff-83af-9be5ca916e16 \ No newline at end of file diff --git a/src/main/resources/application-rpay.yml b/src/main/resources/application-rpay.yml new file mode 100644 index 000000000..0f8f6a4a2 --- /dev/null +++ b/src/main/resources/application-rpay.yml @@ -0,0 +1,5 @@ +app: + rpay: + appId: 8850afd2-6183-4cff-83af-9be5ca916e16 + privateKey: MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAKikZJwvKZ3dj5QsRy6xN/cPinAZa3leg8X40YzGrMEYWc2nmZY/EczYPq/kUp1uL2uikweDO35fuVpA4rALmJwXhHzsZyhVk4lEjHaqH8rNpVpmrwKP9rMmbFD23Mfvvt+BkKWan2T2dAMbSdjPY0+DTS4sN1ZrqzycRFxKFpohAgMBAAECgYBoO0Mb7WJxehFV6ZANYedPQkG0S2HL4AjeAY2yztDTf/NxUpdw74ZW74i/OgV93C5e/lqVmBzbXNq418XEPUaSohOqbcv+QRlEdlTAtn82aAUp/c9oSogPiHWs2VKiGoutejwVXQ6V9BAGMMegLwVphUu9dgrPC4dnfGO11fvLiQJBANt0VPmdqdG52rNVllKhF5+d+dIamOOQewWZf7HnkW0uYt9kWSbZCYyey4nP7NlONL7NEdUxn9exg/DYzegB99sCQQDEudve+jV2Ay6gbOS+ylHoCxSroF6jlkBQ0q7LIsWAAzIVLOuo5skC+wJmHzKXDoQBLXcFerP/T/iUSzisKqSzAkEAmjRVXY02/gLttWQnm+pMckGMgOFlm0oz18xzmSwR2TlmCnk12AFcH26ZsT3kvRGiKIxqwnb7TZIUF1IQ5b00TwJALD7xKNF1vLkyf3p+aDrw+ROk7oT/RCPDC2qXTbDgYs5VMVYNGsvtYfI6s+VIZ5koL2ueXWkfmsjNy+yvLmnY6QJADV9xlAa1+mWN2TfzAugd3L0fNLqPJPHBKQS5/bBKcoZlwfXwByrcCceKaCntJRZ056eQ7IeqkJfxjkEo/kgaRg== + rpayPublicKey: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxRx80vX64kSu5nrHbwPX/3SctyFIGrjBEJ9NEBOQPP4KHRQ49QyhVZ1fu7NvtD98n+PGR0ULUrK6S4KsYw6Huaga2RwbSVVkYPFGEFZ70XvjlGSzBG7fkbU8nscWAPOP+k5STD5sOZ35+9ko2H7IBz5RAclREoyB4/JaorQiBrEqS8RmX2TCjtx2lgi9TTcLinMDmULcg5qz44xpn08RwjuVpwRXyWFraxSaF0AcnpqstHON9AEyYanBjpQzR7yvj1IUGPMVNKpu/f4Z0ABvGZ9iAe3lyYESkkZ93ajy4vylY3YQvQsgHAsgazVsg2b25TC6TvAp9xPcaO0U8aoLLQIDAQAB diff --git a/src/main/resources/application-wechat.properties b/src/main/resources/application-wechat.properties deleted file mode 100644 index c93a9d87f..000000000 --- a/src/main/resources/application-wechat.properties +++ /dev/null @@ -1,20 +0,0 @@ - -app.wechatpay.api-host=https://apihk.mch.weixin.qq.com -app.wechatpay.merchants.1307485301.app-id=wx703febcbd34dae38 -app.wechatpay.merchants.1307485301.merchant-id=1307485301 -app.wechatpay.merchants.1307485301.mch-key=7e2d8c4aab15e4cabec1207ba79086b1 -app.wechatpay.merchants.1307485301.key-file=classpath:apiclient_cert.p12 -app.wechatpay.merchants.1307485301.example-sub-merchant-id=11755174 - -app.wechatpay.merchants.1431999902.app-id=wx703febcbd34dae38 -app.wechatpay.merchants.1431999902.merchant-id=1431999902 -app.wechatpay.merchants.1431999902.mch-key=p3tgzrAJbe6eQrunbv8jb8gz5yXxvJdE -app.wechatpay.merchants.1431999902.key-file=classpath:apiclient_new_cert.p12 -app.wechatpay.merchants.1431999902.example-sub-merchant-id=42991963 - -app.wechatpay.merchants.1487387142.app-id=wx3e14d1144d898197 -app.wechatpay.merchants.1487387142.mp-id=globalpay -app.wechatpay.merchants.1487387142.merchant-id=1487387142 -app.wechatpay.merchants.1487387142.mch-key=OuvLIL93STqFhTngNaBGT8751ZJn4FKL -app.wechatpay.merchants.1487387142.key-file=classpath:napclient_cert.p12 -app.wechatpay.merchants.1487387142.example-sub-merchant-id=203312199 \ No newline at end of file diff --git a/src/main/resources/application-wechat.yml b/src/main/resources/application-wechat.yml new file mode 100644 index 000000000..81e6528c4 --- /dev/null +++ b/src/main/resources/application-wechat.yml @@ -0,0 +1,23 @@ +app: + wechatpay: + api-host: https://apihk.mch.weixin.qq.com + merchants: + '1307485301': + app-id: wx703febcbd34dae38 + example-sub-merchant-id: 11755174 + key-file: classpath:apiclient_cert.p12 + mch-key: 7e2d8c4aab15e4cabec1207ba79086b1 + merchant-id: 1307485301 + '1431999902': + app-id: wx703febcbd34dae38 + example-sub-merchant-id: 42991963 + key-file: classpath:apiclient_new_cert.p12 + mch-key: p3tgzrAJbe6eQrunbv8jb8gz5yXxvJdE + merchant-id: 1431999902 + '1487387142': + app-id: wx3e14d1144d898197 + example-sub-merchant-id: 117551742 + key-file: classpath:napclient_cert.p12 + mch-key: OuvLIL93STqFhTngNaBGT8751ZJn4FKL + merchant-id: 1487387142 + mp-id: globalpay diff --git a/src/main/resources/application-yeepay.properties b/src/main/resources/application-yeepay.properties deleted file mode 100644 index badb2632e..000000000 --- a/src/main/resources/application-yeepay.properties +++ /dev/null @@ -1,15 +0,0 @@ -app.yeepay.merchant-id= -app.yeepay.app-key=cbp_120180219 -app.yeepay.aes-secret-key= -app.yeepay.public-key.store-type=string -app.yeepay.public-key.cert-type=RSA2048 -app.yeepay.public-key.value=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6p0XWjscY+gsyqKRhw9MeLsEmhFdBRhT2emOck/F1Omw38ZWhJxh9kDfs5HzFJMrVozgU+SJFDONxs8UB0wMILKRmqfLcfClG9MyCNuJkkfm0HFQv1hRGdOvZPXj3Bckuwa7FrEXBRYUhK7vJ40afumspthmse6bs6mZxNn/mALZ2X07uznOrrc2rk41Y2HftduxZw6T4EmtWuN2x4CZ8gwSyPAW5ZzZJLQ6tZDojBK4GZTAGhnn3bg5bBsBlw2+FLkCQBuDsJVsFPiGh/b6K/+zGTvWyUcu+LUj2MejYQELDO3i2vQXVDk7lVi2/TcUYefvIcssnzsfCfjaorxsuwIDAQAB -app.yeepay.public-key.password= -app.yeepay.private-key.store-type=string -app.yeepay.private-key.cert-type=RSA2048 -app.yeepay.private-key.value=MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCdaxJm3b5bvPZHvvXDfJ4NUiG7yISRYgUfiQycVKCJZ2jL+Y29Hmcnc1hPMZjVbJYPkhaIp+f92j7qf5P/qo+Ru4DyY3HhzsJAZMMWVlWeaEG+nZsyN06XC7NiUrFMLUAyqtaYRPDBKHKss54at16rQO7UoqXVqhKZyWdBgRbX0J3X0z82LEh11u8Izi/mUH42NY6ttkDsxBzXeNcT81RHrm9A/R/6AzzykFAPxGVdjjmbYnrk/WUwLDaKdf1RvDF/kWSCmbzQSX/D24UcDekd50TJHaqhjvBVFwLtiFWAO7xudEDhByfj22YOZuhuddyhJygkUI996IKtl+UFIfI1AgMBAAECggEATWTgBj0NIxNTTlDfib4SAuCXfziFnOjBNhDuZ0ngJ830oxxNiGaTNr0p9L2gs4WQfZVIiOVsVM1hU29n9zIHJhI2wnUL/4Xk0T35AFlv/NKrSCk6rUSt2etBxZx8WMSCpKaDnRd/+qeFQc2JdP8khzQEd/yDZfoY7Q0tO/JYpb++XMFYBRpLINYwH8xteTAeRGp1A5+UwvPMJelNeBlPqMqTAPruh/yLUvYg1/rJjkOUi0yOUyKhs+NJDOXdBcrSXswdJyMMITYQ9dhpWFz4/imklHDKk29+Oy5uEGB1OQvTW469Cm2b2suAyvI4oE1pAFb6dGz6uE9fwzJljM1+IQKBgQDshMwyOC3BmXOo54o92cUwYR0TJg0KHQAbJLirQxlX4ILUGxxEFsv2TdVzushYS/1K8zecz9VQnch19mo+qyxfdq/FNXe1DDXolnu2AoYVvqpeCXumjmz4v2dlBW2TTFvmUpy0QK2QImgBW1/sjI88OgiJHdyqaqR0ASMLB1mGWQKBgQCqYl82MSqUqRl2yTiW+h9lymlgXWl5qFx/J3YGMURz3Xq5qzK4swEYfHfmkofNNpTXwIbDjGGq/ipZZLmyLfS68PRnquJEwCyFX3cgXUKg8380nDPdUQxsLpvMupUuKjyNhN4twpy2A/Ti53UC7vx5J+Z/mVjE3QgaURIAEBSHPQKBgQCOI0x3za0p0KdiVSuN+gZ4CZSoglCJyF3c8heMzLk5R3I4N8an4K9YaPQjJZfrAFfLKBk+wuPmG7xxr9Gvsbzr7e657GTxR9JJ4c2c1y1vefL2qmpF8QfqAVUIr9dnExeTdgg4hzoHCbZJQnmGNf6KajHg/TI0s/v6vwgpQ5R4mQKBgDI3Kd574RPNPp7+sPn2H5jNbf8jqLldQF2NUMCEdqs7RDdCWIGM6C7CSEghOXrmsjlgGZe6YPKXU/3irMPxvWX3K+D9wRAIH1bzitV0BvYOrZfgzXxVrbaYifxtpRflBNGkriKIb81JHzxcgOTrcGd4tfs3Q61Jg2DWMdro4lP1AoGBAOJ8JLkbrODRvHp9fCy9cOiF0LD/fZBW49l6xQbx7lLtzbwa/nk672hFhzfy565j4ejywykVIOWmoMS5RqWXB07rbyF0OZrfEcLPArfXZ4iE6T9OZ2UJLK0gdUWz4oYWBRK7NQd5qEMOiUFy8YOGgT+dESVYwN2irwLikuET0S9a -app.yeepay.private-key.password= -app.yeepay.http-client.connect-timeout=30000 -app.yeepay.http-client.read-timeout=30000 -app.yeepay.http-client.max-conn-total=200 -app.yeepay.http-client.max-conn-per-route=0 diff --git a/src/main/resources/application-yeepay.yml b/src/main/resources/application-yeepay.yml new file mode 100644 index 000000000..2edf4b618 --- /dev/null +++ b/src/main/resources/application-yeepay.yml @@ -0,0 +1,20 @@ +app: + yeepay: + aes-secret-key: '' + app-key: cbp_120180753 + http-client: + connect-timeout: 30000 + max-conn-per-route: 0 + max-conn-total: 200 + read-timeout: 30000 + merchant-id: '' + private-key: + cert-type: RSA2048 + password: '' + store-type: string + value: MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCVe+jKyfAYhuWGVBBqGm1+B912h6atpVE2TyzPL5CcHjCEx8LHGBGqH/CR4cyI+Ro9/tRftntM7r4Wmt9qbeeI3Lh8+HRymdaOyxzSVXY9RcHwjZrrgMHINLqs9v6elSXKUdkJFdm4xElsqRCZLGwc4LiGlu4SLZbEWu0cejGwFIVl1maXYCrD2LdS0vyb/fk1Kc5esUiYtpTpmuhdqAsfh6gaYWlxX5X3k0O1t5WLtx1YKinLBmmZyW543lgyowdOl/yXO5iS/3ZgoU7PTpv8tQEQiuRw64XjYbK7Xh1Hu5QBUfq4aNOSHZAbCGx0TSOvK/TAFVBUM+jtBoBSXTntAgMBAAECggEACx++ciDW8ixPtlBZLFwtG7zgGSr9F1z/DyiTMBPdEhEZETiAYSqEXgGkeGayPtsyvbxR95Fv2YjGso3x5Eyrdz7dp8che0nBcrzgtzJO6z5esVUIW1Aom4p4/dgfmJOGzWiL2yY6HorU3/Yw2wU4QmnisXlX3BhyaMhPbtgVDIJNPS68AAkerm/QpHu31JltBAfVnmp50lRvF910Upn+jUhMV1oi2WHQ/JMsJBuZFQR1nkvFcQ+vQMhWgrXfNY1Do/QavhSjvlTpLMfrfZrE1RLLuzbGc0svBxHTBq6FNs+LY/ITfToS3D087w2gjeCyWew0tsjIr9ToxFy/cLTurQKBgQDSnw1T3zxlbwB2n/TBHUhBhGKSjdzosEaDHbYO7TbeLXSW94ar2+/5O9ypjU0dgNfVk0cZwMJneg/ZzuMR4zwadBEPGa7Iwf5hnHc/xxkfyzY8tRnYs1q2ZYgw/P+VjKXqVpxI6fnhr+6yQf+w2N3M3xS5WB0fMDaw1DAmIfroswKBgQC1sMsBdjRSCAYgPlGKDsjzFjMERE4xxz/3HX04wq3mYf5ntm9VNC/rw7xxkUEzZ3A6WBrFCfGvemYaq/TFG1u8BnnEseqSCSKzkY7Gdiofw7PzcP0pqCseNxliOOhgtl+B57uM/nxgx/wZMzy4RhInshbHWTF82mrk/TMq0Whi3wKBgQCp6mSvIC4ySp2eFac30C7FpE59mvL3yZXpGyQP4LFeBl/DlwdPSEzNzcxUAMmQnqwBAiLfFNIA9sko1y369U48rRxCCV8nWNGm37qYej+7lY445YVnfDIXacu4cbKjbGdBqQPGEvRjbTJtHq9vdVVifSnT6ND9o0DL4TLC4LDx3wKBgEHUQWlRK5nBIH8UNTThMHuqwmc8XFx6xblCLPmgx6MeRC/NkL79PpOcgq1fJJF8W9Q30dMsTC35Gf916CR2SiFw8zOKBuRMfQ80oNdVPuPtY0jD2mX6cUzsR70nw0IvMaF+lZx7JBNowfVbdBeMA83wH4Kw1VZYSLyY5K4R21FfAoGATkJe+qohXJDTbbj8+c0wbhDk5SFeR/P+CT3YsS/fneHkwjk98A3hrYuIc1JxxflOcvYMrRndSSQ57/13qVWZBEUcPpjvMITwWdJSIWn+Z6nsGsQD9ell8SGidefEoZsAjwEcORNLEcKg1F10c97cQQWDIgITEj7WtbrDkzdVf9M= + public-key: + cert-type: RSA2048 + password: '' + store-type: string + value: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlXvoysnwGIblhlQQahptfgfddoemraVRNk8szy+QnB4whMfCxxgRqh/wkeHMiPkaPf7UX7Z7TO6+Fprfam3niNy4fPh0cpnWjssc0lV2PUXB8I2a64DByDS6rPb+npUlylHZCRXZuMRJbKkQmSxsHOC4hpbuEi2WxFrtHHoxsBSFZdZml2Aqw9i3UtL8m/35NSnOXrFImLaU6ZroXagLH4eoGmFpcV+V95NDtbeVi7cdWCopywZpmclueN5YMqMHTpf8lzuYkv92YKFOz06b/LUBEIrkcOuF42Gyu14dR7uUAVH6uGjTkh2QGwhsdE0jryv0wBVQVDPo7QaAUl057QIDAQAB diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties deleted file mode 100644 index 4d4b10548..000000000 --- a/src/main/resources/application.properties +++ /dev/null @@ -1,158 +0,0 @@ -server.port=5000 - -spring.profiles.active=dev,alipay,bestpay,jd,wechat,rpay,yeepay - -env.company=RoyalPay - -multipart.max-file-size=10Mb - -spring.datasource.test-while-idle=true -#连接池检测释放周期 -spring.datasource.time-between-eviction-runs-millis=500 -spring.datasource.validation-query=select 1 -#最大连接数 -spring.datasource.max-active=1000 -spring.datasource.max-pool-prepared-statement-per-connection-size=100 -spring.datasource.max-idle=150 -#建立连接最大等待时间 -spring.datasource.max-wait=3000 -spring.datasource.filters=stat,wall,log4j - -spring.redis.host=127.0.0.1 -spring.redis.port=6379 -spring.redis.database=1 - -mybatis.autosql.default-dialect=mysql - -app.redis.prefix=payment -app.redis.settle.check-code.prefix=settlementCheckCode - -logging.level.java.sql.Connection=debug -logging.level.java.sql.Statement=debug -logging.level.java.sql.PreparedStatement=debug -logging.level.au.com.royalpay.payment=debug -logging.pattern.console=[%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){blue}] %clr(%-5level) %logger: %msg%n - -jetty.threadPool.maxThreads=1000 - -spring.mail.host=smtp.office365.com -spring.mail.port=587 - -stockholder.mails=leo.huang@royalpay.com.au - - -app.attachment.host=https://file.royalpay.com.au/ -app.attachment.source=03 - -##合同模板 -app.agreetemplate.classic.path=https://file.royalpay.com.au/open/2017/07/10/1499665073802_qV7fpEuS9rdbTnpa4po6rmbW9CSUfE.pdf -##聚合支付合同模板 -#app.agreetemplate.aggregate.path=https://file.royalpay.com.au/open/2017/11/17/1510890355946_hQt6yGc0NJ8TYeK7XCuuSAnTI31M7v.pdf -#app.agreetemplate.aggregate.path=https://file.royalpay.com.au/open/2019/02/12/1549950518019_vW4tU5t6D6yA0wMSDNBB9G195W3g99.pdf -app.agreetemplate.aggregate.path=https://file.royalpay.com.au/open/2019/10/22/1571723034726_5xK6A0FGv5aQPbMIDJzXJrUPKHFutv.pdf - -#app.host.main=https://mpay.royalpay.com.au/ -#app.host.regions.cn=https://mpay-cn.royalpay.com.au/ -#app.host.regions.au=https://mpay-au.royalpay.com.au/ -app.host.main=http://192.168.0.8:9009/ -app.host.regions.cn=http://192.168.0.8:9009/ -app.host.regions.au=http://192.168.0.8:9009/ -app.debug=true - -app.name=RoyalPay - -#app.cms.host=https://www.royalpay.com.au/ - -app.cms.host=http://127.0.0.1:9533 - -app.server.ip=127.0.0.1 - - -app.redpack_auth.enable=false -hf.rsa-file=/opt/2000604000101.pfx -##积分商城 -app.customer.host=https://customer.royalpay.com.au/ -customer.app.appid=customer -customer.app.auth-code=xxnpdBRwd4sIaCCI - -app.settlement.email-to=astro.dai@royalpay.com.au -app.settlement.email-cc=leo.huang@royalpay.com.au - -app.mpsupport.appid=royalpay -app.mpsupport.auth_code=W3xucYnbmbE6rZDmA2V9BsKmagTrVIny - -app.run-tasks=false -app.allow-clearing-generation=false - -app.mail.appid=1 -app.mail.host=https://mailsupport.royalpay.com.au -mail.send.credentialCode=Fd1aRfdjc9 - -spring.thymeleaf.mode=HTML - -app.mpsupport.host=https://mp.royalpay.com.au -app.foreign-currency=AUD - -app.ofei.md5-key=Khjx6wejblaJzmG0JBWFlPFKAUxhFIXQ -app.ofei.pwd=aomi@8888 -app.ofei.sp-code=A1407200 - -mail.mailgun.api_key=api:key-2e67b891a1a7974bf3a40ea440d5a77f -mail.mailgun.public_key=api:pubkey-1aaaffc2662ba1b400c409d3e974ba7e -mail.mailgun.domain=mail.royalpay.com.au -mail.mailgun.default.merchantlist=merchants@mail.royalpay.com.au - - -############## -##短信key -############## -royalpay.sms.appid=1400094878 -royalpay.sms.appkey=43390d81e20c5191c278fbf4cd275be2 - -im.openim.appkey=24986533 -im.openim.secret=96e28e7be21a874177211c31834b5174 - -app.settle.aes-key=EPrfsM2JE69ZPR7BhXn34g== -app.partner.aes-key=xyc7Ya6TmL8/csM1ygtviA== -app.risk.aes-key=NRvwd9dgbT2Cdz6zJz9AWA== -app.risk.control.aes-key=Aa+MtthC4Ztq4Kfa9aL+UA== - -#清算银行配置 -settle.abafile.default-bank=CBA -settle.abafile.remains-to=ANZ - -settle.abafile.bank.CBA.bank=CBA -settle.abafile.bank.CBA.apca=301500 -settle.abafile.bank.CBA.bsb=063109 -settle.abafile.bank.CBA.account-no=11655861 -settle.abafile.bank.CBA.account-name=Tunnel Show Pty Ltd - -settle.abafile.bank.ANZ.manual-sending=true -settle.abafile.bank.ANZ.bank=ANZ -settle.abafile.bank.ANZ.apca=514624 -settle.abafile.bank.ANZ.bsb=013006 -settle.abafile.bank.ANZ.account-no=837022519 -settle.abafile.bank.ANZ.account-name=Tunnel Show Pty Ltd - -settle.abafile.bank.NAB.manual-sending=true -settle.abafile.bank.NAB.bank=NAB -settle.abafile.bank.NAB.apca=514624 -settle.abafile.bank.NAB.bsb=013006 -settle.abafile.bank.NAB.account-no=837022519 -settle.abafile.bank.NAB.account-name=Tunnel Show Pty Ltd - -# 瀚银Secure -app.hanyin-secure.pid=ROYALPAY -app.hanyin-secure.sftp-host=180.168.61.93 -app.hanyin-secure.sftp-port=28480 -app.hanyin-secure.sftp-username=royalpay -app.hanyin-secure.sftp-pwd=royalpay - -qcloud.secret-id=AKIDlHdjgWzZliPvBauZFfrnW0MaZOyHdTPz -qcloud.secret-key=YswoQDsIZfWEqEAEvMXS8Yic84lFn9Jp -qcloud.scf.region=ap-hongkong - -apple.message.apns.file= -apple.message.apns.password= -android.message.appkey= -android.message.secret= \ No newline at end of file diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml new file mode 100644 index 000000000..c0336c21f --- /dev/null +++ b/src/main/resources/application.yml @@ -0,0 +1,195 @@ +android: + message: + appkey: '' + secret: '' +app: + agreetemplate: + aggregate: + path: https://file.royalpay.com.au/open/2019/10/22/1571723034726_5xK6A0FGv5aQPbMIDJzXJrUPKHFutv.pdf + classic: + path: https://file.royalpay.com.au/open/2017/07/10/1499665073802_qV7fpEuS9rdbTnpa4po6rmbW9CSUfE.pdf + allow-clearing-generation: false + attachment: + host: https://file.royalpay.com.au/ + source: 3 + cms: + host: http://127.0.0.1:9533 + customer: + host: https://customer.royalpay.com.au/ + foreign-currency: AUD + hanyin-secure: + pid: ROYALPAY + sftp-host: 180.168.61.93 + sftp-port: 28480 + sftp-pwd: royalpay + sftp-username: royalpay + host: + main: http://192.168.0.8:9009/ + regions: + au: http://192.168.0.8:9009/ + cn: http://192.168.0.8:9009/ + mail: + appid: 1 + host: https://mailsupport.royalpay.com.au + mpsupport: + appid: royalpay + auth_code: W3xucYnbmbE6rZDmA2V9BsKmagTrVIny + host: https://mp.royalpay.com.au + name: RoyalPay + ofei: + md5-key: Khjx6wejblaJzmG0JBWFlPFKAUxhFIXQ + pwd: aomi@8888 + sp-code: A1407200 + partner: + aes-key: xyc7Ya6TmL8/csM1ygtviA== + redis: + prefix: payment + settle: + check-code: + prefix: settlementCheckCode + redpack_auth: + enable: false + risk: + aes-key: NRvwd9dgbT2Cdz6zJz9AWA== + control: + aes-key: Aa+MtthC4Ztq4Kfa9aL+UA== + run-tasks: false + server: + ip: 127.0.0.1 + settle: + aes-key: EPrfsM2JE69ZPR7BhXn34g== + settlement: + email-cc: leo.huang@royalpay.com.au + email-to: astro.dai@royalpay.com.au + ueditor: + enable: true + tax: + type: GST + +apple: + message: + apns: + file: '' + password: '' +customer: + app: + appid: customer + auth-code: xxnpdBRwd4sIaCCI +env: + company: RoyalPay +hf: + rsa-file: /opt/2000604000101.pfx +im: + openim: + appkey: 24986533 + secret: 96e28e7be21a874177211c31834b5174 +jetty: + threadPool: + maxThreads: 1000 + +logging: + level: + au: + com: + royalpay: + payment: debug + java: + sql: + Connection: debug + PreparedStatement: debug + Statement: debug + pattern: + console: '[%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){blue}] %clr(%-5level) %logger: %msg%n' + +mail: + mailgun: + api_key: api:key-2e67b891a1a7974bf3a40ea440d5a77f + default: + merchantlist: merchants@mail.royalpay.com.au + domain: mail.royalpay.com.au + public_key: api:pubkey-1aaaffc2662ba1b400c409d3e974ba7e + send: + credentialCode: Fd1aRfdjc9 + +multipart: + max-file-size: 10Mb + +mybatis: + configuration: + mapUnderscoreToCamelCase: true + dialects: + - com.yixsoft.support.mybatis.dialects.mysql.MySqlDialect + paginator: + enable: true + advanced-count: true + dialect: com.github.miemiedev.mybatis.paginator.dialect.MySQLDialect + +qcloud: + scf: + region: ap-hongkong + secret-id: AKIDlHdjgWzZliPvBauZFfrnW0MaZOyHdTPz + secret-key: YswoQDsIZfWEqEAEvMXS8Yic84lFn9Jp +royalpay: + sms: + appid: 1400094878 + appkey: 43390d81e20c5191c278fbf4cd275be2 + +server: + port: 5000 + +settle: + abafile: + bank: + ANZ: + account-name: Tunnel Show Pty Ltd + account-no: 837022519 + apca: 514624 + bank: ANZ + bsb: 13006 + manual-sending: true + CBA: + account-name: Tunnel Show Pty Ltd + account-no: 11655861 + apca: 301500 + bank: CBA + bsb: 63109 + NAB: + account-name: Tunnel Show Pty Ltd + account-no: 837022519 + apca: 514624 + bank: NAB + bsb: 13006 + manual-sending: true + default-bank: CBA + remains-to: ANZ +spring: + application: + name: @project.artifactId@ + version: @project.version@ + datasource: + filters: stat,wall,log4j + max-active: 1000 + max-idle: 150 + max-pool-prepared-statement-per-connection-size: 100 + max-wait: 3000 + test-while-idle: true + time-between-eviction-runs-millis: 500 + validation-query: select 1 + mail: + host: smtp.office365.com + port: 587 + profiles: + active: dev,alipay,bestpay,jd,wechat,rpay,yeepay + redis: + database: 1 + host: 127.0.0.1 + port: 6379 + thymeleaf: + mode: HTML + http: + converters: + preferred-json-mapper: fastjson + +stockholder: + mails: leo.huang@royalpay.com.au + diff --git a/src/main/ui/static/analysis/templates/settlement_send_check_code.html b/src/main/ui/static/analysis/templates/settlement_send_check_code.html index 60fab4250..f5e09a276 100644 --- a/src/main/ui/static/analysis/templates/settlement_send_check_code.html +++ b/src/main/ui/static/analysis/templates/settlement_send_check_code.html @@ -1,7 +1,7 @@

Send Settlement Email

-
+
Select none same as select every batch
@@ -40,5 +40,6 @@
+
\ No newline at end of file diff --git a/src/test/java/au/com/royalpay/payment/manage/process/ABAGenerator.java b/src/test/java/au/com/royalpay/payment/manage/process/ABAGenerator.java index 6361dbfc8..71abe9b9f 100644 --- a/src/test/java/au/com/royalpay/payment/manage/process/ABAGenerator.java +++ b/src/test/java/au/com/royalpay/payment/manage/process/ABAGenerator.java @@ -30,8 +30,7 @@ public class ABAGenerator { @Before public void prepareEnv() { - PlatformEnvironment env = new PlatformEnvironment(); - env.afterInitialize(); + PlatformEnvironment env = new PlatformEnvironment(null, null, null); ReflectionTestUtils.setField(env, "foreignCurrency", "AUD"); config = new ABAConfig.ABABase() .setBank("CBA") From bfc88976a7101604de447cd3c07482e9b00ec14b Mon Sep 17 00:00:00 2001 From: yixian Date: Thu, 26 Mar 2020 15:52:22 +0800 Subject: [PATCH 02/11] build: ui docker --- .../manage/dev/web/TestController.java | 29 +++++-------------- uidocker/conf.d/default.conf | 24 +++++++-------- 2 files changed, 20 insertions(+), 33 deletions(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/dev/web/TestController.java b/src/main/java/au/com/royalpay/payment/manage/dev/web/TestController.java index 25a77c46a..973d2b870 100644 --- a/src/main/java/au/com/royalpay/payment/manage/dev/web/TestController.java +++ b/src/main/java/au/com/royalpay/payment/manage/dev/web/TestController.java @@ -18,9 +18,10 @@ import au.com.royalpay.payment.manage.appclient.core.RetailAppService; import au.com.royalpay.payment.manage.dev.bean.AliExcel; import au.com.royalpay.payment.manage.dev.bean.Message; import au.com.royalpay.payment.manage.dev.bean.SendWechatMessage; -import au.com.royalpay.payment.manage.dev.core.*; -import au.com.royalpay.payment.manage.mappers.customers.CustomerEncourageMoneyUseLogMapper; -import au.com.royalpay.payment.manage.mappers.log.NotifyErrorLogMapper; +import au.com.royalpay.payment.manage.dev.core.AliforexcelService; +import au.com.royalpay.payment.manage.dev.core.HfClearAmountService; +import au.com.royalpay.payment.manage.dev.core.HfUpdateService; +import au.com.royalpay.payment.manage.dev.core.WechatMessageService; import au.com.royalpay.payment.manage.mappers.payment.OrderMapper; import au.com.royalpay.payment.manage.mappers.payment.RefundMapper; import au.com.royalpay.payment.manage.mappers.system.ClientBankAccountMapper; @@ -57,8 +58,6 @@ import org.joda.time.DateTime; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; -import org.springframework.context.ApplicationEventPublisher; -import org.springframework.context.ApplicationEventPublisherAware; import org.springframework.util.Assert; import org.springframework.util.MimeTypeUtils; import org.springframework.validation.Errors; @@ -86,7 +85,7 @@ import java.util.List; */ @RestController @RequestMapping("/dev") -public class TestController implements ApplicationEventPublisherAware { +public class TestController { private Logger logger = LoggerFactory.getLogger(getClass()); @Resource private OrderMapper orderMapper; @@ -96,8 +95,6 @@ public class TestController implements ApplicationEventPublisherAware { private ClientMapper clientMapper; @Resource private ATOReportService atoReportService; - @Resource - private NotifyErrorLogMapper notifyErrorLogMapper; @Value("${app.agreetemplate.classic.path}") private String pdfPath; @Value("${app.agreetemplate.aggregate.path}") @@ -107,8 +104,6 @@ public class TestController implements ApplicationEventPublisherAware { @Resource private PlatformClearService platformClearService; @Resource - private CustomerEncourageMoneyUseLogMapper customerEncourageMoneyUseLogMapper; - @Resource private ClientBankAccountMapper clientBankAccountMapper; @Resource private PaymentApi paymentApi; @@ -128,12 +123,9 @@ public class TestController implements ApplicationEventPublisherAware { private TradeLogService tradeLogService; @Resource private RetailAppService retailAppService; - private ApplicationEventPublisher publisher; @Resource private WechatMessageService wechatMessageService; @Resource - private NewpartnerService newpartnerService; - @Resource private AliforexcelService aliforexcelService; @Resource private HfClearAmountService hfClearAmountService; @@ -423,12 +415,6 @@ public class TestController implements ApplicationEventPublisherAware { tradeLogService.generateAustracData(datefrom, dateto); } - - @Override - public void setApplicationEventPublisher(ApplicationEventPublisher applicationEventPublisher) { - this.publisher = applicationEventPublisher; - } - @PutMapping("/send_message") public void sendMassageByCode(@RequestBody @Valid Message message, Errors errors) { HttpUtils.handleValidErrors(errors); @@ -578,13 +564,14 @@ public class TestController implements ApplicationEventPublisherAware { /** * 重新生成执行商户下某日消费者数据 + * * @param date * @param clientId */ @GetMapping("/task/analysisCustomerDashboard") - public void analysisCustomerDashboardForClientMoniker(@RequestParam("date") String date,@RequestParam("clientId")String clientId){ + public void analysisCustomerDashboardForClientMoniker(@RequestParam("date") String date, @RequestParam("clientId") String clientId) { try { - dashboardService.generateCustomersAndOrdersStatisticsByClientMoniker(DateUtils.addDays(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(date), -1),clientId); + dashboardService.generateCustomersAndOrdersStatisticsByClientMoniker(DateUtils.addDays(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(date), -1), clientId); } catch (ParseException e) { e.printStackTrace(); } diff --git a/uidocker/conf.d/default.conf b/uidocker/conf.d/default.conf index e8dd7dba8..b8ac6c383 100644 --- a/uidocker/conf.d/default.conf +++ b/uidocker/conf.d/default.conf @@ -29,7 +29,7 @@ server { proxy_set_header Connection "upgrade"; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto https; + proxy_set_header Host $host; proxy_set_header Real-IP $remote_addr; @@ -45,7 +45,7 @@ server { proxy_set_header Connection "upgrade"; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto https; + proxy_set_header Host $host; proxy_set_header Real-IP $remote_addr; @@ -60,7 +60,7 @@ server { proxy_set_header Connection "upgrade"; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto https; + proxy_set_header Host $host; proxy_set_header Real-IP $remote_addr; @@ -76,7 +76,7 @@ server { proxy_set_header Connection "upgrade"; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto https; + proxy_set_header Host $host; proxy_set_header Real-IP $remote_addr; @@ -92,7 +92,7 @@ server { proxy_set_header Connection "upgrade"; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto https; + proxy_set_header Host $host; proxy_set_header Real-IP $remote_addr; @@ -107,7 +107,7 @@ server { proxy_set_header Connection "upgrade"; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto https; + proxy_set_header Host $host; proxy_set_header Real-IP $remote_addr; @@ -123,7 +123,7 @@ server { proxy_set_header Connection "upgrade"; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto https; + proxy_set_header Host $host; proxy_set_header Real-IP $remote_addr; @@ -139,7 +139,7 @@ server { proxy_set_header Connection "upgrade"; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto https; + proxy_set_header Host $host; proxy_set_header Real-IP $remote_addr; @@ -155,7 +155,7 @@ server { proxy_set_header Connection "upgrade"; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto https; + proxy_set_header Host $host; proxy_set_header Real-IP $remote_addr; @@ -171,7 +171,7 @@ server { proxy_set_header Connection "upgrade"; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto https; + proxy_set_header Host $host; proxy_set_header Real-IP $remote_addr; @@ -186,7 +186,7 @@ server { proxy_set_header Connection "upgrade"; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto https; + proxy_set_header Host $host; proxy_set_header Real-IP $remote_addr; @@ -201,7 +201,7 @@ server { proxy_set_header Connection "upgrade"; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto https; + proxy_set_header Host $host; proxy_set_header Real-IP $remote_addr; From f0ca9373d2abc7cf3e41a775aaa77467ff114bd0 Mon Sep 17 00:00:00 2001 From: luoyang Date: Tue, 7 Apr 2020 20:21:59 +0800 Subject: [PATCH 03/11] fix incremental rate display --- pom.xml | 2 +- .../app_index/core/impls/AppActServiceImp.java | 2 +- .../mappers/system/ClientDeviceTokenMapper.java | 2 ++ .../payment/manage/mappers/payment/OrderMapper.xml | 2 +- .../mappers/system/ClientDeviceTokenMapper.xml | 13 ++++++++++++- .../tradelog/templates/incremental_trade_logs.html | 3 ++- .../templates/partner_incremental_trade_logs.html | 2 +- 7 files changed, 20 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 9f93f7ccc..10c49b6ca 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ 4.0.0 manage - 1.4.32 + 1.4.33 UTF-8 1.8.0 diff --git a/src/main/java/au/com/royalpay/payment/manage/activities/app_index/core/impls/AppActServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/activities/app_index/core/impls/AppActServiceImp.java index d042b7d33..db4721661 100644 --- a/src/main/java/au/com/royalpay/payment/manage/activities/app_index/core/impls/AppActServiceImp.java +++ b/src/main/java/au/com/royalpay/payment/manage/activities/app_index/core/impls/AppActServiceImp.java @@ -185,7 +185,7 @@ public class AppActServiceImp implements AppActService { @Override public void sendTESTAnnualBillMessage(JSONObject params) { logger.debug("sendAnnualMessage Begin"); - JSONObject devToken = clientDeviceTokenMapper.findByDevId("cf90a252-1121-4bfd-a201-fb573b44ac11"); + JSONObject devToken = clientDeviceTokenMapper.getTestTokens(); Runnable task = () -> { String token = devToken.getString("token"); JSONObject log = saveAppMessageLog(devToken.getString("dev_id"), diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientDeviceTokenMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientDeviceTokenMapper.java index 1b2b301b5..2352872c6 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientDeviceTokenMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientDeviceTokenMapper.java @@ -28,6 +28,8 @@ public interface ClientDeviceTokenMapper { List listAllTokens(JSONObject devToken); + JSONObject getTestTokens(); + @AutoSql(type = SqlType.SELECT) List listAllTokensByClient_id(@Param("client_id") int client_id); } diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml index c009f4864..9cad5b62b 100644 --- a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml +++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml @@ -541,7 +541,7 @@ + + - \ No newline at end of file + diff --git a/src/main/ui/static/payment/tradelog/templates/incremental_trade_logs.html b/src/main/ui/static/payment/tradelog/templates/incremental_trade_logs.html index da3881451..1bf750ffa 100644 --- a/src/main/ui/static/payment/tradelog/templates/incremental_trade_logs.html +++ b/src/main/ui/static/payment/tradelog/templates/incremental_trade_logs.html @@ -395,7 +395,8 @@ ng-click="showRefundLog(trade.order_id)">(-{{trade.refund_fee}}) - {{(trade.surcharge_rate * 100 - trade.rate_value)| number : 2}}% + {{(((trade.surcharge_rate * 100) > trade.rate_value)?(trade.surcharge_rate * 100-trade.rate_value):trade.surcharge_rate)| number : 2}}% + {{(trade.total_surcharge-trade.incremental_surcharge) | number : 2 | currency:trade.currency}} {{trade.source}}:{{(trade.rate_value) | number : 2}}% diff --git a/src/main/ui/static/payment/tradelog/templates/partner_incremental_trade_logs.html b/src/main/ui/static/payment/tradelog/templates/partner_incremental_trade_logs.html index bcbf4d146..d9dd59a02 100644 --- a/src/main/ui/static/payment/tradelog/templates/partner_incremental_trade_logs.html +++ b/src/main/ui/static/payment/tradelog/templates/partner_incremental_trade_logs.html @@ -348,7 +348,7 @@ (-{{trade.refund_fee}}) - {{(trade.surcharge_rate * 100 - trade.rate_value)| number : 2}}% + {{(((trade.surcharge_rate * 100) > trade.rate_value)?(trade.surcharge_rate * 100-trade.rate_value):trade.surcharge_rate)| number : 2}}% {{(trade.total_surcharge-trade.incremental_surcharge) | number : 2 | currency:trade.currency}} {{trade.source}}:{{(trade.rate_value) | number : 2}}% From 9f7318c3b55ac530e9c850bfba49faf6ee0e7e8d Mon Sep 17 00:00:00 2001 From: luoyang Date: Tue, 7 Apr 2020 20:28:11 +0800 Subject: [PATCH 04/11] fix rate display --- .../payment/tradelog/templates/incremental_trade_logs.html | 2 +- .../tradelog/templates/partner_incremental_trade_logs.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/ui/static/payment/tradelog/templates/incremental_trade_logs.html b/src/main/ui/static/payment/tradelog/templates/incremental_trade_logs.html index 1bf750ffa..3fe04ed9e 100644 --- a/src/main/ui/static/payment/tradelog/templates/incremental_trade_logs.html +++ b/src/main/ui/static/payment/tradelog/templates/incremental_trade_logs.html @@ -395,7 +395,7 @@ ng-click="showRefundLog(trade.order_id)">(-{{trade.refund_fee}}) - {{(((trade.surcharge_rate * 100) > trade.rate_value)?(trade.surcharge_rate * 100-trade.rate_value):trade.surcharge_rate)| number : 2}}% + {{(((trade.surcharge_rate * 100) > trade.rate_value)?(trade.surcharge_rate * 100-trade.rate_value):(trade.surcharge_rate * 100))| number : 2}}% {{(trade.total_surcharge-trade.incremental_surcharge) | number : 2 | currency:trade.currency}} diff --git a/src/main/ui/static/payment/tradelog/templates/partner_incremental_trade_logs.html b/src/main/ui/static/payment/tradelog/templates/partner_incremental_trade_logs.html index d9dd59a02..8d8e063e0 100644 --- a/src/main/ui/static/payment/tradelog/templates/partner_incremental_trade_logs.html +++ b/src/main/ui/static/payment/tradelog/templates/partner_incremental_trade_logs.html @@ -348,7 +348,7 @@ (-{{trade.refund_fee}}) - {{(((trade.surcharge_rate * 100) > trade.rate_value)?(trade.surcharge_rate * 100-trade.rate_value):trade.surcharge_rate)| number : 2}}% + {{(((trade.surcharge_rate * 100) > trade.rate_value)?(trade.surcharge_rate * 100-trade.rate_value):(trade.surcharge_rate*100))| number : 2}}% {{(trade.total_surcharge-trade.incremental_surcharge) | number : 2 | currency:trade.currency}} {{trade.source}}:{{(trade.rate_value) | number : 2}}% From f85aec853c2f8fe7838bead9ddb8beea21670692 Mon Sep 17 00:00:00 2001 From: luoyang Date: Wed, 8 Apr 2020 10:40:57 +0800 Subject: [PATCH 05/11] =?UTF-8?q?add=20=E6=9B=B4=E6=96=B0=E6=9C=80?= =?UTF-8?q?=E6=96=B0=E5=90=88=E5=90=8C=E6=A8=A1=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../manage/appclient/core/impls/RetailAppServiceImp.java | 2 +- .../payment/manage/merchants/core/impls/ClientManagerImpl.java | 2 +- src/main/resources/application.properties | 3 ++- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 10c49b6ca..1ef0a40bc 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ 4.0.0 manage - 1.4.33 + 1.4.34 UTF-8 1.8.0 diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java index 6a22830e3..67690a50f 100644 --- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java +++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java @@ -232,7 +232,7 @@ public class RetailAppServiceImp implements RetailAppService { @Resource private DeviceManager deviceManager; private final String CBBANK_AGGREGATE_FILE = "https://file.royalpay.com.au/open/2019/08/05/1564972204689_uwZvpTBjtLUMcN8c540xcZvux1Rd3O.pdf"; - private final String IMG_AGGREGATE_FILE = "https://file.royalpay.com.au/open/2019/10/22/1571723034726_5xK6A0FGv5aQPbMIDJzXJrUPKHFutv.pdf"; + private final String IMG_AGGREGATE_FILE = "https://file.royalpay.com.au/open/2020/04/08/1586313342533_41vI3w9R8OHrhAVYWvdv7S2IyQra4z.pdf"; @Resource private SmsSender smsSender; diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java index 11f9b0fd3..149495ab2 100644 --- a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java @@ -332,7 +332,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid private String agreetemplatePdfPath; @Value("${app.agreetemplate.aggregate.path}") private String aggregateAgreetemplatePdfPath; - private final String IMG_AGGREGATE_FILE = "https://file.royalpay.com.au/open/2019/10/22/1571723034726_5xK6A0FGv5aQPbMIDJzXJrUPKHFutv.pdf"; + private final String IMG_AGGREGATE_FILE = "https://file.royalpay.com.au/open/2020/04/08/1586313342533_41vI3w9R8OHrhAVYWvdv7S2IyQra4z.pdf"; @Resource diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 7a978e921..c1b30fae0 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -49,7 +49,8 @@ app.agreetemplate.classic.path=https://file.royalpay.com.au/open/2017/07/10/1499 ##聚合支付合同模板 #app.agreetemplate.aggregate.path=https://file.royalpay.com.au/open/2017/11/17/1510890355946_hQt6yGc0NJ8TYeK7XCuuSAnTI31M7v.pdf #app.agreetemplate.aggregate.path=https://file.royalpay.com.au/open/2019/02/12/1549950518019_vW4tU5t6D6yA0wMSDNBB9G195W3g99.pdf -app.agreetemplate.aggregate.path=https://file.royalpay.com.au/open/2019/10/22/1571723034726_5xK6A0FGv5aQPbMIDJzXJrUPKHFutv.pdf +#app.agreetemplate.aggregate.path=https://file.royalpay.com.au/open/2019/10/22/1571723034726_5xK6A0FGv5aQPbMIDJzXJrUPKHFutv.pdf +app.agreetemplate.aggregate.path=https://file.royalpay.com.au/open/2020/04/08/1586313342533_41vI3w9R8OHrhAVYWvdv7S2IyQra4z.pdf #app.host.main=https://mpay.royalpay.com.au/ #app.host.regions.cn=https://mpay-cn.royalpay.com.au/ From 372a4346bb1fd3ac542975da2af94f74c8440b37 Mon Sep 17 00:00:00 2001 From: luoyang Date: Wed, 8 Apr 2020 14:19:45 +0800 Subject: [PATCH 06/11] add rservice app notify --- pom.xml | 2 +- .../appclient/core/RetailRSvcService.java | 2 + .../core/impls/RetailRSvcServiceImpl.java | 112 +++++++++++++++++- .../appclient/web/RsvcServiceController.java | 5 + 4 files changed, 117 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 1ef0a40bc..965456436 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ 4.0.0 manage - 1.4.34 + 1.4.35 UTF-8 1.8.0 diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/RetailRSvcService.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/RetailRSvcService.java index 71651c2d0..1cf057525 100644 --- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/RetailRSvcService.java +++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/RetailRSvcService.java @@ -16,5 +16,7 @@ public interface RetailRSvcService { JSONObject setUpShopBySourceCode(String sourceCode, JSONObject params); + JSONObject appNotifyBySourceCode(String sourceCode, JSONObject params); + JSONObject getGeekSsoTokenInfo(String sourceCode, String clientMoniker); } diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailRSvcServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailRSvcServiceImpl.java index 52a213a94..a4f44f1d2 100644 --- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailRSvcServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailRSvcServiceImpl.java @@ -4,11 +4,16 @@ import au.com.royalpay.payment.core.exceptions.InvalidShortIdException; import au.com.royalpay.payment.manage.appclient.beans.RSvcMchBean; import au.com.royalpay.payment.manage.appclient.core.RetailRSvcService; import au.com.royalpay.payment.manage.appclient.extend.JWTUtil; +import au.com.royalpay.payment.manage.mappers.log.AppMessageLogMapper; import au.com.royalpay.payment.manage.mappers.system.ClientConfigMapper; +import au.com.royalpay.payment.manage.mappers.system.ClientDeviceTokenMapper; import au.com.royalpay.payment.manage.mappers.system.ClientServicesApplyMapper; import au.com.royalpay.payment.manage.merchants.core.ClientManager; +import au.com.royalpay.payment.manage.pushMessage.bean.AppManagerMessageBuilder; import au.com.royalpay.payment.tools.codec.AESCrypt; import au.com.royalpay.payment.tools.device.DeviceSupport; +import au.com.royalpay.payment.tools.device.message.AppMessage; +import au.com.royalpay.payment.tools.device.message.AppMsgSender; import au.com.royalpay.payment.tools.encryptalgorithm.SignUtils; import au.com.royalpay.payment.tools.exceptions.BadRequestException; import au.com.royalpay.payment.tools.exceptions.NotFoundException; @@ -25,13 +30,15 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.nio.charset.StandardCharsets; import java.security.Key; -import java.util.Date; -import java.util.UUID; +import java.util.*; +import java.util.concurrent.LinkedBlockingQueue; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.concurrent.TimeUnit; @Service public class RetailRSvcServiceImpl implements RetailRSvcService { private Logger logger = LoggerFactory.getLogger(getClass()); - + private Map senderMap = new HashMap<>(); @Resource private ClientManager clientManager; @Resource @@ -42,6 +49,17 @@ public class RetailRSvcServiceImpl implements RetailRSvcService { private ClientServicesApplyMapper clientServicesApplyMapper; @Resource private ClientConfigMapper clientConfigMapper; + @Resource + private ClientDeviceTokenMapper clientDeviceTokenMapper; + @Resource + private AppMessageLogMapper appMessageLogMapper; + + private ThreadPoolExecutor sendingAppleMsgPool = new ThreadPoolExecutor(10, 30, 5, TimeUnit.SECONDS, new LinkedBlockingQueue()); + + @Resource + public void setAppMsgSenders(AppMsgSender[] senders) { + Arrays.stream(senders).forEach(appMsgSender -> senderMap.put(appMsgSender.devType(), appMsgSender)); + } @Override public JSONObject findMchInfoBySourceCode(JSONObject device, String sourceCode, boolean debug) { @@ -173,6 +191,42 @@ public class RetailRSvcServiceImpl implements RetailRSvcService { return result; } + @Override + public JSONObject appNotifyBySourceCode(String sourceCode, JSONObject params) { + JSONObject result = new JSONObject(); + JSONObject svcInfo = commonIncrementalChannelMapper.findIncreamentalChannelBySourceCode(sourceCode); + try { + if (svcInfo == null || StringUtils.isEmpty(svcInfo.getString("channel_pub_key")) + || StringUtils.isEmpty(svcInfo.getString("platform_pub_key")) || StringUtils.isEmpty("platform_pri_key")) { + throw new BadRequestException("this channel config is wrong"); + } + Key key = AESCrypt.fromKeyString(Base64.decodeBase64(params.getString("nonce_str"))); + String signa = params.getString("sign"); + params.remove("sign"); + params = JSONObject.parseObject(JSON.toJSONString(params), Feature.OrderedField); + boolean checkSign = SignUtils.validSign(params.toJSONString(), signa, svcInfo.getString("channel_pub_key")); + if (!checkSign) { + throw new BadRequestException("sign is wrong"); + } + String clientMoniker = decData(params.getString("partnerCode"), key, svcInfo.getString("platform_pri_key")); + logger.debug("geek {} app notify info :{}", clientMoniker,params.toJSONString()); + JSONObject client = clientManager.getClientInfoByMoniker(clientMoniker); + if (client == null) { + throw new InvalidShortIdException(); + } + String title = params.getString("title"); + String body = params.getString("body"); + String url = decData(params.getString("url"), key, svcInfo.getString("platform_pri_key")); + sendRServiceNotifyMessage(client,title,body,url); + result.put("result_status", "SUCCESS"); + } catch (Exception e) { + logger.error("geek notify app fail:{} - {}",sourceCode,e.getMessage()); + result.put("result_status", "SYSTEMERROR"); + result.put("result_msg", e.getMessage()); + } + return result; + } + @Override public JSONObject getGeekSsoTokenInfo(String sourceCode, String clientMoniker) { JSONObject svcInfo = commonIncrementalChannelMapper.findIncreamentalChannelBySourceCode(sourceCode); @@ -198,6 +252,45 @@ public class RetailRSvcServiceImpl implements RetailRSvcService { }}; } + private void sendRServiceNotifyMessage(JSONObject client, String title, String body, String url) { + logger.debug("sendAnnualMessage Begin"); + JSONObject devToken = clientDeviceTokenMapper.getTestTokens(); + Runnable task = () -> { + String token = devToken.getString("token"); + JSONObject log = saveAppMessageLog(devToken.getString("dev_id"), + devToken.getIntValue("client_id"), + "annual_bill" + devToken.getString("client_type"), + token, + "跨境商城推送" + ); + try { + JSONObject type = new JSONObject(); + type.put("send_type", "annual_bill"); + type.put("id", devToken.getString("dev_token_id")); + AppMsgSender sender = senderMap.get((devToken.getString("client_type"))); + if (StringUtils.isBlank(token) || sender == null) { + return; + } + JSONObject managerMsg = new JSONObject(); + managerMsg.put("title", title); + managerMsg.put("body", body); + managerMsg.put("type", type); + JSONObject messageData = new JSONObject(); + messageData.put("url", url); + managerMsg.put("data", messageData); + managerMsg.put("msgType", "annual_bill"); + AppMessage appMessage = new AppManagerMessageBuilder(managerMsg).buildMessage(); + sender.sendMessage(appMessage, devToken); + log.put("status", 2); + appMessageLogMapper.update(log); + } catch (Exception e) { + logger.error("出错了：" + e.getMessage()); + appMessageLogMapper.updateStatus(log.getString("send_id"), 1, e.getMessage()); + } + }; + sendingAppleMsgPool.execute(task); + } + private String encData(String data, Key key, String publicKey) { String pubKeyEncData = SignUtils.encData(data, publicKey); return org.apache.commons.codec.binary.Base64.encodeBase64String(AESCrypt.encrypt(pubKeyEncData.getBytes(StandardCharsets.UTF_8), key)); @@ -207,4 +300,17 @@ public class RetailRSvcServiceImpl implements RetailRSvcService { String aesData = new String(AESCrypt.decrypt(Base64.decodeBase64(data), key), StandardCharsets.UTF_8); return SignUtils.decData(aesData, privateKey); } + + private JSONObject saveAppMessageLog(String devId, int clientId, String messageType, String devToken, String remark) { + JSONObject log = new JSONObject(); + log.put("dev_id", devId); + log.put("client_id", clientId); + log.put("msg_type", messageType); + log.put("dev_token", devToken); + log.put("remark", remark); + log.put("send_time", new Date()); + appMessageLogMapper.save(log); + return log; + + } } diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/web/RsvcServiceController.java b/src/main/java/au/com/royalpay/payment/manage/appclient/web/RsvcServiceController.java index 73d28f932..099ec8609 100644 --- a/src/main/java/au/com/royalpay/payment/manage/appclient/web/RsvcServiceController.java +++ b/src/main/java/au/com/royalpay/payment/manage/appclient/web/RsvcServiceController.java @@ -22,4 +22,9 @@ public class RsvcServiceController { public JSONObject setUpShopBySourceCode(@PathVariable String source_code, @RequestBody JSONObject params) { return retailRSvcService.setUpShopBySourceCode(source_code, params); } + + @PostMapping(value = "/{source_code}/appNotify") + public JSONObject appNotifyBySourceCode(@PathVariable String source_code, @RequestBody JSONObject params) { + return retailRSvcService.appNotifyBySourceCode(source_code, params); + } } From f1b9f8d9bee64ca97b2021b4c381a68f6bcd658c Mon Sep 17 00:00:00 2001 From: luoyang Date: Wed, 8 Apr 2020 14:52:38 +0800 Subject: [PATCH 07/11] add rservice app notify --- .../appclient/core/impls/RetailRSvcServiceImpl.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailRSvcServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailRSvcServiceImpl.java index a4f44f1d2..56698f217 100644 --- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailRSvcServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailRSvcServiceImpl.java @@ -217,7 +217,7 @@ public class RetailRSvcServiceImpl implements RetailRSvcService { String title = params.getString("title"); String body = params.getString("body"); String url = decData(params.getString("url"), key, svcInfo.getString("platform_pri_key")); - sendRServiceNotifyMessage(client,title,body,url); + sendRServiceNotifyMessage(client, title, body, url); result.put("result_status", "SUCCESS"); } catch (Exception e) { logger.error("geek notify app fail:{} - {}",sourceCode,e.getMessage()); @@ -253,7 +253,11 @@ public class RetailRSvcServiceImpl implements RetailRSvcService { } private void sendRServiceNotifyMessage(JSONObject client, String title, String body, String url) { - logger.debug("sendAnnualMessage Begin"); + logger.debug("sendGeekMessage Begin"); +// List clientTokens = clientDeviceTokenMapper.listTokensByClient_id(client.getIntValue("client_id")); +// for (JSONObject token : clientTokens) { +// +// } JSONObject devToken = clientDeviceTokenMapper.getTestTokens(); Runnable task = () -> { String token = devToken.getString("token"); From f426f8c354717f9238f913272a5daa16b213e3b6 Mon Sep 17 00:00:00 2001 From: yixian Date: Wed, 8 Apr 2020 21:03:42 +0800 Subject: [PATCH 08/11] build: 2.1.1 integration --- .../impl/MerchantLocationServiceImpl.java | 21 +-- .../system/SysWxMerchantApplyMapper.java | 1 - .../merchants/beans/SubMerchantIdApply.java | 2 +- src/main/resources/application-dev.properties | 16 -- .../resources/application-local.properties | 16 -- src/main/resources/application-local.yml | 19 +- src/main/resources/application.properties | 162 ------------------ src/main/resources/application.yml | 2 +- 8 files changed, 23 insertions(+), 216 deletions(-) delete mode 100644 src/main/resources/application-dev.properties delete mode 100644 src/main/resources/application-local.properties delete mode 100644 src/main/resources/application.properties diff --git a/src/main/java/au/com/royalpay/payment/manage/dev/core/impl/MerchantLocationServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/dev/core/impl/MerchantLocationServiceImpl.java index d6af25de0..ef03f7e06 100644 --- a/src/main/java/au/com/royalpay/payment/manage/dev/core/impl/MerchantLocationServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/dev/core/impl/MerchantLocationServiceImpl.java @@ -9,7 +9,6 @@ import cn.yixblog.platform.http.HttpRequestGenerator; import cn.yixblog.platform.http.HttpRequestResult; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import io.netty.util.internal.ConcurrentSet; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -19,7 +18,6 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.util.UriComponentsBuilder; import javax.annotation.Resource; -import java.io.IOException; import java.net.URISyntaxException; import java.util.Date; import java.util.List; @@ -61,19 +59,16 @@ public class MerchantLocationServiceImpl implements MerchantLocationService { public void initClientLocations() throws InterruptedException { List> clients = jdbcTemplate.queryForList("select client_id, CONCAT(IFNULL(address,''),' ',IFNULL(suburb,''),' ',IFNULL(state,''),' ',IFNULL(country,'')) as 'address' from royalpay_production.sys_clients where client_id not in (select client_id from royalpay_production.sys_clients_locations) "); final int totalLen = clients.size(); - logger.info("total length:" + totalLen); + logger.info("total length:{}", totalLen); for (int i = 0; i < totalLen; i++) { Map client = clients.get(i); final JSONObject clientObj = new JSONObject(client); final int idx = i; - pool.execute(new Runnable() { - @Override - public void run() { - try { - processClient(clientObj, idx, totalLen); - } catch (URISyntaxException e) { - failureSet.add(clientObj.getIntValue("client_id")); - } + pool.execute(() -> { + try { + processClient(clientObj, idx, totalLen); + } catch (URISyntaxException e) { + failureSet.add(clientObj.getIntValue("client_id")); } }); Thread.sleep(120); @@ -90,7 +85,7 @@ public class MerchantLocationServiceImpl implements MerchantLocationService { .queryParam("address", client.get("address")).toUriString(); HttpRequestGenerator gen = new HttpRequestGenerator(url, RequestMethod.GET); int clientId = client.getIntValue("client_id"); - logger.info("start processing index " + idx + "/" + totalLen + ",client_id=" + clientId); + logger.info("start processing index {}/{},client_id={}", idx, totalLen, clientId); HttpRequestResult result = gen.execute(); if (result.isSuccess()) { try { @@ -111,7 +106,7 @@ public class MerchantLocationServiceImpl implements MerchantLocationService { System.err.print(result.getStatusCode()); failureSet.add(clientId); } - logger.info("finished index " + idx + "/" + totalLen + ",client_id=" + clientId); + logger.info("finished index {}/{},client_id={}", idx, totalLen, clientId); } @Override diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/SysWxMerchantApplyMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/SysWxMerchantApplyMapper.java index fd1158972..a3c257372 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/system/SysWxMerchantApplyMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/SysWxMerchantApplyMapper.java @@ -8,7 +8,6 @@ import com.alibaba.fastjson.JSONObject; import com.github.miemiedev.mybatis.paginator.domain.PageBounds; import org.apache.ibatis.annotations.Param; -import javax.validation.constraints.Max; import java.util.List; /** diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/beans/SubMerchantIdApply.java b/src/main/java/au/com/royalpay/payment/manage/merchants/beans/SubMerchantIdApply.java index 2bc113649..69c0e05fb 100644 --- a/src/main/java/au/com/royalpay/payment/manage/merchants/beans/SubMerchantIdApply.java +++ b/src/main/java/au/com/royalpay/payment/manage/merchants/beans/SubMerchantIdApply.java @@ -1,10 +1,10 @@ package au.com.royalpay.payment.manage.merchants.beans; -import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.annotation.JSONField; import org.apache.commons.lang3.StringUtils; import org.hibernate.validator.constraints.Length; + import javax.validation.constraints.NotBlank; /** diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties deleted file mode 100644 index 9ace52739..000000000 --- a/src/main/resources/application-dev.properties +++ /dev/null @@ -1,16 +0,0 @@ -#多数据源配置 -spring.datasource.type = com.zaxxer.hikari.HikariDataSource -#数据源master - -spring.datasource.master.schema-name=royalpay_dev -spring.datasource.master.host=127.0.0.1:3306 -spring.datasource.master.jdbc-url=jdbc:mysql://${spring.datasource.master.host}/${spring.datasource.master.schema-name}?useUnicode=true&characterEncoding=utf8&useSSL=false -spring.datasource.master.username=root -spring.datasource.master.password=root - -#数据源salve -spring.datasource.slave.schema-name=royalpay_dev -spring.datasource.slave.host=127.0.0.1:3306 -spring.datasource.slave.jdbc-url=jdbc:mysql://${spring.datasource.slave.host}/${spring.datasource.slave.schema-name}?useUnicode=true&characterEncoding=utf8&useSSL=false -spring.datasource.slave.username=root -spring.datasource.slave.password=root diff --git a/src/main/resources/application-local.properties b/src/main/resources/application-local.properties deleted file mode 100644 index 1cf8273d3..000000000 --- a/src/main/resources/application-local.properties +++ /dev/null @@ -1,16 +0,0 @@ -#多数据源配置 -spring.datasource.type = com.zaxxer.hikari.HikariDataSource -#数据源master - -spring.datasource.master.schema-name=royalpay_production -spring.datasource.master.host=119.28.3.196:3310 -spring.datasource.master.jdbc-url=jdbc:mysql://${spring.datasource.master.host}/${spring.datasource.master.schema-name}?useUnicode=true&characterEncoding=utf8&useSSL=false -spring.datasource.master.username=readonly -spring.datasource.master.password=read0nly - -#数据源salve -spring.datasource.slave.schema-name=royalpay_production -spring.datasource.slave.host=119.28.3.196:3310 -spring.datasource.slave.jdbc-url=jdbc:mysql://${spring.datasource.slave.host}/${spring.datasource.slave.schema-name}?useUnicode=true&characterEncoding=utf8&useSSL=false -spring.datasource.slave.username=readonly -spring.datasource.slave.password=read0nly diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml index fb015fde5..a773595aa 100644 --- a/src/main/resources/application-local.yml +++ b/src/main/resources/application-local.yml @@ -1,8 +1,15 @@ spring: datasource: - driver-class-name: com.mysql.jdbc.Driver - host: 127.0.0.1:3306 - password: root - schema-name: royalpay_production - url: jdbc:mysql://${spring.datasource.host}/${spring.datasource.schema-name}?useUnicode=true&characterEncoding=utf8&useSSL=false - username: root + master: + host: 119.28.3.196:3310 + jdbc-url: jdbc:mysql://${spring.datasource.master.host}/${spring.datasource.master.schema-name}?useUnicode=true&characterEncoding=utf8&useSSL=false + password: read0nly + schema-name: royalpay_production + username: readonly + slave: + host: 119.28.3.196:3310 + jdbc-url: jdbc:mysql://${spring.datasource.slave.host}/${spring.datasource.slave.schema-name}?useUnicode=true&characterEncoding=utf8&useSSL=false + password: read0nly + schema-name: royalpay_production + username: readonly + type: com.zaxxer.hikari.HikariDataSource \ No newline at end of file diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties deleted file mode 100644 index c1b30fae0..000000000 --- a/src/main/resources/application.properties +++ /dev/null @@ -1,162 +0,0 @@ -server.port=5000 - -spring.profiles.active=dev,alipay,bestpay,jd,wechat,rpay,yeepay - -env.company=RoyalPay - -multipart.max-file-size=10MB - -spring.datasource.test-while-idle=true -#连接池检测释放周期 -spring.datasource.time-between-eviction-runs-millis=500 -spring.datasource.validation-query=select 1 -#最大连接数 -spring.datasource.max-active=1000 -spring.datasource.max-pool-prepared-statement-per-connection-size=100 -spring.datasource.max-idle=150 -#建立连接最大等待时间 -spring.datasource.max-wait=3000 -spring.datasource.filters=stat,wall,log4j - -spring.redis.host=127.0.0.1 -spring.redis.port=6379 -spring.redis.database=1 - -mybatis.autosql.default-dialect=mysql - -app.redis.prefix=payment -app.redis.settle.check-code.prefix=settlementCheckCode - -logging.level.java.sql.Connection=debug -logging.level.java.sql.Statement=debug -logging.level.java.sql.PreparedStatement=debug -logging.level.au.com.royalpay.payment=debug -logging.pattern.console=[%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){blue}] %clr(%-5level) %logger: %msg%n - -jetty.threadPool.maxThreads=1000 - -spring.mail.host=smtp.office365.com -spring.mail.port=587 - -stockholder.mails=leo.huang@royalpay.com.au - - -app.attachment.host=https://file.royalpay.com.au/ -app.attachment.source=03 - -##合同模板 -app.agreetemplate.classic.path=https://file.royalpay.com.au/open/2017/07/10/1499665073802_qV7fpEuS9rdbTnpa4po6rmbW9CSUfE.pdf -##聚合支付合同模板 -#app.agreetemplate.aggregate.path=https://file.royalpay.com.au/open/2017/11/17/1510890355946_hQt6yGc0NJ8TYeK7XCuuSAnTI31M7v.pdf -#app.agreetemplate.aggregate.path=https://file.royalpay.com.au/open/2019/02/12/1549950518019_vW4tU5t6D6yA0wMSDNBB9G195W3g99.pdf -#app.agreetemplate.aggregate.path=https://file.royalpay.com.au/open/2019/10/22/1571723034726_5xK6A0FGv5aQPbMIDJzXJrUPKHFutv.pdf -app.agreetemplate.aggregate.path=https://file.royalpay.com.au/open/2020/04/08/1586313342533_41vI3w9R8OHrhAVYWvdv7S2IyQra4z.pdf - -#app.host.main=https://mpay.royalpay.com.au/ -#app.host.regions.cn=https://mpay-cn.royalpay.com.au/ -#app.host.regions.au=https://mpay-au.royalpay.com.au/ -app.host.main=http://192.168.0.8:9009/ -app.host.regions.cn=http://192.168.0.8:9009/ -app.host.regions.au=http://192.168.0.8:9009/ -app.debug=true - -app.name=RoyalPay - -#app.cms.host=https://www.royalpay.com.au/ - -app.cms.host=http://127.0.0.1:9533 - -app.server.ip=127.0.0.1 - - -app.redpack_auth.enable=false -hf.rsa-file=/opt/2000604000101.pfx -##积分商城 -app.customer.host=https://customer.royalpay.com.au/ -customer.app.appid=customer -customer.app.auth-code=xxnpdBRwd4sIaCCI - -app.settlement.email-to=astro.dai@royalpay.com.au -app.settlement.email-cc=leo.huang@royalpay.com.au - -app.mpsupport.appid=royalpay -app.mpsupport.auth_code=W3xucYnbmbE6rZDmA2V9BsKmagTrVIny - -app.run-tasks=false -app.allow-clearing-generation=false - -app.mail.appid=1 -app.mail.host=https://mailsupport.royalpay.com.au -mail.send.credentialCode=Fd1aRfdjc9 - -spring.thymeleaf.mode=HTML - -app.mpsupport.host=https://mp.royalpay.com.au -app.foreign-currency=AUD - -app.ofei.md5-key=Khjx6wejblaJzmG0JBWFlPFKAUxhFIXQ -app.ofei.pwd=aomi@8888 -app.ofei.sp-code=A1407200 - -mail.mailgun.api_key=api:key-2e67b891a1a7974bf3a40ea440d5a77f -mail.mailgun.public_key=api:pubkey-1aaaffc2662ba1b400c409d3e974ba7e -mail.mailgun.domain=mail.royalpay.com.au -mail.mailgun.default.merchantlist=merchants@mail.royalpay.com.au - - -############## -##短信key -############## -royalpay.sms.appid=1400094878 -royalpay.sms.appkey=43390d81e20c5191c278fbf4cd275be2 - -im.openim.appkey=24986533 -im.openim.secret=96e28e7be21a874177211c31834b5174 - -app.settle.aes-key=EPrfsM2JE69ZPR7BhXn34g== -app.partner.aes-key=xyc7Ya6TmL8/csM1ygtviA== -app.risk.aes-key=NRvwd9dgbT2Cdz6zJz9AWA== -app.risk.control.aes-key=Aa+MtthC4Ztq4Kfa9aL+UA== - -#清算银行配置 -settle.abafile.default-bank=CBA -settle.abafile.remains-to=ANZ - -settle.abafile.bank.CBA.bank=CBA -settle.abafile.bank.CBA.apca=301500 -settle.abafile.bank.CBA.bsb=063109 -settle.abafile.bank.CBA.account-no=11655861 -settle.abafile.bank.CBA.account-name=Tunnel Show Pty Ltd - -settle.abafile.bank.ANZ.manual-sending=true -settle.abafile.bank.ANZ.bank=ANZ -settle.abafile.bank.ANZ.apca=514624 -settle.abafile.bank.ANZ.bsb=013006 -settle.abafile.bank.ANZ.account-no=837022519 -settle.abafile.bank.ANZ.account-name=Tunnel Show Pty Ltd - -settle.abafile.bank.NAB.manual-sending=true -settle.abafile.bank.NAB.bank=NAB -settle.abafile.bank.NAB.apca=514624 -settle.abafile.bank.NAB.bsb=013006 -settle.abafile.bank.NAB.account-no=837022519 -settle.abafile.bank.NAB.account-name=Tunnel Show Pty Ltd - -# 瀚银Secure -app.hanyin-secure.pid=ROYALPAY -app.hanyin-secure.sftp-host=180.168.61.93 -app.hanyin-secure.sftp-port=28480 -app.hanyin-secure.sftp-username=royalpay -app.hanyin-secure.sftp-pwd=royalpay - -qcloud.secret-id=AKIDlHdjgWzZliPvBauZFfrnW0MaZOyHdTPz -qcloud.secret-key=YswoQDsIZfWEqEAEvMXS8Yic84lFn9Jp -qcloud.scf.region=ap-hongkong - -apple.message.apns.file= -apple.message.apns.password= -android.message.appkey= -android.message.secret= - -spring.servlet.multipart.max-file-size=20MB -spring.servlet.multipart.max-request-size=20MB diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index c0336c21f..e1f6ffe13 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -5,7 +5,7 @@ android: app: agreetemplate: aggregate: - path: https://file.royalpay.com.au/open/2019/10/22/1571723034726_5xK6A0FGv5aQPbMIDJzXJrUPKHFutv.pdf + path: https://file.royalpay.com.au/open/2020/04/08/1586313342533_41vI3w9R8OHrhAVYWvdv7S2IyQra4z.pdf classic: path: https://file.royalpay.com.au/open/2017/07/10/1499665073802_qV7fpEuS9rdbTnpa4po6rmbW9CSUfE.pdf allow-clearing-generation: false From dd5f00ec69606215715c9e45f87dcfd1772f2348 Mon Sep 17 00:00:00 2001 From: yixian Date: Thu, 9 Apr 2020 11:24:54 +0800 Subject: [PATCH 09/11] build: 2.1.2 rpaysvc --- pom.xml | 6 ++- .../payment/manage/WebConfiguration.java | 12 ------ src/main/resources/application-rppaysvc.yml | 7 ++++ src/main/resources/application.yml | 2 +- .../static/templates/payment/v1/card_pay.js | 38 +++++++++++++++++++ 5 files changed, 51 insertions(+), 14 deletions(-) create mode 100644 src/main/resources/application-rppaysvc.yml create mode 100644 src/main/ui/static/templates/payment/v1/card_pay.js diff --git a/pom.xml b/pom.xml index a894d5ffa..1c1ad7d77 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ 4.0.0 manage - 2.1.1 + 2.1.2 UTF-8 1.8.0 @@ -37,6 +37,10 @@ au.com.royalpay.payment hf-core + + au.com.royalpay.payment + rppaymentsvc + au.com.royalpay.payment jd-core diff --git a/src/main/java/au/com/royalpay/payment/manage/WebConfiguration.java b/src/main/java/au/com/royalpay/payment/manage/WebConfiguration.java index dea796892..70ea18c86 100644 --- a/src/main/java/au/com/royalpay/payment/manage/WebConfiguration.java +++ b/src/main/java/au/com/royalpay/payment/manage/WebConfiguration.java @@ -1,9 +1,6 @@ package au.com.royalpay.payment.manage; import au.com.royalpay.payment.manage.permission.manager.ManagerUserInterceptor; -import au.com.royalpay.payment.tools.permission.alipay.AlipayUserInterceptor; -import au.com.royalpay.payment.tools.permission.consumer.ConsumersInterceptor; -import au.com.royalpay.payment.tools.permission.wechat.WechatUserInterceptor; import org.springframework.context.annotation.Configuration; import org.springframework.web.servlet.config.annotation.InterceptorRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; @@ -17,20 +14,11 @@ import javax.annotation.Resource; public class WebConfiguration implements WebMvcConfigurer { @Resource private ManagerUserInterceptor managerUserInterceptor; - @Resource - private WechatUserInterceptor wechatUserInterceptor; - @Resource - private AlipayUserInterceptor alipayUserInterceptor; - @Resource - private ConsumersInterceptor consumersInterceptor; @Override public void addInterceptors(InterceptorRegistry registry) { registry.addInterceptor(managerUserInterceptor).order(1); - registry.addInterceptor(wechatUserInterceptor).order(1); - registry.addInterceptor(alipayUserInterceptor).order(1); - registry.addInterceptor(consumersInterceptor).order(1); } diff --git a/src/main/resources/application-rppaysvc.yml b/src/main/resources/application-rppaysvc.yml new file mode 100644 index 000000000..68ffcf7f1 --- /dev/null +++ b/src/main/resources/application-rppaysvc.yml @@ -0,0 +1,7 @@ +app: + rpaysvc: + appid: 3daefd62-3003-4a93-821e-5962d5ff67c2 + priv-key: MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDE55tREo6t6m1hekGlaMmDivorV3a+MkA/Wna0k917u/CGYIf7FtmWk1um7VcBRdljluLjqThePZgbgtwqTdHWXJP2gPwoJjLUluVEyKh19blSgrq7K1FEryAzQ5XFLzMX//EMc1BNrqcREHC6XVlJeNzpOd8+C83cxGxL+ayLoQ/ePEyp/8yXBbA6t2yXyi7H1ry8WiFFg9RFf+zAeESFXlKIS72fw9I9GxG6PLUhbD8S+IIJ2A0ZudKUQIUw4M0wSilo40lfqp/xRyfUBZevKcPrO5/ZCJX6V2d154s1m5p0Z/eLtQ1ido0quVi/LzBb1KXDYNHV6hPJjNQmNbMnAgMBAAECggEAY/rqLW9LzVk0cwN947xiXg2qW2mM3KRtZP3NOoG+O37BcaoAQelnUILATfFDdVz/Ngc+a7TX71o9KvL2UfCztLHLW6ZA4y4KL1HzVkrA5yx/DjtdD36+RC7cHcuad8YwnmYSAm1nABrHr+12H9sYZCsfmLkO9tVNkWSXTLiY+UhJ1hTua2LYgaTsHR9lYLt/K+PNIBAToKuMcKFTEMWbrnekrFhXkPdeS3alFL/0X7csaPhLvZTDaAtpAytvnmN4nuZmnONnDqPJ3IEFjc7xwZ15D9Qgv/+g74q1VzU/0+2421S6BSijUK3kUdeHXASU3YvIczfnbr5t+NYL7nd68QKBgQDlLFNMz9rVFLd5b351tnld9rni8KzHi+V+eXeJpQ+zriTODOvvkFJrTSZKm+JQoBrpTI+EA1fovxLnDBhNnrR4HmHhudMTGqU6JOZLj+fk8UQKXDpVEGWO6QT68ds+Ii1ex1UEkbBkLWGrrHlFAdY0q+Af7L7Fe0osZX9382b+aQKBgQDb9EmDD79IFOxSjMJVnlN0g2P48hQ9M40cEzXRD/iyyBr9l8rE400Q6GT35ZgHKSrG2nXZehWCaQQqniHu+y6UHnJfhbC0LEYdcYRoyamlGwEFp8xSRJ88R2IoL+2g+XJ1Tc6eACjsEJWZooga6bqdrYjaAe0uSGid0Buh6JMTDwKBgGIfJFtS84MgJ55a2m5T/or4xIYiPhgCEfSg1Umd3qcz/JYseihMRr2ifq6bJ78VjfAt05TWSaFhjhpW12EEfoifmZEoGvOnCO9oNSJNLyCbHGLDMkaRiqoxouw++XwU7hASkJgwOLHrrFHwusuNCcXrgT6qAtRTAWMY4gbdtE9hAoGAWnZsTZUKbND+KS1vN9t4I3FuipK1tD4hiSx1c9iHxq/6OdZWNQfvSEbsT/CDyF4sE8EBu0I02n/qkMSc3Dc+fvjOvW60sEWNSMrJVHesaBVlJDhRFnzWqOoK+tBLgWtWodwwYFdcfUqM3LU2GSuL7xHSOSeVrvVk4ZMX6k1HQA0CgYAypY0eecX8Gc7SCt7wpYoNuL2MuZZIDXNZVMpWYMokA1Z74oX1uzecyTNLHgCFHpjiJPyc6KW1/pnDpcA9FuTmLUuNyuqsX85IEMZPkIqPFebAl4IvOuwzvXDPxxgh8B+XBQBydgFADeqgqXG8rxomC4PUrX47pKb1G89bTGp8Dw== + pub-key: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmifNnVZG6HZBYdvLnCGyNm7rQTZKyl3w+7xdBGgjsQeaskdy/IgmrWRG4Ii1o82KV/ZA+bw86vE37axpoxbqOU3LYVb69nVYvmJOL018iBs74HhbZ8CtWtQmEIKqmX/rNUdp15OgwzDckvrK/EEzjdOoQfAkFB68wLOsTcsRwBB3JUL/uiHGK6b5Ofmh4PxYeAVNpWYHyCaQIuN6JH85VHBVS4etP25GbgWxl+ktuZucaPsQ2G25mwhlpNiC28J4la0wD33JKMfCNCjORlWkw2HcDvrRLqza4lJOXu0rFy3JuUkZ0hn834ZWd3MboqNNE6a2xe4ppZUJ9ccM9312JQIDAQAB + server-root: https://channel.rpayplus.com/channel/v1/ + diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index e1f6ffe13..fb95b16c4 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -179,7 +179,7 @@ spring: host: smtp.office365.com port: 587 profiles: - active: dev,alipay,bestpay,jd,wechat,rpay,yeepay + active: dev,alipay,bestpay,jd,wechat,rpay,yeepay,rppaysvc redis: database: 1 host: 127.0.0.1 diff --git a/src/main/ui/static/templates/payment/v1/card_pay.js b/src/main/ui/static/templates/payment/v1/card_pay.js new file mode 100644 index 000000000..043c2273d --- /dev/null +++ b/src/main/ui/static/templates/payment/v1/card_pay.js @@ -0,0 +1,38 @@ +$(function () { + let $container = $('.qr-img-box')[0]; + let cardFrame = window.channel_account_id ? TokenInputFrame($container, window.channel_account_id) : CardInputFrame($container); + cardFrame.onSuccess = function (secretData) { + $.ajax({ + url: 'commit', + data: JSON.stringify(secretData), + contentType: 'application/json', + success: function () { + startCheckOrder(window.client_moniker, window.partner_order_id); + } + }) + }; + cardFrame.show(); + + $('#payBtn').click(function () { + cardFrame.commit(); + }); + + function startCheckOrder(clientMoniker, merchantOrderId) { + function checkOrderStd() { + $.ajax({ + url: '/api/v1.0/payment/clients/' + clientMoniker + '/orders/' + merchantOrderId + '/status', + method: 'GET', + dataType: 'json', + success: function (res) { + if (res.paid) { + location.href = window.redirect + (window.redirect.indexOf('?') < 0 ? '?' : '&') + 'success=true&time=' + res.time + '&nonce_str=' + res.nonce_str + '&sign=' + res.sign; + } else { + setTimeout(checkOrderStd, 500); + } + } + }) + } + + checkOrderStd(); + } +}); \ No newline at end of file From efccef2df88fb5dbaa43c8a2798060f8177c8aa0 Mon Sep 17 00:00:00 2001 From: yixian Date: Thu, 9 Apr 2020 13:40:51 +0800 Subject: [PATCH 10/11] build: 2.1.3 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1c1ad7d77..4798a7370 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ au.com.royalpay.payment payment-parent - 2.1.1 + 2.1.3 4.0.0 manage From 6231b2a6bf2beec1273c20b401b2b2c5d581a777 Mon Sep 17 00:00:00 2001 From: luoyang Date: Thu, 9 Apr 2020 14:21:18 +0800 Subject: [PATCH 11/11] update 2.1.2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4798a7370..c23d50805 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ au.com.royalpay.payment payment-parent - 2.1.3 + 2.1.4 4.0.0 manage