Skip to content

Commit d74a041

Browse files
jdcloud-apigatewayjdcloud-apigateway
authored
Merge pull request #158 from jdcloud-apigateway/master
add updates
2 parents e7e9bb7 + 9895506 commit d74a041

2 files changed

Lines changed: 139 additions & 0 deletions

File tree

‎src/Billing/ChangeLog.md‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
2024-07-23 version 1.1.13
2+
查价接口金额类型更新为double
3+
2024-07-22 version 1.1.12
4+
对外账单接口金额类型更新为double
5+
2023-08-25 version 1.1.8
6+
1.接收线下账单，增加合同编码，结构名称
7+
2023-02-07 version 1.1.6
8+
1.调账增加原价、优惠金额参数
9+
10+
2023-02-07 version 1.1.5
11+
1.退款金额计算接口增加代金券退款列表
12+
113
2022-11-21 version 1.1.4
214
1.对外接口返回增加可用区字段
315

‎src/data/billing/v1/api-2.json.php‎

Lines changed: 127 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,7 @@
183183
'cashCouponFee' => [ 'type' => 'double', 'locationName' => 'cashCouponFee', ],
184184
'freeCashCouponFee' => [ 'type' => 'double', 'locationName' => 'freeCashCouponFee', ],
185185
'payCashCouponFee' => [ 'type' => 'double', 'locationName' => 'payCashCouponFee', ],
186+
'wire' => [ 'type' => 'double', 'locationName' => 'wire', ],
186187
'consumeTime' => [ 'type' => 'string', 'locationName' => 'consumeTime', ],
187188
'transactionNo' => [ 'type' => 'string', 'locationName' => 'transactionNo', ],
188189
'refundNo' => [ 'type' => 'string', 'locationName' => 'refundNo', ],
@@ -217,8 +218,14 @@
217218
'pin' => [ 'type' => 'string', 'locationName' => 'pin', ],
218219
'serviceCode' => [ 'type' => 'string', 'locationName' => 'serviceCode', ],
219220
'resourceId' => [ 'type' => 'string', 'locationName' => 'resourceId', ],
221+
'billFee' => [ 'type' => 'double', 'locationName' => 'billFee', ],
222+
'discountFee' => [ 'type' => 'double', 'locationName' => 'discountFee', ],
220223
'actualFee' => [ 'type' => 'double', 'locationName' => 'actualFee', ],
221224
'adjustFee' => [ 'type' => 'double', 'locationName' => 'adjustFee', ],
225+
'cashPayFee' => [ 'type' => 'double', 'locationName' => 'cashPayFee', ],
226+
'balancePayFee' => [ 'type' => 'double', 'locationName' => 'balancePayFee', ],
227+
'cashCouponFee' => [ 'type' => 'double', 'locationName' => 'cashCouponFee', ],
228+
'couponNumber' => [ 'type' => 'string', 'locationName' => 'couponNumber', ],
222229
'property' => [ 'type' => 'string', 'locationName' => 'property', ],
223230
'usage' => [ 'type' => 'double', 'locationName' => 'usage', ],
224231
'adjustUsage' => [ 'type' => 'double', 'locationName' => 'adjustUsage', ],
@@ -256,6 +263,7 @@
256263
'cashCouponFee' => [ 'type' => 'double', 'locationName' => 'cashCouponFee', ],
257264
'balancePayFee' => [ 'type' => 'double', 'locationName' => 'balancePayFee', ],
258265
'cashPayFee' => [ 'type' => 'double', 'locationName' => 'cashPayFee', ],
266+
'wire' => [ 'type' => 'double', 'locationName' => 'wire', ],
259267
'unitPrice' => [ 'type' => 'double', 'locationName' => 'unitPrice', ],
260268
'priceUnit' => [ 'type' => 'string', 'locationName' => 'priceUnit', ],
261269
'payState' => [ 'type' => 'integer', 'locationName' => 'payState', ],
@@ -370,11 +378,14 @@
370378
'cashCouponFee' => [ 'type' => 'double', 'locationName' => 'cashCouponFee', ],
371379
'freeCashCouponFee' => [ 'type' => 'double', 'locationName' => 'freeCashCouponFee', ],
372380
'payCashCouponFee' => [ 'type' => 'double', 'locationName' => 'payCashCouponFee', ],
381+
'wire' => [ 'type' => 'double', 'locationName' => 'wire', ],
373382
'consumeTime' => [ 'type' => 'string', 'locationName' => 'consumeTime', ],
374383
'transactionNo' => [ 'type' => 'string', 'locationName' => 'transactionNo', ],
375384
'refundNo' => [ 'type' => 'string', 'locationName' => 'refundNo', ],
376385
'site' => [ 'type' => 'integer', 'locationName' => 'site', ],
377386
'org' => [ 'type' => 'string', 'locationName' => 'org', ],
387+
'orgName' => [ 'type' => 'string', 'locationName' => 'orgName', ],
388+
'contractNumber' => [ 'type' => 'string', 'locationName' => 'contractNumber', ],
378389
'tradeType' => [ 'type' => 'integer', 'locationName' => 'tradeType', ],
379390
'billType' => [ 'type' => 'integer', 'locationName' => 'billType', ],
380391
'formulaDesc' => [ 'type' => 'string', 'locationName' => 'formulaDesc', ],
@@ -675,6 +686,13 @@
675686
'cashPayFee' => [ 'type' => 'double', 'locationName' => 'cashPayFee', ],
676687
],
677688
],
689+
'NewCustomerBillSummaryCondition' => [
690+
'type' => 'structure',
691+
'members' => [
692+
'pinList' => [ 'type' => 'list', 'member' => [ 'type' => 'string', ], ],
693+
'billDate' => [ 'type' => 'string', 'locationName' => 'billDate', ],
694+
],
695+
],
678696
'OrderCompensateFeeVo' => [
679697
'type' => 'structure',
680698
'members' => [
@@ -704,6 +722,7 @@
704722
'serviceCode' => [ 'type' => 'string', 'locationName' => 'serviceCode', ],
705723
'site' => [ 'type' => 'integer', 'locationName' => 'site', ],
706724
'region' => [ 'type' => 'string', 'locationName' => 'region', ],
725+
'az' => [ 'type' => 'string', 'locationName' => 'az', ],
707726
'billingType' => [ 'type' => 'integer', 'locationName' => 'billingType', ],
708727
'timeSpan' => [ 'type' => 'integer', 'locationName' => 'timeSpan', ],
709728
'timeUnit' => [ 'type' => 'integer', 'locationName' => 'timeUnit', ],
@@ -768,6 +787,8 @@
768787
'endTime' => [ 'type' => 'string', 'locationName' => 'endTime', ],
769788
'taskId' => [ 'type' => 'string', 'locationName' => 'taskId', ],
770789
'sourceId' => [ 'type' => 'string', 'locationName' => 'sourceId', ],
790+
'az' => [ 'type' => 'string', 'locationName' => 'az', ],
791+
'protectionPeriod' => [ 'type' => 'integer', 'locationName' => 'protectionPeriod', ],
771792
],
772793
],
773794
'PushBillsReq' => [
@@ -799,13 +820,23 @@
799820
'type' => 'structure',
800821
'members' => [
801822
'resourceId' => [ 'type' => 'string', 'locationName' => 'resourceId', ],
823+
'status' => [ 'type' => 'integer', 'locationName' => 'status', ],
824+
'message' => [ 'type' => 'string', 'locationName' => 'message', ],
802825
'fee' => [ 'type' => 'double', 'locationName' => 'fee', ],
803826
'cashFee' => [ 'type' => 'double', 'locationName' => 'cashFee', ],
804827
'balanceFee' => [ 'type' => 'double', 'locationName' => 'balanceFee', ],
805828
'couponFee' => [ 'type' => 'double', 'locationName' => 'couponFee', ],
806829
'orderFees' => [ 'type' => 'list', 'member' => [ 'shape' => 'RefundOrderFee', ], ],
807830
],
808831
],
832+
'RefundCoupon' => [
833+
'type' => 'structure',
834+
'members' => [
835+
'couponNumber' => [ 'type' => 'string', 'locationName' => 'couponNumber', ],
836+
'payType' => [ 'type' => 'integer', 'locationName' => 'payType', ],
837+
'couponRefundFee' => [ 'type' => 'double', 'locationName' => 'couponRefundFee', ],
838+
],
839+
],
809840
'RefundOrderFee' => [
810841
'type' => 'structure',
811842
'members' => [
@@ -814,6 +845,7 @@
814845
'cashFee' => [ 'type' => 'double', 'locationName' => 'cashFee', ],
815846
'balanceFee' => [ 'type' => 'double', 'locationName' => 'balanceFee', ],
816847
'couponFee' => [ 'type' => 'double', 'locationName' => 'couponFee', ],
848+
'couponList' => [ 'type' => 'list', 'member' => [ 'shape' => 'RefundCoupon', ], ],
817849
],
818850
],
819851
'ResourceAeVo' => [
@@ -891,6 +923,41 @@
891923
'endTime' => [ 'type' => 'string', 'locationName' => 'endTime', ],
892924
],
893925
],
926+
'OrderFee' => [
927+
'type' => 'structure',
928+
'members' => [
929+
'transactionNo' => [ 'type' => 'string', 'locationName' => 'transactionNo', ],
930+
'actualFee' => [ 'type' => 'double', 'locationName' => 'actualFee', ],
931+
'cashPayFee' => [ 'type' => 'double', 'locationName' => 'cashPayFee', ],
932+
'balancePayFee' => [ 'type' => 'double', 'locationName' => 'balancePayFee', ],
933+
'cashCouponFee' => [ 'type' => 'double', 'locationName' => 'cashCouponFee', ],
934+
'startTime' => [ 'type' => 'string', 'locationName' => 'startTime', ],
935+
'endTime' => [ 'type' => 'string', 'locationName' => 'endTime', ],
936+
'formula' => [ 'type' => 'string', 'locationName' => 'formula', ],
937+
'timeUnit' => [ 'type' => 'integer', 'locationName' => 'timeUnit', ],
938+
'timeSpan' => [ 'type' => 'integer', 'locationName' => 'timeSpan', ],
939+
'refundCouponList' => [ 'type' => 'list', 'member' => [ 'shape' => 'RefundCoupon', ], ],
940+
],
941+
],
942+
'ResourceCanRefundVo' => [
943+
'type' => 'structure',
944+
'members' => [
945+
'billingType' => [ 'type' => 'integer', 'locationName' => 'billingType', ],
946+
'billingTypeName' => [ 'type' => 'string', 'locationName' => 'billingTypeName', ],
947+
'resourceId' => [ 'type' => 'string', 'locationName' => 'resourceId', ],
948+
'status' => [ 'type' => 'integer', 'locationName' => 'status', ],
949+
'statusName' => [ 'type' => 'string', 'locationName' => 'statusName', ],
950+
'formulaStr' => [ 'type' => 'string', 'locationName' => 'formulaStr', ],
951+
'endTime' => [ 'type' => 'string', 'locationName' => 'endTime', ],
952+
'canRefund' => [ 'type' => 'boolean', 'locationName' => 'canRefund', ],
953+
'reason' => [ 'type' => 'string', 'locationName' => 'reason', ],
954+
'refundFee' => [ 'type' => 'decimal', 'locationName' => 'refundFee', ],
955+
'cashPayFee' => [ 'type' => 'decimal', 'locationName' => 'cashPayFee', ],
956+
'balancePayFee' => [ 'type' => 'decimal', 'locationName' => 'balancePayFee', ],
957+
'cashCouponFee' => [ 'type' => 'decimal', 'locationName' => 'cashCouponFee', ],
958+
'orderFees' => [ 'type' => 'list', 'member' => [ 'shape' => 'OrderFee', ], ],
959+
],
960+
],
894961
'ResourceCountBo' => [
895962
'type' => 'structure',
896963
'members' => [
@@ -902,6 +969,13 @@
902969
'count' => [ 'type' => 'integer', 'locationName' => 'count', ],
903970
],
904971
],
972+
'ResourceDiffPrice' => [
973+
'type' => 'structure',
974+
'members' => [
975+
'resourceId' => [ 'type' => 'string', 'locationName' => 'resourceId', ],
976+
'diffPrice' => [ 'type' => 'double', 'locationName' => 'diffPrice', ],
977+
],
978+
],
905979
'ResourceOperateRecordReq' => [
906980
'type' => 'structure',
907981
'members' => [
@@ -955,6 +1029,53 @@
9551029
'offset' => [ 'type' => 'integer', 'locationName' => 'offset', ],
9561030
],
9571031
],
1032+
'ResourceOrderSnapshotQueryCondition' => [
1033+
'type' => 'structure',
1034+
'members' => [
1035+
'resourceIdList' => [ 'type' => 'list', 'member' => [ 'type' => 'string', ], ],
1036+
'processTypes' => [ 'type' => 'list', 'member' => [ 'type' => 'integer', ], ],
1037+
],
1038+
],
1039+
'ResourceOrderSnapshotVo' => [
1040+
'type' => 'structure',
1041+
'members' => [
1042+
'id' => [ 'type' => 'integer', 'locationName' => 'id', ],
1043+
'transactionNo' => [ 'type' => 'string', 'locationName' => 'transactionNo', ],
1044+
'resourceOrderId' => [ 'type' => 'integer', 'locationName' => 'resourceOrderId', ],
1045+
'resourceId' => [ 'type' => 'string', 'locationName' => 'resourceId', ],
1046+
'billingType' => [ 'type' => 'integer', 'locationName' => 'billingType', ],
1047+
'timeUnit' => [ 'type' => 'integer', 'locationName' => 'timeUnit', ],
1048+
'timeSpan' => [ 'type' => 'integer', 'locationName' => 'timeSpan', ],
1049+
'status' => [ 'type' => 'integer', 'locationName' => 'status', ],
1050+
'billingStatus' => [ 'type' => 'integer', 'locationName' => 'billingStatus', ],
1051+
'networkOperator' => [ 'type' => 'integer', 'locationName' => 'networkOperator', ],
1052+
'pin' => [ 'type' => 'string', 'locationName' => 'pin', ],
1053+
'appCode' => [ 'type' => 'string', 'locationName' => 'appCode', ],
1054+
'serviceCode' => [ 'type' => 'string', 'locationName' => 'serviceCode', ],
1055+
'site' => [ 'type' => 'integer', 'locationName' => 'site', ],
1056+
'region' => [ 'type' => 'string', 'locationName' => 'region', ],
1057+
'formula' => [ 'type' => 'string', 'locationName' => 'formula', ],
1058+
'isOnTrial' => [ 'type' => 'integer', 'locationName' => 'isOnTrial', ],
1059+
'startTime' => [ 'type' => 'string', 'locationName' => 'startTime', ],
1060+
'endTime' => [ 'type' => 'string', 'locationName' => 'endTime', ],
1061+
'priceSnapshot' => [ 'type' => 'string', 'locationName' => 'priceSnapshot', ],
1062+
'opType' => [ 'type' => 'integer', 'locationName' => 'opType', ],
1063+
'processType' => [ 'type' => 'integer', 'locationName' => 'processType', ],
1064+
'operatorName' => [ 'type' => 'string', 'locationName' => 'operatorName', ],
1065+
'operatorType' => [ 'type' => 'integer', 'locationName' => 'operatorType', ],
1066+
'createTime' => [ 'type' => 'string', 'locationName' => 'createTime', ],
1067+
'updateTime' => [ 'type' => 'string', 'locationName' => 'updateTime', ],
1068+
'opComment' => [ 'type' => 'string', 'locationName' => 'opComment', ],
1069+
'billingMode' => [ 'type' => 'integer', 'locationName' => 'billingMode', ],
1070+
],
1071+
],
1072+
'ResourceOrderSnapshotsVo' => [
1073+
'type' => 'structure',
1074+
'members' => [
1075+
'resourceId' => [ 'type' => 'string', 'locationName' => 'resourceId', ],
1076+
'resourceOrderSnapshotVos' => [ 'type' => 'list', 'member' => [ 'shape' => 'ResourceOrderSnapshotVo', ], ],
1077+
],
1078+
],
9581079
'ResourceOrderStatusCondition' => [
9591080
'type' => 'structure',
9601081
'members' => [
@@ -1141,7 +1262,13 @@
11411262
'billDate' => [ 'type' => 'integer', 'locationName' => 'billDate', ],
11421263
'region' => [ 'type' => 'string', 'locationName' => 'region', ],
11431264
'billingType' => [ 'type' => 'integer', 'locationName' => 'billingType', ],
1265+
'billFee' => [ 'type' => 'double', 'locationName' => 'billFee', ],
1266+
'discountFee' => [ 'type' => 'double', 'locationName' => 'discountFee', ],
11441267
'adjustFee' => [ 'type' => 'double', 'locationName' => 'adjustFee', ],
1268+
'cashPayFee' => [ 'type' => 'double', 'locationName' => 'cashPayFee', ],
1269+
'balancePayFee' => [ 'type' => 'double', 'locationName' => 'balancePayFee', ],
1270+
'cashCouponFee' => [ 'type' => 'double', 'locationName' => 'cashCouponFee', ],
1271+
'couponNumber' => [ 'type' => 'string', 'locationName' => 'couponNumber', ],
11451272
],
11461273
],
11471274
'UpdateBillingStatusReq' => [

0 commit comments

Comments
 (0)