Skip to content

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

ibiz4j 发布系统代码 [ ibiz-pay，支付]

上级 31cf9056
隐藏空白字符变更
内嵌 并排
正在显示 包含 295 行增加 和 42 行删除
app_web/public/assets/json/data-dictionary.json
浏览文件 @ 769957f5
......@@ -46,6 +46,35 @@
"codename":"Dingtalk",
"value": "dingtalk",
"disabled": false
}
]
},
{
"srfkey": "YesNo",
"emptytext": "未定义",
"codelisttype":"static",
"items": [
{
"id": "1",
"label": "是",
"text": "是",
"class":"",
"data":"",
"codename":"Item_1",
"value": "1",
"disabled": false
}
, {
"id": "0",
"label": "否",
"text": "否",
"class":"",
"data":"",
"codename":"Item_0",
"value": "0",
"disabled": false
}
]
......
app_web/public/assets/json/view-config.json
浏览文件 @ 769957f5
{
"paytradeeditview": {
"title": "支付交易编辑视图",
"caption": "支付交易1",
"caption": "支付交易",
"viewtype": "DEEDITVIEW",
"viewmodule": "pay",
"viewname": "PayTradeEditView",
......@@ -9,7 +9,7 @@
},
"paytradegridview": {
"title": "支付交易表格视图",
"caption": "支付交易1",
"caption": "支付交易",
"viewtype": "DEGRIDVIEW",
"viewmodule": "pay",
"viewname": "PayTradeGridView",
......
app_web/src/authservice/pay-trade/pay-trade-auth-service-base.ts
浏览文件 @ 769957f5
import AuthService from '../auth-service';
/**
* 支付交易1权限服务对象基类
* 支付交易权限服务对象基类
*
* @export
* @class PayTradeAuthServiceBase
......
app_web/src/authservice/pay-trade/pay-trade-auth-service.ts
浏览文件 @ 769957f5
......@@ -2,7 +2,7 @@ import PayTradeAuthServiceBase from './pay-trade-auth-service-base';
/**
* 支付交易1权限服务对象
* 支付交易权限服务对象
*
* @export
* @class PayTradeAuthService
......
app_web/src/locale/lanres/codelist/codelist_en_US.ts
浏览文件 @ 769957f5
......@@ -6,4 +6,9 @@ export default {
"dingtalk": "钉钉开放平台",
"empty": ""
},
YesNo: {
"1": "是",
"0": "否",
"empty": ""
},
};
\ No newline at end of file
app_web/src/locale/lanres/codelist/codelist_zh_CN.ts
浏览文件 @ 769957f5
......@@ -6,4 +6,9 @@ export default {
"dingtalk": "钉钉开放平台",
"empty": "",
},
YesNo: {
"1": "是",
"0": "否",
"empty": "",
},
};
\ No newline at end of file
app_web/src/locale/lanres/entities/pay-open-access/pay-open-access_en_US.ts
浏览文件 @ 769957f5
......@@ -12,6 +12,7 @@ export default {
disabled: "是否禁用",
redirect_uri: "RedirectURI",
notify_url: "NotifyUrl",
agent_id: "AGENT_ID",
},
views: {
gridview: {
......@@ -49,6 +50,9 @@ export default {
access_token: "管理账号token",
expires_time: "管理账号token过期时间",
redirect_uri: "RedirectURI",
notify_url: "NotifyUrl",
agent_id: "AGENT_ID",
disabled: "是否禁用",
accessid: "开放平台接入标识",
},
uiactions: {
......
app_web/src/locale/lanres/entities/pay-open-access/pay-open-access_zh_CN.ts
浏览文件 @ 769957f5
......@@ -11,6 +11,7 @@ export default {
disabled: "是否禁用",
redirect_uri: "RedirectURI",
notify_url: "NotifyUrl",
agent_id: "AGENT_ID",
},
views: {
gridview: {
......@@ -48,6 +49,9 @@ export default {
access_token: "管理账号token",
expires_time: "管理账号token过期时间",
redirect_uri: "RedirectURI",
notify_url: "NotifyUrl",
agent_id: "AGENT_ID",
disabled: "是否禁用",
accessid: "开放平台接入标识",
},
uiactions: {
......
app_web/src/locale/lanres/entities/pay-trade/pay-trade_en_US.ts
浏览文件 @ 769957f5
......@@ -14,11 +14,11 @@ export default {
},
views: {
editview: {
caption: "支付交易1",
caption: "支付交易",
title: "支付交易编辑视图",
},
gridview: {
caption: "支付交易1",
caption: "支付交易",
title: "支付交易表格视图",
},
},
......
app_web/src/locale/lanres/entities/pay-trade/pay-trade_zh_CN.ts
浏览文件 @ 769957f5
......@@ -13,11 +13,11 @@ export default {
},
views: {
editview: {
caption: "支付交易1",
caption: "支付交易",
title: "支付交易编辑视图",
},
gridview: {
caption: "支付交易1",
caption: "支付交易",
title: "支付交易表格视图",
},
},
......
app_web/src/mock/codelist/codelist.ts
浏览文件 @ 769957f5
......@@ -54,6 +54,35 @@ mock.onGet('./assets/json/data-dictionary.json').reply((config: any) => {
"codename":"Dingtalk",
value: "dingtalk",
disabled: false,
},
]
},
{
srfkey: "YesNo",
emptytext: "未定义",
"codelisttype":"static",
items: [
{
id: "1",
label: "是",
text: "是",
"class":"",
"data":"",
"codename":"Item_1",
value: "1",
disabled: false,
},
{
id: "0",
label: "否",
text: "否",
"class":"",
"data":"",
"codename":"Item_0",
value: "0",
disabled: false,
},
]
......
app_web/src/mock/viewconfig/viewconfig.ts
浏览文件 @ 769957f5
......@@ -9,7 +9,7 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
return [status,{
"paytradeeditview": {
"title": "支付交易编辑视图",
"caption": "支付交易1",
"caption": "支付交易",
"viewtype": "DEEDITVIEW",
"viewmodule": "pay",
"viewname": "PayTradeEditView",
......@@ -17,7 +17,7 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
},
"paytradegridview": {
"title": "支付交易表格视图",
"caption": "支付交易1",
"caption": "支付交易",
"viewtype": "DEGRIDVIEW",
"viewmodule": "pay",
"viewname": "PayTradeGridView",
......
app_web/src/service/pay-trade/pay-trade-service-base.ts
浏览文件 @ 769957f5
......@@ -4,7 +4,7 @@ import EntityService from '../entity-service';
/**
* 支付交易1服务对象基类
* 支付交易服务对象基类
*
* @export
* @class PayTradeServiceBase
......
app_web/src/service/pay-trade/pay-trade-service.ts
浏览文件 @ 769957f5
......@@ -3,7 +3,7 @@ import PayTradeServiceBase from './pay-trade-service-base';
/**
* 支付交易1服务对象
* 支付交易服务对象
*
* @export
* @class PayTradeService
......
app_web/src/uiservice/pay-trade/pay-trade-ui-service-base.ts
浏览文件 @ 769957f5
......@@ -6,7 +6,7 @@ import PayTradeService from '@/service/pay-trade/pay-trade-service';
import PayTradeAuthService from '@/authservice/pay-trade/pay-trade-auth-service';
/**
* 支付交易1UI服务对象基类
* 支付交易UI服务对象基类
*
* @export
* @class PayTradeUIServiceBase
......
app_web/src/uiservice/pay-trade/pay-trade-ui-service.ts
浏览文件 @ 769957f5
import PayTradeUIServiceBase from './pay-trade-ui-service-base';
/**
* 支付交易1UI服务对象
* 支付交易UI服务对象
*
* @export
* @class PayTradeUIService
......
app_web/src/widgets/pay-open-access/main-form/main-form-base.vue
浏览文件 @ 769957f5
......@@ -113,6 +113,55 @@
</app-form-item>
</i-col>
<i-col v-show="detailsModel.notify_url.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='notify_url' :itemRules="this.rules().notify_url" class='' :caption="$t('entities.payopenaccess.main_form.details.notify_url')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.notify_url.error" :isEmptyCaption="false" labelPos="LEFT">
<input-box
v-model="data.notify_url"
@enter="onEnter($event)"
unit=""
:disabled="detailsModel.notify_url.disabled"
type='text'
style="">
</input-box>
</app-form-item>
</i-col>
<i-col v-show="detailsModel.agent_id.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='agent_id' :itemRules="this.rules().agent_id" class='' :caption="$t('entities.payopenaccess.main_form.details.agent_id')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.agent_id.error" :isEmptyCaption="false" labelPos="LEFT">
<input-box
v-model="data.agent_id"
@enter="onEnter($event)"
unit=""
:disabled="detailsModel.agent_id.disabled"
type='number'
style="">
</input-box>
</app-form-item>
</i-col>
<i-col v-show="detailsModel.disabled.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='disabled' :itemRules="this.rules().disabled" class='' :caption="$t('entities.payopenaccess.main_form.details.disabled')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.disabled.error" :isEmptyCaption="false" labelPos="LEFT">
<dropdown-list
v-model="data.disabled"
:data="data"
:context="context"
:viewparams="viewparams"
:localContext ='{ }'
:localParam ='{ }'
:disabled="detailsModel.disabled.disabled"
valueType="number"
style="width:100px;width: 100px;"
tag='YesNo'
codelistType='STATIC'
placeholder='请选择...'>
</dropdown-list>
</app-form-item>
</i-col>
......@@ -508,6 +557,9 @@ export default class MainBase extends Vue implements ControlInterface {
access_token: null,
expires_time: null,
redirect_uri: null,
notify_url: null,
agent_id: null,
disabled: null,
accessid: null,
payopenaccess:null,
};
......@@ -592,6 +644,18 @@ export default class MainBase extends Vue implements ControlInterface {
{ required: this.detailsModel.redirect_uri.required, type: 'string', message: 'RedirectURI 值不能为空', trigger: 'change' },
{ required: this.detailsModel.redirect_uri.required, type: 'string', message: 'RedirectURI 值不能为空', trigger: 'blur' },
],
notify_url: [
{ required: this.detailsModel.notify_url.required, type: 'string', message: 'NotifyUrl 值不能为空', trigger: 'change' },
{ required: this.detailsModel.notify_url.required, type: 'string', message: 'NotifyUrl 值不能为空', trigger: 'blur' },
],
agent_id: [
{ required: this.detailsModel.agent_id.required, type: 'number', message: 'AGENT_ID 值不能为空', trigger: 'change' },
{ required: this.detailsModel.agent_id.required, type: 'number', message: 'AGENT_ID 值不能为空', trigger: 'blur' },
],
disabled: [
{ required: this.detailsModel.disabled.required, type: 'number', message: '是否禁用 值不能为空', trigger: 'change' },
{ required: this.detailsModel.disabled.required, type: 'number', message: '是否禁用 值不能为空', trigger: 'blur' },
],
}
}
......@@ -722,6 +786,12 @@ export default class MainBase extends Vue implements ControlInterface {
expires_time: new FormItemModel({ caption: '管理账号token过期时间', detailType: 'FORMITEM', name: 'expires_time', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
,
redirect_uri: new FormItemModel({ caption: 'RedirectURI', detailType: 'FORMITEM', name: 'redirect_uri', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
,
notify_url: new FormItemModel({ caption: 'NotifyUrl', detailType: 'FORMITEM', name: 'notify_url', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
,
agent_id: new FormItemModel({ caption: 'AGENT_ID', detailType: 'FORMITEM', name: 'agent_id', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
,
disabled: new FormItemModel({ caption: '是否禁用', detailType: 'FORMITEM', name: 'disabled', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
,
accessid: new FormItemModel({ caption: '开放平台接入标识', detailType: 'FORMITEM', name: 'accessid', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
,
......@@ -907,6 +977,42 @@ export default class MainBase extends Vue implements ControlInterface {
this.formDataChange({ name: 'redirect_uri', newVal: newVal, oldVal: oldVal });
}
/**
* 监控表单属性 notify_url 值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof MainBase
*/
@Watch('data.notify_url')
onNotify_urlChange(newVal: any, oldVal: any) {
this.formDataChange({ name: 'notify_url', newVal: newVal, oldVal: oldVal });
}
/**
* 监控表单属性 agent_id 值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof MainBase
*/
@Watch('data.agent_id')
onAgent_idChange(newVal: any, oldVal: any) {
this.formDataChange({ name: 'agent_id', newVal: newVal, oldVal: oldVal });
}
/**
* 监控表单属性 disabled 值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof MainBase
*/
@Watch('data.disabled')
onDisabledChange(newVal: any, oldVal: any) {
this.formDataChange({ name: 'disabled', newVal: newVal, oldVal: oldVal });
}
/**
* 监控表单属性 accessid 值
*
......@@ -989,6 +1095,9 @@ export default class MainBase extends Vue implements ControlInterface {
}
......
app_web/src/widgets/pay-open-access/main-form/main-form-model.ts
浏览文件 @ 769957f5
......@@ -90,6 +90,21 @@ export default class MainModel {
prop: 'redirect_uri',
dataType: 'TEXT',
},
{
name: 'notify_url',
prop: 'notify_url',
dataType: 'TEXT',
},
{
name: 'agent_id',
prop: 'agent_id',
dataType: 'BIGINT',
},
{
name: 'disabled',
prop: 'disabled',
dataType: 'YESNO',
},
{
name: 'accessid',
prop: 'id',
......
app_web/src/widgets/pay-open-access/pickup-viewpickupviewpanel-pickupviewpanel/pickup-viewpickupviewpanel-pickupviewpanel-model.ts
浏览文件 @ 769957f5
......@@ -48,6 +48,9 @@ export default class PickupViewpickupviewpanelModel {
{
name: 'notify_url',
},
{
name: 'agent_id',
},
]
}
......
app_web/src/widgets/pay-trade/default-searchform/default-searchform-service.ts
浏览文件 @ 769957f5
......@@ -13,7 +13,7 @@ import DefaultModel from './default-searchform-model';
export default class DefaultService extends ControlService {
/**
* 支付交易1服务对象
* 支付交易服务对象
*
* @type {PayTradeService}
* @memberof DefaultService
......
app_web/src/widgets/pay-trade/main-form/main-form-service.ts
浏览文件 @ 769957f5
......@@ -14,7 +14,7 @@ import PayOpenAccessService from '@/service/pay-open-access/pay-open-access-serv
export default class MainService extends ControlService {
/**
* 支付交易1服务对象
* 支付交易服务对象
*
* @type {PayTradeService}
* @memberof MainService
......
app_web/src/widgets/pay-trade/main-grid/main-grid-base.vue
浏览文件 @ 769957f5
......@@ -1073,7 +1073,7 @@ export default class MainBase extends Vue implements ControlInterface {
excel.export_json_to_excel({
header: tHeader, //表头 必填
data, //具体数据 必填
filename: "支付交易1"+(this.$t('app.gridpage.grid') as string), //非必填
filename: "支付交易"+(this.$t('app.gridpage.grid') as string), //非必填
autoWidth: true, //非必填
bookType: "xlsx" //非必填
});
......
app_web/src/widgets/pay-trade/main-grid/main-grid-service.ts
浏览文件 @ 769957f5
......@@ -13,7 +13,7 @@ import MainModel from './main-grid-model';
export default class MainService extends ControlService {
/**
* 支付交易1服务对象
* 支付交易服务对象
*
* @type {PayTradeService}
* @memberof MainService
......
ibzpay-core/src/main/java/cn/ibizlab/core/pay/domain/PayOpenAccess.java
浏览文件 @ 769957f5
......@@ -132,6 +132,14 @@ public class PayOpenAccess extends EntityMP implements Serializable {
@JSONField(name = "notify_url")
@JsonProperty("notify_url")
private String notifyUrl;
/**
* AGENT_ID
*/
@DEField(name = "agent_id")
@TableField(value = "agent_id")
@JSONField(name = "agent_id")
@JsonProperty("agent_id")
private Long agentId;
......@@ -225,6 +233,14 @@ public class PayOpenAccess extends EntityMP implements Serializable {
this.modify("notify_url", notifyUrl);
}
/**
* 设置 [AGENT_ID]
*/
public void setAgentId(Long agentId) {
this.agentId = agentId;
this.modify("agent_id", agentId);
}
/**
* 复制当前对象数据到目标对象(粘贴重置)
......
ibzpay-core/src/main/java/cn/ibizlab/core/pay/domain/PayTrade.java
浏览文件 @ 769957f5
......@@ -32,7 +32,7 @@ import cn.ibizlab.util.domain.EntityMP;
import com.baomidou.mybatisplus.core.toolkit.IdWorker;
/**
* 实体[支付交易1]
* 实体[支付交易]
*/
@Getter
@Setter
......
ibzpay-core/src/main/java/cn/ibizlab/core/pay/service/impl/PayTradeServiceImpl.java
浏览文件 @ 769957f5
......@@ -42,7 +42,7 @@ import com.alibaba.fastjson.JSONObject;
import org.springframework.util.StringUtils;
/**
* 实体[支付交易1] 服务对象接口实现
* 实体[支付交易] 服务对象接口实现
*/
@Slf4j
@Service("PayTradeServiceImpl")
......
ibzpay-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @ 769957f5
......@@ -4,7 +4,7 @@
<!--输出实体[PAY_OPEN_ACCESS]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-pay_open_access-3-1">
<changeSet author="root" id="tab-pay_open_access-7-1">
<createTable tableName="IBZOPENACCESS">
<column name="ACCESSID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_PAY_OPEN_ACCESS_ACCESSID"/>
......@@ -29,12 +29,14 @@
</column>
<column name="NOTIFY_URL" remarks="" type="VARCHAR(500)">
</column>
<column name="AGENT_ID" remarks="" type="BIGINT">
</column>
</createTable>
</changeSet>
<!--输出实体[PAY_TRADE]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-pay_trade-6-2">
<changeSet author="root" id="tab-pay_trade-8-2">
<createTable tableName="IBZPAYTRADE">
<column name="SUBJECT" remarks="" type="VARCHAR(100)">
</column>
......
ibzpay-core/src/main/resources/mapper/pay/payopenaccess/PayOpenAccessMapper.xml
浏览文件 @ 769957f5
......@@ -8,7 +8,7 @@
<![CDATA[select t1.* from (SELECT t1.`ACCESSID`, t1.`ACCESSNAME`, t1.`ACCESS_KEY`, t1.`ACCESS_TOKEN`, t1.`DISABLED`, t1.`EXPIRES_TIME`, t1.`NOTIFY_URL`, t1.`OPEN_TYPE`, t1.`REDIRECT_URI`, t1.`REGION_ID`, t1.`SECRET_KEY` FROM `IBZOPENACCESS` t1 ) t1 where accessid=#{id}]]>
</select>
<select id="selectById" resultMap="PayOpenAccessResultMap" databaseId="oracle">
<![CDATA[select t1.* from (SELECT t1.ACCESSID, t1.ACCESSNAME, t1.ACCESS_KEY, t1.ACCESS_TOKEN, t1.DISABLED, t1.EXPIRES_TIME, t1.NOTIFY_URL, t1.OPEN_TYPE, t1.REDIRECT_URI, t1.REGION_ID, t1.SECRET_KEY FROM IBZOPENACCESS t1 ) t1 where accessid=#{id}]]>
<![CDATA[select t1.* from (SELECT t1.ACCESSID, t1.ACCESSNAME, t1.ACCESS_KEY, t1.ACCESS_TOKEN, t1.AGENT_ID, t1.DISABLED, t1.EXPIRES_TIME, t1.NOTIFY_URL, t1.OPEN_TYPE, t1.REDIRECT_URI, t1.REGION_ID, t1.SECRET_KEY FROM IBZOPENACCESS t1 ) t1 where accessid=#{id}]]>
</select>
<select id="selectById" resultMap="PayOpenAccessResultMap" databaseId="postgresql">
<![CDATA[select t1.* from (SELECT t1.ACCESSID, t1.ACCESSNAME, t1.ACCESS_KEY, t1.ACCESS_TOKEN, t1.DISABLED, t1.EXPIRES_TIME, t1.NOTIFY_URL, t1.OPEN_TYPE, t1.REDIRECT_URI, t1.REGION_ID, t1.SECRET_KEY FROM IBZOPENACCESS t1 ) t1 where accessid=#{id}]]>
......@@ -26,6 +26,7 @@
<result property="expiresTime" column="expires_time" />
<result property="redirectUri" column="redirect_uri" />
<result property="notifyUrl" column="notify_url" />
<result property="agentId" column="agent_id" />
</resultMap>
......@@ -47,7 +48,7 @@
</sql>
<!--数据查询[Default]-->
<sql id="Default" databaseId="oracle">
<![CDATA[ SELECT t1.ACCESSID, t1.ACCESSNAME, t1.ACCESS_KEY, t1.ACCESS_TOKEN, t1.DISABLED, t1.EXPIRES_TIME, t1.NOTIFY_URL, t1.OPEN_TYPE, t1.REDIRECT_URI, t1.REGION_ID, t1.SECRET_KEY FROM IBZOPENACCESS t1
<![CDATA[ SELECT t1.ACCESSID, t1.ACCESSNAME, t1.ACCESS_KEY, t1.ACCESS_TOKEN, t1.AGENT_ID, t1.DISABLED, t1.EXPIRES_TIME, t1.NOTIFY_URL, t1.OPEN_TYPE, t1.REDIRECT_URI, t1.REGION_ID, t1.SECRET_KEY FROM IBZOPENACCESS t1
]]>
</sql>
<!--数据查询[Default]-->
......@@ -62,7 +63,7 @@
</sql>
<!--数据查询[View]-->
<sql id="View" databaseId="oracle">
<![CDATA[ SELECT t1.ACCESSID, t1.ACCESSNAME, t1.ACCESS_KEY, t1.ACCESS_TOKEN, t1.DISABLED, t1.EXPIRES_TIME, t1.NOTIFY_URL, t1.OPEN_TYPE, t1.REDIRECT_URI, t1.REGION_ID, t1.SECRET_KEY FROM IBZOPENACCESS t1
<![CDATA[ SELECT t1.ACCESSID, t1.ACCESSNAME, t1.ACCESS_KEY, t1.ACCESS_TOKEN, t1.AGENT_ID, t1.DISABLED, t1.EXPIRES_TIME, t1.NOTIFY_URL, t1.OPEN_TYPE, t1.REDIRECT_URI, t1.REGION_ID, t1.SECRET_KEY FROM IBZOPENACCESS t1
]]>
</sql>
<!--数据查询[View]-->
......
ibzpay-core/src/main/resources/permission/systemResource.json
浏览文件 @ 769957f5
......@@ -5,7 +5,7 @@
"entities":[
{
"dename":"PayTrade",
"delogicname":"支付交易1",
"delogicname":"支付交易",
"sysmoudle":{"id":"PAY","name":"pay"},
"dedataset":[{"id":"Default" , "name":"数据集"}],
"deaction":[{"id":"Create" , "name":"Create" , "type":"BUILTIN" },{"id":"Update" , "name":"Update" , "type":"BUILTIN" },{"id":"Remove" , "name":"Remove" , "type":"BUILTIN" },{"id":"Get" , "name":"Get" , "type":"BUILTIN" },{"id":"GetDraft" , "name":"GetDraft" , "type":"BUILTIN" },{"id":"CheckKey" , "name":"CheckKey" , "type":"BUILTIN" },{"id":"Save" , "name":"Save" , "type":"BUILTIN" }],
......
ibzpay-core/src/main/resources/sysmodel/ibzpay.json
浏览文件 @ 769957f5
......@@ -161,7 +161,21 @@
"data_type":"VARCHAR",
"data_length":500,
"key_field":0,
"show_order":11,
"show_order":12,
"major_field":0
},
{
"fieldname":"AGENT_ID" ,
"codename":"Agent_id",
"field_logic_name":"AGENT_ID",
"entity_name":"PayOpenAccess",
"field_type":"BIGINT",
"nullable":1,
"physical_field":1,
"data_type":"BIGINT",
"data_length":20,
"key_field":0,
"show_order":13,
"major_field":0
}
],
......@@ -179,7 +193,7 @@
,
{
"entity_name":"PAY_TRADE",
"logic_name":"支付交易1",
"logic_name":"支付交易",
"code_name":"PayTrade",
"table_name":"IBZPAYTRADE",
"system_id":"ibzpay",
......
ibzpay-provider/ibzpay-provider-api/src/main/java/cn/ibizlab/api/dto/PayOpenAccessDTO.java
浏览文件 @ 769957f5
......@@ -127,6 +127,15 @@ public class PayOpenAccessDTO extends DTOBase implements Serializable {
@Size(min = 0, max = 500, message = "内容长度必须小于等于[500]")
private String notifyUrl;
/**
* 属性 [AGENT_ID]
*
*/
@JSONField(name = "agent_id")
@JsonProperty("agent_id")
@JsonSerialize(using = ToStringSerializer.class)
private Long agentId;
/**
* 设置 [ACCESSNAME]
......@@ -208,6 +217,14 @@ public class PayOpenAccessDTO extends DTOBase implements Serializable {
this.modify("notify_url",notifyUrl);
}
/**
* 设置 [AGENT_ID]
*/
public void setAgentId(Long agentId){
this.agentId = agentId ;
this.modify("agent_id",agentId);
}
}
......
ibzpay-provider/ibzpay-provider-api/src/main/java/cn/ibizlab/api/rest/PayTradeResource.java
浏览文件 @ 769957f5
......@@ -35,7 +35,7 @@ import cn.ibizlab.core.pay.filter.PayTradeSearchContext;
import cn.ibizlab.util.annotation.VersionCheck;
@Slf4j
@Api(tags = {"支付交易1" })
@Api(tags = {"支付交易" })
@RestController("api-paytrade")
@RequestMapping("")
public class PayTradeResource {
......@@ -48,7 +48,7 @@ public class PayTradeResource {
public PayTradeMapping paytradeMapping;
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzpay-PayTrade-Create-all')")
@ApiOperation(value = "新建支付交易1", tags = {"支付交易1" }, notes = "新建支付交易1")
@ApiOperation(value = "新建支付交易", tags = {"支付交易" }, notes = "新建支付交易")
@RequestMapping(method = RequestMethod.POST, value = "/paytrades")
public ResponseEntity<PayTradeDTO> create(@Validated @RequestBody PayTradeDTO paytradedto) {
PayTrade domain = paytradeMapping.toDomain(paytradedto);
......@@ -58,7 +58,7 @@ public class PayTradeResource {
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzpay-PayTrade-Create-all')")
@ApiOperation(value = "批量新建支付交易1", tags = {"支付交易1" }, notes = "批量新建支付交易1")
@ApiOperation(value = "批量新建支付交易", tags = {"支付交易" }, notes = "批量新建支付交易")
@RequestMapping(method = RequestMethod.POST, value = "/paytrades/batch")
public ResponseEntity<Boolean> createBatch(@RequestBody List<PayTradeDTO> paytradedtos) {
paytradeService.createBatch(paytradeMapping.toDomain(paytradedtos));
......@@ -66,7 +66,7 @@ public class PayTradeResource {
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzpay-PayTrade-Update-all')")
@ApiOperation(value = "更新支付交易1", tags = {"支付交易1" }, notes = "更新支付交易1")
@ApiOperation(value = "更新支付交易", tags = {"支付交易" }, notes = "更新支付交易")
@RequestMapping(method = RequestMethod.PUT, value = "/paytrades/{paytrade_id}")
public ResponseEntity<PayTradeDTO> update(@PathVariable("paytrade_id") String paytrade_id, @RequestBody PayTradeDTO paytradedto) {
PayTrade domain = paytradeMapping.toDomain(paytradedto);
......@@ -77,7 +77,7 @@ public class PayTradeResource {
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzpay-PayTrade-Update-all')")
@ApiOperation(value = "批量更新支付交易1", tags = {"支付交易1" }, notes = "批量更新支付交易1")
@ApiOperation(value = "批量更新支付交易", tags = {"支付交易" }, notes = "批量更新支付交易")
@RequestMapping(method = RequestMethod.PUT, value = "/paytrades/batch")
public ResponseEntity<Boolean> updateBatch(@RequestBody List<PayTradeDTO> paytradedtos) {
paytradeService.updateBatch(paytradeMapping.toDomain(paytradedtos));
......@@ -85,14 +85,14 @@ public class PayTradeResource {
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzpay-PayTrade-Remove-all')")
@ApiOperation(value = "删除支付交易1", tags = {"支付交易1" }, notes = "删除支付交易1")
@ApiOperation(value = "删除支付交易", tags = {"支付交易" }, notes = "删除支付交易")
@RequestMapping(method = RequestMethod.DELETE, value = "/paytrades/{paytrade_id}")
public ResponseEntity<Boolean> remove(@PathVariable("paytrade_id") String paytrade_id) {
return ResponseEntity.status(HttpStatus.OK).body(paytradeService.remove(paytrade_id));
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzpay-PayTrade-Remove-all')")
@ApiOperation(value = "批量删除支付交易1", tags = {"支付交易1" }, notes = "批量删除支付交易1")
@ApiOperation(value = "批量删除支付交易", tags = {"支付交易" }, notes = "批量删除支付交易")
@RequestMapping(method = RequestMethod.DELETE, value = "/paytrades/batch")
public ResponseEntity<Boolean> removeBatch(@RequestBody List<String> ids) {
paytradeService.removeBatch(ids);
......@@ -100,7 +100,7 @@ public class PayTradeResource {
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzpay-PayTrade-Get-all')")
@ApiOperation(value = "获取支付交易1", tags = {"支付交易1" }, notes = "获取支付交易1")
@ApiOperation(value = "获取支付交易", tags = {"支付交易" }, notes = "获取支付交易")
@RequestMapping(method = RequestMethod.GET, value = "/paytrades/{paytrade_id}")
public ResponseEntity<PayTradeDTO> get(@PathVariable("paytrade_id") String paytrade_id) {
PayTrade domain = paytradeService.get(paytrade_id);
......@@ -108,27 +108,27 @@ public class PayTradeResource {
return ResponseEntity.status(HttpStatus.OK).body(dto);
}
@ApiOperation(value = "获取支付交易1草稿", tags = {"支付交易1" }, notes = "获取支付交易1草稿")
@ApiOperation(value = "获取支付交易草稿", tags = {"支付交易" }, notes = "获取支付交易草稿")
@RequestMapping(method = RequestMethod.GET, value = "/paytrades/getdraft")
public ResponseEntity<PayTradeDTO> getDraft() {
return ResponseEntity.status(HttpStatus.OK).body(paytradeMapping.toDto(paytradeService.getDraft(new PayTrade())));
}
@ApiOperation(value = "检查支付交易1", tags = {"支付交易1" }, notes = "检查支付交易1")
@ApiOperation(value = "检查支付交易", tags = {"支付交易" }, notes = "检查支付交易")
@RequestMapping(method = RequestMethod.POST, value = "/paytrades/checkkey")
public ResponseEntity<Boolean> checkKey(@RequestBody PayTradeDTO paytradedto) {
return ResponseEntity.status(HttpStatus.OK).body(paytradeService.checkKey(paytradeMapping.toDomain(paytradedto)));
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzpay-PayTrade-Save-all')")
@ApiOperation(value = "保存支付交易1", tags = {"支付交易1" }, notes = "保存支付交易1")
@ApiOperation(value = "保存支付交易", tags = {"支付交易" }, notes = "保存支付交易")
@RequestMapping(method = RequestMethod.POST, value = "/paytrades/save")
public ResponseEntity<Boolean> save(@RequestBody PayTradeDTO paytradedto) {
return ResponseEntity.status(HttpStatus.OK).body(paytradeService.save(paytradeMapping.toDomain(paytradedto)));
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzpay-PayTrade-Save-all')")
@ApiOperation(value = "批量保存支付交易1", tags = {"支付交易1" }, notes = "批量保存支付交易1")
@ApiOperation(value = "批量保存支付交易", tags = {"支付交易" }, notes = "批量保存支付交易")
@RequestMapping(method = RequestMethod.POST, value = "/paytrades/savebatch")
public ResponseEntity<Boolean> saveBatch(@RequestBody List<PayTradeDTO> paytradedtos) {
paytradeService.saveBatch(paytradeMapping.toDomain(paytradedtos));
......@@ -136,7 +136,7 @@ public class PayTradeResource {
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzpay-PayTrade-searchDefault-all')")
@ApiOperation(value = "获取数据集", tags = {"支付交易1" } ,notes = "获取数据集")
@ApiOperation(value = "获取数据集", tags = {"支付交易" } ,notes = "获取数据集")
@RequestMapping(method= RequestMethod.GET , value="/paytrades/fetchdefault")
public ResponseEntity<List<PayTradeDTO>> fetchDefault(PayTradeSearchContext context) {
Page<PayTrade> domains = paytradeService.searchDefault(context) ;
......@@ -149,7 +149,7 @@ public class PayTradeResource {
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzpay-PayTrade-searchDefault-all')")
@ApiOperation(value = "查询数据集", tags = {"支付交易1" } ,notes = "查询数据集")
@ApiOperation(value = "查询数据集", tags = {"支付交易" } ,notes = "查询数据集")
@RequestMapping(method= RequestMethod.POST , value="/paytrades/searchdefault")
public ResponseEntity<Page<PayTradeDTO>> searchDefault(@RequestBody PayTradeSearchContext context) {
Page<PayTrade> domains = paytradeService.searchDefault(context) ;
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或