From bbe0a2fd03063316e50cf141986bda984599bbda Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Tue, 22 Feb 2022 23:41:42 +0800
Subject: [PATCH] Merge branch 'developer'
---
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxRefundRecordAction.java | 54 +++++++++++++++++++-----------------------------------
1 files changed, 19 insertions(+), 35 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 9ad03ff..76de059 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,24 +1,22 @@
package com.matrix.system.shopXcx.api.action;
+import com.matrix.component.tools.WxUtils;
import com.matrix.core.pojo.AjaxResult;
import com.matrix.core.tools.LogUtil;
-import com.matrix.biz.bean.BizUser;
-import com.matrix.system.common.bean.BusParameterSettings;
import com.matrix.system.common.bean.CustomerDataDictionary;
+import com.matrix.system.common.constance.AppConstance;
import com.matrix.system.common.dao.BusParameterSettingsDao;
import com.matrix.system.common.dao.CustomerDataDictionaryDao;
-import com.matrix.component.redis.RedisUserLoginUtils;
-import com.matrix.system.common.constance.AppConstance;
-
+import com.matrix.system.common.init.UserCacheManager;
+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;
import com.matrix.system.shopXcx.bean.ShopOrder;
import com.matrix.system.shopXcx.bean.ShopRefundRecord;
import com.matrix.system.shopXcx.dao.ShopDeliveryInfoDao;
import com.matrix.system.shopXcx.dao.ShopOrderDao;
import com.matrix.system.shopXcx.dao.ShopRefundRecordDao;
-import com.matrix.component.tools.WxUtils;
-import com.matrix.system.shopXcx.api.service.WxShopRefundRecordService;
-import com.matrix.system.shopXcx.api.tools.SMSTools;
import org.apache.commons.collections.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
@@ -40,7 +38,7 @@
@RequestMapping(value = "wxapi/RefundRecord")
public class WxRefundRecordAction {
@Autowired
- private RedisUserLoginUtils redisUserLoginUtils;
+ private UserCacheManager userCacheManager;
@Autowired
private ShopRefundRecordDao refundRecordDao;
@Autowired
@@ -105,6 +103,7 @@
return Double.valueOf(moneyStr);
}
+
/**
* 接收保存退款退货数据
*/
@@ -112,10 +111,10 @@
@PostMapping(value = "/saveRefundRecord")
public @ResponseBody
AjaxResult saveRefundRecord(@RequestBody ShopRefundRecord refundRecord) {
- BizUser loginUser = redisUserLoginUtils.getLoginUser(BizUser.class);
+ SysVipInfo loginUser = userCacheManager.getLoginUser();
refundRecord.setCreateBy(loginUser.getOpenId());
refundRecord.setUpdateBy(loginUser.getOpenId());
- refundRecord.setUserId(loginUser.getOpenId());
+ refundRecord.setUserId(loginUser.getId());
refundRecord.setCompanyId(loginUser.getCompanyId());
refundRecord.setAuditStatus(AppConstance.REFUND_NOT_AUDITED);
refundRecord.setRefundStatus(AppConstance.REFUND_PROCESSING);
@@ -126,7 +125,7 @@
refundRecord.setApplyTime(new Date());
ShopRefundRecord record = new ShopRefundRecord();
- record.setUserId(loginUser.getOpenId());
+ record.setUserId(loginUser.getId());
record.setOrderId(refundRecord.getOrderId());
List<ShopRefundRecord> shopRefundRecords = refundRecordDao.selectByModel(record);
if(CollectionUtils.isNotEmpty(shopRefundRecords)){
@@ -137,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, "未发货直接退款未找到订单信息");
}
@@ -161,8 +160,11 @@
if(flag){
ShopRefundRecord fundRecord = refundRecordDao.selectById(shopRecord.getId());
- refundRecordService.sendRefundInfoToUser(fundRecord);
refundRecordService.updateGroupBuyStatus(orderId.longValue());
+
+
+
+
return new AjaxResult(AjaxResult.STATUS_SUCCESS, "退款成功");
}
return new AjaxResult(AjaxResult.STATUS_FAIL, "退款失败");
@@ -175,25 +177,8 @@
modifyMap.put("id", orderId);
modifyMap.put("orderStatus", ShopOrder.ORDER_STATUS_APPLY_MONEYBACK);
shopOrderDao.updateByMap(modifyMap);
- //从数据字典获取需要发送的手机号码和短信提醒内容
- BusParameterSettings busParameterSetting1 =busParameterSettingsDao.selectCompanyParamByCode("MSG_ALERT_CONTENT_REFUND",17L);
-
- String msg = busParameterSetting1.getParamValue();
- //TODO 写死微商城17L公司id
- BusParameterSettings busParameterSetting= busParameterSettingsDao.selectCompanyParamByCode("MSG_ALERT_MOBILE",17L);
-
-
- String phons = busParameterSetting.getParamValue();
-
- phons.replace('，',',');
- List<String> result = Arrays.asList(phons.split(","));
- if(CollectionUtils.isNotEmpty(result)){
- for(String phon : result){
- smsTools.sendMsg(phon, msg + "退订回T" );
- }
- }
return new AjaxResult(AjaxResult.STATUS_SUCCESS, "保存成功");
}
@@ -207,9 +192,8 @@
@PostMapping("/findRefundRecord")
@ResponseBody
public AjaxResult getRefundRecordByUserId(@RequestBody ShopRefundRecord refundRecord) {
- BizUser loginUser = redisUserLoginUtils.getLoginUser(BizUser.class);
- String userId = loginUser.getOpenId();
- refundRecord.setUserId(userId);
+ SysVipInfo loginUser = userCacheManager.getLoginUser();
+ refundRecord.setUserId(loginUser.getId());
List<ShopRefundRecord> list = refundRecordDao.selectByRefundUserId(refundRecord);
AjaxResult result = new AjaxResult(AjaxResult.STATUS_SUCCESS, list, list.size());
return result;
--
Gitblit v1.9.1