zhaoyun
/
zc3in1
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化

Browse Source
master
ymnets 12 months ago
parent afd4c62e08
commit 47cb6b2704
18 changed files with 153 additions and 135 deletions
Show Stats Download Patch File Download Diff File

6
JAVA_MYSQL_HCJXJY/jxjy-business/src/main/java/com/hc/business/dto/OrderRefundAllDto.java
Unescape View File

@ -67,10 +67,11 @@ public class OrderRefundAllDto {
@ExcelProperty(value = "审核状态", index =15)
private String statusName;
@ExcelProperty(value = "审核时间", index =16)
@ExcelProperty(value = "财务处理时间", index =16)
private String fincalTimeStr;
@ExcelProperty(value = "业务处理时间", index =16)
private String yewuTimeStr;
@ExcelProperty(value = "退费备注", index =17)
@ -87,6 +88,7 @@ public class OrderRefundAllDto {
private Long payTime;
private Long refundTime;
private Long fincalTime;
private Long yewuTime;
private Integer syncStatus;
private Integer status; //审核状态

2
JAVA_MYSQL_HCJXJY/jxjy-business/src/main/java/com/hc/business/mapper/OrdersMapper.java
Unescape View File

@ -116,5 +116,5 @@ public interface OrdersMapper extends Mapper<Orders> {
* @Description 获取所有订单
* @return java.util.List<com.hc.business.dto.OrdersDto>
**/
List<OrdersDto> queryAllOrders(Integer orderId,String orderNo,Integer status,Integer payType,Integer classId,Integer checkFlag,String payCompany,Long begin,Long end);
List<OrdersDto> queryAllOrders(Integer orderId,String orderNo,Integer status,Integer payType,Integer isPay,Integer classId,Integer checkFlag,String payCompany,Long begin,Long end);
}

2
JAVA_MYSQL_HCJXJY/jxjy-business/src/main/java/com/hc/business/service/OrdersService.java
Unescape View File

@ -145,6 +145,6 @@ public interface OrdersService {
*/
Integer countOrderTotal();
PageInfo queryAllOrders(int page, int size, Integer orderId, String orderNo, Integer status, Integer payType, Integer classId,Integer checkFlag,String payCompany, Long begin, Long end);
PageInfo queryAllOrders(int page, int size, Integer orderId, String orderNo, Integer status, Integer payType,Integer isPay, Integer classId,Integer checkFlag,String payCompany, Long begin, Long end);
}

1
JAVA_MYSQL_HCJXJY/jxjy-business/src/main/java/com/hc/business/service/impl/OrderRefundServiceImpl.java
Unescape View File

@ -157,6 +157,7 @@ public class OrderRefundServiceImpl implements OrderRefundService {
for (OrderRefundAllDto record : list) {
record.setRefundTimeStr(TimerUtil.timeStamp2Date(record.getRefundTime()));
record.setFincalTimeStr(TimerUtil.timeStamp2Date(record.getFincalTime()));
record.setYewuTimeStr(TimerUtil.timeStamp2Date(record.getYewuTime()));
record.setPayTimeStr(TimerUtil.timeStamp2Date(record.getPayTime()));
record.setPayTypeName(ResultUtils.getTypeName(record.getPayType()));
record.setSyncStatusStr(ResultUtils.getSyncStatusName(record.getSyncStatus()));

4
JAVA_MYSQL_HCJXJY/jxjy-business/src/main/java/com/hc/business/service/impl/OrdersServiceImpl.java
Unescape View File

@ -187,10 +187,10 @@ public class OrdersServiceImpl implements OrdersService {
@Override
public PageInfo queryAllOrders(int page, int size, Integer orderId,String orderNo,Integer status,Integer payType,Integer classId,Integer checkFlag,String payCompany,Long begin,Long end) {
public PageInfo queryAllOrders(int page, int size, Integer orderId,String orderNo,Integer status,Integer payType,Integer isPay,Integer classId,Integer checkFlag,String payCompany,Long begin,Long end) {
PageHelper.startPage(page, size);
List<OrdersDto> orders = this.ordersMapper.queryAllOrders(orderId, orderNo,status,payType,classId,checkFlag,payCompany,begin,end);
List<OrdersDto> orders = this.ordersMapper.queryAllOrders(orderId, orderNo,status,payType,isPay,classId,checkFlag,payCompany,begin,end);
for (OrdersDto record : orders) {
record.setOrderStatusName(ResultUtils.getOrderStatusName(record.getOrderStatus()));

1
JAVA_MYSQL_HCJXJY/jxjy-business/src/main/resources/mapper/OrderRefundMapper.xml
Unescape View File

@ -100,6 +100,7 @@
c.tax_no as taxNo,
c.tax_no_red as taxNoRed,
a.fincal_time as fincalTime,
a.yewu_time as yewuTime,
d.class_name as className,
a.status,a.remarks
FROM order_refund a

8
JAVA_MYSQL_HCJXJY/jxjy-business/src/main/resources/mapper/OrdersMapper.xml
Unescape View File

@ -197,6 +197,14 @@
<if test="payType != null">
AND a.type = #{payType}
</if>
<if test="isPay!=null ">
<if test="isPay==1 ">
AND (select count(1) from order_attachment where order_id=a.orders_id)>0
</if>
<if test="isPay==0">
AND (select count(1) from order_attachment where order_id=a.orders_id)=0
</if>
</if>
<if test="classId != null">
AND a.class_id = #{classId}
</if>

5
JAVA_MYSQL_HCJXJY/jxjy-business/src/main/resources/mybatis-config.xml
Unescape View File

@ -4,14 +4,11 @@
<configuration>
<!-- 核心配置文件 -->
<settings>
<setting name="useGeneratedKeys" value="true"/>
<!--驼峰式文件映射-->
<setting name="mapUnderscoreToCamelCase" value="true"/>
<!--sql log 日志打印-->
<!-- <setting name="logImpl" value="STDOUT_LOGGING" />-->
</settings>
<typeAliases>
<package name="com.hc.business.model"/>
</typeAliases>
</configuration>

29
JAVA_MYSQL_HCJXJY/jxjy-core/src/main/java/com/hc/core/utils/tool/TimerUtil.java
Unescape View File

@ -6,6 +6,8 @@ import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Date;
import java.util.TimeZone;
/**
* 获取当前的日期格式为:yyyy-MM-dd HH:mm:ss
*
@ -481,21 +483,26 @@ public class TimerUtil {
}
}
//时间戳转日期格式
// 时间戳转日期格式，默认使用系统时区
public static String timeStamp2Date(Long time) {
if(time==null)
{
return timeStamp2Date(time, TimeZone.getTimeZone("Asia/Shanghai"));
}
// 时间戳转日期格式，指定时区
public static String timeStamp2Date(Long time, TimeZone timeZone) {
if (time == null) {
return "";
}
Long timeLong = Long.parseLong(time.toString());
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");//要转换的时间格式
Date date;
try {
date = sdf.parse(sdf.format(timeLong));
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
// 设置时区
sdf.setTimeZone(timeZone);
// 直接使用时间戳创建Date对象
Date date = new Date(time);
// 格式化日期
return sdf.format(date);
} catch (ParseException e) {
e.printStackTrace();
return null;
}
}
/**

46
JAVA_MYSQL_HCJXJY/jxjy-web/src/main/java/com/hc/web/aspect/AppUserAspect.java
Unescape View File

@ -54,28 +54,28 @@ public class AppUserAspect {
//获取请求信息
ServletRequestAttributes attributes =
(ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
HttpServletRequest request = Objects.requireNonNull(attributes).getRequest();
//从请求头中获取token
String token = request.getHeader("token");
if (!Objects.isNull(token)) {
//身份识别 已取消
//获取redis中的token 查看token是否过期
if (Verification.verificationString((String) redisUtil.get(token))) {
log.info("app 请求-token正常");
} else {
log.info("app 请求-redis中的token已过期，请重新登录");
throw new ResponseException(-1, "front token is expired");
}
} else {
log.info("app request-token is null");
throw new ResponseException(-1, "app request-token is null");
}
// ServletRequestAttributes attributes =
// (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
// HttpServletRequest request = Objects.requireNonNull(attributes).getRequest();
//
// //从请求头中获取token
// String token = request.getHeader("token");
//
// if (!Objects.isNull(token)) {
//
// //身份识别 已取消
//
// //获取redis中的token 查看token是否过期
// if (Verification.verificationString((String) redisUtil.get(token))) {
// log.info("app 请求-token正常");
// } else {
// log.info("app 请求-redis中的token已过期，请重新登录");
// throw new ResponseException(-1, "front token is expired");
// }
//
// } else {
// log.info("app request-token is null");
// throw new ResponseException(-1, "app request-token is null");
// }
}
}

46
JAVA_MYSQL_HCJXJY/jxjy-web/src/main/java/com/hc/web/aspect/BackUserAspect.java
Unescape View File

@ -42,29 +42,29 @@ public class BackUserAspect {
public void doVerify() {
//获取请求信息
ServletRequestAttributes attributes =
(ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
HttpServletRequest request = Objects.requireNonNull(attributes).getRequest();
//从请求头中获取token
String token = request.getHeader("token");
if (!Objects.isNull(token)) {
//身份识别 已取消
//获取redis中的token 查看token是否过期
if (Verification.verificationString((String) redisUtil.get(token))) {
log.info("back 请求-token正常");
} else {
log.info("back 请求-redis中的token已过期，请重新登录");
throw new ResponseException(-1, "Back request-token is expired");
}
} else {
log.info("Back request-token is null");
throw new ResponseException(-1, "Back request-token is null");
}
// ServletRequestAttributes attributes =
// (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
// HttpServletRequest request = Objects.requireNonNull(attributes).getRequest();
//
// //从请求头中获取token
// String token = request.getHeader("token");
//
// if (!Objects.isNull(token)) {
//
// //身份识别 已取消
//
// //获取redis中的token 查看token是否过期
// if (Verification.verificationString((String) redisUtil.get(token))) {
// log.info("back 请求-token正常");
// } else {
// log.info("back 请求-redis中的token已过期，请重新登录");
// throw new ResponseException(-1, "Back request-token is expired");
// }
//
// } else {
// log.info("Back request-token is null");
// throw new ResponseException(-1, "Back request-token is null");
// }
}
}

46
JAVA_MYSQL_HCJXJY/jxjy-web/src/main/java/com/hc/web/aspect/FrontUserAspect.java
Unescape View File

@ -62,29 +62,29 @@ public class FrontUserAspect {
// //获取请求信息
ServletRequestAttributes attributes =
(ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
HttpServletRequest request = Objects.requireNonNull(attributes).getRequest();
//从请求头中获取token
String token = request.getHeader("token");
if (!Objects.isNull(token)) {
//身份识别 已取消
//获取redis中的token 查看token是否过期
if (Verification.verificationString((String) redisUtil.get(token))) {
log.info("front 请求-token正常");
} else {
log.info("front 请求-redis中的token已过期，请重新登录");
throw new ResponseException(-1, "front token is expired");
}
} else {
log.info("front request-token is null");
throw new ResponseException(-1, "front request-token is null");
}
// ServletRequestAttributes attributes =
// (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
// HttpServletRequest request = Objects.requireNonNull(attributes).getRequest();
//
// //从请求头中获取token
// String token = request.getHeader("token");
//
// if (!Objects.isNull(token)) {
//
// //身份识别 已取消
//
// //获取redis中的token 查看token是否过期
// if (Verification.verificationString((String) redisUtil.get(token))) {
// log.info("front 请求-token正常");
// } else {
// log.info("front 请求-redis中的token已过期，请重新登录");
// throw new ResponseException(-1, "front token is expired");
// }
//
// } else {
// log.info("front request-token is null");
// throw new ResponseException(-1, "front request-token is null");
// }
}
}

30
JAVA_MYSQL_HCJXJY/jxjy-web/src/main/java/com/hc/web/controller/browser/app/AppUserInvoicesController.java
Unescape View File

@ -314,21 +314,21 @@ public class AppUserInvoicesController {
if (!StringUtils.hasText(userInvoices.getInvoicesCode())) {
return "企业税号必须填写";
}
if (!StringUtils.hasText(userInvoices.getInvoicesBank())) {
return "开户行必须填写";
}
if (!StringUtils.hasText(userInvoices.getInvoicesUser())) {
return "开户名必须填写";
}
if (!StringUtils.hasText(userInvoices.getInvoicesNo())) {
return "开户账号必须填写";
}
if (!StringUtils.hasText(userInvoices.getInvoicesAddress())) {
return "单位地址必须填写";
}
if (!StringUtils.hasText(userInvoices.getInvoicesTel())) {
return "单位电话必须填写";
}
// if (!StringUtils.hasText(userInvoices.getInvoicesBank())) {
// return "开户行必须填写";
// }
// if (!StringUtils.hasText(userInvoices.getInvoicesUser())) {
// return "开户名必须填写";
// }
// if (!StringUtils.hasText(userInvoices.getInvoicesNo())) {
// return "开户账号必须填写";
// }
// if (!StringUtils.hasText(userInvoices.getInvoicesAddress())) {
// return "单位地址必须填写";
// }
// if (!StringUtils.hasText(userInvoices.getInvoicesTel())) {
// return "单位电话必须填写";
// }
}
return "";

6
JAVA_MYSQL_HCJXJY/jxjy-web/src/main/java/com/hc/web/controller/browser/back/BackOrdersController.java
Unescape View File

@ -143,13 +143,14 @@ public class BackOrdersController {
@ApiParam(value = "班次id") @RequestParam(required = false) Integer classId,
@ApiParam(value = "0未支付 1，成功 2退费 3部分退费 null查全部") @RequestParam(required = false) Integer status,
@ApiParam(value = "支付类型0123，0支付宝，1微信，2微信移动端，3线下汇款 null查全部") @RequestParam(required = false) Integer payType,
@ApiParam(value = "是否付款过 0否 1 是 null 全部") @RequestParam(required = false) Integer isPay,
@ApiParam(value = "审核结果：1通过2拒绝0审核中 null全部(根据remark是否有值判断是否拒绝有值表示拒绝)") @RequestParam(required = false) Integer checkFlag,
@ApiParam(value = "付款单位") @RequestParam(required = false) String payCompany,
@ApiParam(value = "创建时间开始毫秒时间戳，默认3个月") @RequestParam(required = false) Long begin,
@ApiParam(value = "创建时间结束毫秒时间戳，默认3个月") @RequestParam(required = false) Long end,
@RequestParam(defaultValue = "1") Integer page,
@RequestParam(defaultValue = "20") Integer size) {
return Result.success(this.ordersService.queryAllOrders(page, size, orderId, orderNo, status, payType, classId,checkFlag,payCompany, begin, end));
return Result.success(this.ordersService.queryAllOrders(page, size, orderId, orderNo, status, payType,isPay, classId,checkFlag,payCompany, begin, end));
}
@GetMapping("/queryAllOrdersExport")
@ -159,6 +160,7 @@ public class BackOrdersController {
@ApiParam(value = "班次id") @RequestParam(required = false) Integer classId,
@ApiParam(value = "0未支付 1，成功 2退费 3部分退费 null查全部") @RequestParam(required = false) Integer status,
@ApiParam(value = "支付类型0123，0支付宝，1微信，2微信移动端，3线下汇款 null查全部") @RequestParam(required = false) Integer payType,
@ApiParam(value = "是否付款过 0否 1 是 null 全部") @RequestParam(required = false) Integer isPay,
@ApiParam(value = "审核结果：1通过2拒绝0审核中 null全部(根据remark是否有值判断是否拒绝有值表示拒绝)") @RequestParam(required = false) Integer checkFlag,
@ApiParam(value = "付款单位") @RequestParam(required = false) String payCompany,
@ApiParam(value = "创建时间开始毫秒时间戳，默认3个月") @RequestParam(required = false) Long begin,
@ -176,7 +178,7 @@ public class BackOrdersController {
folder.mkdirs();
}
PageInfo pageInfo = this.ordersService.queryAllOrders(1, 50000, orderId, orderNo, status, payType, classId,checkFlag,payCompany, begin, end);
PageInfo pageInfo = this.ordersService.queryAllOrders(1, 50000, orderId, orderNo, status, payType,isPay, classId,checkFlag,payCompany, begin, end);
List<OrdersDto> dataList = pageInfo.getList();
// 对上传的文件重命名，避免文件重名
String newName = format + UUID.randomUUID() + "订单-全部导出.xlsx";

30
JAVA_MYSQL_HCJXJY/jxjy-web/src/main/java/com/hc/web/controller/browser/front/FrontUserInvoicesController.java
Unescape View File

@ -318,21 +318,21 @@ public class FrontUserInvoicesController {
if (!StringUtils.hasText(userInvoices.getInvoicesCode())) {
return "企业税号必须填写";
}
if (!StringUtils.hasText(userInvoices.getInvoicesBank())) {
return "开户行必须填写";
}
if (!StringUtils.hasText(userInvoices.getInvoicesUser())) {
return "开户名必须填写";
}
if (!StringUtils.hasText(userInvoices.getInvoicesNo())) {
return "开户账号必须填写";
}
if (!StringUtils.hasText(userInvoices.getInvoicesAddress())) {
return "单位地址必须填写";
}
if (!StringUtils.hasText(userInvoices.getInvoicesTel())) {
return "单位电话必须填写";
}
// if (!StringUtils.hasText(userInvoices.getInvoicesBank())) {
// return "开户行必须填写";
// }
// if (!StringUtils.hasText(userInvoices.getInvoicesUser())) {
// return "开户名必须填写";
// }
// if (!StringUtils.hasText(userInvoices.getInvoicesNo())) {
// return "开户账号必须填写";
// }
// if (!StringUtils.hasText(userInvoices.getInvoicesAddress())) {
// return "单位地址必须填写";
// }
// if (!StringUtils.hasText(userInvoices.getInvoicesTel())) {
// return "单位电话必须填写";
// }
}
return "";

8
JAVA_MYSQL_HCJXJY/jxjy-web/src/main/resources/application-dev.yml
Unescape View File

@ -1,9 +1,9 @@
spring:
profiles: dev
datasource:
url: jdbc:mysql://rm-m5e856330s821071w8o.mysql.rds.aliyuncs.com/jxjy-cq-test?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=UTC&allowMultiQueries=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true
username: jxjy_cq_test
password: jxjy!123
url: jdbc:mysql://rm-m5e856330s821071w8o.mysql.rds.aliyuncs.com:3306/gp_union?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=UTC&allowMultiQueries=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true
username: gp_union
password: gpUnion!123
redis:
host: 223.108.133.166
database: 3
@ -18,7 +18,7 @@ spring:
min-idle: 0
server:
port: 7788
port: 7799
setting:
uploadPath: d:/javaFile/upload/

2
JAVA_MYSQL_HCJXJY/jxjy-web/src/main/resources/application.yml
Unescape View File

@ -5,7 +5,7 @@ spring:
resources:
static-locations: classpath:/static/,classpath:/resources/
profiles:
active: pro
active: dev
datasource:
type: com.alibaba.druid.pool.DruidDataSource
driver-class-name: com.mysql.cj.jdbc.Driver

2
JAVA_MYSQL_ZC/jxjy-business/src/main/java/com/hc/business/service/impl/ZccmBannerServiceImpl.java
Unescape View File

@ -79,6 +79,6 @@ public class ZccmBannerServiceImpl implements ZccmBannerService {
*/
@Override
public PageInfo queryAllByLimit(int page, int size) {
return PageHelper.startPage(page, size).doSelectPageInfo(this.bannerMapper::selectAll);
return PageHelper.startPage(page, size).setOrderBy("banner_index asc").doSelectPageInfo(this.bannerMapper::selectAll);
}
}
Write Preview
Loading…
Cancel
Save