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

Commit 0d74a857 authored by 胡佳晨's avatar 胡佳晨

admin

parent 48630286
...@@ -227,7 +227,7 @@ public class KylinOrderRefundAdminController extends BaseController { ...@@ -227,7 +227,7 @@ public class KylinOrderRefundAdminController extends BaseController {
@NotNull(message = "类型不能为空") @RequestParam int type) { @NotNull(message = "类型不能为空") @RequestParam int type) {
String codeNum = kylinOrderRefundsService.getOrderRefundCode(code,type); String codeNum = kylinOrderRefundsService.getOrderRefundCode(code,type);
if(codeNum==null){ if(codeNum==null){
return error("查询失败"); return success("ERROR");
}else{ }else{
return success(codeNum); return success(codeNum);
} }
......
...@@ -42,6 +42,8 @@ ...@@ -42,6 +42,8 @@
</ul> </ul>
</div> </div>
</form> </form>
</div>
<div class="col-sm-12 search-collapse">
<form id="formId2"> <form id="formId2">
<div class="select-list"> <div class="select-list">
<ul> <ul>
...@@ -53,6 +55,10 @@ ...@@ -53,6 +55,10 @@
<a class="btn btn-primary btn-rounded btn-sm" onclick="findCode()"><i <a class="btn btn-primary btn-rounded btn-sm" onclick="findCode()"><i
class="fa fa-search"></i>&nbsp;查询</a> class="fa fa-search"></i>&nbsp;查询</a>
</li> </li>
<li>
<label>长订单号:</label>
<input type="text" name="allCode" readonly/>
</li>
</ul> </ul>
</div> </div>
</form> </form>
...@@ -114,8 +120,9 @@ ...@@ -114,8 +120,9 @@
function findCode() { function findCode() {
var shortCode = document.getElementsByName("findCode")[0].value; var shortCode = document.getElementsByName("findCode")[0].value;
$.operate.get(prefix + "/search/code?code="+shortCode+"&type=2", null, function (res) { var allCode = document.getElementsByName("allCode")[0];
$.modal.alert(res); $.operate.get(prefix + "/search/code?code=" + shortCode + "&type=2", function (res) {
allCode.value=res.msg;
}); });
} }
......
...@@ -474,20 +474,24 @@ public class KylinOrderRefundsServiceImpl extends ServiceImpl<KylinOrderRefundsM ...@@ -474,20 +474,24 @@ public class KylinOrderRefundsServiceImpl extends ServiceImpl<KylinOrderRefundsM
@Override @Override
public String getOrderRefundCode(String code, int type) { public String getOrderRefundCode(String code, int type) {
String orderCode = null; String orderCode = null;
if (type == 1) { try {
KylinOrderRefunds data = kylinOrderRefundsMapper.selectOne(new UpdateWrapper<KylinOrderRefunds>().like("order_refund_code", code)); if (type == 1) {
if (data == null) { KylinOrderRefunds data = kylinOrderRefundsMapper.selectOne(new UpdateWrapper<KylinOrderRefunds>().like("order_refund_code", code));
return null; if (data == null) {
} else { return null;
orderCode = data.getOrderRefundCode(); } else {
} orderCode = data.getOrderRefundCode();
} else if (type == 2) { }
KylinOrderTickets data = kylinOrderTicketsMapper.selectOne(new UpdateWrapper<KylinOrderTickets>().like("order_code", code)); } else if (type == 2) {
if (data == null) { KylinOrderTickets data = kylinOrderTicketsMapper.selectOne(new UpdateWrapper<KylinOrderTickets>().like("order_code", code));
return null; if (data == null) {
} else { return null;
orderCode = data.getOrderCode(); } else {
orderCode = data.getOrderCode();
}
} }
}catch (Exception e){
} }
return orderCode; return orderCode;
} }
......
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