Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
caosy
/
fun-admin
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
b733c8a1
authored
Jan 22, 2018
by
Huang Linyu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
后台订单可以修改供应商
parent
4621dbb5
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
127 additions
and
2 deletions
src/main/java/com/ctrip/fun/admin/controller/order/OpCourseOrderController.java
src/main/java/com/ctrip/fun/admin/service/order/OpCourseOrderService.java
src/main/resources/properties/service.properties
src/main/webapp/WEB-INF/templates/order/common/contact.ftl
src/main/java/com/ctrip/fun/admin/controller/order/OpCourseOrderController.java
View file @
b733c8a1
package
com
.
ctrip
.
fun
.
admin
.
controller
.
order
;
import
java.io.IOException
;
import
java.io.Serializable
;
import
java.math.BigDecimal
;
import
java.text.DecimalFormat
;
import
java.text.ParseException
;
...
...
@@ -33,6 +34,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
import
com.ctrip.fun.admin.exception.CommonException
;
import
com.ctrip.fun.admin.form.PaginationForm
;
import
com.ctrip.fun.admin.form.operation.SupplierForm
;
import
com.ctrip.fun.admin.form.order.CourseOrderQueryForm
;
import
com.ctrip.fun.admin.form.order.OrderPayForm
;
import
com.ctrip.fun.admin.form.order.OrderPlayer
;
...
...
@@ -46,7 +48,9 @@ import com.ctrip.fun.common.core.util.BeanConverter;
import
com.ctrip.fun.common.core.util.DateUtil
;
import
com.ctrip.fun.common.vo.CurrencyTypeEnum
;
import
com.ctrip.fun.common.vo.PagedResponseBean
;
import
com.ctrip.fun.common.vo.Response
;
import
com.ctrip.fun.common.vo.basic.VoucherBean
;
import
com.ctrip.fun.common.vo.operation.SupplierBean
;
import
com.ctrip.fun.common.vo.order.CourseOrderBean
;
import
com.ctrip.fun.common.vo.order.CourseOrderListBean
;
import
com.ctrip.fun.common.vo.order.CourseOrderListExcelBean
;
...
...
@@ -57,11 +61,13 @@ import com.ctrip.fun.common.vo.order.OfflinePayTypeEnum;
import
com.ctrip.fun.common.vo.order.OpCourseOrderBean
;
import
com.ctrip.fun.common.vo.order.OpOrderQuery
;
import
com.ctrip.fun.common.vo.order.OrderCategoryEnum
;
import
com.ctrip.fun.common.vo.order.OrderItemSupplierBean
;
import
com.ctrip.fun.common.vo.order.OrderMenuEnum
;
import
com.ctrip.fun.common.vo.order.OrderNotifyEnum
;
import
com.ctrip.fun.common.vo.order.OrderPayinfoBean
;
import
com.ctrip.fun.common.vo.order.OrderProcessEnum
;
import
com.ctrip.fun.common.vo.order.OrderProcessLogBean
;
import
com.ctrip.fun.common.vo.order.OrderQuery
;
import
com.ctrip.fun.common.vo.order.OrderResourceBean
;
import
com.ctrip.fun.common.vo.order.OrderResourceQuery
;
import
com.ctrip.fun.common.vo.order.OrderSourceEnum
;
...
...
@@ -72,6 +78,7 @@ import com.ctrip.fun.common.vo.product.CourseTeeTimeQuery;
import
com.ctrip.fun.common.vo.product.GetAsmResourcePriceRequestQuery
;
import
com.ctrip.fun.common.vo.product.GetAsmResourcePriceResponseBean
;
import
com.ctrip.fun.common.vo.product.ProductPaymentTypeEnum
;
import
com.ctrip.fun.common.vo.riskcontrol.OrderItemParameterDTO
;
import
com.ctrip.fun.common.vo.user.UserExtBean
;
import
freemarker.ext.beans.BeansWrapper
;
...
...
@@ -912,6 +919,8 @@ public class OpCourseOrderController extends AbstractOpOrderController<CourseOrd
List
<
CourseTeeTimeBean
>
courseTeeTimeList
=
orderResourceService
.
getTeeTime
(
userId
,
courseTeeTimeQuery
);
return
courseTeeTimeList
;
}
/**
*
...
...
@@ -1005,6 +1014,14 @@ public class OpCourseOrderController extends AbstractOpOrderController<CourseOrd
list
.
add
(
status
);
return
list
;
}
@RequestMapping
(
value
=
"/updateOrderSupplier"
,
method
=
RequestMethod
.
POST
)
public
@ResponseBody
Response
<
Integer
>
updateOrderItemSupplier
(
OrderItemSupplierBean
supplierBean
)
throws
Exception
{
Response
<
Integer
>
response
=
opCourseOrderService
.
updateOrderItemSupplier
(
supplierBean
);
return
response
;
}
/**
* 暂存订单(无需支付,直接下单或走继续支付订单).
...
...
src/main/java/com/ctrip/fun/admin/service/order/OpCourseOrderService.java
View file @
b733c8a1
package
com
.
ctrip
.
fun
.
admin
.
service
.
order
;
import
java.io.Serializable
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.Map
;
...
...
@@ -21,6 +22,8 @@ import com.ctrip.fun.common.vo.order.CourseOrderListExcelBean;
import
com.ctrip.fun.common.vo.order.CourseOrderProcessBean
;
import
com.ctrip.fun.common.vo.order.OpCourseOrderBean
;
import
com.ctrip.fun.common.vo.order.OpOrderQuery
;
import
com.ctrip.fun.common.vo.order.OrderItemSupplierBean
;
import
com.ctrip.fun.common.vo.order.OrderProcessBean
;
import
com.ctrip.fun.common.vo.order.OrderResourceBean
;
import
com.ctrip.fun.common.vo.order.OrderResourceQuery
;
import
com.ctrip.fun.common.vo.order.PlaceOrderResponseBean
;
...
...
@@ -210,5 +213,23 @@ public class OpCourseOrderService extends AbstractOpOrderService<CourseOrderProc
throw
new
Exception
(
response
.
getMessage
());
}
}
/**
* 更新订单中的供应商
* @param supplierBean
* @throws Exception
*/
public
Response
<
Integer
>
updateOrderItemSupplier
(
OrderItemSupplierBean
supplierBean
)
throws
Exception
{
String
uri
=
super
.
getServiceUri
(
"uri.order.updateOrderItemSupplier"
);
uri
=
uri
.
replace
(
"{orderType}"
,
this
.
getOrderType
());
Request
<
OrderItemSupplierBean
>
request
=
new
Request
<
OrderItemSupplierBean
>(
""
,
supplierBean
);
HttpEntity
<
Request
<
OrderItemSupplierBean
>>
entity
=
new
HttpEntity
<
Request
<
OrderItemSupplierBean
>>(
request
);
Response
<
Integer
>
response
=
super
.
exchange
(
uri
,
HttpMethod
.
POST
,
entity
,
new
ParameterizedTypeReference
<
Response
<
Integer
>>()
{
}).
getBody
();
return
response
;
}
}
src/main/resources/properties/service.properties
View file @
b733c8a1
...
...
@@ -57,6 +57,7 @@ uri.order.changeCustomerInfo=/fun-golf-service/courseOrder/changeCustomerInfo
uri.order.settle
=
/fun-golf-service/{orderType}/settle
uri.order.getOrderStatusFromCtrip
=
/fun-golf-service/{orderType}/getOrderStatusFromCtrip
uri.order.updateOnlineOrderFlag
=
/fun-golf-service/{orderType}/updateOnlineOrderFlag
uri.order.updateOrderItemSupplier
=
/fun-golf-service/{orderType}/updateOrderItemSupplier
# tourOrder
uri.tourOrder.changeCustomerInfo
=
/fun-golf-service/tourOrder/changeCustomerInfo
...
...
src/main/webapp/WEB-INF/templates/order/common/contact.ftl
View file @
b733c8a1
...
...
@@ -3,12 +3,12 @@
<div class = "div-contact">
<table class="table-font table table-bordered table-striped">
<tr>
<th colspan=3>球场联系人</th>
<th colspan=3>球场联系人
<button class="btn" onclick="openSupplierModel();">编辑</button>
</th>
</tr>
<tr>
<td>Num</td><td>联系人姓名</td><td>联系人电话 / 工作时间</td>
</tr>
<tr>
<tr
id="courseContactor"
>
<td>1</td><td>${orderBean.courseContactName}</td><td>${orderBean.courseContactPhone} / ${(orderBean.courseWorkTime)!}</td>
</tr>
</table>
...
...
@@ -61,6 +61,44 @@
<div class = "div-detail-right">
<#include "../common/orderProcessLog.ftl">
</div>
<div class="modal hide fade bs-example-modal-lg" id="supplierModal" style="width:800px;">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal">×</button>
<h3>查询供应商</h3>
</div>
<div class="modal-body">
<div class="input-append">
<input type="text" name="supplierName" id="modalSupplierName" value="" placeholder="供应商名称" class="input-medium" />
<button id="J_query_supplier_Btn" class="btn" data-toggle="modal" >查询</button>
</div>
<table class="table table-bordered table-striped">
<thead>
<tr>
<th>供应商名称</th>
<th>联系人</th>
<th>联系人电话</th>
<th style="text-align: center;"><i class="icon-wrench"></i></th>
</tr>
</thead>
<tbody id="supplierList">
</tbody>
</table>
<div class="pagination pagination-mini">
<ul>
</ul>
</div>
</div>
<div class="modal-footer">
<button class="btn" data-dismiss="modal" aria-hidden="true">关闭</button>
</div>
</div>
<script src="${staticServer}/js/lib/jquery-1.9.1.min.js">
</script>
<script>
...
...
@@ -140,5 +178,52 @@
}
function openSupplierModel(){
$("#supplierModal").modal('show');
}
$(function(){
$('#J_query_supplier_Btn').click(function () {
$.ajax({
url: "/j/supplier/list",
type: "get",
data: {
supplierName: $("#modalSupplierName1").val()
},
success: function (obj) {
var template = Handlebars.compile($("#table_template_supplier").html());
$('#supplierList').html(template(obj));
}
});
});
$("#supplierList").on("click", "#J_supplierSelctorBtn", function () {
var contact = $(this).data('contact');
var contactPhone = $(this).data('contactPhone');
var workTime = $(this).data('workTime');
//将供应商信息保存到订单数据中
var orderId = $("#orderId").val();
$.post("/order/updateOrderSupplier",{"orderId":orderId,"supplierId":$(this).data('id'),"supplierName":$(this).data('supplierName')},function(data){
if(data.status==0){
var contactorHtml="<td>1</td><td>"+contact+"</td><td>"+contactPhone +" / "+ workTime +"</td>";
$('#courseContactor').html(contactorHtml);
$('#supplierModal').modal('hide');
}
});
})
});
</script>
<script id="table_template_supplier" type="text/x-handlebars-template">
{{#each body}}
<tr>
<td><a href="/golf/supplier/edit?id={{id}}" target="_blank">{{name}}</a></td>
<td>{{contact}}</td><td>{{contactPhone}}</td>
<td style="padding:3px;"><a id="J_supplierSelctorBtn" data-id="{{id}}" data-contact="{{contact}}" data-contact-phone="{{contactPhone}}" data-work-time="{{workTime}}"
data-supplier-name="{{name}}" >选择</a></td>
</tr>
{{/each}}
</script>
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment