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

Skip to content

L
liquidnet-bus-v1
Commit 3facbe7b authored by jiangxiulong's avatar jiangxiulong
Browse files
Options

提交退款查询订单用orderCode UnicodeUtil

parent feacd79c
Hide whitespace changes
Inline Side-by-side
Showing with 51 additions and 15 deletions
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/RefundApplyParam.java
View file @ 3facbe7b
...@@ -16,6 +16,7 @@ import java.util.List; ...@@ -16,6 +16,7 @@ import java.util.List;
@Data @Data
public class RefundApplyParam implements Serializable { public class RefundApplyParam implements Serializable {
private String orderTicketsId; private String orderTicketsId;
private String orderCode;
private String orderRefundBatchesId; private String orderRefundBatchesId;
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/kylin/KylinOrderRefundAdminController.java
View file @ 3facbe7b
package com.liquidnet.client.admin.web.controller.zhengzai.kylin; package com.liquidnet.client.admin.web.controller.zhengzai.kylin;
import cn.hutool.core.text.UnicodeUtil;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.liquidnet.client.admin.common.core.controller.BaseController; import com.liquidnet.client.admin.common.core.controller.BaseController;
import com.liquidnet.client.admin.common.core.domain.AjaxResult; import com.liquidnet.client.admin.common.core.domain.AjaxResult;
import com.liquidnet.client.admin.common.core.page.TableDataInfo; import com.liquidnet.client.admin.common.core.page.TableDataInfo;
import com.liquidnet.client.admin.zhengzai.kylin.service.impl.KylinOrderRefundsServiceImpl; import com.liquidnet.client.admin.zhengzai.kylin.service.impl.KylinOrderRefundsServiceImpl;
import com.liquidnet.client.admin.zhengzai.kylin.service.impl.KylinOrderTicketsAdminServiceImpl; import com.liquidnet.client.admin.zhengzai.kylin.service.impl.KylinOrderTicketsAdminServiceImpl;
import com.liquidnet.commons.lang.util.JsonUtils;
import com.liquidnet.service.base.ResponseDto; import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.kylin.constant.KylinTableStatusConst; import com.liquidnet.service.kylin.constant.KylinTableStatusConst;
import com.liquidnet.service.kylin.dao.OrderRefundDao; import com.liquidnet.service.kylin.dao.OrderRefundDao;
...@@ -20,7 +22,7 @@ import org.springframework.stereotype.Controller; ...@@ -20,7 +22,7 @@ import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap; import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.util.List; import java.util.Map;
/** /**
* <p> * <p>
...@@ -80,7 +82,7 @@ public class KylinOrderRefundAdminController extends BaseController { ...@@ -80,7 +82,7 @@ public class KylinOrderRefundAdminController extends BaseController {
@PostMapping("applyOrder") @PostMapping("applyOrder")
@ResponseBody @ResponseBody
public OrderDetailsVo applyOrder(RefundApplyParam refundApplyParam) { public OrderDetailsVo applyOrder(RefundApplyParam refundApplyParam) {
OrderDetailsVo orderInfo = kylinOrderTicketsAdminServiceImpl.orderDetails(refundApplyParam.getOrderTicketsId()); OrderDetailsVo orderInfo = kylinOrderRefundsServiceImpl.orderDetails(refundApplyParam.getOrderCode());
return orderInfo; return orderInfo;
} }
...@@ -182,7 +184,14 @@ public class KylinOrderRefundAdminController extends BaseController { ...@@ -182,7 +184,14 @@ public class KylinOrderRefundAdminController extends BaseController {
return error(res.getMessage()); return error(res.getMessage());
} }
} catch (Exception e) { } catch (Exception e) {
return error(e.getMessage()); String message = e.getMessage();
String[] msg = e.getMessage().split(" ");
if (msg.length>0 && null != msg[3]) {
String msgStr = UnicodeUtil.toString(msg[3]);
Map msgMap = JsonUtils.fromJson(msgStr.replace("[", "").replace("]", ""), Map.class);
message = msgMap.get("message").toString();
}
return error(message);
} }
} }
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/refund/applyView.html
View file @ 3facbe7b
...@@ -6,10 +6,11 @@ ...@@ -6,10 +6,11 @@
<body class="white-bg"> <body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content"> <div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-post-add"> <form class="form-horizontal m" id="form-post-add">
<input hidden="hidden" type="text" name="orderTicketsId" id="orderTicketsId">
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label is-required">订单id：</label> <label class="col-sm-3 control-label is-required">订单编号：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input class="form-control" type="text" name="orderTicketsId" id="orderTicketsId" required> <input class="form-control" type="text" name="orderCode" id="orderCode" required>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
...@@ -41,21 +42,22 @@ ...@@ -41,21 +42,22 @@
$("#form-post-add").validate({ $("#form-post-add").validate({
onkeyup: false, onkeyup: false,
rules: { rules: {
orderTicketsId: { orderCode: {
submitHandler: function (form) { submitHandler: function (form) {
var config = { var config = {
url: prefix + "/applyOrder", url: prefix + "/applyOrder",
type: "post", type: "post",
dataType: "json", dataType: "json",
data: { data: {
"orderTicketsId": function () { "orderCode": function () {
return $.common.trim($("#orderTicketsId").val()); return $.common.trim($("#orderCode").val());
} }
}, },
beforeSend: function () { beforeSend: function () {
$.modal.loading("正在查询订单，请稍后..."); $.modal.loading("正在查询订单，请稍后...");
}, },
success: function (result) { success: function (result) {
$("#orderTicketsId").val(result.orderTicketVo.orderTicketsId);
var options = { var options = {
data: result.orderTicketEntitiesVo, data: result.orderTicketEntitiesVo,
pagination: false, pagination: false,
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinOrderRefundsServiceImpl.java
View file @ 3facbe7b
package com.liquidnet.client.admin.zhengzai.kylin.service.impl; package com.liquidnet.client.admin.zhengzai.kylin.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.liquidnet.client.admin.common.utils.StringUtils;
import com.liquidnet.commons.lang.util.BeanUtil; import com.liquidnet.commons.lang.util.BeanUtil;
import com.liquidnet.service.base.ResponseDto; import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.kylin.constant.KylinTableStatusConst; import com.liquidnet.service.kylin.constant.KylinTableStatusConst;
...@@ -13,7 +15,9 @@ import com.liquidnet.service.kylin.dao.OrderRefundDao; ...@@ -13,7 +15,9 @@ import com.liquidnet.service.kylin.dao.OrderRefundDao;
import com.liquidnet.service.kylin.dto.param.RefundApplyParam; import com.liquidnet.service.kylin.dto.param.RefundApplyParam;
import com.liquidnet.service.kylin.dto.param.RefundCallbackParam; import com.liquidnet.service.kylin.dto.param.RefundCallbackParam;
import com.liquidnet.service.kylin.dto.param.RefundSearchParam; import com.liquidnet.service.kylin.dto.param.RefundSearchParam;
import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketVo;
import com.liquidnet.service.kylin.dto.vo.returns.KylinOrderRefundsVo; import com.liquidnet.service.kylin.dto.vo.returns.KylinOrderRefundsVo;
import com.liquidnet.service.kylin.dto.vo.returns.OrderDetailsVo;
import com.liquidnet.service.kylin.entity.KylinOrderRefunds; import com.liquidnet.service.kylin.entity.KylinOrderRefunds;
import com.liquidnet.service.kylin.entity.KylinOrderTicketEntities; import com.liquidnet.service.kylin.entity.KylinOrderTicketEntities;
import com.liquidnet.service.kylin.entity.KylinOrderTicketStatus; import com.liquidnet.service.kylin.entity.KylinOrderTicketStatus;
...@@ -57,6 +61,9 @@ public class KylinOrderRefundsServiceImpl extends ServiceImpl<KylinOrderRefundsM ...@@ -57,6 +61,9 @@ public class KylinOrderRefundsServiceImpl extends ServiceImpl<KylinOrderRefundsM
@Autowired @Autowired
private KylinOrderTicketEntitiesMapper kylinOrderTicketEntitiesMapper; private KylinOrderTicketEntitiesMapper kylinOrderTicketEntitiesMapper;
@Autowired
private KylinOrderTicketsAdminServiceImpl kylinOrderTicketsAdminServiceImpl;
@Autowired @Autowired
MongoTemplate mongoTemplate; MongoTemplate mongoTemplate;
...@@ -283,4 +290,11 @@ public class KylinOrderRefundsServiceImpl extends ServiceImpl<KylinOrderRefundsM ...@@ -283,4 +290,11 @@ public class KylinOrderRefundsServiceImpl extends ServiceImpl<KylinOrderRefundsM
return "success"; return "success";
} }
public OrderDetailsVo orderDetails(String orderCode) {
LambdaQueryWrapper<KylinOrderTickets> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(KylinOrderTickets::getOrderCode, orderCode);
KylinOrderTickets kylinOrderTickets = kylinOrderTicketsMapper.selectOne(wrapper);
return kylinOrderTicketsAdminServiceImpl.orderDetails(kylinOrderTickets.getOrderTicketsId());
}
} }
liquidnet-bus-client/liquidnet-client-admin/pom.xml
View file @ 3facbe7b
...@@ -260,6 +260,10 @@ ...@@ -260,6 +260,10 @@
<groupId>com.aliyun.oss</groupId> <groupId>com.aliyun.oss</groupId>
<artifactId>aliyun-sdk-oss</artifactId> <artifactId>aliyun-sdk-oss</artifactId>
</dependency> </dependency>
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-core</artifactId>
</dependency>
</dependencies> </dependencies>
<repositories> <repositories>
<repository> <repository>
......
liquidnet-bus-client/pom.xml
View file @ 3facbe7b
...@@ -53,6 +53,11 @@ ...@@ -53,6 +53,11 @@
<artifactId>aliyun-sdk-oss</artifactId> <artifactId>aliyun-sdk-oss</artifactId>
<version>3.10.2</version> <version>3.10.2</version>
</dependency> </dependency>
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-all</artifactId>
<version>5.6.7</version>
</dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>
</project> </project>
\ No newline at end of file
liquidnet-bus-common/liquidnet-common-base/src/main/java/com/liquidnet/commons/lang/util/FilesUtils.java
View file @ 3facbe7b
...@@ -7,6 +7,11 @@ import java.io.InputStream; ...@@ -7,6 +7,11 @@ import java.io.InputStream;
import java.io.OutputStream; import java.io.OutputStream;
import java.io.File; import java.io.File;
/**
* aloss 上传MultipartFile to File
* @author jiangxiulong
* @since 2021-06-10
*/
public class FilesUtils { public class FilesUtils {
/** /**
* MultipartFile 转 File * MultipartFile 转 File
......
liquidnet-bus-common/liquidnet-common-base/src/main/java/com/liquidnet/commons/lang/util/UUIDUtil.java
View file @ 3facbe7b
/**
* $Id: UUIDUtil.java 861 2015-10-26 08:03:35Z yupengfei $
* Copyright(C) 2014-2020 netease - easegame, All Rights Reserved.
*/
package com.liquidnet.commons.lang.util; package com.liquidnet.commons.lang.util;
import java.util.UUID; import java.util.UUID;
/** /**
* * 上传图片名称生成
* @author <a href="mailto:yupengfei@kowlone.com">kowlone</a> * @author jiangxiulong
* @version 1.0 2015年10月26日 下午4:03:13 * @since 2021-06-09
*/ */
public final class UUIDUtil { public final class UUIDUtil {
/** /**
......
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