记得上下班打卡 | git大法好，push需谨慎

Skip to content

L
liquidnet-bus-v1
Commit 8fab60d0 authored by jiangxiulong's avatar jiangxiulong
Browse files
Options

Merge remote-tracking branch 'origin/dev' into dev

parents c94e9de4 c953b8b4
Hide whitespace changes
Inline Side-by-side
Showing with 25 additions and 143 deletions
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/docu/db_liquidnet_admin_data.sql
View file @ 8fab60d0
......@@ -72,6 +72,7 @@ INSERT INTO test_ln_scene.sys_dict_type (dict_id, dict_name, dict_type, status,
INSERT INTO test_ln_scene.sys_dict_type (dict_id, dict_name, dict_type, status, create_by, create_time, update_by, update_time, remark) VALUES (106, '购买方式', 'zhengzai_buy_mode', '0', 'admin', '2021-06-08 14:03:35', '', null, null);
INSERT INTO test_ln_scene.sys_dict_type (dict_id, dict_name, dict_type, status, create_by, create_time, update_by, update_time, remark) VALUES (107, '支付状态', 'zhengzai_payment_type', '0', 'admin', '2021-06-11 16:01:37', '', null, '票务状态');
INSERT INTO test_ln_scene.sys_dict_type (dict_id, dict_name, dict_type, status, create_by, create_time, update_by, update_time, remark) VALUES (108, '出票状态', 'zhengzai_ticket_status', '0', 'admin', '2021-06-11 16:03:36', '', null, '订单出票状态');
INSERT INTO test_ln_scene.sys_dict_type (dict_id, dict_name, dict_type, status, create_by, create_time, update_by, update_time, remark) VALUES (109, '票种类型', 'zhengzai_ticket_type', '0', 'admin', '2021-06-18 11:12:28', '', null, null);
-- sys_dict_data
INSERT INTO test_ln_scene.sys_dict_data (dict_code, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, update_by, update_time, remark) VALUES (100, 2, '支付宝', 'alipay', 'zhengzai_pay_type', null, null, 'Y', '0', 'admin', '2021-06-07 10:39:11', '', null, '支付宝');
......@@ -106,4 +107,6 @@ INSERT INTO test_ln_scene.sys_dict_data (dict_code, dict_sort, dict_label, dict_
INSERT INTO test_ln_scene.sys_dict_data (dict_code, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, update_by, update_time, remark) VALUES (130, 3, '退票中', '2', 'zhengzai_payment_type', null, null, 'Y', '0', 'admin', '2021-06-11 16:06:35', '', null, null);
INSERT INTO test_ln_scene.sys_dict_data (dict_code, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, update_by, update_time, remark) VALUES (131, 4, '已退款', '3', 'zhengzai_payment_type', null, null, 'Y', '0', 'admin', '2021-06-11 16:06:52', '', null, null);
INSERT INTO test_ln_scene.sys_dict_data (dict_code, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, update_by, update_time, remark) VALUES (132, 1, '未出票', '0', 'zhengzai_ticket_status', null, null, 'Y', '0', 'admin', '2021-06-11 16:07:27', '', null, null);
INSERT INTO test_ln_scene.sys_dict_data (dict_code, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, update_by, update_time, remark) VALUES (133, 2, '已出票', '1', 'zhengzai_ticket_status', null, null, 'Y', '0', 'admin', '2021-06-11 16:07:41', '', null, null);
\ No newline at end of file
INSERT INTO test_ln_scene.sys_dict_data (dict_code, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, update_by, update_time, remark) VALUES (133, 2, '已出票', '1', 'zhengzai_ticket_status', null, null, 'Y', '0', 'admin', '2021-06-11 16:07:41', '', null, null);
INSERT INTO test_ln_scene.sys_dict_data (dict_code, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, update_by, update_time, remark) VALUES (134, 1, '单日票', '1', 'zhengzai_ticket_type', null, null, 'Y', '0', 'admin', '2021-06-18 11:13:08', '', null, null);
INSERT INTO test_ln_scene.sys_dict_data (dict_code, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, update_by, update_time, remark) VALUES (135, 2, '通票', '2', 'zhengzai_ticket_type', null, null, 'Y', '0', 'admin', '2021-06-18 11:13:36', '', null, null);
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/performances/performancesStatic.html
View file @ 8fab60d0
......@@ -114,7 +114,7 @@
<div class="cell" th:text="${respBean.price}">180.00</div>
</td>
<td>
<div class="cell" th:text="${respBean.type}">单日票</div>
<div class="cell" th:text="${@dict.getLabel('zhengzai_ticket_type',respBean.type)}">0</div>
</td>
<td>
<div class="cell" th:text="${respBean.useStart}">2021-03-06</div>
......@@ -141,146 +141,6 @@
<div class="cell" th:text="${respBean.totalExchange}">0</div>
</td>
</tr>
<!-- <tr class="el-table__row el-table__row&#45;&#45;striped">-->
<!-- <td rowspan="1" colspan="1" class="el-table_5_column_32 ">-->
<!-- <div class="cell">680元区</div>-->
<!-- </td>-->
<!-- <td rowspan="1" colspan="1" class="el-table_5_column_33 ">-->
<!-- <div class="cell">680.00</div>-->
<!-- </td>-->
<!-- <td rowspan="1" colspan="1" class="el-table_5_column_34 ">-->
<!-- <div class="cell">单日票</div>-->
<!-- </td>-->
<!-- <td rowspan="1" colspan="1" class="el-table_5_column_35 ">-->
<!-- <div class="cell">2021-03-06</div>-->
<!-- </td>-->
<!-- <td rowspan="1" colspan="1" class="el-table_5_column_36 ">-->
<!-- <div class="cell">19</div>-->
<!-- </td>-->
<!-- <td rowspan="1" colspan="1" class="el-table_5_column_37 ">-->
<!-- <div class="cell">9</div>-->
<!-- </td>-->
<!-- <td rowspan="1" colspan="1" class="el-table_5_column_38 ">-->
<!-- <div class="cell">1</div>-->
<!-- </td>-->
<!-- <td rowspan="1" colspan="1" class="el-table_5_column_39 ">-->
<!-- <div class="cell">0</div>-->
<!-- </td>-->
<!-- <td rowspan="1" colspan="1" class="el-table_5_column_40 ">-->
<!-- <div class="cell">10</div>-->
<!-- </td>-->
<!-- <td rowspan="1" colspan="1" class="el-table_5_column_41 ">-->
<!-- <div class="cell">12920</div>-->
<!-- </td>-->
<!-- <td rowspan="1" colspan="1" class="el-table_5_column_42 ">-->
<!-- <div class="cell">0</div>-->
<!-- </td>-->
<!-- </tr>-->
<!-- <tr class="el-table__row">-->
<!-- <td rowspan="1" colspan="1" class="el-table_5_column_32 ">-->
<!-- <div class="cell">480元区</div>-->
<!-- </td>-->
<!-- <td rowspan="1" colspan="1" class="el-table_5_column_33 ">-->
<!-- <div class="cell">480.00</div>-->
<!-- </td>-->
<!-- <td rowspan="1" colspan="1" class="el-table_5_column_34 ">-->
<!-- <div class="cell">单日票</div>-->
<!-- </td>-->
<!-- <td rowspan="1" colspan="1" class="el-table_5_column_35 ">-->
<!-- <div class="cell">2021-03-06</div>-->
<!-- </td>-->
<!-- <td rowspan="1" colspan="1" class="el-table_5_column_36 ">-->
<!-- <div class="cell">21</div>-->
<!-- </td>-->
<!-- <td rowspan="1" colspan="1" class="el-table_5_column_37 ">-->
<!-- <div class="cell">3</div>-->
<!-- </td>-->
<!-- <td rowspan="1" colspan="1" class="el-table_5_column_38 ">-->
<!-- <div class="cell">0</div>-->
<!-- </td>-->
<!-- <td rowspan="1" colspan="1" class="el-table_5_column_39 ">-->
<!-- <div class="cell">0</div>-->
<!-- </td>-->
<!-- <td rowspan="1" colspan="1" class="el-table_5_column_40 ">-->
<!-- <div class="cell">9</div>-->
<!-- </td>-->
<!-- <td rowspan="1" colspan="1" class="el-table_5_column_41 ">-->
<!-- <div class="cell">10080</div>-->
<!-- </td>-->
<!-- <td rowspan="1" colspan="1" class="el-table_5_column_42 ">-->
<!-- <div class="cell">0</div>-->
<!-- </td>-->
<!-- </tr>-->
<!-- <tr class="el-table__row el-table__row&#45;&#45;striped">-->
<!-- <td rowspan="1" colspan="1" class="el-table_5_column_32 ">-->
<!-- <div class="cell">380元区</div>-->
<!-- </td>-->
<!-- <td rowspan="1" colspan="1" class="el-table_5_column_33 ">-->
<!-- <div class="cell">380.00</div>-->
<!-- </td>-->
<!-- <td rowspan="1" colspan="1" class="el-table_5_column_34 ">-->
<!-- <div class="cell">单日票</div>-->
<!-- </td>-->
<!-- <td rowspan="1" colspan="1" class="el-table_5_column_35 ">-->
<!-- <div class="cell">2021-03-06</div>-->
<!-- </td>-->
<!-- <td rowspan="1" colspan="1" class="el-table_5_column_36 ">-->
<!-- <div class="cell">15</div>-->
<!-- </td>-->
<!-- <td rowspan="1" colspan="1" class="el-table_5_column_37 ">-->
<!-- <div class="cell">8</div>-->
<!-- </td>-->
<!-- <td rowspan="1" colspan="1" class="el-table_5_column_38 ">-->
<!-- <div class="cell">0</div>-->
<!-- </td>-->
<!-- <td rowspan="1" colspan="1" class="el-table_5_column_39 ">-->
<!-- <div class="cell">0</div>-->
<!-- </td>-->
<!-- <td rowspan="1" colspan="1" class="el-table_5_column_40 ">-->
<!-- <div class="cell">5</div>-->
<!-- </td>-->
<!-- <td rowspan="1" colspan="1" class="el-table_5_column_41 ">-->
<!-- <div class="cell">5700</div>-->
<!-- </td>-->
<!-- <td rowspan="1" colspan="1" class="el-table_5_column_42 ">-->
<!-- <div class="cell">0</div>-->
<!-- </td>-->
<!-- </tr>-->
<!-- <tr class="el-table__row">-->
<!-- <td rowspan="1" colspan="1" class="el-table_5_column_32 ">-->
<!-- <div class="cell">总计</div>-->
<!-- </td>-->
<!-- <td rowspan="1" colspan="1" class="el-table_5_column_33 ">-->
<!-- <div class="cell"></div>-->
<!-- </td>-->
<!-- <td rowspan="1" colspan="1" class="el-table_5_column_34 ">-->
<!-- <div class="cell"></div>-->
<!-- </td>-->
<!-- <td rowspan="1" colspan="1" class="el-table_5_column_35 ">-->
<!-- <div class="cell"></div>-->
<!-- </td>-->
<!-- <td rowspan="1" colspan="1" class="el-table_5_column_36 ">-->
<!-- <div class="cell">55</div>-->
<!-- </td>-->
<!-- <td rowspan="1" colspan="1" class="el-table_5_column_37 ">-->
<!-- <div class="cell">20</div>-->
<!-- </td>-->
<!-- <td rowspan="1" colspan="1" class="el-table_5_column_38 ">-->
<!-- <div class="cell">25</div>-->
<!-- </td>-->
<!-- <td rowspan="1" colspan="1" class="el-table_5_column_39 ">-->
<!-- <div class="cell">0</div>-->
<!-- </td>-->
<!-- <td rowspan="1" colspan="1" class="el-table_5_column_40 ">-->
<!-- <div class="cell">24</div>-->
<!-- </td>-->
<!-- <td rowspan="1" colspan="1" class="el-table_5_column_41 ">-->
<!-- <div class="cell">28700</div>-->
<!-- </td>-->
<!-- <td rowspan="1" colspan="1" class="el-table_5_column_42 ">-->
<!-- <div class="cell">0</div>-->
<!-- </td>-->
<!-- </tr>&lt;!&ndash;&ndash;&gt;-->
</tbody>
</table>
<div style="display: none;">
......
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/dao/PerformanceOrderStatisticalDao.java
View file @ 8fab60d0
......@@ -21,7 +21,7 @@ public class PerformanceOrderStatisticalDao {
private String title;
private BigDecimal price;
private Integer type;
private LocalDateTime useStart;
private String useStart;
private BigDecimal totalGeneral = BigDecimal.ZERO;
private BigDecimal saleGeneral = BigDecimal.ZERO;
private BigDecimal surplusGeneral = BigDecimal.ZERO;
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/docu/mongo_db_ddl.sql 0 → 100644
View file @ 8fab60d0
use test_ln_scene;
#创建集合
db.createCollection("KylinOrderTicketVo");
db.createCollection("KylinOrderTicketEntitiesVo");
#创建索引
db.KylinOrderTicketVo.createIndex({orderTicketsId:"hashed"});
db.KylinOrderTicketVo.createIndex({orderCode:"hashed"});
db.KylinOrderTicketVo.createIndex({userId:"hashed"});
db.KylinOrderTicketEntitiesVo.createIndex({orderTicketEntitiesId:"hashed"});
db.KylinOrderTicketEntitiesVo.createIndex({orderId:"hashed"});
#创建分片
sh.enableSharding("test_ln_scene");
sh.shardCollection("test_ln_scene.KylinOrderTicketVo",{"orderTicketsId":"hashed"});
sh.shardCollection("test_ln_scene.KylinOrderTicketEntitiesVo",{"orderTicketEntitiesId":"hashed"});
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment