From 300d53fad6120d72478f7bbee0e5e1dfa9116132 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 01 Sep 2022 17:18:11 +0800
Subject: [PATCH] 20220822
---
src/main/java/cc/mrbird/febs/pay/service/impl/XcxPayServiceImpl.java | 96 ++++++++++++++++++++++++++++++++++++------------
1 files changed, 72 insertions(+), 24 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/pay/service/impl/XcxPayServiceImpl.java b/src/main/java/cc/mrbird/febs/pay/service/impl/XcxPayServiceImpl.java
index 794a2e3..77b72de 100644
--- a/src/main/java/cc/mrbird/febs/pay/service/impl/XcxPayServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/pay/service/impl/XcxPayServiceImpl.java
@@ -5,25 +5,20 @@
import cc.mrbird.febs.common.enumerates.FlowTypeEnum;
import cc.mrbird.febs.common.enumerates.MoneyFlowTypeEnum;
import cc.mrbird.febs.common.properties.XcxProperties;
-import cc.mrbird.febs.common.utils.MallUtils;
-import cc.mrbird.febs.common.utils.OssUtils;
-import cc.mrbird.febs.common.utils.RedisUtils;
-import cc.mrbird.febs.common.utils.SpringContextHolder;
+import cc.mrbird.febs.common.utils.*;
import cc.mrbird.febs.mall.dto.ApiRechargeWalletDto;
-import cc.mrbird.febs.mall.entity.DataDictionaryCustom;
-import cc.mrbird.febs.mall.entity.MallMember;
-import cc.mrbird.febs.mall.entity.MallOrderInfo;
-import cc.mrbird.febs.mall.entity.MallOrderItem;
-import cc.mrbird.febs.mall.mapper.DataDictionaryCustomMapper;
-import cc.mrbird.febs.mall.mapper.MallMemberMapper;
-import cc.mrbird.febs.mall.mapper.MallOrderInfoMapper;
+import cc.mrbird.febs.mall.dto.RechargeWalletMessageSendDto;
+import cc.mrbird.febs.mall.entity.*;
+import cc.mrbird.febs.mall.mapper.*;
import cc.mrbird.febs.mall.service.IMallMoneyFlowService;
+import cc.mrbird.febs.mall.vo.RechargeWalletMessageSendVo;
import cc.mrbird.febs.pay.model.*;
import cc.mrbird.febs.pay.service.IXcxPayService;
import cc.mrbird.febs.pay.util.WechatConfigure;
import cc.mrbird.febs.pay.util.WeixinServiceUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil;
@@ -59,6 +54,10 @@
WeixinServiceUtil weixinServiceUtil;
@Autowired
private DataDictionaryCustomMapper dataDictionaryCustomMapper;
+ @Autowired
+ private MallMoneyFlowMapper mallMoneyFlowMapper;
+ @Autowired
+ private MallMemberWithdrawMapper mallMemberWithdrawMapper;
private final IMallMoneyFlowService mallMoneyFlowService;
@Autowired
RedisUtils redisUtils;
@@ -89,8 +88,59 @@
money,
MoneyFlowTypeEnum.RECHARGE.getValue(),
rechargeNo,
- FlowTypeEnum.BALANCE.getValue());
+ FlowTypeEnum.BALANCE.getValue(),
+ "余额充值",1);
return payData;
+ }
+
+ @Override
+ public void rechargeWalletMessageSend(RechargeWalletMessageSendDto info) {
+ RestTemplate restTemplate = new RestTemplate();
+ String url = WechatConfigure.SEND_INFO_URL + redisUtils.get(WechatConfigure.WX_ACCESS_TOKEN_REDIS_KEY);
+ //拼接推送的模版
+ RechargeWalletMessageSendVo orderStateMsgVo = new RechargeWalletMessageSendVo();
+ orderStateMsgVo.setTouser(info.getOpenId());//用户的openId
+ orderStateMsgVo.setTemplate_id(info.getTemplateId());//订阅消息模板id
+ orderStateMsgVo.setPage(info.getPage());
+ Map<String, WxTemplateData> m = new HashMap<>(4);
+ m.put("character_string1", new WxTemplateData(info.getRechargeNo()));
+ m.put("amount3", new WxTemplateData(info.getRechargeAmount()));
+ m.put("amount4", new WxTemplateData(info.getBalance()));
+ m.put("date5", new WxTemplateData(info.getCreateTime()));
+ orderStateMsgVo.setData(m);
+ String s = JSONUtil.toJsonStr(orderStateMsgVo);
+ log.info(s);
+ ResponseEntity<String> responseEntity = restTemplate.postForEntity(url, orderStateMsgVo, String.class);
+ log.info(responseEntity.getBody());
+
+ }
+
+ @Override
+ public Boolean memberWithdrawal(MemberWithdrawalDto info) {
+ boolean flag=false;
+ BigDecimal unit = new BigDecimal("100");
+ BigDecimal money = new BigDecimal(info.getTotalFee().toString());
+ String outTradeNo = info.getOutTradeNo();
+ String openid = info.getOpenid();
+ String desc = info.getDesc();
+
+ MallMember mallMember = mallMemberMapper.selectMemberByOpenId(openid);
+ if(ObjectUtil.isEmpty(mallMember)){
+ return flag;
+ }
+ MallMemberWithdraw mallMemberWithdraw = mallMemberWithdrawMapper.selectByWithDrawNoAndMemberIdAndState(outTradeNo,mallMember.getId(),1);
+ if(ObjectUtil.isEmpty(mallMemberWithdraw)){
+ return flag;
+ }
+ Boolean debug = xcxProperties.getDebug();
+ if (debug) {
+ flag = weixinServiceUtil.comPay("[测试]" + desc, outTradeNo,
+ 1, openid);
+ } else {
+ flag = weixinServiceUtil.comPay(desc, outTradeNo,
+ unit.multiply(money).intValue(),openid);
+ }
+ return flag;
}
@Override
@@ -122,12 +172,11 @@
orderStateMsgVo.setTouser(info.getOpenId());//用户的openId
orderStateMsgVo.setTemplate_id(info.getTemplateId());//订阅消息模板id
orderStateMsgVo.setPage(info.getPage());
- Map<String, WxTemplateData> m = new HashMap<>(5);
- m.put("character_string1", new WxTemplateData(info.getOrderNo()));
- m.put("thing9", new WxTemplateData(info.getGoodsName()));
- m.put("phrase2", new WxTemplateData(info.getOrderState()));
- m.put("thing13", new WxTemplateData(info.getAddressArea()));
- m.put("thing16", new WxTemplateData(info.getTakeCode()));
+ Map<String, WxTemplateData> m = new HashMap<>(4);
+ m.put("character_string2", new WxTemplateData(info.getOrderNo()));
+ m.put("thing11", new WxTemplateData(info.getGoodsName()));
+ m.put("amount1", new WxTemplateData(info.getAmount()));
+ m.put("character_string9", new WxTemplateData(info.getTakeCode()));
orderStateMsgVo.setData(m);
String s = JSONUtil.toJsonStr(orderStateMsgVo);
log.info(s);
@@ -172,12 +221,11 @@
orderStateMsgVo.setTouser(info.getOpenId());//用户的openId
orderStateMsgVo.setTemplate_id(info.getTemplateId());//订阅消息模板id
orderStateMsgVo.setPage(info.getPage());
- Map<String, WxTemplateData> m = new HashMap<>(5);
- m.put("character_string1", new WxTemplateData(info.getOrderNo()));
- m.put("thing9", new WxTemplateData(info.getGoodsName()));
- m.put("phrase2", new WxTemplateData(info.getOrderState()));
- m.put("thing13", new WxTemplateData(info.getAddressArea()));
- m.put("thing16", new WxTemplateData(info.getTakeCode()));
+ Map<String, WxTemplateData> m = new HashMap<>(4);
+ m.put("character_string2", new WxTemplateData(info.getOrderNo()));
+ m.put("thing11", new WxTemplateData(info.getGoodsName()));
+ m.put("amount1", new WxTemplateData(info.getAmount()));
+ m.put("character_string9", new WxTemplateData(info.getTakeCode()));
orderStateMsgVo.setData(m);
String s = JSONUtil.toJsonStr(orderStateMsgVo);
log.info(s);
--
Gitblit v1.9.1