From e423d56d730db1baed24f3f7dbbc4141038776b6 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Fri, 18 Jun 2021 22:12:03 +0800
Subject: [PATCH] 修复每日业绩bug和优化赠送业绩计算方式
---
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxRefundRecordAction.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxRefundRecordAction.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxRefundRecordAction.java
index daf749a..1d471ab 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxRefundRecordAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxRefundRecordAction.java
@@ -1,6 +1,5 @@
package com.matrix.system.shopXcx.api.action;
-import com.matrix.system.hive.bean.SysVipInfo;
import com.matrix.component.redis.RedisUserLoginUtils;
import com.matrix.component.tools.WxUtils;
import com.matrix.core.pojo.AjaxResult;
@@ -9,6 +8,7 @@
import com.matrix.system.common.constance.AppConstance;
import com.matrix.system.common.dao.BusParameterSettingsDao;
import com.matrix.system.common.dao.CustomerDataDictionaryDao;
+import com.matrix.system.hive.bean.SysVipInfo;
import com.matrix.system.shopXcx.api.service.WxShopRefundRecordService;
import com.matrix.system.shopXcx.api.tools.SMSTools;
import com.matrix.system.shopXcx.bean.ShopDeliveryInfo;
@@ -103,6 +103,7 @@
return Double.valueOf(moneyStr);
}
+
/**
* 接收保存退款退货数据
*/
@@ -135,13 +136,13 @@
if (i == 0) {
return new AjaxResult(AjaxResult.STATUS_FAIL, "保存失败");
}
-
+ ShopOrder order = shopOrderDao.selectById(refundRecord.getOrderId());
//未发货的订单取消订单不走后台审核直接退款
List<ShopRefundRecord> refundRecordsList = refundRecordDao.selectByModel(record);
if(CollectionUtils.isNotEmpty(refundRecordsList)){
ShopRefundRecord shopRecord = refundRecordsList.get(0);
Integer orderId = shopRecord.getOrderId();
- ShopOrder order = shopOrderDao.selectById(orderId);
+
if (order == null) {
return new AjaxResult(AjaxResult.STATUS_FAIL, "未发货直接退款未找到订单信息");
}
@@ -160,6 +161,10 @@
if(flag){
ShopRefundRecord fundRecord = refundRecordDao.selectById(shopRecord.getId());
refundRecordService.updateGroupBuyStatus(orderId.longValue());
+
+
+
+
return new AjaxResult(AjaxResult.STATUS_SUCCESS, "退款成功");
}
return new AjaxResult(AjaxResult.STATUS_FAIL, "退款失败");
@@ -172,6 +177,8 @@
modifyMap.put("id", orderId);
modifyMap.put("orderStatus", ShopOrder.ORDER_STATUS_APPLY_MONEYBACK);
shopOrderDao.updateByMap(modifyMap);
+
+
return new AjaxResult(AjaxResult.STATUS_SUCCESS, "保存成功");
}
--
Gitblit v1.9.1