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

Skip to content

L
liquidnet-bus-v1
Commit 0a8937c7 authored by jiangxiulong's avatar jiangxiulong
Browse files
Options

票种完善 打印mid完善 退款详情俩个显示互换

parent c69aa367
Hide whitespace changes
Inline Side-by-side
Showing with 171 additions and 8 deletions
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/performancesExpress/performanceOrderList.html
View file @ 0a8937c7
......@@ -71,7 +71,7 @@
<label>票种：</label>
<select name="ticketsId">
<option value="">所有</option>
<option th:each="ticket : ${performancesTicketList}" th:text="${ticket.title + ticket.timeTitle}" th:value="${ticket.ticketsId}"></option>
<option th:each="ticket : ${performancesTicketList}" th:text="${ticket.title +'/'+ ticket.timeTitle}" th:value="${ticket.ticketsId}"></option>
</select>
</li>
<li>
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/performancesExpress/performancesList.html
View file @ 0a8937c7
......@@ -54,9 +54,9 @@
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label is-required">数量：</label>
<div class="col-sm-10">
<input class="form-control" type="text" name="printNum" id="printNum">
<label class="col-sm-12 control-label">mid(特殊情况使用)：</label>
<div class="col-sm-12">
<input class="form-control" type="number" name="printNum" id="printNum">
</div>
</div>
</div>
......@@ -330,8 +330,8 @@
$.modal.closeLoading();
var rows = result.rows;
var html = '<option value="">全部</option>';
$.each(rows,function(index,value){
html += '<option value="'+value.ticketsId+'">'+value.title+'-'+value.timeTitle+'</option>'
$.each(rows, function (index, value) {
html += '<option value="' + value.ticketsId + '">' + value.title + '/' + value.timeTitle + '</option>'
});
$('#selectTicketDiv').find('#openTicketListTplSelect').html(html);
openTicketList("openTicketListTpl", performanceId);
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/refund/details.html
View file @ 0a8937c7
......@@ -118,11 +118,11 @@
<label class="col-sm-2 control-label">实际支付方式：</label>
<div class="form-control-static" th:text="*{@dict.getLabel('zhengzai_pay_type',KylinOrderRefundsAdminVo.payType)}"/>
<label class="col-sm-2 control-label">取票方式：</label>
<div class="form-control-static" th:text="${KylinOrderRefundsAdminVo.typeName}"></div>
<div class="form-control-static" th:text="${KylinOrderRefundsAdminVo.getTicketType}"></div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">申请退款类型：</label>
<div class="form-control-static" th:text="${KylinOrderRefundsAdminVo.getTicketType}"></div>
<div class="form-control-static" th:text="${KylinOrderRefundsAdminVo.typeName}"></div>
<label class="col-sm-2 control-label">退款编号：</label>
<div class="form-control-static" th:text="${KylinOrderRefundsAdminVo.orderRefundCode}"></div>
<label class="col-sm-2 control-label">退款中心退款编号：</label>
......
liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/JxlMathUtil.java 0 → 100644
View file @ 0a8937c7
//package com.liquidnet.service;
//
//import com.liquidnet.common.cache.redis.config.RedisConfig;
//import lombok.extern.slf4j.Slf4j;
//
///**
// * @author AnJiabin <anjiabin@zhengzai.tv>
// * @version V1.0
// * @Description: TODO
// * @class: MathUtil
// * @Package com.liquidnet.common.cache.redis.util
// * @Copyright: LightNet @ Copyright (c) 2021
// * @date 2021/8/10 18:03
// */
//@Slf4j
//public class JxlMathUtil {
// public static int getIndex(String key){
// log.debug("MathUtil.getIndex key:{} hashcode:{}",key,key.hashCode());
// int defaultDb = RedisConfig.defaultDb;
// int totalDbs = RedisConfig.totalDbs;
//// totalDbs = 256;
// if(totalDbs==1){
// log.info("only one db : {} ",defaultDb);
// return defaultDb;
// }
// int mod = 250;
// if(totalDbs > 1 && totalDbs < 256){
// if(totalDbs==16){
// mod = 15;
// }else{
// mod = totalDbs - 1;
// }
// }
// long value = Long.valueOf(key.hashCode());
// int hash=(int)(value ^ (value >>> 32));
// int index=hash % mod;
// log.debug("MathUtil.getIndex key:{} index:{}",key,index);
// return index;
// }
//
// public static void main(String[] args) {
// /*RedisConfig redisConfig = new RedisConfig();
// redisConfig.getRedisTemplateByDb(MathUtil.getIndex("1"));*/
// getIndex("kylin:performances:id:296290722991104003684701");
//// getIndex("kylin:order:coupon:id:397983761946132487870836");
//// getIndex("sweet:integralActivity:list");
//// getIndex("kylin:order:id:325244198036357120519956");
//// getIndex("kylin:performances:roadShowId:5936345");
//// getIndex("kylin:performances:roadShowId:570");
//// getIndex("kylin:order:refund:address");
//// getIndex("basicServices:upushList:IOS");
//// getIndex("basicServices:upushList:Android");
//// getIndex("basicServices:zhengzaiAppVersionsAndroid");
//// getIndex("basicServices:zhengzaiAppVersionsIos");
//// getIndex("basicServices:zhengzaiCheckAppVersionsAndroid");
//// getIndex("basicServices:zhengzaiCheckAppVersionsIos");
//// getIndex("kylin:performances_inventory:ticket:id:245075780722810880782444:surplusGeneral");
//// getIndex("kylin:performances:notice");
// }
//}
\ No newline at end of file
liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/JxlMybatisPlusCodeGenerator.java 0 → 100644
View file @ 0a8937c7
package com.liquidnet.service;
import com.baomidou.mybatisplus.core.toolkit.StringPool;
import com.baomidou.mybatisplus.generator.AutoGenerator;
import com.baomidou.mybatisplus.generator.InjectionConfig;
import com.baomidou.mybatisplus.generator.config.*;
import com.baomidou.mybatisplus.generator.config.po.TableInfo;
import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
import com.baomidou.mybatisplus.generator.engine.FreemarkerTemplateEngine;
import java.util.ArrayList;
import java.util.List;
public class JxlMybatisPlusCodeGenerator {
/**
* @param moduleRootPath 项目模块根路径 到 /src 之前 ex：E:\projects\trlabs-bus-v1\trlabs-bus-service\trlabs-common\trlabs-mybatis
* @param dsc 数据源
* @param parentName 相当于业务模块名 com.liquidnet.service.adam 全限定类名
* @param tableNames 表名
*/
public static void doGenerator(String moduleRootPath,
DataSourceConfig dsc,
String parentName,
String[] tableNames) {
AutoGenerator mpg = new AutoGenerator();
// 全局配置BankMybatisPlusCodeGenerator
GlobalConfig gc = new GlobalConfig();
gc.setOutputDir(moduleRootPath + "/src/main/java");
gc.setAuthor("jiangxiulong");
gc.setOpen(false);
// gc.setSwagger2(true); 实体属性 Swagger2 注解
mpg.setGlobalConfig(gc);
// 数据源配置
mpg.setDataSource(dsc);
// 包配置
PackageConfig pc = new PackageConfig();
pc.setParent(parentName);
mpg.setPackageInfo(pc);
// 自定义配置
InjectionConfig cfg = new InjectionConfig() {
@Override
public void initMap() {
// to do nothing
}
};
// 如果模板引擎是 freemarker
String templatePath = "/templates/mapper.xml.ftl";
// 自定义输出配置
List<FileOutConfig> focList = new ArrayList<>();
// 自定义配置会被优先输出
focList.add(new FileOutConfig(templatePath) {
@Override
public String outputFile(TableInfo tableInfo) {
// 自定义输出文件名 ， 如果你 Entity 设置了前后缀、此处注意 xml 的名称会跟着发生变化！！
return moduleRootPath + "/src/main/resources/com/liquidnet/service/sweet/mapper/" + pc.getModuleName()
+ "/" + tableInfo.getEntityName() + "Mapper" + StringPool.DOT_XML;
}
});
cfg.setFileOutConfigList(focList);
mpg.setCfg(cfg);
// 配置模板
TemplateConfig templateConfig = new TemplateConfig();
templateConfig.setXml(null);
mpg.setTemplate(templateConfig);
// 策略配置
StrategyConfig strategy = new StrategyConfig();
strategy.setNaming(NamingStrategy.underline_to_camel);
strategy.setColumnNaming(NamingStrategy.underline_to_camel);
// strategy.setSuperEntityClass("你自己的父类实体,没有就不用设置!");
strategy.setEntityLombokModel(true);
strategy.setRestControllerStyle(true);
strategy.setInclude(tableNames);
strategy.setControllerMappingHyphenStyle(true);
strategy.setTablePrefix(pc.getModuleName() + "_");
mpg.setStrategy(strategy);
mpg.setTemplateEngine(new FreemarkerTemplateEngine());
mpg.execute();
}
public static void main(String[] args) {
DataSourceConfig dsc = new DataSourceConfig();
// dsc.setSchemaName("public");
dsc.setDriverName("com.mysql.cj.jdbc.Driver");
dsc.setUrl("jdbc:mysql://39.106.122.201:3308/dev_ln_scene?useUnicode=true&useSSL=false&characterEncoding=utf8&serverTimezone=CST");
dsc.setUsername("testmall");
dsc.setPassword("zhengzai!mYT");
String resourcePath = "/Users/jiangxiulong/Downloads/tmp";
String directory = "com.liquidnet.service.sweet";
String[] dbTableArray = new String[]{"sweet_applet_user"};
doGenerator(resourcePath, dsc, directory, dbTableArray);
}
}
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