From 86f2368f146af23c9e16507f790752e79858a29f Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Thu, 22 Feb 2024 22:34:31 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/pay/service/impl/XcxPayServiceImpl.java | 339 ++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 279 insertions(+), 60 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 43192c9..0751acb 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,19 +5,11 @@
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.dto.RechargeWalletMessageSendDto;
-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.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.*;
@@ -25,24 +17,30 @@
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.text.StrFormatter;
+import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
-import cn.hutool.json.JSONObject;
+import cn.hutool.http.HttpRequest;
+import cn.hutool.http.HttpResponse;
import cn.hutool.json.JSONUtil;
-import com.baomidou.dynamic.datasource.toolkit.Base64;
-import com.baomidou.mybatisplus.extension.exceptions.ApiException;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.httpclient.HttpStatus;
+import org.apache.http.HttpEntity;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;
import org.springframework.web.client.RestTemplate;
+import cn.hutool.core.io.FileUtil;
import java.io.*;
import java.math.BigDecimal;
-import java.net.*;
+import java.nio.charset.Charset;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -61,6 +59,10 @@
WeixinServiceUtil weixinServiceUtil;
@Autowired
private DataDictionaryCustomMapper dataDictionaryCustomMapper;
+ @Autowired
+ private MallMoneyFlowMapper mallMoneyFlowMapper;
+ @Autowired
+ private MallMemberWithdrawMapper mallMemberWithdrawMapper;
private final IMallMoneyFlowService mallMoneyFlowService;
@Autowired
RedisUtils redisUtils;
@@ -76,9 +78,13 @@
BrandWCPayRequestData payData;
String productNames = "小程序充值";
MallMember mallMember = mallMemberMapper.selectById(apiRechargeWalletDto.getMemberId());
- String rechargeNo = "CZ_"+MallUtils.getOrderNum();
+ String rechargeNo = apiRechargeWalletDto.getRechargeNo();
+ Long agentApplyId = apiRechargeWalletDto.getAgentApplyId() == null ? 0L : apiRechargeWalletDto.getAgentApplyId();
Boolean debug = xcxProperties.getDebug();
- String attrStr = "{'rechargeNo':"+rechargeNo+",'memberId':"+mallMember.getId()+"}";
+ String attrStr = "{'rechargeNo':"+rechargeNo
+ +",'memberId':"+mallMember.getId()
+ +",'agentApplyId':"+agentApplyId
+ +",'type':"+apiRechargeWalletDto.getType()+"}";
if (debug) {
payData = weixinServiceUtil.createRechargeWallet("[测试]" + productNames, rechargeNo,
1, mallMember.getOpenId(), attrStr);
@@ -86,13 +92,6 @@
payData = weixinServiceUtil.createRechargeWallet(productNames, rechargeNo,
unit.multiply(money).intValue(),mallMember.getOpenId(), attrStr);
}
- mallMoneyFlowService.addMoneyFlow(
- mallMember.getId(),
- money,
- MoneyFlowTypeEnum.RECHARGE.getValue(),
- rechargeNo,
- FlowTypeEnum.BALANCE.getValue(),
- "余额充值",1);
return payData;
}
@@ -116,6 +115,74 @@
ResponseEntity<String> responseEntity = restTemplate.postForEntity(url, orderStateMsgVo, String.class);
log.info(responseEntity.getBody());
+ }
+
+ @Override
+ public Boolean memberWithdrawal(MemberWithdrawalDto info) {
+ log.info("后台同意提现申请..."+JSONUtil.toJsonStr(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
+ public FebsResponse getQrCode(WxGenerateQrCodeDto wxGenerateQrCodeDto) {
+// //这里调用的是上面的获取access_token方法
+// String access_token = redisUtils.get(WechatConfigure.WX_ACCESS_TOKEN_REDIS_KEY).toString();
+// String url = "https://api.weixin.qq.com/wxa/getwxacodeunlimit?access_token="+access_token;
+// String scene = wxGenerateQrCodeDto.getScene();
+// Map<String, String> param = new HashMap<>();
+// param.put("scene",scene);
+// //这里的page如果没有的话可以不写，默认是跳主页，如果写了没有的页面的话，会返回错误信息
+// param.put("page",wxGenerateQrCodeDto.getPage());
+// String json = JSON.toJSONString(param);
+// ByteArrayInputStream inputStream = sendPost(url, json);
+// try {
+// System.out.println(inputStream);
+// //这里判断的是返回的图片还是错误信息，一般错误信息不会大于200
+// if (inputStream.available() <= 200){
+// ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+// int i;
+// byte[] buffer = new byte[200];
+// while ((i = inputStream.read(buffer)) != -1){
+// byteArrayOutputStream.write(buffer,0,i);
+// }
+// String str = new String(byteArrayOutputStream.toByteArray());
+// byteArrayOutputStream.close();
+// //错误信息
+// com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(str);
+// if ("41030".equals(jsonObject.getString("errcode"))){
+// return new FebsResponse().fail().data("所传page页面不存在，或者小程序没有发布");
+// }else if ("45009".equals(jsonObject.getString("errcode"))){
+// return new FebsResponse().fail().data("调用分钟频率受限");
+// }
+// }
+// inputStream.close();
+// }catch (Exception e){
+// return new FebsResponse().fail().data("获取二维码失败");
+// }
+ return new FebsResponse().success();
}
@Override
@@ -148,10 +215,10 @@
orderStateMsgVo.setTemplate_id(info.getTemplateId());//订阅消息模板id
orderStateMsgVo.setPage(info.getPage());
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()));
+ m.put("thing19", new WxTemplateData(info.getAddressArea()));
+ m.put("phone_number18", new WxTemplateData(info.getLeaderPhone()));
+ m.put("thing3", new WxTemplateData(info.getGoodsName()));
+ m.put("thing15", new WxTemplateData(info.getRemark()));
orderStateMsgVo.setData(m);
String s = JSONUtil.toJsonStr(orderStateMsgVo);
log.info(s);
@@ -209,48 +276,200 @@
}
@Override
- public List<String> getTemplateId() {
- List<String> wxTemplates = new ArrayList<>();
- List<DataDictionaryCustom> wxTemplateList = dataDictionaryCustomMapper.selectDicByType(DataDictionaryEnum.WX_TEMPLATE_ID_ONE.getType());
+ public List<HashMap<String, String>> getTemplateId() {
+ List<HashMap<String, String>> wxTemplates = new ArrayList<>();
+ List<DataDictionaryCustom> wxTemplateList = dataDictionaryCustomMapper.selectDicByType(DataDictionaryEnum.WX_TEMPLATE_ID_THREE.getType());
if(CollUtil.isNotEmpty(wxTemplateList)){
for(DataDictionaryCustom dic : wxTemplateList){
- wxTemplates.add(dic.getValue());
+ HashMap<String, String> objectObjectHashMap = new HashMap<>();
+ objectObjectHashMap.put("name",dic.getCode());
+ objectObjectHashMap.put("value",dic.getValue());
+ wxTemplates.add(objectObjectHashMap);
}
}
return wxTemplates;
}
+ @Autowired
+ private MallGoodsMapper mallGoodsMapper;
+ @Autowired
+ private MallTeamLeaderMapper mallTeamLeaderMapper;
+
@Override
public FebsResponse generateQrCode(WxGenerateQrCodeDto wxGenerateQrCodeDto) {
- String base64 = null;
- try {
- RestTemplate restTemplate = new RestTemplate();
- String url = "https://api.weixin.qq.com/wxa/getwxacodeunlimit?access_token=" + redisUtils.get(WechatConfigure.WX_ACCESS_TOKEN_REDIS_KEY);
- Map<String, Object> params = new HashMap<>();
- params.put("scene", wxGenerateQrCodeDto.getScene());
- params.put("page", wxGenerateQrCodeDto.getPage());
- params.put("width", 430);
- ResponseEntity<byte[]> responseEntity = restTemplate.postForEntity(url, params, byte[].class);
- if (responseEntity.getStatusCode() == HttpStatus.OK) {
- byte[] body = responseEntity.getBody();
- InputStream inputStream = new ByteArrayInputStream(body);
- // 将获取流转为base64格式
- byte[] data = null;
- ByteArrayOutputStream swapStream = new ByteArrayOutputStream();
- byte[] buff = new byte[100];
- int rc = 0;
- while ((rc = inputStream.read(buff, 0, 100)) > 0) {
- swapStream.write(buff, 0, rc);
+ Integer type = wxGenerateQrCodeDto.getType();
+ if(1 == type){
+ long goodsId = StrUtil.isBlank(wxGenerateQrCodeDto.getTypeParam()) ? 0L : Long.parseLong(wxGenerateQrCodeDto.getTypeParam());
+ MallGoods mallGoods = mallGoodsMapper.selectById(goodsId);
+ if(ObjectUtil.isNotNull(mallGoods)){
+ String wxCodeImg = mallGoods.getWxCodeImg();
+ if(StrUtil.isNotBlank(wxCodeImg)){
+ return new FebsResponse().success().data(wxCodeImg);
}
- data = swapStream.toByteArray();
- base64 = Base64.byteArrayToBase64(data);
- inputStream.close();
- swapStream.close();
}
- } catch (IOException e) {
- throw new ApiException("生成二维码失败");
}
- return new FebsResponse().success().data(base64);
+ if(2 == type){
+ String uniqueCode = wxGenerateQrCodeDto.getTypeParam();
+ MallTeamLeader mallTeamLeader = mallTeamLeaderMapper.selectLeaderByUniqueCode(uniqueCode);
+ if(ObjectUtil.isNotNull(mallTeamLeader)){
+ String wxCodeImg = mallTeamLeader.getWxCodeImg();
+ if(StrUtil.isNotBlank(wxCodeImg)){
+ return new FebsResponse().success().data(wxCodeImg);
+ }
+ }
+ }
+
+ if (type == 3) {
+ String inviteId = wxGenerateQrCodeDto.getTypeParam();
+ MallMember member = mallMemberMapper.selectInfoByInviteId(inviteId);
+ if(ObjectUtil.isNotNull(member)){
+ String wxCodeImg = member.getInviteImg();
+ if(StrUtil.isNotBlank(wxCodeImg)){
+ return new FebsResponse().success().data(wxCodeImg);
+ }
+ }
+ }
+
+ String randomNum = MallUtils.getRandomNum(5);
+ String imgName="/user_" + randomNum + "_acode_1.jpg";
+ String codeImgPath = generateAcode(wxGenerateQrCodeDto.getScene(), wxGenerateQrCodeDto.getPage(), imgName, "400px", null);
+ if(1 == type){
+ long goodsId = StrUtil.isBlank(wxGenerateQrCodeDto.getTypeParam()) ? 0L : Long.parseLong(wxGenerateQrCodeDto.getTypeParam());
+ MallGoods mallGoods = mallGoodsMapper.selectById(goodsId);
+ mallGoods.setWxCodeImg(codeImgPath);
+ mallGoodsMapper.updateById(mallGoods);
+ }
+ if(2 == type){
+ String uniqueCode = wxGenerateQrCodeDto.getTypeParam();
+ MallTeamLeader mallTeamLeader = mallTeamLeaderMapper.selectLeaderByUniqueCode(uniqueCode);
+ mallTeamLeader.setWxCodeImg(codeImgPath);
+ mallTeamLeaderMapper.updateById(mallTeamLeader);
+ }
+
+ if (type == 3) {
+ String inviteId = wxGenerateQrCodeDto.getTypeParam();
+ MallMember member = mallMemberMapper.selectInfoByInviteId(inviteId);
+ if(ObjectUtil.isNotNull(member)){
+ member.setInviteImg(codeImgPath);
+ mallMemberMapper.updateById(member);
+ }
+ }
+ return new FebsResponse().success().data(codeImgPath);
+ }
+
+ public static ByteArrayInputStream sendPost(String URL, String json) {
+ InputStream inputStream = null;
+ ByteArrayInputStream byteArrayInputStream = null;
+ // 创建默认的httpClient实例.
+ CloseableHttpClient httpclient = HttpClients.createDefault();
+ // 创建httppost
+ HttpPost httppost = new HttpPost(URL);
+ httppost.addHeader("Content-type", "application/json; charset=utf-8");
+ httppost.setHeader("Accept", "application/json");
+ try {
+ StringEntity s = new StringEntity(json, Charset.forName("UTF-8"));
+ s.setContentEncoding("UTF-8");
+ httppost.setEntity(s);
+ org.apache.http.HttpResponse response = httpclient.execute(httppost);
+ if (response.getStatusLine().getStatusCode() == HttpStatus.SC_OK){
+ // 获取相应实体
+ HttpEntity entity = response.getEntity();
+ inputStream = entity.getContent();
+ ByteArrayOutputStream outStream = new ByteArrayOutputStream();
+ // 创建一个Buffer字符串
+ byte[] buffer = new byte[1024];
+ // 每次读取的字符串长度，如果为-1，代表全部读取完毕
+ int len = 0;
+ // 使用一个输入流从buffer里把数据读取出来
+ while ((len = inputStream.read(buffer)) != -1) {
+ // 用输出流往buffer里写入数据，中间参数代表从哪个位置开始读，len代表读取的长度
+ outStream.write(buffer, 0, len);
+ }
+ // 关闭输入流
+ inputStream.close();
+ // 把outStream里的数据写入内存
+ byteArrayInputStream = new ByteArrayInputStream(outStream.toByteArray());
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ } finally {
+ // 关闭连接,释放资源
+ try {
+ httpclient.close();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+ return byteArrayInputStream;
+ }
+
+
+ /**
+ * 生成小程序码
+ * @param scene 参数
+ * @param path 跳转路径
+ * @param imgName 图片唯一名称
+ * @return
+ */
+ //图片上传路径
+ public static final String IMG_UPLOAD_PATH="/mnt/sdc/webresource/blnka/wxcode";
+ public String generateAcode(String scene,String path,String imgName,String width, Integer type){
+ String urlPrefix="https://file.blnka.cn/blnka/wxcode";
+ String imgPath=IMG_UPLOAD_PATH+imgName;
+ if(!FileUtil.exist(imgPath)){
+
+ cn.hutool.json.JSONObject obj = JSONUtil.createObj();
+ //调用二维码接口
+ String url = null;
+ if (type == null) {
+ // 该接口无数量限制，但是 scene 传参最大字符长度为32个字符
+ url = StrUtil.format("https://api.weixin.qq.com/wxa/getwxacodeunlimit?access_token={}",redisUtils.get(WechatConfigure.WX_ACCESS_TOKEN_REDIS_KEY).toString());
+ obj.set("scene", scene);
+ obj.set("page", path);
+ } else {
+ // 该接口存在数量限制, 总共可生成10w个, 但参数是接在path后面
+ url = StrUtil.format("https://api.weixin.qq.com/wxa/getwxacode?access_token={}", redisUtils.get(WechatConfigure.WX_ACCESS_TOKEN_REDIS_KEY).toString());
+ obj.set("page", path + "?" + scene );
+ }
+
+ //最小 280px，最大 1280px
+ obj.set("width", width);
+ obj.set("auto_color", false);
+ cn.hutool.json.JSONObject obj2 = JSONUtil.createObj();
+ obj2.set("r", 0);
+ obj2.set("g", 0);
+ obj2.set("b", 0);
+ obj.set("line_color", obj2);
+ //是否需要透明底色，为 true 时，生成透明底色的小程序码
+ obj.set("is_hyaline", false);
+ try {
+ HttpResponse execute = HttpRequest.post(url).body(obj.toString(), "application/json").execute();
+ log.error("微信返回值:{}", execute.body());
+ InputStream inputStream = execute.bodyStream();
+ File file = new File(imgPath);
+ FileUtil.writeFromStream(inputStream, file);
+ long uploadUrl = FileUtil.size(file);
+ //小于10kb重新生成
+ if(uploadUrl<=10240){
+ log.error("生成微信小程序码失败:图片大小异常：{}",uploadUrl);
+ return null;
+ }
+ } catch (Exception e) {
+ log.error("生成微信小程序码失败",e);
+ return null;
+ }
+
+ }else {
+ //判断文件是否正常 不正常 删除
+ File file = new File(imgPath);
+ long uploadUrl = FileUtil.size(file);
+ if(uploadUrl<=10240){
+ FileUtil.del(file);
+ return null;
+ }
+ }
+ log.debug("生成微信小程序码成功，路径：" + imgPath);
+ return urlPrefix+"/"+imgName;
}
/**
--
Gitblit v1.9.1