Skip to content

C
chinafrica
提交 993a9ef9 authored 作者: luojie's avatar luojie
浏览文件
操作

修改后台

上级 ddb20174
隐藏空白字符变更
内嵌 并排
正在显示 包含 784 行增加 和 424 行删除
platform-admin/src/main/java/com/platform/controller/TbCfOrderController.java
浏览文件 @ 993a9ef9
...@@ -10,6 +10,7 @@ import com.platform.utils.PageUtils; ...@@ -10,6 +10,7 @@ import com.platform.utils.PageUtils;
import com.platform.utils.Query; import com.platform.utils.Query;
import com.platform.utils.R; import com.platform.utils.R;
import com.platform.vo.PlatformOrderVo; import com.platform.vo.PlatformOrderVo;
import com.platform.vo.DeliveryOrderVo;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
...@@ -47,8 +48,10 @@ public class TbCfOrderController { ...@@ -47,8 +48,10 @@ public class TbCfOrderController {
List<TbCfOrderEntity> tbCfOrderList = tbCfOrderService.queryList(query); List<TbCfOrderEntity> tbCfOrderList = tbCfOrderService.queryList(query);
for(TbCfOrderEntity tbCfOrder:tbCfOrderList){ for(TbCfOrderEntity tbCfOrder:tbCfOrderList){
BigDecimal itemNum = BigDecimal.valueOf(tbCfItemOrderRService.getItemNum(tbCfOrder.getOrdersId())); BigDecimal itemNum = BigDecimal.valueOf(tbCfItemOrderRService.getItemNum(tbCfOrder.getOrdersId()));
tbCfOrder.setItemsPrice(tbCfOrder.getItemPrice().multiply(itemNum)); if(itemNum!=null) {
tbCfOrder.setItemsPrice(tbCfOrder.getItemPrice().multiply(itemNum));
}
} }
int total = tbCfOrderService.queryTotal(query); int total = tbCfOrderService.queryTotal(query);
PageUtils pageUtil = new PageUtils(tbCfOrderList, total, query.getLimit(), query.getPage()); PageUtils pageUtil = new PageUtils(tbCfOrderList, total, query.getLimit(), query.getPage());
...@@ -101,10 +104,18 @@ public class TbCfOrderController { ...@@ -101,10 +104,18 @@ public class TbCfOrderController {
@ResponseBody @ResponseBody
public R delete(@RequestBody String[] orderIds) { public R delete(@RequestBody String[] orderIds) {
tbCfOrderService.deleteBatch(orderIds); tbCfOrderService.deleteBatch(orderIds);
return R.ok(); return R.ok();
} }
/**
* 删除
*/
@RequestMapping("/deleteorder")
@RequiresPermissions("tbcforder:deleteorder")
@ResponseBody
public R deleteOrder(@RequestBody String orderId) {
tbCfOrderService.deleteOrder(orderId);
return R.ok();
}
/** /**
* 查看所有列表 * 查看所有列表
*/ */
...@@ -188,7 +199,7 @@ public class TbCfOrderController { ...@@ -188,7 +199,7 @@ public class TbCfOrderController {
@ResponseBody @ResponseBody
public R orderDeliveryList(@PathVariable("orderId") String orderId){ public R orderDeliveryList(@PathVariable("orderId") String orderId){
//查询列表数据 //查询列表数据
List<TbCfOrderListEntity> tbCfOrderList = tbCfOrderListService.queryOrderDeliveryList(orderId); List<DeliveryOrderVo> tbCfOrderList = tbCfOrderListService.queryOrderDeliveryList(orderId);
int total = tbCfOrderListService.queryOrderDeliveryTotal(orderId); int total = tbCfOrderListService.queryOrderDeliveryTotal(orderId);
PageUtils pageUtil = new PageUtils(tbCfOrderList,total); PageUtils pageUtil = new PageUtils(tbCfOrderList,total);
return R.ok().put("page", pageUtil); return R.ok().put("page", pageUtil);
......
platform-admin/src/main/java/com/platform/controller/TbCfOrderListController.java deleted 100644 → 0
浏览文件 @ ddb20174
package com.platform.controller;
import com.platform.entity.TbCfOrderListEntity;
import com.platform.service.TbCfOrderListService;
import com.platform.utils.PageUtils;
import com.platform.utils.Query;
import com.platform.utils.R;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import java.util.Map;
/**
* Controller
*
* @author lipengjun
* @date 2019-09-20 11:03:37
*/
@Controller
@RequestMapping(value = "tbcforderlist",produces = "application/json; charset=utf-8")
public class TbCfOrderListController {
@Autowired
private TbCfOrderListService tbCfOrderListService;
/**
* 订单列表（运营简表）
*/
@GetMapping("/orderList")
@RequiresPermissions("tbcforderlist:orderlist")
@ResponseBody
public R orderList(@RequestParam Map<String, Object> params){
//查询列表数据
Query query = new Query(params);
List<TbCfOrderListEntity> tbCfOrderList = tbCfOrderListService.queryOrderList(query);
int total = tbCfOrderListService.queryTotal(query);
PageUtils pageUtil = new PageUtils(tbCfOrderList,total, query.getLimit(), query.getPage());
return R.ok().put("page", pageUtil);
}
/**
* 订单列表（运营简表）
*/
/*@GetMapping("/totalPay")
@ResponseBody
public R totalPay(){
//查询列表数据
int totalPay = tbCfOrderListService.totalPay();
return R.ok().put("totalPay", totalPay);
}*/
}
platform-admin/src/main/java/com/platform/dao/TbCfItemOrderRDao.java
浏览文件 @ 993a9ef9
...@@ -37,4 +37,6 @@ public interface TbCfItemOrderRDao extends BaseDao<TbCfItemOrderREntity> { ...@@ -37,4 +37,6 @@ public interface TbCfItemOrderRDao extends BaseDao<TbCfItemOrderREntity> {
int updateIsSend(String ordersId); int updateIsSend(String ordersId);
List<TbCfItemOrderREntity> getOrderItemsId(String orderId); List<TbCfItemOrderREntity> getOrderItemsId(String orderId);
int updateEnable(@Param("orderItemId") String orderItemId);
} }
platform-admin/src/main/java/com/platform/dao/TbCfOrderDao.java
浏览文件 @ 993a9ef9
...@@ -72,4 +72,6 @@ public interface TbCfOrderDao extends BaseDao<TbCfOrderEntity> { ...@@ -72,4 +72,6 @@ public interface TbCfOrderDao extends BaseDao<TbCfOrderEntity> {
BigDecimal queryOrderPriceToday(); BigDecimal queryOrderPriceToday();
BigDecimal queryOrderPriceYesterday(); BigDecimal queryOrderPriceYesterday();
int updateOrder(String orderId);
} }
platform-admin/src/main/java/com/platform/dao/TbCfOrderListDao.java
浏览文件 @ 993a9ef9
package com.platform.dao; package com.platform.dao;
import com.platform.entity.TbCfOrderListEntity; import com.platform.entity.TbCfOrderListEntity;
import com.platform.utils.Query; import com.platform.vo.DeliveryOrderVo;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -27,5 +27,5 @@ public interface TbCfOrderListDao extends BaseDao<TbCfOrderListEntity> { ...@@ -27,5 +27,5 @@ public interface TbCfOrderListDao extends BaseDao<TbCfOrderListEntity> {
int queryOrderDeliveryTotal(String orderId); int queryOrderDeliveryTotal(String orderId);
List<TbCfOrderListEntity> queryOrderDeliveryList(String orderId); List<DeliveryOrderVo> queryOrderDeliveryList(String orderId);
} }
platform-admin/src/main/java/com/platform/entity/TbCfOrderListEntity.java
浏览文件 @ 993a9ef9
...@@ -13,265 +13,147 @@ import java.util.Date; ...@@ -13,265 +13,147 @@ import java.util.Date;
*/ */
public class TbCfOrderListEntity implements Serializable { public class TbCfOrderListEntity implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/**
* 订单id
*/
private String ordersId;
/**
* 订单id
*/
private String orderId; private String orderId;
/**
* 商品Id
*/
private String itemId;
/**
* 用户id
*/
private String userInfo;
/**
* 订单号
*/
private String orderNo; private String orderNo;
/** private String userName;
* 下单时间
*/
private Date orderTime; private Date orderTime;
/**
* 金额
*/
private BigDecimal itemPrice;
/**
* 金额
*/
private BigDecimal realityPay; private BigDecimal realityPay;
/**
* 商品
*/
private String itemTitle;
/**
* 商品数量
*/
private Integer itemNum;
/**
* 收货地址
*/
private String deliveryAddress; private String deliveryAddress;
private String deliveryName; private String deliveryName;
private String deliveryPhone; private String deliveryPhone;
/**
* 快递单号
*/
private String pExpressNumber;
private String orderStatus;
/**
* 支付状态
*/
private String payWayCode; private String payWayCode;
/** private String orderStatus;
* 快递状态 private String payId;
*/ private BigDecimal tax;
private Integer deliveryFlag; private BigDecimal fee;
/** private String couponId;
* 代购人 private String couponTitle;
*/ private String deliveryFlag;
private String userName;
public String getOrdersId() {
return ordersId;
}
public void setOrdersId(String ordersId) {
this.ordersId = ordersId;
}
/**
* 获取：订单id
*/
public String getOrderId() { public String getOrderId() {
return orderId; return orderId;
} }
/**
* 设置：订单id
*/
public void setOrderId(String orderId) { public void setOrderId(String orderId) {
this.orderId = orderId; this.orderId = orderId;
} }
/**
* 获取：商品Id
*/
public String getItemId() {
return itemId;
}
/**
* 设置：商品Id
*/
public void setItemId(String itemId) {
this.itemId = itemId;
}
public String getUserInfo() {
return userInfo;
}
public void setUserInfo(String userInfo) {
this.userInfo = userInfo;
}
/**
* 获取：订单号
*/
public String getOrderNo() { public String getOrderNo() {
return orderNo; return orderNo;
} }
/**
* 设置：订单号
*/
public void setOrderNo(String orderNo) { public void setOrderNo(String orderNo) {
this.orderNo = orderNo; this.orderNo = orderNo;
} }
/**
* 获取：下单时间 public String getUserName() {
*/ return userName;
}
public void setUserName(String userName) {
this.userName = userName;
}
public Date getOrderTime() { public Date getOrderTime() {
return orderTime; return orderTime;
} }
/**
* 设置：下单时间
*/
public void setOrderTime(Date orderTime) { public void setOrderTime(Date orderTime) {
this.orderTime = orderTime; this.orderTime = orderTime;
} }
/**
* 获取：金额 public BigDecimal getRealityPay() {
*/ return realityPay;
public BigDecimal getItemPrice() { }
return itemPrice;
} public void setRealityPay(BigDecimal realityPay) {
/** this.realityPay = realityPay;
* 设置：金额 }
*/
public void setItemPrice(BigDecimal itemPrice) {
this.itemPrice = itemPrice;
}
/**
* 获取：商品
*/
public String getItemTitle() {
return itemTitle;
}
/**
* 设置：商品
*/
public void setItemTitle(String itemTitle) {
this.itemTitle = itemTitle;
}
/**
* 获取：商品数量
*/
public Integer getItemNum() {
return itemNum;
}
/**
* 设置：商品数量
*/
public void setItemNum(Integer itemNum) {
this.itemNum = itemNum;
}
/**
* 获取：收货地址
*/
public String getDeliveryAddress() { public String getDeliveryAddress() {
return deliveryAddress; return deliveryAddress;
} }
/**
* 设置：收货地址
*/
public void setDeliveryAddress(String deliveryAddress) { public void setDeliveryAddress(String deliveryAddress) {
this.deliveryAddress = deliveryAddress; this.deliveryAddress = deliveryAddress;
} }
/**
* 获取：快递单号 public String getDeliveryName() {
*/ return deliveryName;
public String getpExpressNumber() {
return pExpressNumber;
} }
/** public void setDeliveryName(String deliveryName) {
* 设置：快递单号 this.deliveryName = deliveryName;
*/
public void setpExpressNumber(String pExpressNumber) {
this.pExpressNumber = pExpressNumber;
} }
/**
* 获取：支付方式 public String getDeliveryPhone() {
*/ return deliveryPhone;
}
public void setDeliveryPhone(String deliveryPhone) {
this.deliveryPhone = deliveryPhone;
}
public String getPayWayCode() { public String getPayWayCode() {
return payWayCode; return payWayCode;
} }
/**
* 设置：支付方式
*/
public void setPayWayCode(String payWayCode) { public void setPayWayCode(String payWayCode) {
this.payWayCode = payWayCode; this.payWayCode = payWayCode;
} }
/**
* 获取：快递状态 public String getOrderStatus() {
*/ return orderStatus;
public Integer getDeliveryFlag() {
return deliveryFlag;
} }
/**
* 设置：快递状态 public void setOrderStatus(String orderStatus) {
*/ this.orderStatus = orderStatus;
public void setDeliveryFlag(Integer deliveryFlag) {
this.deliveryFlag = deliveryFlag;
} }
/**
* 获取：代购人 public String getPayId() {
*/ return payId;
public String getUserName() {
return userName;
} }
/**
* 设置：代购人 public void setPayId(String payId) {
*/ this.payId = payId;
public void setUserName(String userName) {
this.userName = userName;
} }
public BigDecimal getTax() {
return tax;
}
public BigDecimal getRealityPay() { public void setTax(BigDecimal tax) {
return realityPay; this.tax = tax;
} }
public void setRealityPay(BigDecimal realityPay) { public BigDecimal getFee() {
this.realityPay = realityPay; return fee;
} }
public String getDeliveryName() { public void setFee(BigDecimal fee) {
return deliveryName; this.fee = fee;
} }
public void setDeliveryName(String deliveryName) { public String getCouponId() {
this.deliveryName = deliveryName; return couponId;
} }
public String getDeliveryPhone() { public void setCouponId(String couponId) {
return deliveryPhone; this.couponId = couponId;
} }
public void setDeliveryPhone(String deliveryPhone) { public String getCouponTitle() {
this.deliveryPhone = deliveryPhone; return couponTitle;
} }
public String getOrderStatus() { public void setCouponTitle(String couponTitle) {
return orderStatus; this.couponTitle = couponTitle;
} }
public void setOrderStatus(String orderStatus) { public String getDeliveryFlag() {
this.orderStatus = orderStatus; return deliveryFlag;
}
public void setDeliveryFlag(String deliveryFlag) {
this.deliveryFlag = deliveryFlag;
} }
} }
platform-admin/src/main/java/com/platform/service/TbCfOrderListService.java
浏览文件 @ 993a9ef9
...@@ -2,6 +2,7 @@ package com.platform.service; ...@@ -2,6 +2,7 @@ package com.platform.service;
import com.platform.entity.TbCfOrderListEntity; import com.platform.entity.TbCfOrderListEntity;
import com.platform.utils.Query; import com.platform.utils.Query;
import com.platform.vo.DeliveryOrderVo;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -28,7 +29,7 @@ public interface TbCfOrderListService { ...@@ -28,7 +29,7 @@ public interface TbCfOrderListService {
int totalPay(); int totalPay();
List<TbCfOrderListEntity> queryOrderDeliveryList(String orderId); List<DeliveryOrderVo> queryOrderDeliveryList(String orderId);
int queryTotal(Query query); int queryTotal(Query query);
......
platform-admin/src/main/java/com/platform/service/TbCfOrderService.java
浏览文件 @ 993a9ef9
...@@ -109,4 +109,6 @@ public interface TbCfOrderService { ...@@ -109,4 +109,6 @@ public interface TbCfOrderService {
BigDecimal queryOrderPriceToday(); BigDecimal queryOrderPriceToday();
BigDecimal queryOrderPriceYesterday(); BigDecimal queryOrderPriceYesterday();
int deleteOrder(String orderId);
} }
platform-admin/src/main/java/com/platform/service/impl/TbCfOrderListServiceImpl.java
浏览文件 @ 993a9ef9
...@@ -4,6 +4,7 @@ import com.platform.dao.TbCfOrderListDao; ...@@ -4,6 +4,7 @@ import com.platform.dao.TbCfOrderListDao;
import com.platform.entity.TbCfOrderListEntity; import com.platform.entity.TbCfOrderListEntity;
import com.platform.service.TbCfOrderListService; import com.platform.service.TbCfOrderListService;
import com.platform.utils.Query; import com.platform.utils.Query;
import com.platform.vo.DeliveryOrderVo;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
...@@ -32,7 +33,7 @@ public class TbCfOrderListServiceImpl implements TbCfOrderListService { ...@@ -32,7 +33,7 @@ public class TbCfOrderListServiceImpl implements TbCfOrderListService {
} }
@Override @Override
public List<TbCfOrderListEntity> queryOrderDeliveryList(String orderId) { public List<DeliveryOrderVo> queryOrderDeliveryList(String orderId) {
return tbCfOrderListDao.queryOrderDeliveryList(orderId); return tbCfOrderListDao.queryOrderDeliveryList(orderId);
} }
......
platform-admin/src/main/java/com/platform/service/impl/TbCfOrderServiceImpl.java
浏览文件 @ 993a9ef9
...@@ -164,5 +164,14 @@ public class TbCfOrderServiceImpl implements TbCfOrderService { ...@@ -164,5 +164,14 @@ public class TbCfOrderServiceImpl implements TbCfOrderService {
return tbCfOrderDao.queryOrderPriceYesterday(); return tbCfOrderDao.queryOrderPriceYesterday();
} }
@Override
public int deleteOrder(String orderId) {
List<TbCfItemOrderREntity> orderItemsList = tbCfItemOrderRDao.getOrderItemsId(orderId);
for(TbCfItemOrderREntity orderItem:orderItemsList){
tbCfItemOrderRDao.updateEnable(orderItem.getOrderItemId());
}
return tbCfOrderDao.updateOrder(orderId);
}
} }
platform-admin/src/main/java/com/platform/vo/DeliveryOrderVo.java 0 → 100644
浏览文件 @ 993a9ef9
package com.platform.vo;
import java.io.Serializable;
import java.math.BigDecimal;
public class DeliveryOrderVo implements Serializable {
private static final long serialVersionUID = 1L;
private String ordersId;
private String orderId;
private String itemId;
private Long orderNo;
private String itemImg;
private String itemTitle;
private String itemNum;
private BigDecimal itemPrice;
private String itemSku;
private String sourceItemId;
private Integer deliveryFlag;
private String pExpressNumber;
public String getOrdersId() {
return ordersId;
}
public void setOrdersId(String ordersId) {
this.ordersId = ordersId;
}
public String getOrderId() {
return orderId;
}
public void setOrderId(String orderId) {
this.orderId = orderId;
}
public String getItemId() {
return itemId;
}
public void setItemId(String itemId) {
this.itemId = itemId;
}
public Long getOrderNo() {
return orderNo;
}
public void setOrderNo(Long orderNo) {
this.orderNo = orderNo;
}
public String getItemImg() {
return itemImg;
}
public void setItemImg(String itemImg) {
this.itemImg = itemImg;
}
public String getItemTitle() {
return itemTitle;
}
public void setItemTitle(String itemTitle) {
this.itemTitle = itemTitle;
}
public String getItemNum() {
return itemNum;
}
public void setItemNum(String itemNum) {
this.itemNum = itemNum;
}
public BigDecimal getItemPrice() {
return itemPrice;
}
public void setItemPrice(BigDecimal itemPrice) {
this.itemPrice = itemPrice;
}
public String getSourceItemId() {
return sourceItemId;
}
public void setSourceItemId(String sourceItemId) {
this.sourceItemId = sourceItemId;
}
public Integer getDeliveryFlag() {
return deliveryFlag;
}
public void setDeliveryFlag(Integer deliveryFlag) {
this.deliveryFlag = deliveryFlag;
}
public String getpExpressNumber() {
return pExpressNumber;
}
public void setpExpressNumber(String pExpressNumber) {
this.pExpressNumber = pExpressNumber;
}
public String getItemSku() {
return itemSku;
}
public void setItemSku(String itemSku) {
this.itemSku = itemSku;
}
}
\ No newline at end of file
platform-admin/src/main/java/com/platform/vo/OrderInfoVo.java
浏览文件 @ 993a9ef9
package com.platform.vo; package com.platform.vo;
import java.io.Serializable;
import java.math.BigDecimal; import java.math.BigDecimal;
public class OrderInfoVo { public class OrderInfoVo implements Serializable {
private static final long serialVersionUID = 1L;
private Integer orderTotal; private Integer orderTotal;
private BigDecimal orderPriceToday; private BigDecimal orderPriceToday;
private BigDecimal orderPriceYesterday; private BigDecimal orderPriceYesterday;
......
platform-admin/src/main/resources/com/platform/dao/TbCfItemOrderRDao.xml
浏览文件 @ 993a9ef9
...@@ -152,6 +152,11 @@ ...@@ -152,6 +152,11 @@
<select id="findOrderStatus" resultType="int"> <select id="findOrderStatus" resultType="int">
select order_status from tb_cf_item_order_r where order_item_id=#{ordersId} select order_status from tb_cf_item_order_r where order_item_id=#{ordersId}
</select> </select>
<update id="updateEnable" parameterType="com.platform.entity.TbCfItemOrderREntity">
update tb_cf_item_order_r r
set r.enable_flag = 0
where r.order_item_id = #{orderItemId}
</update>
<update id="updateIsSend" parameterType="com.platform.entity.TbCfItemOrderREntity"> <update id="updateIsSend" parameterType="com.platform.entity.TbCfItemOrderREntity">
update tb_cf_item_order_r r update tb_cf_item_order_r r
......
platform-admin/src/main/resources/com/platform/dao/TbCfOrderDao.xml
浏览文件 @ 993a9ef9
...@@ -320,6 +320,12 @@ ...@@ -320,6 +320,12 @@
select delivery_phone from tb_cf_order where order_id=#{orderId} select delivery_phone from tb_cf_order where order_id=#{orderId}
</select> </select>
<update id="updateOrder" parameterType="com.platform.entity.TbCfOrderEntity">
update tb_cf_order o
set o.enable_flag = 0
where o.order_id=#{orderId}
</update>
<!--根据订单id，获取订单内商品详情--> <!--根据订单id，获取订单内商品详情-->
<select id="getOrderItemList" resultType="com.platform.entity.TbCfItemDetailEntity"> <select id="getOrderItemList" resultType="com.platform.entity.TbCfItemDetailEntity">
select t2.* from tb_cf_item_order_r t1,tb_cf_item_detail t2 where t1.order_item_id =#{ordersId} select t2.* from tb_cf_item_order_r t1,tb_cf_item_detail t2 where t1.order_item_id =#{ordersId}
......
platform-admin/src/main/resources/com/platform/dao/TbCfOrderListDao.xml
浏览文件 @ 993a9ef9
...@@ -5,42 +5,53 @@ ...@@ -5,42 +5,53 @@
<resultMap type="com.platform.entity.TbCfOrderListEntity" id="tbCfOrderListMap"> <resultMap type="com.platform.entity.TbCfOrderListEntity" id="tbCfOrderListMap">
<result property="orderId" column="order_id"/> <result property="orderId" column="order_id"/>
<result property="itemId" column="item_id"/> <result property="orderNo" column="order_no"/>
<result property="userId" column="user_id"/> <result property="userName" column="user_name"/>
<result property="orderNo" column="order_no"/> <result property="orderTime" column="order_time"/>
<result property="orderTime" column="order_time"/> <result property="realityPay" column="reality_pay"/>
<result property="realityPay" column="reality_pay"/> <result property="deliveryAddress" column="delivery_address"/>
<result property="itemTitle" column="item_title"/> <result property="deliveryName" column="delivery_name"/>
<result property="itemNum" column="item_num"/> <result property="deliveryPhone" column="delivery_phone"/>
<result property="deliveryAddress" column="delivery_address"/>
<result property="pExpressNumber" column="p_express_number"/>
<result property="payWayCode" column="pay_way_code"/> <result property="payWayCode" column="pay_way_code"/>
<result property="deliveryFlag" column="delivery_flag"/>
<result property="userName" column="user_name"/>
<result property="orderStatus" column="order_status"/> <result property="orderStatus" column="order_status"/>
<result property="payId" column="pay_id"/>
<result property="tax" column="tax"/>
<result property="fee" column="fee"/>
<result property="couponId" column="coupon_id"/>
<result property="couponTitle" column="coupon_title"/>
<result property="deliveryFlag" column="delivery_flag"/>
</resultMap> </resultMap>
<!--查询订单列表--> <!--查询订单列表-->
<select id="queryOrderList" resultType="com.platform.entity.TbCfOrderListEntity"> <select id="queryOrderList" resultType="com.platform.entity.TbCfOrderListEntity">
select select
DISTINCT
o.order_id, o.order_id,
o.order_no, o.order_no,
CONCAT_WS("_",u.nick,u.user_no) userInfo, o.user_name,
o.order_time, o.order_time,
o.reality_pay, o.reality_pay,
o.delivery_name, o.delivery_name,
o.delivery_phone, o.delivery_phone,
o.delivery_address, o.delivery_address,
f.pay_way_code, f.pay_way_code,
o.order_status o.order_status,
o.pay_id,
o.tax,
o.fee,
c.coupon_id,
c.coupon_title,
o.delivery_flag
from tb_cf_order o from tb_cf_order o
INNER JOIN tb_cf_item_order_r i on o.order_id=i.order_id LEFT JOIN tb_cf_finance f on f.order_id=o.order_id
INNER JOIN tb_cf_finance f on f.order_id=o.order_id LEFT JOIN tb_cf_user_info u on u.user_id=o.user_id
INNER JOIN tb_cf_user_info u on u.user_id=o.user_id LEFT JOIN tb_cf_coupon c on c.coupon_id=o.coupon_id
WHERE 1=1 and i.enable_flag=1 and f.pay_way_code!='null' WHERE 1=1 and o.enable_flag=1
<if test="name != null and name.trim() != ''"> <if test="name != null and name.trim() != ''">
AND o.order_no LIKE concat('%',#{name},'%') AND o.order_no LIKE concat('%',#{name},'%')
</if> </if>
<if test="userName != null and userName.trim() != ''">
AND o.user_name LIKE concat('%',#{userName},'%')
</if>
<if test="start != null and start.trim() != '' "> <if test="start != null and start.trim() != '' ">
AND o.order_time <![CDATA[>=]]> CONCAT('', #{start},' 00:00:00') AND o.order_time <![CDATA[>=]]> CONCAT('', #{start},' 00:00:00')
</if> </if>
...@@ -65,56 +76,14 @@ ...@@ -65,56 +76,14 @@
limit #{offset}, #{limit} limit #{offset}, #{limit}
</if> </if>
</select> </select>
<!--查询订单列表-->
<select id="queryOrderDeliveryList" resultType="com.platform.entity.TbCfOrderListEntity">
select
i.order_item_id ordersId,
o.order_id,
o.order_no,
CONCAT_WS("_",u.nick,u.user_no) userInfo,
o.order_time,
o.reality_pay,
o.delivery_name,
o.delivery_phone,
o.delivery_address,
f.pay_way_code,
o.order_status
from tb_cf_order o
INNER JOIN tb_cf_item_order_r i on o.order_id=i.order_id
INNER JOIN tb_cf_finance f on f.order_id=o.order_id
INNER JOIN tb_cf_user_info u on u.user_id=o.user_id
WHERE 1=1 and i.enable_flag=1 and f.pay_way_code!='null' and o.order_id=#{orderId}
</select>
<!--查询总记录数-->
<select id="queryOrderTotal" resultType="int">
select count( distinct i.order_id)
from tb_cf_order o
INNER JOIN tb_cf_item_order_r i on o.order_id=i.order_id
INNER JOIN tb_cf_finance f on f.order_id=o.order_id
INNER JOIN tb_cf_user_info u on u.user_id=o.user_id
WHERE 1=1 and i.enable_flag=1 and f.pay_way_code!='null'
</select>
<!--查询总记录数-->
<select id="queryOrderDeliveryTotal" resultType="int">
select count( distinct i.order_id)
from tb_cf_order o
INNER JOIN tb_cf_item_order_r i on o.order_id=i.order_id
INNER JOIN tb_cf_finance f on f.order_id=o.order_id
INNER JOIN tb_cf_user_info u on u.user_id=o.user_id
WHERE 1=1 and i.enable_flag=1 and f.pay_way_code!='null'
</select>
<!--查询总记录数--> <!--查询总记录数-->
<select id="queryTotal" resultType="int"> <select id="queryTotal" resultType="int">
select count( distinct i.order_id) select count(*)
from tb_cf_order o from tb_cf_order o
INNER JOIN tb_cf_item_order_r i on o.order_id=i.order_id LEFT JOIN tb_cf_finance f on f.order_id=o.order_id
INNER JOIN tb_cf_finance f on f.order_id=o.order_id LEFT JOIN tb_cf_user_info u on u.user_id=o.user_id
INNER JOIN tb_cf_user_info u on u.user_id=o.user_id LEFT JOIN tb_cf_coupon c on c.coupon_id=o.coupon_id
WHERE 1=1 and i.enable_flag=1 and f.pay_way_code!='null' WHERE 1=1 and o.enable_flag=1
<if test="name != null and name.trim() != ''"> <if test="name != null and name.trim() != ''">
AND o.order_no LIKE concat('%',#{name},'%') AND o.order_no LIKE concat('%',#{name},'%')
...@@ -132,6 +101,51 @@ ...@@ -132,6 +101,51 @@
AND i.delivery_flag =#{deliveryFlag} AND i.delivery_flag =#{deliveryFlag}
</if> </if>
</select> </select>
<!--查询代购订单列表-->
<select id="queryOrderDeliveryList" resultType="com.platform.vo.DeliveryOrderVo">
select
r.order_item_id ordersId,
r.order_id,
i.item_id,
o.order_no,
i.item_img,
i.item_title,
i.item_num,
i.item_price,
i.item_sku,
i.source_item_id,
r.delivery_flag,
p.p_express_number
from tb_cf_item_order_r r
LEFT JOIN tb_cf_order o on o.order_id=r.order_id
LEFT JOIN tb_cf_item_detail i on i.item_id = r.item_id
LEFT JOIN tb_cf_platform_order p on p.relative_id =r.order_item_id
LEFT JOIN tb_cf_coupon c on c.coupon_id =o.coupon_id
where r.order_id=#{orderId}
</select>
<!--查询总记录数-->
<select id="queryOrderTotal" resultType="int">
select count( distinct i.order_id)
from tb_cf_order o
INNER JOIN tb_cf_item_order_r i on o.order_id=i.order_id
INNER JOIN tb_cf_finance f on f.order_id=o.order_id
INNER JOIN tb_cf_user_info u on u.user_id=o.user_id
WHERE 1=1 and i.enable_flag=1 and f.pay_way_code!='null'
</select>
<!--查询总记录数-->
<select id="queryOrderDeliveryTotal" resultType="int">
select count( *)
from tb_cf_item_order_r r
LEFT JOIN tb_cf_order o on o.order_id=r.order_id
LEFT JOIN tb_cf_item_detail i on i.item_id = r.item_id
LEFT JOIN tb_cf_platform_order p on p.relative_id =r.order_item_id
LEFT JOIN tb_cf_coupon c on c.coupon_id =o.coupon_id
where r.order_id=#{orderId}
</select>
<select id="totalPay"> <select id="totalPay">
select sum(o.reality_pay) select sum(o.reality_pay)
from tb_cf_order o from tb_cf_order o
......
platform-admin/src/main/webapp/WEB-INF/page/sys/tbcforderlist.html
浏览文件 @ 993a9ef9
...@@ -6,7 +6,30 @@ ...@@ -6,7 +6,30 @@
<head> <head>
<title></title> <title></title>
#parse("sys/header.html") #parse("sys/header.html")
<meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<title>order</title>
<link rel="stylesheet" type="text/css" href="http://unpkg.com/view-design/dist/styles/iview.css">
<script type="text/javascript" src="http://vuejs.org/js/vue.min.js"></script>
<script type="text/javascript" src="http://unpkg.com/view-design/dist/iview.min.js"></script>
<style> <style>
p,li,span,h1,h2,h3,h4,h5{
/* line-height: 2em; */
}
ul>li{
list-style: none;
}
#app{
padding:10px;
width:800px;
}
.order-time{margin-top:10px;}
.order-time .card-title{
display: flex;
justify-content: space-between;
}
.order-basic-information,.order-recipients-information{margin-top:10px;}
.order-basic-information>h4,.order-recipients-information>h4{border-bottom: 1px solid #eee;}
.ui-jqgrid .ui-jqgrid-bdiv{ .ui-jqgrid .ui-jqgrid-bdiv{
height:auto!important; height:auto!important;
} }
...@@ -27,7 +50,7 @@ ...@@ -27,7 +50,7 @@
} }
.table > thead > tr > th, .table > tbody > tr > th, .table > tfoot > tr > th, .table > thead > tr > td, .table > tbody > tr > td, .table > tfoot > tr > td { .table > thead > tr > th, .table > tbody > tr > th, .table > tfoot > tr > th, .table > thead > tr > td, .table > tbody > tr > td, .table > tfoot > tr > td {
border-top: 2px solid #e7eaec; border-top: 2px solid #e7eaec;
line-height: 1.38857; line-height: 0.90000;
padding: 13px; padding: 13px;
vertical-align: middle; vertical-align: middle;
} }
...@@ -42,13 +65,17 @@ ...@@ -42,13 +65,17 @@
height: -webkit-calc(100% - 15px); height: -webkit-calc(100% - 15px);
height: -moz-calc(100% - 15px); height: -moz-calc(100% - 15px);
height: calc(100% - 15px);"> height: calc(100% - 15px);">
<div v-show="showList" style="height: 100%;"> <!-- 订单列表-->
<div v-show="showList" style="height: 98%;">
<Row :gutter="16"> <Row :gutter="16">
<div class="search-group"> <div class="search-group">
<i-col span="4"> <span>
<i-input v-model="orderNo" placeholder="订单号"/> &nbsp;&nbsp;订单号:<i-input v-model="orderNo" placeholder="订单号" style="width: 200px"/>
</i-col> </span>
<span>
&nbsp;&nbsp;用户名:<i-input v-model="userName" placeholder="用户名" style="width: 200px"/>
</span>
<el-date-picker <el-date-picker
v-model="value" v-model="value"
type="daterange" type="daterange"
...@@ -104,30 +131,95 @@ ...@@ -104,30 +131,95 @@
<div id="speedp"></div> <div id="speedp"></div>
<table id="jqGrid"></table> <table id="jqGrid"></table>
</div> </div>
<!--订单详情页 -->
<div v-show="showLists" style="height: 100%;"> <div v-show="showOrderDesc" style="height: 100%;">
<i-Button type="primary" @click="reloadOrder" style="margin-bottom: 10px;">返回</i-Button>
<Steps :current="2" >
<Step title="买家下单" ></Step>
<Step title="买家付款"></Step>
<Step title="发货"></Step>
<Step title="确认收货"></Step>
<Step title="评论"></Step>
</Steps>
<section class="order-time">
<h5>下单时间</h5>
<p>2019年12月26日 </p>
<Col span="11">
<Card>
<div slot="title">
<div class="card-title">
<span>当前订单状态：商品已拍下，等待买家付款</span>
<div>
<i-Button size="small" type="primary">订单发货</i-Button>
<i-Button size="small" type="warning">关闭交易</i-Button>
<i-Button size="small" type="info">备注订单</i-Button>
</div>
</div>
</div>
<p>买家还有23小时59分00秒支付订单，否则系统将自动关闭订单。如果商品被恶意拍下，您可以后台取消订单哟~ </p>
</Card>
</Col>
</section>
<section class="order-basic-information">
<h4>基本信息</h4>
<i-Table :columns="basicInfoColumns" :data="basicInfoData"></i-Table>
</section>
<section class="order-recipients-information">
<h4>收件人信息</h4>
<i-Table :columns="recipientsColumns" :data="recipientsData"></i-Table>
</section>
<section class="order-recipients-information">
<h4>物流信息</h4>
<i-Table :columns="logisticsColumns" :data="logisticsData"></i-Table>
</section>
<section class="order-recipients-information">
<h4>费用信息</h4>
<i-Table :columns="costColumns" :data="costData"></i-Table>
</section>
<section class="order-recipients-information">
<h4>操作日志</h4>
<i-Table :columns="operationColumns" :data="operationData"></i-Table>
</section>
</div>
<!--子订单列表(代购) -->
<div v-show="showLists" style="height: 100%;">
<table id="showLists" width="1680px" height="20px" border="2px"> <table id="showLists" width="1680px" height="20px" border="2px">
<thread> <thread>
<tr> <tr >
<th>订单ID</th> <th>订单唯一ID</th>
<th>订单号</th> <th>订单编号</th>
<th>用户</th> <th>商品名称</th>
<th>收货人</th> <th>商品图片</th>
<th>手机号</th> <th>商品SKU</th>
<th>收货地址</th> <th>商品价格</th>
<th>商品数量</th>
<th>商品链接</th>
<th>代购状态</th>
<th>物流单号</th>
<th>操作</th> <th>操作</th>
</tr> </tr>
</thread> </thread>
<tr v-for="(item,i) in tbCfOrderLists"> <tr v-for="(item,i) in tbCfOrderLists" align="center">
<td>{{item.ordersId}}</td> <td>{{item.ordersId}}</td>
<td>{{item.orderNo}}</td> <td>{{item.orderNo}}</td>
<td>{{item.userInfo}}</td> <td>{{item.itemTitle}}</td>
<td>{{item.deliveryName}}</td> <td>
<td>{{item.deliveryPhone}}</td> <img :src="item.itemImg" height="100px" width="100px" alt="item.itemTitle"/>
<td>{{item.deliveryAddress}}</td> </td>
<td>{{item.itemSku}}</td>
<td>$ {{item.itemPrice}}</td>
<td>{{item.itemNum}}</td>
<td>
<span style="color:green;cursor: pointer;" @click="toProductLink(item.sourceItemId)">商品链接</span>
</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)">代购</i-button></td>
</tr> </tr>
</table> </table>
<div>
<i-button type="warning" @click="reloadDelivery" style="margin-left: 8px">返回</i-button>
</div>
</div> </div>
<!--代购信息--> <!--代购信息-->
<el-dialog title="代购信息" :visible.sync="agentVisible"> <el-dialog title="代购信息" :visible.sync="agentVisible">
...@@ -170,4 +262,10 @@ ...@@ -170,4 +262,10 @@
<script src="${rc.contextPath}/statics/plugins/elmentui/index.js"></script> <script src="${rc.contextPath}/statics/plugins/elmentui/index.js"></script>
<script src="${rc.contextPath}/js/sys/tbcforderList.js?_${date.systemTime}"></script> <script src="${rc.contextPath}/js/sys/tbcforderList.js?_${date.systemTime}"></script>
</body> </body>
<!-- <script src="./vue.js"></script>
<link rel="stylesheet" href="./iview.css">
<script src="./iview.js"></script> -->
<script>
</script>
</html> </html>
\ No newline at end of file
platform-admin/src/main/webapp/js/common.js
浏览文件 @ 993a9ef9
...@@ -139,8 +139,11 @@ function eyeImages(data) { ...@@ -139,8 +139,11 @@ function eyeImages(data) {
* @param name * @param name
*/ */
function handleResetForm(vue, name) { function handleResetForm(vue, name) {
debugger if( vue.$refs[name].resetFields()=='undefined'){
vue.$refs[name].resetFields(); console.log(error)
}else{
vue.$refs[name].resetFields();
}
}; };
...@@ -662,7 +665,7 @@ payStatusFormat = function (cellvalue) { ...@@ -662,7 +665,7 @@ payStatusFormat = function (cellvalue) {
* @returns {string} * @returns {string}
*/ */
deliveryFlagFormat = function (cellvalue) { deliveryFlagFormat = function (cellvalue) {
var returnStr = "待采购" var returnStr = "未采购"
if (!!cellvalue || cellvalue == '0') { if (!!cellvalue || cellvalue == '0') {
if (cellvalue == '10') { if (cellvalue == '10') {
returnStr = "已代购"; returnStr = "已代购";
......
platform-admin/src/main/webapp/js/sys/tbcforderList.js
浏览文件 @ 993a9ef9
$(function () { $(function () {
$("#jqGrid").Grid({ $("#jqGrid").Grid({
//订单列表(全部)
url: '../tbcforder/orderList', url: '../tbcforder/orderList',
//colNames: ['orderId', 'itemId', '用户id', '订单号', '下单时间', '金额', '商品', '商品数量', '收货地址', '快递单号', '支付方式', '物流状态'],
/* cellEdit: true,
cellsubmit: "remote",
cellurl:'../tbcforder/changeDeliveryFlag/',*/
colModel: [ colModel: [
//显示字段 //显示字段
{label: 'orderId', name: 'orderId', index: 'order_id', key: true, hidden: true}, {label: 'orderId', name: 'orderId', index: 'order_id', key: true, hidden: true},
{label: '订单号', name: 'orderNo', index: 'order_no', width: 80}, {label: '订单编号', name: 'orderNo', index: 'order_no'},
{label: '用户', name: 'userInfo', index: 'userInfo', width: 120}, {label: '用户名称', name: 'userName', index: 'user_name'},
{label: '下单时间', name: 'orderTime', index: 'order_time', width: 70}, {label: '下单时间', name: 'orderTime', index: 'order_time'},
{label: '支付方式', name: 'payWayCode', index: 'pay_way_code', width: 45}, {label: '支付方式', name: 'payWayCode', index: 'pay_way_code'},
{label: '订单金额',name: 'realityPay', index: 'reality_pay', width: 45,formatter: "currency",formatoptions: { prefix:"$"}}, {label: '订单金额',name: 'realityPay', index: 'reality_pay',formatter: "currency",formatoptions: { prefix:"$"}},
// formatter: "currency",formatoptions: {thousandsSeparator:",",decimalSeparator:".",decimalPlaces:"2", prefix:"$"}}, //在金额前加上$,加上后，页合计无法正常显示。 {label: '订单状态', name: 'orderStatus', index: 'order_status',formatter:orderStatusFormat},
{label: '收货人', name: 'deliveryName', index: 'delivery_name', width: 100, hidden: true}, {label: '代购状态',name: 'deliveryFlag',index: 'delivery_flag',formatter: deliveryFlagFormat},
{label: '收货人手机', name: 'deliveryPhone', index: 'delivery_phone', width: 100, hidden: true}, {label: '收货人', name: 'deliveryName', index: 'delivery_name', hidden: true},
{label: '收货地址', name: 'deliveryAddress', index: 'delivery_address', width: 100, hidden: true}, {label: '收货人手机', name: 'deliveryPhone', index: 'delivery_phone', hidden: true},
{label: '快递单号', name: 'pExpressNumber', index: 'p_express_number', width: 80,sortable:false ,hidden:true}, {label: '收货地址', name: 'deliveryAddress', index: 'delivery_address', hidden: true},
{label: '订单状态', name: 'orderStatus', index: 'order_status', width: 40,formatter:orderStatusFormat}, {label: '流水ID', name: 'payId', index: 'pay_id', hidden: true},
{label: '物流状态', name: 'deliveryFlag', index: 'delivery_flag', width: 40,formatter:deliveryFlagFormat}, {label: '税费', name: 'tax', index: 'tax', hidden: true},
{label: '代购人', name: 'userName', index: 'user_name', width: 40,hidden:true}, {label: '手续费', name: 'fee', index: 'fee', hidden: true},
{label: '总金额', name: 'totalPay', index: 'totalPay', width: 40,hidden:true}, {label: '优惠券ID', name: 'couponId', index: 'coupon_id', hidden: true},
{label: '优惠券名称', name: 'couponTitle', index: 'coupon_title', hidden: true},
{name: '操作', index: 'operate', {name: '操作', index: 'operate',
formatter: function (value, grid, rows) { formatter: function (value, grid, rows) {
if(grid.colModel.formatter.arguments[2].orderStatus==10){ if(grid.colModel.formatter.arguments[2].orderStatus==10){
return '<a style="color: #c4c4c4" οnclick="showAgent">未支付</a>'; return '<button style="color: orange" class="waitpaybutton">&nbsp;查看订单</button>&nbsp;&nbsp;|&nbsp;&nbsp;<button style="color: #c4c4c4" οnclick="showAgent">关闭订单</button>';
}else if(grid.colModel.formatter.arguments[2].orderStatus==20){ }else if(grid.colModel.formatter.arguments[2].orderStatus==20){
return '<button class="diybutton" style="color: blue" ><i class="ivu-icon ivu-icon-android-cart"></i>代购</button>|<a style="color: orange" class="diybutton">&nbsp;修改</a>'; return '<button style="color: orange" class="diybutton">&nbsp;查看订单</button>&nbsp;&nbsp;|&nbsp;&nbsp;<button class="diybutton" style="color: blue" >订单发货</button>';
}else if(grid.colModel.formatter.arguments[2].orderStatus==40){ }else if(grid.colModel.formatter.arguments[2].orderStatus==40){
return '<a @click="showAgent" style="color: crimson" οnclick="modify(\''+ grid.colModel.formatter.arguments[2].ordersId+ '\');">订单追踪</a>|<a style="color: orange" class="diybutton">&nbsp;修改</a>'; return '<button style="color: orange" class="diybutton">&nbsp;查看订单</button>&nbsp;&nbsp;|&nbsp;&nbsp;<button @click="showAgent" style="color: forestgreen" οnclick="modify(\''+ grid.colModel.formatter.arguments[2].ordersId+ '\');">订单追踪</button>';
}else if(grid.colModel.formatter.arguments[2].orderStatus==50){ }else if(grid.colModel.formatter.arguments[2].orderStatus==50){
return '<a @click="showAgent" style="color:darkgreen" οnclick="modify(\''+ rows.id+ '\');">查看订单详情</a>'; return '<button style="color: orange" class="diybutton">&nbsp;查看订单</button>&nbsp;&nbsp;|&nbsp;&nbsp;<button @click="showAgent" style="color:forestgreen οnclick="modify(\''+ rows.id+ '\');">订单追踪</button>';
}else if(grid.colModel.formatter.arguments[2].orderStatus==60){ }else if(grid.colModel.formatter.arguments[2].orderStatus==60){
return '<a @click="showAgent" style="color: red" οnclick="modify(\''+ rows.id+ '\');">删除订单</a>'; return '<button style="color: orange" class="diybutton">&nbsp;查看订单</button>&nbsp;&nbsp;|&nbsp;&nbsp;<button class="delbutton" style="color: red" >删除订单</button>';
} }
} }
} }
/* , editable:true,edittype:'select',editoptions:{value:{
0:'等待处理', 10:'已经代购', 20:'正在配送', 30:'已到达中国仓', 40:'正运往非洲',50:'买家已签收'}*/
], ],
shrinkToFit: true, shrinkToFit: true,
datatype : "json", datatype : "json",
...@@ -52,57 +48,81 @@ $(function () { ...@@ -52,57 +48,81 @@ $(function () {
viewrecords: true, viewrecords: true,
sortorder: "desc", sortorder: "desc",
}); });
//查询所有支付方式
$.get('../tbcffinance/queryPayWayCodeAll',function (res) { $.get('../tbcffinance/queryPayWayCodeAll',function (res) {
vm.payWayCodeList=JSON.parse(res).list; vm.payWayCodeList=JSON.parse(res).list;
}), }),
$.get('../tbcfexpresstemplate/queryAll',function (res) { //查询所有运费模板(品名)
$.get('../tbcfexpresstemplate/queryAll',function (res) {
vm.descripition=JSON.parse(res).list; vm.descripition=JSON.parse(res).list;
}); }),
$.get('../tbcfstore/queryAll',function (res) { //查询所有店铺
vm.store=JSON.parse(res).list; $.get('../tbcfstore/queryAll',function (res) {
vm.store=JSON.parse(res).list;
})
//绑定事件
document.addEventListener('load',(()=>{
//diybutton 订单发货(代购)
$('#jqGrid').on('click','.diybutton',e=>{
vm.getDelivery($(e.target).parent().parent().attr('id'))
return false
}) })
document.addEventListener('load',( //'delbutton' 删除订单(伪删除)
()=>{ $('#jqGrid').on('click','.delbutton',e=>{
$('#jqGrid').on('click','.diybutton',e=>{ vm.del($(e.target).parent().parent().attr('id'))
vm.getDelivery($(e.target).parent().parent().attr('id')) return false
return false })
}) //'waitpaybutton' 等待支付的订单详情
})( $('#jqGrid').on('click','.waitpaybutton',e=>{
()=>{ //获取订单ID及订单状态
$('#jqGrid').on('click','.diybutton',e=>{ let orderStatus
vm.getDelivery($(e.target).parent().parent().attr('id')) $(e.target).parent().siblings().each((index,item)=>{
return false if($(item).attr('aria-describedby')==='jqGrid_orderStatus'){
orderStatus = $(item).attr('title')
vm.waitpay($(e.target).parent().parent().attr('id'),orderStatus)
}
}) })
return false
}) })
) })())
}); });
let vm = new Vue({ let vm = new Vue({
el: '#rrapp', el: '#rrapp',
data: { data: {
//订单列表
showList: true, showList: true,
//订单代购列表
showLists: false, showLists: false,
agentVisible:false, //订单详情页
showOrderDesc: false,
//代购信息
agentVisible: false,
title: null, title: null,
//子订单列表(代购)
tbCfOrderLists: [], tbCfOrderLists: [],
//订单
tbCfOrderList: {}, tbCfOrderList: {},
deliveryFlagOptions:[{ //代购状态(物流状态)
deliveryFlagOptions: [{
value: '0', value: '0',
label: '待采购' label: '待采购'
},{ }, {
value: '10', value: '10',
label: '已代购' label: '已代购'
},{ }, {
value: '20', value: '20',
label: '已到达中国仓' label: '已到达中国仓'
},{ }, {
value: '40', value: '40',
label: '已到达非洲仓' label: '已到达非洲仓'
},{ }, {
value: '50', value: '50',
label: '买家已签收' label: '买家已签收'
}], }],
//代购信息
agentInfo: { agentInfo: {
ordersId:'', ordersId: '',
//代购人 //代购人
userName: '', userName: '',
//订单号 //订单号
...@@ -110,19 +130,25 @@ let vm = new Vue({ ...@@ -110,19 +130,25 @@ let vm = new Vue({
//快递单号 //快递单号
pExpressNumber: '', pExpressNumber: '',
//商品品名 //商品品名
descripitionId:'', descripitionId: '',
//实际付款 //实际付款
realityPay: '', realityPay: '',
//原网站订单号 //原网站订单号
pOrderId:'', pOrderId: '',
//代购平台 //代购平台
platformName: '' platformName: ''
}, },
deliveryFlag:'', //代购状态
deliveryFlag: '',
//代购弹窗大小
formLabelWidth: '120px', formLabelWidth: '120px',
//商店集合
store: [], store: [],
//品名集合
descripition: [], descripition: [],
payWayCode:'', //支付方式
payWayCode: '',
//日期选择
pickerOptions: { pickerOptions: {
shortcuts: [{ shortcuts: [{
text: '最近一周', text: '最近一周',
...@@ -155,20 +181,193 @@ let vm = new Vue({ ...@@ -155,20 +181,193 @@ let vm = new Vue({
{required: true, message: '名称不能为空', trigger: 'blur'} {required: true, message: '名称不能为空', trigger: 'blur'}
] ]
}, },
orderId:'', //订单ID
orderNo:'', orderId: '',
value:'', //订单号
payWayCodeList:[] orderNo: '',
//用户名
userName:'',
value: '',
//支付方式集合
payWayCodeList: [],
//订单基本信息
basicInfoColumns: [
{
title: '类型',
key: 'type'
},
{
title: '数据',
key: 'data'
}
],
basicInfoData: [],
recipientsColumns: [
{
title: '收件人',
key: 'recipients'
},
{
title: '手机号码',
key: 'phone'
},
{
title: '邮箱',
key: 'email'
},
{
title: '收货地址',
key: 'address'
}
],
recipientsData: [
{
recipients: '用户名称',
phone: '12314',
email: '123124',
address: '124124'
}
],
logisticsColumns: [
{
title: '订单独立id',
key: 'orderid'
},
{
title: '订单编号',
key: 'orderno'
},
{
title: '图片',
key: 'img'
},
{
title: '名称',
key: 'name'
},
{
title: '数量',
key: 'num'
},
{
title: '金额',
key: 'price'
},
{
title: '链接',
key: 'link'
},
{
title: '代购状态',
key: 'orderstatus'
},
{
title: '物流单号',
key: 'logisticno'
}
],
logisticsData: [
{
orderid: '用户名称',
orderno: '12314',
img: '123124',
name: '124124',
num: '124124',
price: '124124',
link: '124124',
orderstatus: '124124',
logisticno: '124124',
}
],
costColumns: [
{
title: '费用类型',
key: 'costtype'
},
{
title: '数值',
key: 'constnum'
}
],
costData: [
{
costtype: '商品合计',
constnum: 1,
}, {
costtype: '运费',
constnum: 1,
}, {
costtype: '税费',
constnum: 1,
}, {
costtype: '手续费',
constnum: 1,
}, {
costtype: '优惠券',
constnum: 1,
}, {
costtype: '现金券',
constnum: 1,
}, {
costtype: '优惠活动',
constnum: 1,
}, {
costtype: '应付款金额',
constnum: 1,
},
],
operationColumns: [
{
title: '操作者',
key: 'operationname'
},
{
title: '操作时间',
key: 'operationtime'
},
{
title: '订单状态',
key: 'orderstatus'
},
{
title: '付款状态',
key: 'paymentstatus'
},
{
title: '发货状态',
key: 'DeliverStatus'
},
{
title: '备注',
key: 'remark'
},
],
operationData: [
{
operationname: '1',
operationtime: '1',
orderstatus: '1',
paymentstatus: '1',
DeliverStatus: '1',
remark: '1',
}
],
}, },
methods: { methods: {
//前往商品链接 (link)
toProductLink(link){
window.open(link,'_blank')
},
queryAll: function () { queryAll: function () {
vm.reload(); vm.reload();
}, },
handleCommand:function(value){ handleCommand: function (value) {
alert('click on item ' + value); alert('click on item ' + value);
}, },
getDelivery: function(e){ getDelivery: function (e) {
console.log(123,e)
vm.showList = false; vm.showList = false;
vm.showLists = true; vm.showLists = true;
vm.getInfo(e); vm.getInfo(e);
...@@ -180,10 +379,27 @@ let vm = new Vue({ ...@@ -180,10 +379,27 @@ let vm = new Vue({
successCallback: function (r) { successCallback: function (r) {
console.log(r.page.list) console.log(r.page.list)
vm.tbCfOrderLists = r.page.list; vm.tbCfOrderLists = r.page.list;
vm.tbCfOrderLists.map(item=>{
if(item.deliveryFlag===0){
vm.$set(item,'deliveryFlag','未发货(未代购)')
}else if(item.deliveryFlag===10){
vm.$set(item,'deliveryFlag','已发货(已代购)')
}else if(item.deliveryFlag===20){
vm.$set(item,'deliveryFlag','已到达中国仓')
}else if(item.deliveryFlag===40){
vm.$set(item,'deliveryFlag','已到达非洲仓')
}else if(item.deliveryFlag===50){
vm.$set(item,'deliveryFlag','买家已签收(交易成功)')
}
})
} }
}); });
}, },
reloadDelivery: function (event) {
vm.showLists = false;
vm.agentVisible = false;
vm.showList = true;
},
//获取代购信息 //获取代购信息
showAgent: function (ordersId) { showAgent: function (ordersId) {
...@@ -202,7 +418,7 @@ let vm = new Vue({ ...@@ -202,7 +418,7 @@ let vm = new Vue({
vm.agentInfo = r.data; vm.agentInfo = r.data;
} else { } else {
vm.agentInfo = { vm.agentInfo = {
ordersId:ordersId, ordersId: ordersId,
//代购人 //代购人
userName: '', userName: '',
//商品品名 //商品品名
...@@ -224,7 +440,8 @@ let vm = new Vue({ ...@@ -224,7 +440,8 @@ let vm = new Vue({
}, },
//新增或者修改代购信息 //新增或者修改代购信息
saveOrUpdateAgentInfo: function () { saveOrUpdateAgentInfo: function () {
if(vm.agentInfo.descripitionId){ let taht = this;
if (vm.agentInfo.descripitionId) {
Ajax.request({ Ajax.request({
url: "../tbcforder/agent/", url: "../tbcforder/agent/",
params: JSON.stringify(vm.agentInfo), params: JSON.stringify(vm.agentInfo),
...@@ -232,17 +449,19 @@ let vm = new Vue({ ...@@ -232,17 +449,19 @@ let vm = new Vue({
dataType: "json", dataType: "json",
contentType: 'application/json', contentType: 'application/json',
successCallback: function (r) { successCallback: function (r) {
if(r.result=="1") { if (r.result == "1") {
vm.agentVisible = false; vm.agentVisible = false;
layer.msg("保存成功", { layer.msg("保存成功", {
time: 2000 //2秒关闭（如果不配置,默认是3秒） time: 2000 //2秒关闭（如果不配置,默认是3秒）
}); });
taht.reload();
} else { } else {
alert("保存失败"); alert("保存失败");
} }
} }
}); });
}else{ } else {
alert("保存失败,请选择商品品名"); alert("保存失败,请选择商品品名");
} }
...@@ -261,25 +480,65 @@ let vm = new Vue({ ...@@ -261,25 +480,65 @@ let vm = new Vue({
} }
}); });
}, },
del: function (e) {
let orderId = e;
if (orderId == null) {
return;
}
confirm('确定要删除选中的记录？', function () {
Ajax.request({
url: "../tbcforder/deleteorder",
params: JSON.stringify(orderId),
type: "POST",
contentType: "application/json",
successCallback: function () {
alert('操作成功', function (index) {
vm.reload();
});
}
});
});
},
waitpay: function (e) {
vm.showList = false;
vm.showOrderDesc=true;
// vm.getInfo(e)
},
reloadOrder: function (event) {
vm.showList = true;
vm.showOrderDesc=false;
},
reload: function (event) { reload: function (event) {
vm.showList = true; vm.showList = true;
let start=vm.value[0] || null; vm.showOrderDesc=false;
let end=vm.value[1] || null; vm.agentVisible=false;
let payWayCode=vm.payWayCode; vm.showLists=false;
let deliveryFlag=vm.deliveryFlag; let start = vm.value[0] || null;
let end = vm.value[1] || null;
let payWayCode = vm.payWayCode;
let deliveryFlag = vm.deliveryFlag;
let userName=vm.userName;
let page = $("#jqGrid").jqGrid('getGridParam', 'page'); let page = $("#jqGrid").jqGrid('getGridParam', 'page');
$("#jqGrid").jqGrid('setGridParam', { $("#jqGrid").jqGrid('setGridParam', {
postData: {'name':vm.orderNo,'start':start,'end':end,'payWayCode':payWayCode,'deliveryFlag':deliveryFlag}, postData: {
'name': vm.orderNo,
'start': start,
'end': end,
'payWayCode': payWayCode,
'deliveryFlag': deliveryFlag,
'userName':userName
},
page: page page: page
}).trigger("reloadGrid"); }).trigger("reloadGrid");
vm.handleReset('formValidate'); vm.handleReset('formValidate');
}, },
reloadSearch: function() { reloadSearch: function () {
vm.deliveryFlag=''; vm.deliveryFlag = '';
vm.orderNo=''; vm.orderNo = '';
vm.value=''; vm.value = '';
vm.payWayCode=''; vm.payWayCode = '';
vm.expressStatus = ''; vm.expressStatus = '';
vm.userName='';
vm.reload(); vm.reload();
}, },
handleSubmit: function (name) { handleSubmit: function (name) {
...@@ -292,4 +551,3 @@ let vm = new Vue({ ...@@ -292,4 +551,3 @@ let vm = new Vue({
} }
} }
}); });
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论