From b67cb476a3de3eb720bc4c295e8fcd9c29825df7 Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Tue, 23 Jan 2024 02:07:21 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/pay/controller/XcxPayController.java | 28 ++++++++++++++++++----------
1 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/pay/controller/XcxPayController.java b/src/main/java/cc/mrbird/febs/pay/controller/XcxPayController.java
index 9e68dfc..6830a9f 100644
--- a/src/main/java/cc/mrbird/febs/pay/controller/XcxPayController.java
+++ b/src/main/java/cc/mrbird/febs/pay/controller/XcxPayController.java
@@ -12,30 +12,21 @@
import cc.mrbird.febs.mall.service.IApiMallMemberWalletService;
import cc.mrbird.febs.mall.service.IMallMoneyFlowService;
import cc.mrbird.febs.pay.model.NotifyData;
-import cc.mrbird.febs.pay.model.OrderStateDto;
-import cc.mrbird.febs.pay.model.OrderStateMsgVo;
-import cc.mrbird.febs.pay.model.WxTemplateData;
-import cc.mrbird.febs.pay.service.IPayService;
import cc.mrbird.febs.pay.service.IXcxPayService;
-import cc.mrbird.febs.pay.util.PayThreadPool;
import cc.mrbird.febs.pay.util.Signature;
import cc.mrbird.febs.pay.util.Util;
import cc.mrbird.febs.pay.util.WechatConfigure;
+import cc.mrbird.febs.rabbit.producter.AgentProducer;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil;
-import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.client.RestTemplate;
-import org.thymeleaf.engine.TemplateData;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletRequest;
@@ -72,6 +63,8 @@
private IApiMallMemberService mallMemberService;
@Autowired
private MallAgentRecordMapper mallAgentRecordMapper;
+ @Autowired
+ private AgentProducer agentProducer;
@Autowired
private IXcxPayService iXcxPayService;
@@ -244,6 +237,19 @@
// System.out.println(rechargeNo);
// }
/**
+ * 微信电子发票回调接口
+ * @return
+ */
+ @Transactional(rollbackFor = Exception.class)
+ @RequestMapping(value = "/fapiaoCallBack")
+ public Map<Object, Object> fapiaoCallBack(HttpServletResponse response, HttpServletRequest request) throws IOException {
+ log.info("微信电子发票回调接口....");
+ Map<Object, Object> objectObjectHashMap = new HashMap<>();
+ objectObjectHashMap.put("code","SUCCESS");
+ objectObjectHashMap.put("message","");
+ return objectObjectHashMap;
+ }
+ /**
* 微信支付回调接口
*/
@Transactional(rollbackFor = Exception.class)
@@ -306,6 +312,8 @@
order.setDeliveryState(OrderDeliveryStateEnum.DELIVERY_WAIT.getValue());
mallOrderInfoMapper.updateById(order);
+ agentProducer.sendOrderCoupon(order.getId());
+
mallMoneyFlowService.addMoneyFlow(
order.getMemberId(),
order.getAmount().negate(),
--
Gitblit v1.9.1