Skip to content

I
ibzpay
提交 3281115d 编写于 作者: ibizdev's avatar ibizdev
浏览文件
操作

zhouweidong@lab.ibiz5.com 发布系统代码

上级 c3394c53
显示空白字符变更
内嵌 并排
正在显示 包含 88 行增加 和 70 行删除
app_web/src/locale/lanres/entities/pay-trade/pay-trade_en_US.ts
浏览文件 @ 3281115d
...@@ -9,6 +9,8 @@ export default { ...@@ -9,6 +9,8 @@ export default {
access_id: "支付平台接入标识", access_id: "支付平台接入标识",
access_name: "支付平台", access_name: "支付平台",
app_id: "AccessKey(AppId)", app_id: "AccessKey(AppId)",
trade_type: "支付类型",
trade_status: "支付状态",
}, },
views: { views: {
editview: { editview: {
......
app_web/src/locale/lanres/entities/pay-trade/pay-trade_zh_CN.ts
浏览文件 @ 3281115d
...@@ -8,6 +8,8 @@ export default { ...@@ -8,6 +8,8 @@ export default {
access_id: "支付平台接入标识", access_id: "支付平台接入标识",
access_name: "支付平台", access_name: "支付平台",
app_id: "AccessKey(AppId)", app_id: "AccessKey(AppId)",
trade_type: "支付类型",
trade_status: "支付状态",
}, },
views: { views: {
editview: { editview: {
......
ibzpay-core/src/main/java/cn/ibizlab/core/pay/domain/PayTrade.java
浏览文件 @ 3281115d
...@@ -97,6 +97,20 @@ public class PayTrade extends EntityMP implements Serializable { ...@@ -97,6 +97,20 @@ public class PayTrade extends EntityMP implements Serializable {
@JSONField(name = "app_id") @JSONField(name = "app_id")
@JsonProperty("app_id") @JsonProperty("app_id")
private String appId; private String appId;
/**
* 支付类型
*/
@TableField(value = "tradetype")
@JSONField(name = "trade_type")
@JsonProperty("trade_type")
private String tradeType;
/**
* 支付状态
*/
@TableField(value = "tradestatus")
@JSONField(name = "trade_status")
@JsonProperty("trade_status")
private String tradeStatus;
/** /**
* 接入平台 * 接入平台
...@@ -164,6 +178,22 @@ public class PayTrade extends EntityMP implements Serializable { ...@@ -164,6 +178,22 @@ public class PayTrade extends EntityMP implements Serializable {
this.modify("appid",appId); this.modify("appid",appId);
} }
/**
* 设置 [支付类型]
*/
public void setTradeType(String tradeType){
this.tradeType = tradeType ;
this.modify("tradetype",tradeType);
}
/**
* 设置 [支付状态]
*/
public void setTradeStatus(String tradeStatus){
this.tradeStatus = tradeStatus ;
this.modify("tradestatus",tradeStatus);
}
} }
......
ibzpay-core/src/main/java/cn/ibizlab/core/pay/filter/PayTradeSearchContext.java
浏览文件 @ 3281115d
...@@ -55,6 +55,13 @@ public class PayTradeSearchContext extends QueryWrapperContext<PayTrade> { ...@@ -55,6 +55,13 @@ public class PayTradeSearchContext extends QueryWrapperContext<PayTrade> {
this.getSearchCond().like("accessname", n_accessname_like); this.getSearchCond().like("accessname", n_accessname_like);
} }
} }
private String n_tradestatus_eq;//[支付状态]
public void setN_tradestatus_eq(String n_tradestatus_eq) {
this.n_tradestatus_eq = n_tradestatus_eq;
if(!ObjectUtils.isEmpty(this.n_tradestatus_eq)){
this.getSearchCond().eq("tradestatus", n_tradestatus_eq);
}
}
/** /**
* 启用快速搜索 * 启用快速搜索
......
ibzpay-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @ 3281115d
<?xml version="1.1" encoding="UTF-8" standalone="no"?> !!!!模版产生代码错误:----
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd"> Tip: If the failing expression is known to be legally refer to something that's sometimes null or missing, either specify a default value like myOptionalVar!myDefault, or use <#if myOptionalVar??>when-present<#else>when-missing</#if>. (These only cover the last step of the expression; to cover the whole expression, use parenthesis: (myOptionalVar.foo)!myDefault, (myOptionalVar.foo)??
----
----
<!--输出实体[PAY_OPEN_ACCESS]数据结构 --> FTL stack trace ("~" means nesting-related):
<changeSet author="a_A_5d9d78509" id="tab-pay_open_access-71-1"> - Failed at: ${dbinst.getUserName()} [in template "CODETEMPL_zh_CN" at line 28, column 24]
<createTable tableName="IBZOPENACCESS"> ----
<column name="ACCESSID" remarks="" type="VARCHAR(100)"> \ No newline at end of file
<constraints primaryKey="true" primaryKeyName="PK_PAY_OPEN_ACCESS_ACCESSID"/>
</column>
<column name="ACCESSNAME" remarks="" type="VARCHAR(100)">
</column>
<column name="OPEN_TYPE" remarks="" type="VARCHAR(100)">
</column>
<column name="ACCESS_KEY" remarks="" type="VARCHAR(100)">
</column>
<column name="SECRET_KEY" remarks="" type="VARCHAR(100)">
</column>
<column name="REGION_ID" remarks="" type="VARCHAR(100)">
</column>
<column name="ACCESS_TOKEN" remarks="" type="VARCHAR(1000)">
</column>
<column name="EXPIRES_TIME" remarks="" type="DATETIME">
</column>
<column name="DISABLED" remarks="" type="INT">
</column>
<column name="REDIRECT_URI" remarks="" type="VARCHAR(500)">
</column>
</createTable>
</changeSet>
<!--输出实体[PAY_TRADE]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-pay_trade-107-2">
<createTable tableName="IBZPAYTRADE">
<column name="TRADEID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_PAY_TRADE_TRADEID"/>
</column>
<column name="TRADENAME" remarks="" type="VARCHAR(100)">
</column>
<column name="SUBJECT" remarks="" type="VARCHAR(100)">
</column>
<column name="OUTTRADENO" remarks="" type="VARCHAR(100)">
</column>
<column name="TOTALAMOUNT" remarks="" type="VARCHAR(100)">
</column>
<column name="ACCESSID" remarks="" type="VARCHAR(100)">
</column>
<column name="ACCESSNAME" remarks="" type="VARCHAR(100)">
</column>
<column name="APPID" remarks="" type="VARCHAR(100)">
</column>
</createTable>
</changeSet>
<!--输出实体[PAY_OPEN_ACCESS]外键关系 -->
<!--输出实体[PAY_TRADE]外键关系 -->
<changeSet author="a_A_5d9d78509" id="fk-pay_trade-107-3">
<addForeignKeyConstraint baseColumnNames="ACCESSID" baseTableName="IBZPAYTRADE" constraintName="DER1N_PAY_TRADE_PAY_OPEN_ACCES" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ACCESSID" referencedTableName="IBZOPENACCESS" validate="true"/>
</changeSet>
</databaseChangeLog>
ibzpay-core/src/main/resources/mapper/pay/paytrade/PayTradeMapper.xml
浏览文件 @ 3281115d
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<![CDATA[select t1.* from (SELECT t1.`ACCESSID`, t1.`ACCESSNAME`, t1.`APPID`, t1.`OUTTRADENO`, t1.`SUBJECT`, t1.`TOTALAMOUNT`, t1.`TRADEID`, t1.`TRADENAME` FROM `IBZPAYTRADE` t1 ) t1 where tradeid=#{id}]]> <![CDATA[select t1.* from (SELECT t1.`ACCESSID`, t1.`ACCESSNAME`, t1.`APPID`, t1.`OUTTRADENO`, t1.`SUBJECT`, t1.`TOTALAMOUNT`, t1.`TRADEID`, t1.`TRADENAME` FROM `IBZPAYTRADE` t1 ) t1 where tradeid=#{id}]]>
</select> </select>
<select id="selectById" resultMap="PayTradeResultMap" databaseId="oracle"> <select id="selectById" resultMap="PayTradeResultMap" databaseId="oracle">
<![CDATA[select t1.* from (SELECT t1.ACCESSID, t1.ACCESSNAME, t1.APPID, t1.OUTTRADENO, t1.SUBJECT, t1.TOTALAMOUNT, t1.TRADEID, t1.TRADENAME FROM IBZPAYTRADE t1 ) t1 where tradeid=#{id}]]> <![CDATA[select t1.* from (SELECT t1.ACCESSID, t1.ACCESSNAME, t1.APPID, t1.OUTTRADENO, t1.SUBJECT, t1.TOTALAMOUNT, t1.TRADEID, t1.TRADENAME, t1.TRADESTATUS, t1.TRADETYPE FROM IBZPAYTRADE t1 ) t1 where tradeid=#{id}]]>
</select> </select>
<!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 --> <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
</sql> </sql>
<!--数据查询[Default]--> <!--数据查询[Default]-->
<sql id="Default" databaseId="oracle"> <sql id="Default" databaseId="oracle">
<![CDATA[ SELECT t1.ACCESSID, t1.ACCESSNAME, t1.APPID, t1.OUTTRADENO, t1.SUBJECT, t1.TOTALAMOUNT, t1.TRADEID, t1.TRADENAME FROM IBZPAYTRADE t1 <![CDATA[ SELECT t1.ACCESSID, t1.ACCESSNAME, t1.APPID, t1.OUTTRADENO, t1.SUBJECT, t1.TOTALAMOUNT, t1.TRADEID, t1.TRADENAME, t1.TRADESTATUS, t1.TRADETYPE FROM IBZPAYTRADE t1
]]> ]]>
</sql> </sql>
<!--数据查询[View]--> <!--数据查询[View]-->
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
</sql> </sql>
<!--数据查询[View]--> <!--数据查询[View]-->
<sql id="View" databaseId="oracle"> <sql id="View" databaseId="oracle">
<![CDATA[ SELECT t1.ACCESSID, t1.ACCESSNAME, t1.APPID, t1.OUTTRADENO, t1.SUBJECT, t1.TOTALAMOUNT, t1.TRADEID, t1.TRADENAME FROM IBZPAYTRADE t1 <![CDATA[ SELECT t1.ACCESSID, t1.ACCESSNAME, t1.APPID, t1.OUTTRADENO, t1.SUBJECT, t1.TOTALAMOUNT, t1.TRADEID, t1.TRADENAME, t1.TRADESTATUS, t1.TRADETYPE FROM IBZPAYTRADE t1
]]> ]]>
</sql> </sql>
</mapper> </mapper>
......
ibzpay-provider/ibzpay-provider-api/src/main/java/cn/ibizlab/api/dto/PayTradeDTO.java
浏览文件 @ 3281115d
...@@ -88,6 +88,22 @@ public class PayTradeDTO extends DTOBase implements Serializable { ...@@ -88,6 +88,22 @@ public class PayTradeDTO extends DTOBase implements Serializable {
@JsonProperty("app_id") @JsonProperty("app_id")
private String appId; private String appId;
/**
* 属性 [TRADETYPE]
*
*/
@JSONField(name = "trade_type")
@JsonProperty("trade_type")
private String tradeType;
/**
* 属性 [TRADESTATUS]
*
*/
@JSONField(name = "trade_status")
@JsonProperty("trade_status")
private String tradeStatus;
/** /**
* 设置 [TRADENAME] * 设置 [TRADENAME]
...@@ -145,6 +161,22 @@ public class PayTradeDTO extends DTOBase implements Serializable { ...@@ -145,6 +161,22 @@ public class PayTradeDTO extends DTOBase implements Serializable {
this.modify("appid",appId); this.modify("appid",appId);
} }
/**
* 设置 [TRADETYPE]
*/
public void setTradeType(String tradeType){
this.tradeType = tradeType ;
this.modify("tradetype",tradeType);
}
/**
* 设置 [TRADESTATUS]
*/
public void setTradeStatus(String tradeStatus){
this.tradeStatus = tradeStatus ;
this.modify("tradestatus",tradeStatus);
}
} }
ibzpay-util/src/main/resources/application-sys.yml
浏览文件 @ 3281115d
...@@ -22,9 +22,9 @@ spring: ...@@ -22,9 +22,9 @@ spring:
max-file-size: 100MB max-file-size: 100MB
max-request-size: 100MB max-request-size: 100MB
datasource: datasource:
username: a_A_5d9d78509 username: root
password: '@6dEfb3@' password: 'root'
url: jdbc:mysql://172.16.180.232:3306/a_A_5d9d78509?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true url: jdbc:mysql://127.0.0.1:3306/ibzpay?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true
driver-class-name: com.mysql.jdbc.Driver driver-class-name: com.mysql.jdbc.Driver
filters: stat,wall,log4j2 filters: stat,wall,log4j2
#配置初始化大小/最小/最大 #配置初始化大小/最小/最大
...@@ -45,7 +45,7 @@ spring: ...@@ -45,7 +45,7 @@ spring:
pool-prepared-statements: false pool-prepared-statements: false
max-pool-prepared-statement-per-connection-size: 20 max-pool-prepared-statement-per-connection-size: 20
isSyncDBSchema: false isSyncDBSchema: false
defaultSchema: a_A_5d9d78509 defaultSchema: root
conf: classpath:liquibase/master.xml conf: classpath:liquibase/master.xml
#Mybatis-plus配置 #Mybatis-plus配置
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或