Skip to content

C
chinafrica
提交 383241fb authored 作者: zgy's avatar zgy
浏览文件
操作

修改订单

上级 f0613cef
隐藏空白字符变更
内嵌 并排
正在显示 包含 64 行增加 和 26 行删除
platform-admin/src/main/java/com/platform/controller/TbCfOrderController.java
浏览文件 @ 383241fb
package com.platform.controller;
import com.platform.entity.SysUserEntity;
import com.platform.entity.TbCfItemDetailEntity;
import com.platform.entity.TbCfOrderEntity;
import com.platform.entity.TbCfOrderListEntity;
......@@ -170,7 +171,23 @@ public class TbCfOrderController extends AbstractController {
// orderVo.setUserName(userName);
// r.put("data", orderVo);
// }
return r.put("data", tbCfPlatformOrder);
return r.put("data", tbCfPlatformOrder);
}
/**
* 获取当前的系统用户
*
* @return R
*/
@GetMapping("/agent/user")
@RequiresPermissions("tbcforder:info")
@ResponseBody
public R queryCurrentUser() {
String user = getUser().getUserName();
return R.ok().put("user", user);
}
/**
......@@ -180,8 +197,8 @@ public class TbCfOrderController extends AbstractController {
@RequiresPermissions("tbcforder:info")
@ResponseBody
public R saveOrUpdateAgentInfo(@RequestBody PlatformOrderVo platformOrderVo) {
int res = tbCfOrderService.saveOrUpdateAgentInfo(platformOrderVo);
return R.ok().put("result", res);
PlatformOrderVo orderVo = tbCfOrderService.saveOrUpdateAgentInfo(platformOrderVo);
return R.ok().put("result", orderVo);
}
@GetMapping("/totalPay")
......
platform-admin/src/main/java/com/platform/service/TbCfOrderService.java
浏览文件 @ 383241fb
......@@ -90,7 +90,7 @@ public interface TbCfOrderService {
* @param tbCfPlatformOrder
* @return
*/
int saveOrUpdateAgentInfo(PlatformOrderVo tbCfPlatformOrder);
PlatformOrderVo saveOrUpdateAgentInfo(PlatformOrderVo tbCfPlatformOrder);
/**
* 根据订单id查询商品详情
......
platform-admin/src/main/java/com/platform/service/impl/TbCfOrderServiceImpl.java
浏览文件 @ 383241fb
......@@ -85,7 +85,7 @@ public class TbCfOrderServiceImpl implements TbCfOrderService {
}
@Override
public int saveOrUpdateAgentInfo(PlatformOrderVo tbCfPlatformOrder) {
public PlatformOrderVo saveOrUpdateAgentInfo(PlatformOrderVo tbCfPlatformOrder) {
//tbCfPlatformOrder 有relativeId 则就是修改
int res = 0;
if (StringUtils.isNotEmpty(tbCfPlatformOrder.getRelativeId())) {
......@@ -131,7 +131,10 @@ public class TbCfOrderServiceImpl implements TbCfOrderService {
tbCfItemOrderREntity3.setDeliveryTime(new Date());
tbCfItemOrderRDao.updateDeliveryTime(tbCfItemOrderREntity3);
}
return res;
if (res>0){
tbCfPlatformOrder = tbCfPlatformOrderDao.queryObject(tbCfPlatformOrder.getOrdersId());
}
return tbCfPlatformOrder;
}
@Override
......
platform-admin/src/main/resources/com/platform/dao/TbCfPlatformOrderDao.xml
浏览文件 @ 383241fb
......@@ -129,7 +129,7 @@
</set>
where relative_id = #{relativeId}
</update>-->
<update id="updates" parameterType="com.platform.vo.PlatformOrderVo">
<update id="updates" parameterType="com.platform.vo.PlatformOrderVo" >
update tb_cf_platform_order p left join tb_cf_express_template e on e.template_id=p.descripition_id
left join tb_cf_item_order_r i on i.order_id=p.order_id
<set>
......@@ -160,6 +160,7 @@
<!--获取订单的代购信息-->
<select id="getAgentInfo" resultType="com.platform.vo.PlatformOrderVo">
select
o.order_id,
p.relative_id,
i.order_item_id ordersId,
p.p_order_id,
......
platform-admin/src/main/webapp/WEB-INF/page/sys/tbcfdelivery.html
浏览文件 @ 383241fb
......@@ -48,13 +48,13 @@
<el-form-item label="代购人" :label-width="formLabelWidth">
<el-input v-model="agentInfo.userName" disabled="true"></el-input>
</el-form-item>
<el-form-item label="代购平台名称" :label-width="formLabelWidth">
<!--<el-form-item label="代购平台名称" :label-width="formLabelWidth">
<i-select v-model="agentInfo.platformName" >
<i-option
v-for="(el,i) in store" :key = 'el.platformCode'
:value="el.platformCode">{{el.platformName}}</i-option>
</i-select>
</el-form-item>
</el-form-item>-->
<el-form-item label="原网站订单号" :label-width="formLabelWidth">
<el-input v-model="agentInfo.pOrderId" ></el-input>
</el-form-item>
......@@ -65,7 +65,7 @@
:value="el.templateId">{{el.templateTitle}}</i-option>
</i-select>
</el-form-item>
<el-form-item label="实际付款" :label-width="formLabelWidth">
<el-form-item label="成本价" :label-width="formLabelWidth">
<el-input v-model="agentInfo.realityPay"></el-input>
</el-form-item>
<el-form-item label="快递单号" :label-width="formLabelWidth">
......
platform-admin/src/main/webapp/WEB-INF/page/sys/tbcforderlist.html
浏览文件 @ 383241fb
......@@ -337,7 +337,7 @@
</td>
<td>{{item.deliveryFlag}}</td>
<td>{{item.pExpressNumber}}</td>
<td><i-button @click="showAgent(item.ordersId)">代购</i-button></td>
<td><i-button @click="showAgent(item.ordersId,item.orderId)">代购</i-button></td>
</tr>
</table>
</div>
......@@ -359,13 +359,13 @@
<el-form-item label="代购人" :label-width="formLabelWidth">
<el-input v-model="agentInfo.userName" disabled="true"></el-input>
</el-form-item>
<el-form-item label="代购平台名称" :label-width="formLabelWidth">
<!-- <el-form-item label="代购平台名称" :label-width="formLabelWidth">
<i-select v-model="agentInfo.platformName" >
<i-option
v-for="(el,i) in store" :key = 'el.platformCode'
:value="el.platformCode">{{el.platformName}}</i-option>
</i-select>
</el-form-item>
</el-form-item>-->
<el-form-item label="原网站订单号" :label-width="formLabelWidth">
<el-input v-model="agentInfo.pOrderId" ></el-input>
</el-form-item>
......@@ -376,7 +376,7 @@
:value="el.templateId">{{el.templateTitle}}</i-option>
</i-select>
</el-form-item>
<el-form-item label="实际付款" :label-width="formLabelWidth">
<el-form-item label="成本价" :label-width="formLabelWidth">
<el-input v-model="agentInfo.realityPay"></el-input>
</el-form-item>
<el-form-item label="快递单号" :label-width="formLabelWidth">
......
platform-admin/src/main/webapp/js/sys/tbcforderList.js
浏览文件 @ 383241fb
......@@ -544,9 +544,10 @@ let vm = new Vue({
},
//获取代购信息
showAgent: function (ordersId) {
showAgent: function (ordersId, orderId) {
vm.agentVisible = true;
vm.agentInfo.ordersId = ordersId;
vm.agentInfo.orderId = orderId;
vm.getAgentInfo(ordersId);
},
/*获取订单的代购信息*/
......@@ -559,17 +560,18 @@ let vm = new Vue({
successCallback: function (r) {
if (!!r.data) {
vm.agentInfo = r.data;
console.log(vm.agentInfo)
} else {
vm.agentInfo = {
ordersId: ordersId,
//代购人
userName: '',
userName: vm.agentInfo.userName,
//商品品名
descripitionId: '',
//快递单号
pExpressNumber: '',
//订单号
orderId: '',
orderId: vm.agentInfo.orderId,
//实际付款
realityPay: '',
//原网站订单号
......@@ -580,6 +582,18 @@ let vm = new Vue({
}
}
});
Ajax.request({
url: "../tbcforder/agent/user",
type: "get",
dataType: "json",
contentType: 'application/json',
successCallback: function (r) {
if (!!r) {
vm.agentInfo.userName = r.user;
}
}
});
},
//新增或者修改代购信息
saveOrUpdateAgentInfo: function (orderId) {
......@@ -592,16 +606,18 @@ let vm = new Vue({
dataType: "json",
contentType: 'application/json',
successCallback: function (r) {
if (r.result == "1") {
vm.agentVisible = false;
layer.msg("保存成功", {
time: 2000 //2秒关闭（如果不配置,默认是3秒）
});
that.reloadDelivery(orderId);
} else {
alert("保存失败");
// if (r.result == "1") {
vm.agentVisible = false;
layer.msg("保存成功", {
time: 2000 //2秒关闭（如果不配置,默认是3秒）
});
let order_id = vm.agentInfo.orderId
if (!!order_id) {
that.reloadDelivery(order_id);
}
// } else {
// alert("保存失败");
// }
}
});
} else {
......@@ -810,6 +826,7 @@ let vm = new Vue({
vm.showList = true;
vm.showOrderDesc = false;
vm.handleReset('formValidate');
vm.reloadSearch();
},
//弃用
/* reloadThisOrder: function (orderId) {
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论