Skip to content

C
chinafrica
提交 94b456e7 authored 作者: 吴德鹏's avatar 吴德鹏
浏览文件
操作

订单

上级 7380e344
显示空白字符变更
内嵌 并排
正在显示 包含 37 行增加 和 27 行删除
platform-admin/src/main/java/com/platform/dao/TbCfOrderDao.java
浏览文件 @ 94b456e7
...@@ -117,6 +117,8 @@ public interface TbCfOrderDao extends BaseDao<TbCfOrderEntity> { ...@@ -117,6 +117,8 @@ public interface TbCfOrderDao extends BaseDao<TbCfOrderEntity> {
TbCfOrderEntity queryOrderById(String orderId); TbCfOrderEntity queryOrderById(String orderId);
int getOrderCount(@Param("orderId") String orderId,@Param("flag") Integer flag); int getOrderCount(@Param("orderId") String orderId, @Param("flag") Integer flag);
int deleteOrderById(String orderId);
} }
platform-admin/src/main/resources/com/platform/dao/TbCfItemOrderRDao.xml
浏览文件 @ 94b456e7
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
<result property="closeTime" column="close_time"/> <result property="closeTime" column="close_time"/>
<result property="updateTime" column="update_time"/> <result property="updateTime" column="update_time"/>
<result property="isSend" column="is_send"/> <result property="isSend" column="is_send"/>
<result property="itemNum" column="item_num"/>
</resultMap> </resultMap>
<select id="queryObject" resultType="com.platform.entity.TbCfItemOrderREntity"> <select id="queryObject" resultType="com.platform.entity.TbCfItemOrderREntity">
...@@ -27,7 +28,8 @@ ...@@ -27,7 +28,8 @@
`delivery_time`, `delivery_time`,
`close_time`, `close_time`,
`is_send`, `is_send`,
`update_time` `update_time`,
item_num
from tb_cf_item_order_r from tb_cf_item_order_r
where order_item_id = #{id} where order_item_id = #{id}
</select> </select>
...@@ -43,7 +45,8 @@ ...@@ -43,7 +45,8 @@
`delivery_time`, `delivery_time`,
`close_time`, `close_time`,
`is_send`, `is_send`,
`update_time` `update_time`,
item_num
from tb_cf_item_order_r from tb_cf_item_order_r
WHERE 1=1 WHERE 1=1
<if test="name != null and name.trim() != ''"> <if test="name != null and name.trim() != ''">
......
platform-admin/src/main/resources/com/platform/dao/TbCfOrderDao.xml
浏览文件 @ 94b456e7
...@@ -590,6 +590,10 @@ ...@@ -590,6 +590,10 @@
order by order_time desc order by order_time desc
</select> </select>
<update id="deleteOrderById">
update tb_cf_order set enable_flag=0 where order_id={orderId}
</update>
<select id="queryPayCount" resultType="int"> <select id="queryPayCount" resultType="int">
select count(order_id) from tb_cf_order where pay_status=#{payStatus} select count(order_id) from tb_cf_order where pay_status=#{payStatus}
</select> </select>
......
platform-admin/src/main/webapp/js/sys/tbcforderList.js
浏览文件 @ 94b456e7
...@@ -34,16 +34,16 @@ $(function () { ...@@ -34,16 +34,16 @@ $(function () {
formatter: function (value, grid, rows) { formatter: function (value, grid, rows) {
console.log(grid.colModel.formatter.arguments[2].orderStatus) console.log(grid.colModel.formatter.arguments[2].orderStatus)
if (grid.colModel.formatter.arguments[2].orderStatus == 10 || grid.colModel.formatter.arguments[2].orderStatus == 60) { if (grid.colModel.formatter.arguments[2].orderStatus == 10 || grid.colModel.formatter.arguments[2].orderStatus == 60) {
if (grid.colModel.formatter.arguments[2].tested == 'T'){ if (grid.colModel.formatter.arguments[2].tested == 'T') {
return '<button onclick="closeList" class="orderdescbutton btnbox">查看订单</button><button class="closeOrder closebtnbox">订单关闭</button><button onclick="fakertotrue" class="btnbox testbtn">测试订单</button>'; return '<button onclick="closeList" class="orderdescbutton btnbox">查看订单</button><button class="closeOrder closebtnbox">订单关闭</button><button onclick="fakertotrue" class="btnbox testbtn">测试订单</button>';
}else { } else {
return '<button onclick="closeList" class="orderdescbutton btnbox">查看订单</button><button class="closeOrder closebtnbox">订单关闭</button><button onclick="truetofaker" class="btnbox truebtn">真实订单</button>'; return '<button onclick="closeList" class="orderdescbutton btnbox">查看订单</button><button class="closeOrder closebtnbox">订单关闭</button><button onclick="truetofaker" class="btnbox truebtn">真实订单</button>';
} }
} else { } else {
if (grid.colModel.formatter.arguments[2].tested == 'T'){ if (grid.colModel.formatter.arguments[2].tested == 'T') {
return '<button onclick="closeList" class="orderdescbutton btnbox">查看订单</button><button class="diybutton gobtnbox">订单发货</button><button onclick="fakertotrue" class="btnbox testbtn">测试订单</button>'; return '<button onclick="closeList" class="orderdescbutton btnbox">查看订单</button><button class="diybutton gobtnbox">订单发货</button><button onclick="fakertotrue" class="btnbox testbtn">测试订单</button>';
}else { } else {
return '<button onclick="closeList" class="orderdescbutton btnbox">查看订单</button><button class="diybutton gobtnbox">订单发货</button><button onclick="truetofaker" class="btnbox truebtn">真实订单</button>'; return '<button onclick="closeList" class="orderdescbutton btnbox">查看订单</button><button class="diybutton gobtnbox">订单发货</button><button onclick="truetofaker" class="btnbox truebtn">真实订单</button>';
} }
...@@ -503,6 +503,10 @@ let vm = new Vue({ ...@@ -503,6 +503,10 @@ let vm = new Vue({
{ {
costtype: '商品合计', costtype: '商品合计',
constnum: 1, constnum: 1,
},
{
costtype: '商品件数',
constnum: 1,
}, { }, {
costtype: '运费', costtype: '运费',
constnum: 1, constnum: 1,
...@@ -519,10 +523,6 @@ let vm = new Vue({ ...@@ -519,10 +523,6 @@ let vm = new Vue({
costtype: '现金券', costtype: '现金券',
constnum: '无', constnum: '无',
}, { }, {
costtype: '优惠活动',
constnum: 1,
}
, {
costtype: '满减金额', costtype: '满减金额',
constnum: 1, constnum: 1,
}, { }, {
...@@ -817,14 +817,14 @@ let vm = new Vue({ ...@@ -817,14 +817,14 @@ let vm = new Vue({
}); });
}, },
// 切换成测试订单 // 切换成测试订单
truetofaker:function (e){ truetofaker: function (e) {
let orderId = e; let orderId = e;
if (orderId == null) { if (orderId == null) {
return; return;
} }
confirm('确定要修改为测试订单？', function () { confirm('确定要修改为测试订单？', function () {
Ajax.request({ Ajax.request({
url: "../tbcforder/setToTestOrder?"+'tested=T'+'&orderId='+orderId, url: "../tbcforder/setToTestOrder?" + 'tested=T' + '&orderId=' + orderId,
type: "POST", type: "POST",
contentType: "application/json", contentType: "application/json",
successCallback: function () { successCallback: function () {
...@@ -836,14 +836,14 @@ let vm = new Vue({ ...@@ -836,14 +836,14 @@ let vm = new Vue({
}); });
}, },
//切换成真实订单 //切换成真实订单
fakertotrue:function (e){ fakertotrue: function (e) {
let orderId = e; let orderId = e;
if (orderId == null) { if (orderId == null) {
return; return;
} }
confirm('确定要修改为真实订单？', function () { confirm('确定要修改为真实订单？', function () {
Ajax.request({ Ajax.request({
url: "../tbcforder/setToTestOrder?"+'orderId='+orderId, url: "../tbcforder/setToTestOrder?" + 'orderId=' + orderId,
type: "POST", type: "POST",
contentType: "application/json", contentType: "application/json",
successCallback: function () { successCallback: function () {
...@@ -946,11 +946,12 @@ let vm = new Vue({ ...@@ -946,11 +946,12 @@ let vm = new Vue({
}) })
vm.costData[0].constnum = r.orderBasicVo.itemsPrice; vm.costData[0].constnum = r.orderBasicVo.itemsPrice;
vm.costData[1].constnum = r.orderBasicVo.expressCost; vm.costData[1].constnum = r.orderBasicVo.num;
vm.costData[2].constnum = r.orderBasicVo.tax; vm.costData[2].constnum = r.orderBasicVo.expressCost;
vm.costData[3].constnum = r.orderBasicVo.fee; vm.costData[3].constnum = r.orderBasicVo.tax;
vm.costData[4].constnum = r.orderBasicVo.fee;
// vm.costData[4].constnum = r.orderBasicVo.couponId; // vm.costData[4].constnum = r.orderBasicVo.couponId;
vm.costData[4].constnum = r.orderBasicVo.couponPrice; vm.costData[5].constnum = r.orderBasicVo.couponPrice;
vm.costData[6].constnum = r.orderBasicVo.couponTitle; vm.costData[6].constnum = r.orderBasicVo.couponTitle;
vm.costData[7].constnum = r.orderBasicVo.reduceAmount; vm.costData[7].constnum = r.orderBasicVo.reduceAmount;
vm.costData[8].constnum = r.orderBasicVo.realityPay; vm.costData[8].constnum = r.orderBasicVo.realityPay;
...@@ -1015,7 +1016,7 @@ let vm = new Vue({ ...@@ -1015,7 +1016,7 @@ let vm = new Vue({
'userName': userName, 'userName': userName,
'orderStatus': orderStatus, 'orderStatus': orderStatus,
'payStatus': payStatus, 'payStatus': payStatus,
'tested':tested, 'tested': tested,
}, },
page: page page: page
}).trigger("reloadGrid"); }).trigger("reloadGrid");
...@@ -1030,7 +1031,7 @@ let vm = new Vue({ ...@@ -1030,7 +1031,7 @@ let vm = new Vue({
vm.userName = ''; vm.userName = '';
vm.orderStatus = ''; vm.orderStatus = '';
vm.payStatus = ''; vm.payStatus = '';
vm.orderlisttype=''; vm.orderlisttype = '';
vm.reload(); vm.reload();
}, },
handleSubmit: function (name) { handleSubmit: function (name) {
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论