Skip to content

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

修改查询汇率接口为1小时查询一次

上级 b489a0d2
显示空白字符变更
内嵌 并排
正在显示 包含 400 行增加 和 84 行删除
platform-admin/src/main/java/com/platform/controller/TbCfOrderController.java
浏览文件 @ c3c39e7e
......@@ -9,6 +9,7 @@ import com.platform.service.TbCfOrderService;
import com.platform.utils.PageUtils;
import com.platform.utils.Query;
import com.platform.utils.R;
import com.platform.vo.OrderBasicVo;
import com.platform.vo.PlatformOrderVo;
import com.platform.vo.DeliveryOrderVo;
import org.apache.shiro.authz.annotation.RequiresPermissions;
......@@ -167,6 +168,17 @@ public class TbCfOrderController {
int res = tbCfOrderService.saveOrUpdateAgentInfo(platformOrderVo);
return R.ok().put("result", res);
}
@GetMapping("/totalPay")
@ResponseBody
public R totalPay(){
//查询列表数据
int totalPay = tbCfOrderListService.totalPay();
return R.ok().put("totalPay", totalPay);
}
/**
* 订单列表（运营简表）
*/
......@@ -178,19 +190,9 @@ public class TbCfOrderController {
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());
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);
}
/**
* 订单列表（代购订单列表）
*/
......@@ -204,5 +206,19 @@ public class TbCfOrderController {
PageUtils pageUtil = new PageUtils(tbCfOrderList,total);
return R.ok().put("page", pageUtil);
}
/**
* 订单详情表
*/
@GetMapping("/orderBasic/{orderId}")
@RequiresPermissions("tbcforder:orderBasic")
@ResponseBody
public R orderBasic(@PathVariable("orderId") String orderId){
//查询列表数据
OrderBasicVo orderBasicVo= tbCfOrderListService.queryorderBasic(orderId);
orderBasicVo.setAtcTime("35天");
orderBasicVo.setCountry("赞比亚");
orderBasicVo.setSource("APP");
orderBasicVo.setDeliveryOrderList(tbCfOrderListService.queryOrderDeliveryList(orderId));
return R.ok().put("orderBasicVo", orderBasicVo);
}
}
platform-admin/src/main/java/com/platform/dao/TbCfOrderListDao.java
浏览文件 @ c3c39e7e
package com.platform.dao;
import com.platform.entity.TbCfOrderListEntity;
import com.platform.utils.Query;
import com.platform.vo.DeliveryOrderVo;
import com.platform.vo.OrderBasicVo;
import java.util.List;
import java.util.Map;
......@@ -28,4 +30,8 @@ public interface TbCfOrderListDao extends BaseDao<TbCfOrderListEntity> {
int queryOrderDeliveryTotal(String orderId);
List<DeliveryOrderVo> queryOrderDeliveryList(String orderId);
OrderBasicVo queryorderBasic(String orderId);
int queryTotal(Map<String, Object> map);
}
platform-admin/src/main/java/com/platform/service/TbCfOrderListService.java
浏览文件 @ c3c39e7e
......@@ -3,6 +3,7 @@ package com.platform.service;
import com.platform.entity.TbCfOrderListEntity;
import com.platform.utils.Query;
import com.platform.vo.DeliveryOrderVo;
import com.platform.vo.OrderBasicVo;
import java.util.List;
import java.util.Map;
......@@ -31,7 +32,10 @@ public interface TbCfOrderListService {
List<DeliveryOrderVo> queryOrderDeliveryList(String orderId);
int queryTotal(Query query);
int queryOrderDeliveryTotal(String orderId);
OrderBasicVo queryorderBasic(String orderId);
int queryTotal(Map<String, Object> map);
}
platform-admin/src/main/java/com/platform/service/impl/TbCfOrderListServiceImpl.java
浏览文件 @ c3c39e7e
......@@ -5,6 +5,7 @@ import com.platform.entity.TbCfOrderListEntity;
import com.platform.service.TbCfOrderListService;
import com.platform.utils.Query;
import com.platform.vo.DeliveryOrderVo;
import com.platform.vo.OrderBasicVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
......@@ -37,15 +38,18 @@ public class TbCfOrderListServiceImpl implements TbCfOrderListService {
return tbCfOrderListDao.queryOrderDeliveryList(orderId);
}
@Override
public int queryTotal(Query query) {
return tbCfOrderListDao.queryTotal(query);
}
@Override
public int queryOrderDeliveryTotal(String orderId) {
return tbCfOrderListDao.queryOrderDeliveryTotal(orderId);
}
@Override
public OrderBasicVo queryorderBasic(String orderId) {
return tbCfOrderListDao.queryorderBasic(orderId);
}
@Override
public int queryTotal(Map<String, Object> map) {
return tbCfOrderListDao.queryTotal(map);
}
}
platform-admin/src/main/java/com/platform/vo/OrderBasicVo.java 0 → 100644
浏览文件 @ c3c39e7e
package com.platform.vo;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
public class OrderBasicVo implements Serializable {
private static final long serialVersionUID = 1L;
private String orderId;
private String orderNo;
private String userName;
private String atcTime;
private String source;
private String country;
private String payId;
private String payWayCode;
private String couponTitle;
private String deliveryName;
private String deliveryPhone;
private String deliveryAddress;
private List<DeliveryOrderVo> deliveryOrderList;
private BigDecimal itemPrice;
private BigDecimal expressCost;
private BigDecimal tax;
private BigDecimal fee;
private String couponId;
private BigDecimal realityPay;
public String getOrderId() {
return orderId;
}
public void setOrderId(String orderId) {
this.orderId = orderId;
}
public String getOrderNo() {
return orderNo;
}
public void setOrderNo(String orderNo) {
this.orderNo = orderNo;
}
public String getUserName() {
return userName;
}
public void setUserName(String userName) {
this.userName = userName;
}
public String getAtcTime() {
return atcTime;
}
public void setAtcTime(String atcTime) {
this.atcTime = atcTime;
}
public String getSource() {
return source;
}
public void setSource(String source) {
this.source = source;
}
public String getCountry() {
return country;
}
public void setCountry(String country) {
this.country = country;
}
public String getPayId() {
return payId;
}
public void setPayId(String payId) {
this.payId = payId;
}
public String getPayWayCode() {
return payWayCode;
}
public void setPayWayCode(String payWayCode) {
this.payWayCode = payWayCode;
}
public String getCouponTitle() {
return couponTitle;
}
public void setCouponTitle(String couponTitle) {
this.couponTitle = couponTitle;
}
public String getDeliveryName() {
return deliveryName;
}
public void setDeliveryName(String deliveryName) {
this.deliveryName = deliveryName;
}
public String getDeliveryPhone() {
return deliveryPhone;
}
public void setDeliveryPhone(String deliveryPhone) {
this.deliveryPhone = deliveryPhone;
}
public String getDeliveryAddress() {
return deliveryAddress;
}
public void setDeliveryAddress(String deliveryAddress) {
this.deliveryAddress = deliveryAddress;
}
public List<DeliveryOrderVo> getDeliveryOrderList() {
return deliveryOrderList;
}
public void setDeliveryOrderList(List<DeliveryOrderVo> deliveryOrderList) {
this.deliveryOrderList = deliveryOrderList;
}
public BigDecimal getItemPrice() {
return itemPrice;
}
public void setItemPrice(BigDecimal itemPrice) {
this.itemPrice = itemPrice;
}
public BigDecimal getExpressCost() {
return expressCost;
}
public void setExpressCost(BigDecimal expressCost) {
this.expressCost = expressCost;
}
public BigDecimal getTax() {
return tax;
}
public void setTax(BigDecimal tax) {
this.tax = tax;
}
public BigDecimal getFee() {
return fee;
}
public void setFee(BigDecimal fee) {
this.fee = fee;
}
public String getCouponId() {
return couponId;
}
public void setCouponId(String couponId) {
this.couponId = couponId;
}
public BigDecimal getRealityPay() {
return realityPay;
}
public void setRealityPay(BigDecimal realityPay) {
this.realityPay = realityPay;
}
}
platform-admin/src/main/resources/com/platform/dao/TbCfOrderListDao.xml
浏览文件 @ c3c39e7e
......@@ -23,7 +23,6 @@
</resultMap>
<!--查询订单列表-->
<select id="queryOrderList" resultType="com.platform.entity.TbCfOrderListEntity">
select
o.order_id,
o.order_no,
......@@ -52,6 +51,9 @@
<if test="userName != null and userName.trim() != ''">
AND o.user_name LIKE concat('%',#{userName},'%')
</if>
<if test="orderStatus != null and orderStatus.trim() != ''">
AND o.order_status LIKE concat('%',#{orderStatus},'%')
</if>
<if test="start != null and start.trim() != '' ">
AND o.order_time <![CDATA[>=]]> CONCAT('', #{start},' 00:00:00')
</if>
......@@ -62,20 +64,21 @@
AND f.pay_way_code =#{payWayCode}
</if>
<if test="deliveryFlag != null and deliveryFlag.trim() != ''">
AND i.delivery_flag =#{deliveryFlag}
AND o.delivery_flag =#{deliveryFlag}
</if>
<choose>
<when test="sidx != null and sidx.trim() != ''">
order by ${sidx} ${order}
</when>
<otherwise>
order by o.order_id desc
order by order_id desc
</otherwise>
</choose>
<if test="offset != null and limit != null">
limit #{offset}, #{limit}
</if>
</select>
<!--查询总记录数-->
<select id="queryTotal" resultType="int">
select count(*)
......@@ -84,10 +87,15 @@
LEFT 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 o.enable_flag=1
<if test="name != null and name.trim() != ''">
AND o.order_no LIKE concat('%',#{name},'%')
</if>
<if test="userName != null and userName.trim() != ''">
AND o.user_name LIKE concat('%',#{userName},'%')
</if>
<if test="orderStatus != null and orderStatus.trim() != ''">
AND o.order_status LIKE concat('%',#{orderStatus},'%')
</if>
<if test="start != null and start.trim() != '' ">
AND o.order_time <![CDATA[>=]]> CONCAT('', #{start},' 00:00:00')
</if>
......@@ -98,7 +106,7 @@
AND f.pay_way_code =#{payWayCode}
</if>
<if test="deliveryFlag != null and deliveryFlag.trim() != ''">
AND i.delivery_flag =#{deliveryFlag}
AND o.delivery_flag =#{deliveryFlag}
</if>
</select>
......@@ -124,17 +132,7 @@
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
......@@ -145,7 +143,40 @@
where r.order_id=#{orderId}
</select>
<!--订单详情页数据 -->
<select id="queryorderBasic" resultType="com.platform.vo.OrderBasicVo">
select
o.order_id,
o.order_no,
o.user_name,
f.pay_id,
f.pay_way_code,
c.coupon_title,
o.delivery_name,
o.delivery_phone,
o.delivery_address,
o.items_price,
o.express_cost,
o.tax,
o.fee,
c.coupon_id,
o.reality_pay
from tb_cf_order o
LEFT JOIN tb_cf_finance f on f.order_id=o.order_id
LEFT JOIN tb_cf_coupon c on c.coupon_id=o.coupon_id
where 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="totalPay">
select sum(o.reality_pay)
from tb_cf_order o
......@@ -156,6 +187,4 @@
left join sys_user s on s.user_id=p.user_id
WHERE 1=1 and f.pay_way_code!='null'
</select>
</mapper>
\ No newline at end of file
platform-admin/src/main/webapp/WEB-INF/page/sys/tbcforderlist.html
浏览文件 @ c3c39e7e
......@@ -50,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 {
border-top: 2px solid #e7eaec;
line-height: 0.90000;
line-height: 0.85000;
padding: 13px;
vertical-align: middle;
}
......@@ -68,7 +68,6 @@
<!-- 订单列表-->
<div v-show="showList" style="height: 98%;">
<Row :gutter="16">
<div class="search-group">
<span>
&nbsp;&nbsp;订单号:<i-input v-model="orderNo" placeholder="订单号" style="width: 200px"/>
......@@ -87,31 +86,28 @@
value-format="yyyy-MM-dd"
:picker-options="pickerOptions">
</el-date-picker>
<!-- <el-select v-model="deliveryFlag" placeholder="物流状态">
<el-select v-model="orderStatus" placeholder="订单状态">
<el-option
v-for="item in deliveryFlagOptions"
v-for="item in orderStatusOptions"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>-->
<!-- <el-select v-model="payStatus" placeholder="支付状态">
</el-select>
<el-select v-model="deliveryFlag" placeholder="代购状态">
<el-option
v-for="item in payStatusOptions"
v-for="item in deliveryFlagOptions"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
<el-select v-model="orderStatus" placeholder="订单状态">
<el-select v-model="payWayCode" placeholder="支付方式">
<el-option
v-for="item in orderStatusOptions"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
v-for="(el,i) in payWayCodeList" :key = 'el.pay_way_code'
:value="el.pay_way_code">{{el.pay_way_code}}</el-option>
</el-select>
<el-select v-model="deliveryFlag" placeholder="代购状态">
<!-- <el-select v-model="deliveryFlag" placeholder="物流状态">
<el-option
v-for="item in deliveryFlagOptions"
:key="item.value"
......@@ -119,17 +115,21 @@
:value="item.value">
</el-option>
</el-select>-->
<!-- <el-select v-model="payWayCode" placeholder="支付方式">
<!-- <el-select v-model="payStatus" placeholder="支付状态">
<el-option
v-for="(el,i) in payWayCodeList" :key = 'el.pay_way_code'
:value="el.pay_way_code">{{el.pay_way_code}}</el-option>
</el-select>-->
<i-button type="success" @click="queryAll">查询</i-button>
<i-button type="warning" @click="reloadSearch">重置</i-button>
v-for="item in payStatusOptions"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
-->
<i-button type="success" @click="queryAll" ><i class="fa fa-search"></i>查询</i-button>
<i-button type="warning" @click="reloadSearch" ><i class="fa fa-refresh"></i>重置</i-button>
</div>
</Row>
<div id="speedp"></div>
<table id="jqGrid"></table>
<div id="speedp"></div>
</div>
<!--订单详情页 -->
<div v-show="showOrderDesc" style="height: 100%;">
......
platform-admin/src/main/webapp/js/sys/tbcforderList.js
浏览文件 @ c3c39e7e
......@@ -23,15 +23,15 @@ $(function () {
{name: '操作', index: 'operate',
formatter: function (value, grid, rows) {
if(grid.colModel.formatter.arguments[2].orderStatus==10){
return '<button style="color: orange" class="waitpaybutton">&nbsp;查看订单</button>&nbsp;&nbsp;|&nbsp;&nbsp;<button style="color: #c4c4c4" οnclick="showAgent">关闭订单</button>';
return '<button style="color: black;background-color: lightskyblue" class="orderdescbutton">&nbsp;查看订单</button>&nbsp;&nbsp;|&nbsp;&nbsp;<button style="color: red" οnclick="showAgent">关闭订单</button>';
}else if(grid.colModel.formatter.arguments[2].orderStatus==20){
return '<button style="color: orange" class="diybutton">&nbsp;查看订单</button>&nbsp;&nbsp;|&nbsp;&nbsp;<button class="diybutton" style="color: blue" >订单发货</button>';
return '<button style="color: black;background-color: lightskyblue" class="diybutton">&nbsp;查看订单</button>&nbsp;&nbsp;|&nbsp;&nbsp;<button class="diybutton" style="color: blue ">订单发货</button>';
}else if(grid.colModel.formatter.arguments[2].orderStatus==40){
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>';
return '<button style="color: black;background-color: lightskyblue" 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){
return '<button style="color: orange" class="diybutton">&nbsp;查看订单</button>&nbsp;&nbsp;|&nbsp;&nbsp;<button @click="showAgent" style="color:forestgreen οnclick="modify(\''+ rows.id+ '\');">订单追踪</button>';
return '<button style="color: black;background-color: lightskyblue" 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){
return '<button style="color: orange" class="diybutton">&nbsp;查看订单</button>&nbsp;&nbsp;|&nbsp;&nbsp;<button class="delbutton" style="color: red" >删除订单</button>';
return '<button style="color: black;background-color: lightskyblue" class="diybutton">&nbsp;查看订单</button>&nbsp;&nbsp;|&nbsp;&nbsp;<button class="delbutton" style="color: red" >删除订单</button>';
}
}
}
......@@ -73,13 +73,15 @@ $(function () {
return false
})
//'waitpaybutton' 等待支付的订单详情
$('#jqGrid').on('click','.waitpaybutton',e=>{
$('#jqGrid').on('click','.orderdescbutton',e=>{
//获取订单ID及订单状态
let orderStatus
$(e.target).parent().siblings().each((index,item)=>{
if($(item).attr('aria-describedby')==='jqGrid_orderStatus'){
orderStatus = $(item).attr('title')
vm.waitpay($(e.target).parent().parent().attr('id'),orderStatus)
vm.orderDesc($(e.target).parent().parent().attr('id'),orderStatus)
}
})
return false
......@@ -120,6 +122,38 @@ let vm = new Vue({
value: '50',
label: '买家已签收'
}],
orderStatusOptions:[{
value:'20',
label:"已付款"
},{
value:'10',
label:"未付款"
},{
value:'40',
label:"已发货"
},{
value:'50',
label:"交易成功"
},{
value:'60',
label:"交易关闭"
}],
deliveryFlagOptions: [{
value: '0',
label: '待采购'
},{
value: '10',
label: '已代购'
},{
value: '20',
label: '已到达中国仓'
},{
value: '40',
label: '已到达非洲仓'
},{
value: '50',
label: '买家已签收'
}],
//代购信息
agentInfo: {
ordersId: '',
......@@ -148,6 +182,10 @@ let vm = new Vue({
descripition: [],
//支付方式
payWayCode: '',
//订单状态
orderStatus:'',
//代购状态
deliveryFlag:'',
//日期选择
pickerOptions: {
shortcuts: [{
......@@ -203,7 +241,30 @@ let vm = new Vue({
key: 'data'
}
],
basicInfoData: [],
basicInfoData: [
{
type: '用户名称',
data: 18
},{
type: '自动确定收货时间',
data: 18
},{
type: '订单来源',
data: 18
},{
type: '订单地区',
data: 18
},{
type: '交易流水号',
data: 18
},{
type: '支付方式',
data: 18
},{
type: '活动信息',
data: 18
}
],
recipientsColumns: [
{
title: '收件人',
......@@ -499,10 +560,21 @@ let vm = new Vue({
});
});
},
waitpay: function (e) {
orderDesc: function (e,orderStatus) {
vm.showList = false;
vm.showOrderDesc=true;
// vm.getInfo(e)
let orderId=e;
vm.getOderDescInfo(orderId)
},
getOderDescInfo: function(orderId){
Ajax.request({
url: "../tbcforder/orderBasic/" + orderId,
async: true,
successCallback: function (r) {
console.log(r)
vm.basicInfoData[0].data=r.orderBasicVo.userName
}
});
},
reloadOrder: function (event) {
vm.showList = true;
......@@ -518,6 +590,7 @@ let vm = new Vue({
let payWayCode = vm.payWayCode;
let deliveryFlag = vm.deliveryFlag;
let userName=vm.userName;
let orderStatus=vm.orderStatus;
let page = $("#jqGrid").jqGrid('getGridParam', 'page');
$("#jqGrid").jqGrid('setGridParam', {
postData: {
......@@ -526,7 +599,8 @@ let vm = new Vue({
'end': end,
'payWayCode': payWayCode,
'deliveryFlag': deliveryFlag,
'userName':userName
'userName':userName,
'orderStatus':orderStatus
},
page: page
}).trigger("reloadGrid");
......@@ -539,6 +613,7 @@ let vm = new Vue({
vm.payWayCode = '';
vm.expressStatus = '';
vm.userName='';
vm.orderStatus='';
vm.reload();
},
handleSubmit: function (name) {
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论