From ca8a2fc9f8bf6d3701ecd11be7fc5f7aab226a71 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Thu, 28 Jan 2021 17:15:28 +0800
Subject: [PATCH] 1、修复充值问题
---
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/cz-form.html | 19 ++++++-------------
zq-erp/src/main/java/com/matrix/system/hive/action/OrderController.java | 15 +++++++++++++++
zq-erp/pom.xml | 4 ++--
3 files changed, 23 insertions(+), 15 deletions(-)
diff --git a/zq-erp/pom.xml b/zq-erp/pom.xml
index ca46822..10d3f71 100644
--- a/zq-erp/pom.xml
+++ b/zq-erp/pom.xml
@@ -390,11 +390,11 @@
<exclude>config/test/*</exclude>
<exclude>config/xcx/*</exclude>
- <!---->
+ <!--
<exclude>config/config.json</exclude>
<exclude>config/application.properties</exclude>
<exclude>config/system.properties</exclude>
-
+ -->
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/action/OrderController.java b/zq-erp/src/main/java/com/matrix/system/hive/action/OrderController.java
index ffe1a96..55f0ffd 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/action/OrderController.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/action/OrderController.java
@@ -22,6 +22,7 @@
import com.matrix.system.hive.dao.SysOrderItemDao;
import com.matrix.system.hive.dao.SysShopInfoDao;
import com.matrix.core.tools.DateUtil;
+import com.matrix.system.hive.plugin.util.CollectionUtils;
import com.matrix.system.hive.pojo.ShoppingCarItem;
import com.matrix.system.hive.pojo.ShoppingCarItemsVo;
import com.matrix.system.hive.service.*;
@@ -151,10 +152,24 @@
@ResponseBody
@Transactional(rollbackFor = Exception.class)
public AjaxResult refundOrder(@RequestBody SysOrder sysOrder) {
+ //储值卡订单不能通过退款渠道退款
+ if(CollectionUtils.isNotEmpty(sysOrder.getItems())){
+ List<SysOrderItem> orderItem = orderItemService.findByOrderId(sysOrder.getItems().get(0).getOrderId());
+ if(orderItem.size()==1){
+ if(orderItem.get(0).getShoppingGoods().getCode().equals("vipCzk")){
+ return AjaxResult.buildFailInstance("充值订单请直接冲负数金额退款！");
+ }
+ }
+ }
+
+
+
SysUsers user = getMe();
sysOrder.setShopId(user.getShopId());
sysOrder.setStatu(Dictionary.ORDER_STATU_TK);
sysOrder.setOrderTime(new Date());
+
+
//校验订单是否满足结算调价，新订单则保存订单，已有订单则删除后更新
sysOrder = orderService.checkAndSaveOrder(sysOrder);
orderService.refundOrderMoney(sysOrder);
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/cz-form.html b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/cz-form.html
index e2eeca7..c60267d 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/cz-form.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/cz-form.html
@@ -62,7 +62,7 @@
<el-row type="flex" align="middle" style="padding: 0 0 10px 0;">
<el-col :span="5" style="text-align: center;">充值金额</el-col>
<el-col :span="10" style="text-align: center; line-height: 50px;">
- <el-input v-model="rechargeMoney" @change="changeRechargeMoney" placeholder="0.1元起充"></el-input>
+ <el-input type="number" v-model="rechargeMoney" @change="changeRechargeMoney" placeholder="可充负数退款"></el-input>
</el-col>
</el-row>
@@ -168,7 +168,7 @@
data : {
cardInfo : "",
loginUser : "",
- rechargeMoney : "",
+ rechargeMoney : 0,
payMethods: [{
value: '现金支付',
img: '/images/pay/cash.png',
@@ -251,11 +251,6 @@
return;
}
- if (_this.rechargeMoney < 0.1) {
- this.$message.warning("0.1元起充");
- return;
- }
-
if (_this.payMoneys.length > 0) {
let flows = []
var total = 0;
@@ -266,10 +261,11 @@
this.$message.warning("请输入" + item.type + "的付款金额");
return false;
}
- flow.amount = item.money;
- total += item.money;
+ flow.amount = parseFloat(item.money);
+ total += parseFloat(item.money);
flows.push(flow);
})
+ debugger
if (total != _this.rechargeMoney) {
this.$message.warning("付款金额应等于充值金额");
return false;
@@ -347,10 +343,7 @@
return;
}
- if (rechargeMoney < 0.1) {
- this.$message.warning("0.1元起充");
- return;
- }
+
if (item.type != '储值卡') {
this.$nextTick(function () {
if (item.isActive) {
--
Gitblit v1.9.1