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

优化

Browse Source
master
ymnets 5 months ago
parent 47cb6b2704
commit 268f9d1a8d
11 changed files with 87 additions and 78 deletions
Show Stats Download Patch File Download Diff File

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

@ -70,11 +70,11 @@ public class OrderRefundAllDto {
@ExcelProperty(value = "财务处理时间", index =16) @ExcelProperty(value = "财务处理时间", index =16)
private String fincalTimeStr; private String fincalTimeStr;
@ExcelProperty(value = "业务处理时间", index =16) @ExcelProperty(value = "业务处理时间", index =17)
private String yewuTimeStr; private String yewuTimeStr;
@ExcelProperty(value = "退费备注", index =17) @ExcelProperty(value = "退费备注", index =18)
private String remarks; private String remarks;
///////////////////////// /////////////////////////

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

@ -46,5 +46,5 @@ public interface OrderUserLogMapper extends Mapper<OrderUserLog> {
List<OrderUserLog> queryByUserIdAndOrderId(@Param("ordersId") Integer ordersId, List<OrderUserLog> queryByUserIdAndOrderId(@Param("ordersId") Integer ordersId,
@Param("userId") Integer userId); @Param("userId") Integer userId);
List<OrdersAllUserDto> queryAllOrdersUser(Integer orderId, String orderNo, Integer status, Integer payType, Integer classId, Long begin, Long end); List<OrdersAllUserDto> queryAllOrdersUser(Integer orderId, String orderNo, Integer status, Integer payType,Integer isPay, Integer classId, Long begin, Long end);
} }

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

@ -76,6 +76,6 @@ public interface OrderUserLogService {
*/ */
List<OrderUserLogDto> queryUserLogByOrderId(Integer orderId); List<OrderUserLogDto> queryUserLogByOrderId(Integer orderId);
List<OrdersAllUserDto> queryAllOrdersUser(Integer orderId, String orderNo, Integer status, Integer payType, Integer classId, Long begin, Long end); List<OrdersAllUserDto> queryAllOrdersUser(Integer orderId, String orderNo, Integer status, Integer payType,Integer isPay, Integer classId, Long begin, Long end);
} }

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

@ -108,8 +108,8 @@ public class OrderUserLogServiceImpl implements OrderUserLogService {
} }
@Override @Override
public List<OrdersAllUserDto> queryAllOrdersUser(Integer orderId,String orderNo,Integer status,Integer payType,Integer classId,Long begin,Long end) { public List<OrdersAllUserDto> queryAllOrdersUser(Integer orderId,String orderNo,Integer status,Integer payType,Integer isPay,Integer classId,Long begin,Long end) {
List<OrdersAllUserDto> users = this.orderUserLogMapper.queryAllOrdersUser(orderId, orderNo,status,payType,classId,begin,end); List<OrdersAllUserDto> users = this.orderUserLogMapper.queryAllOrdersUser(orderId, orderNo,status,payType,isPay,classId,begin,end);
for (OrdersAllUserDto record : users) { for (OrdersAllUserDto record : users) {
record.setOrderStatusName(ResultUtils.getOrderStatusName(record.getOrderStatus())); record.setOrderStatusName(ResultUtils.getOrderStatusName(record.getOrderStatus()));
record.setTypeName(ResultUtils.getTypeName(record.getType())); record.setTypeName(ResultUtils.getTypeName(record.getType()));

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

@ -81,6 +81,14 @@
<if test="payType != null"> <if test="payType != null">
AND a.type = #{payType} AND a.type = #{payType}
</if> </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"> <if test="classId != null">
AND a.class_id = #{classId} AND a.class_id = #{classId}
</if> </if>

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

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

@ -138,7 +138,7 @@ public class BackOrderRefundController {
} catch (FileNotFoundException e) { } catch (FileNotFoundException e) {
throw new RuntimeException(e); throw new RuntimeException(e);
} }
List<String> strList = Arrays.asList("payType", "payTime", "refundTime", "fincalTime", "syncStatus","invoicesNo","invoicesBank","status"); List<String> strList = Arrays.asList("payType", "payTime", "refundTime", "fincalTime","yewuTime", "syncStatus","invoicesNo","invoicesBank","status");
EasyExcel.write(outputStream, OrderRefundAllDto.class).excludeColumnFieldNames(strList).registerWriteHandler(new ExcelWidthStyleStrategy()).sheet("财务退费导出").doWrite(dataList); EasyExcel.write(outputStream, OrderRefundAllDto.class).excludeColumnFieldNames(strList).registerWriteHandler(new ExcelWidthStyleStrategy()).sheet("财务退费导出").doWrite(dataList);
return Result.success("/jxjyfile/" + newName); return Result.success("/jxjyfile/" + newName);
} }

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

@ -68,6 +68,7 @@ public class BackOrderUserLogController {
@ApiParam(value = "班次id") @RequestParam(required = false) Integer classId, @ApiParam(value = "班次id") @RequestParam(required = false) Integer classId,
@ApiParam(value = "0未支付 1，成功 2退费 3部分退费 null查全部") @RequestParam(required = false) Integer status, @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 = "支付类型0123，0支付宝，1微信，2微信移动端，3线下汇款 null查全部") @RequestParam(required = false) Integer payType,
@ApiParam(value = "是否付款过 0否 1 是 null 全部") @RequestParam(required = false) Integer isPay,
@ApiParam(value = "创建时间开始毫秒时间戳，默认3个月") @RequestParam(required = false) Long begin, @ApiParam(value = "创建时间开始毫秒时间戳，默认3个月") @RequestParam(required = false) Long begin,
@ApiParam(value = "创建时间结束毫秒时间戳，默认3个月") @RequestParam(required = false) Long end) { @ApiParam(value = "创建时间结束毫秒时间戳，默认3个月") @RequestParam(required = false) Long end) {
@ -83,7 +84,7 @@ public class BackOrderUserLogController {
folder.mkdirs(); folder.mkdirs();
} }
List<OrdersAllUserDto> dataList = this.orderUserLogService.queryAllOrdersUser(orderId, orderNo, status, payType, classId, begin, end); List<OrdersAllUserDto> dataList = this.orderUserLogService.queryAllOrdersUser(orderId, orderNo, status, payType,isPay, classId, begin, end);
// 对上传的文件重命名，避免文件重名 // 对上传的文件重命名，避免文件重名
String newName = format + UUID.randomUUID() + "订单-学员导出.xlsx"; String newName = format + UUID.randomUUID() + "订单-学员导出.xlsx";
FileOutputStream outputStream = null; FileOutputStream outputStream = null;

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

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

Write Preview
Loading…
Cancel
Save