Browse Source

售后状态

LuoDLeo 7 tháng trước cách đây
mục cha
commit
4e74c16d1f

+ 2 - 1
src/main/java/org/springblade/modules/finance/service/impl/AfterSalesServiceImpl.java

@@ -196,10 +196,11 @@ public class AfterSalesServiceImpl extends ServiceImpl<AfterSalesMapper, AfterSa
 	}
 	}
 
 
 	@Override
 	@Override
+	@Transactional
 	public void agree(String afterSalesNo) {
 	public void agree(String afterSalesNo) {
 		AfterSales afterSales = lambdaQuery().eq(AfterSales::getAfterSalesNo, afterSalesNo).one();
 		AfterSales afterSales = lambdaQuery().eq(AfterSales::getAfterSalesNo, afterSalesNo).one();
 		Assert.notNull(afterSales, "售后数据不存在");
 		Assert.notNull(afterSales, "售后数据不存在");
-		afterSales.setStatus(AfterSalesStatusEnum.PROCESSED.getValue());
+		afterSales.setStatus(AfterSalesStatusEnum.FINISH.getValue());
 		updateById(afterSales);
 		updateById(afterSales);
 
 
 		if (AfterSalesTypeEnum.REFUND.getValue().equals(afterSales.getType())) {
 		if (AfterSalesTypeEnum.REFUND.getValue().equals(afterSales.getType())) {

+ 4 - 0
src/main/java/org/springblade/modules/finance/service/impl/IWxPayServiceImpl.java

@@ -23,6 +23,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springblade.common.enums.YesOrNoEnum;
 import org.springblade.common.enums.YesOrNoEnum;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.log.logger.BladeLogger;
 import org.springblade.core.log.logger.BladeLogger;
+import org.springblade.modules.finance.entity.AfterSales;
 import org.springblade.modules.finance.entity.Order;
 import org.springblade.modules.finance.entity.Order;
 import org.springblade.modules.finance.entity.OrderRefund;
 import org.springblade.modules.finance.entity.OrderRefund;
 import org.springblade.modules.finance.pay.entity.WxPayV3Bean;
 import org.springblade.modules.finance.pay.entity.WxPayV3Bean;
@@ -319,6 +320,9 @@ public class IWxPayServiceImpl implements IWxPayService {
 			}
 			}
 			if ("PROCESSING".equals(status)) {
 			if ("PROCESSING".equals(status)) {
 				log.info("订单号[{}],微信退款处理中", orderNo);
 				log.info("订单号[{}],微信退款处理中", orderNo);
+				AfterSales afterSales = afterSalesService.getById(afterSalesId);
+				afterSales.setRefundState(2);// 退款中
+				afterSalesService.updateById(afterSales);
 				orderRefundService.saveOrUpdate(orderRefund);
 				orderRefundService.saveOrUpdate(orderRefund);
 			}
 			}
 			if ("ABNORMAL".equals(status)) {
 			if ("ABNORMAL".equals(status)) {