From f7ba13eed9729fef5046dc7572e061d275d7d3b0 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Tue, 21 Mar 2023 13:35:42 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B93-18=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/zscat/mallplus/oms/vo/OrderParam.java | 3 ++- .../mallplus/oms/service/impl/OmsOrderServiceImpl.java | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/oms/vo/OrderParam.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/oms/vo/OrderParam.java index 8a7a15e..b0537be 100644 --- a/mallplus-mbg/src/main/java/com/zscat/mallplus/oms/vo/OrderParam.java +++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/oms/vo/OrderParam.java @@ -22,7 +22,8 @@ public class OrderParam { //使用的积分数 private Integer useIntegration; //支付方式 - private Integer payType = 1; +// private Integer payType = 1; + private Integer payType = 0; private Integer offline;// 0 送货 1 自取 private String lading_mobile; //自取人电话 private String lading_name; //自取人姓名 diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/oms/service/impl/OmsOrderServiceImpl.java b/mallplus-portal/src/main/java/com/zscat/mallplus/oms/service/impl/OmsOrderServiceImpl.java index 21e8b45..d8e7da1 100644 --- a/mallplus-portal/src/main/java/com/zscat/mallplus/oms/service/impl/OmsOrderServiceImpl.java +++ b/mallplus-portal/src/main/java/com/zscat/mallplus/oms/service/impl/OmsOrderServiceImpl.java @@ -2196,10 +2196,10 @@ public class OmsOrderServiceImpl extends ServiceImpl i //总金额+运费-促销优惠-优惠券优惠-积分抵扣 BigDecimal payAmount = order.getTotalAmount() .add(order.getFreightAmount()) - .subtract(order.getPromotionAmount()) + /*.subtract(order.getPromotionAmount())*/ .subtract(order.getCouponAmount()) - .subtract(order.getIntegrationAmount()) - .subtract(order.getVipAmount()); + /*.subtract(order.getIntegrationAmount())*/; +// .subtract(order.getVipAmount()); return payAmount; } From 647dcb79967231c5c185449266198ecb41ddba9f Mon Sep 17 00:00:00 2001 From: guoxing <1369478551@qq.com> Date: Tue, 21 Mar 2023 17:30:03 +0800 Subject: [PATCH 2/4] 2023-3-21 --- mallplusui-web-admin/config/dev.env.js | 6 +- .../src/api/orderStatistic.js | 84 +++ .../src/views/oms/order/index1.vue | 4 +- .../src/views/oms/order/orderStatistic.vue | 544 +++--------------- 4 files changed, 164 insertions(+), 474 deletions(-) create mode 100644 mallplusui-web-admin/src/api/orderStatistic.js diff --git a/mallplusui-web-admin/config/dev.env.js b/mallplusui-web-admin/config/dev.env.js index 1fbcfe6..9dd8db7 100644 --- a/mallplusui-web-admin/config/dev.env.js +++ b/mallplusui-web-admin/config/dev.env.js @@ -4,7 +4,7 @@ const prodEnv = require('./prod.env') module.exports = merge(prodEnv, { NODE_ENV: '"development"', - // BASE_API: '"http://mall.yyundong.com/adminapi"', - // BASE_API: '"http://192.168.3.9:8085"' - BASE_API: '"http://127.0.0.1:8085"' + BASE_API: '"http://mall.yyundong.com/adminapi"', + // BASE_API: '"http://192.168.3.20:8085"' + // BASE_API: '"http://127.0.0.1:8085"' }) diff --git a/mallplusui-web-admin/src/api/orderStatistic.js b/mallplusui-web-admin/src/api/orderStatistic.js new file mode 100644 index 0000000..dfc84f5 --- /dev/null +++ b/mallplusui-web-admin/src/api/orderStatistic.js @@ -0,0 +1,84 @@ +import request from '@/utils/request' +export function getValueszd() { + return request({ + url:'/oms/OmsOrder/getLocation', + method:'get' + }) +} + +export function getValueqhd(params) { + return request({ + url:'/oms/OmsOrder/getPickupPoint', + method:'get', + params:params + }) +} + +export function fetchList(params) { + return request({ + url:'/oms/OmsOrder/getOmsOrderLocationByPage', + method:'get', + params:params + }) +} + +export function closeOrder(params) { + return request({ + url:'/oms/OmsOrder/update/close', + method:'post', + params:params + }) +} + +export function deleteOrder(id) { + return request({ + url:'/oms/OmsOrder/delete'+id, + method:'get' + }) +} + +export function deliveryOrder(data) { + return request({ + url:'/oms/OmsOrder/update/delivery', + method:'post', + data:data + }); +} + +export function getOrderDetail(id) { + return request({ + url:'/oms/OmsOrder/'+id, + method:'get' + }); +} + +export function updateReceiverInfo(data) { + return request({ + url:'/oms/OmsOrder/update/receiverInfo', + method:'post', + data:data + }); +} + +export function updateMoneyInfo(data) { + return request({ + url:'/oms/OmsOrder/update/moneyInfo', + method:'post', + data:data + }); +} + +export function updateOrderNote(params) { + return request({ + url:'/oms/OmsOrder/update/note', + method:'post', + params:params + }) +} +export function orderData(params) { + return request({ + url:'/oms/OmsOrder/data/count', + method:'get', + params:params + }) +} \ No newline at end of file diff --git a/mallplusui-web-admin/src/views/oms/order/index1.vue b/mallplusui-web-admin/src/views/oms/order/index1.vue index 2600a6f..b704f83 100644 --- a/mallplusui-web-admin/src/views/oms/order/index1.vue +++ b/mallplusui-web-admin/src/views/oms/order/index1.vue @@ -399,7 +399,9 @@ return formatDate(date, 'yyyy-MM-dd hh:mm:ss'); }, formatPayType(value) { //支付方式：0->未支付；1->支付宝；2->微信 - if (value === 1) { + if (value === 0) { + return '未支付'; + } else if (value === 1) { return '支付宝'; } else if (value === 2) { return '微信'; diff --git a/mallplusui-web-admin/src/views/oms/order/orderStatistic.vue b/mallplusui-web-admin/src/views/oms/order/orderStatistic.vue index cf6d19d..8a711fc 100644 --- a/mallplusui-web-admin/src/views/oms/order/orderStatistic.vue +++ b/mallplusui-web-admin/src/views/oms/order/orderStatistic.vue @@ -2,7 +2,7 @@
- + @@ -50,12 +50,12 @@ 已退款 --> - + @@ -70,30 +70,27 @@
- - - + - - + + + + + + - - + + -
@@ -119,23 +116,8 @@ 数据列表 -
- + - -