From c8b658df0004f9698f20d7017703e0901fcf8b15 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 26 Jul 2023 13:00:57 +0800
Subject: [PATCH] 短信认证
---
src/main/java/cc/mrbird/febs/pay/service/impl/XcxPayServiceImpl.java | 89 ++++++++++++++++++++++++++------------------
1 files changed, 52 insertions(+), 37 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 f43d50e..4b721d4 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
@@ -8,6 +8,7 @@
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.dto.WxUpCodeDto;
import cc.mrbird.febs.mall.entity.*;
import cc.mrbird.febs.mall.mapper.*;
import cc.mrbird.febs.mall.service.IMallMoneyFlowService;
@@ -15,20 +16,15 @@
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.WechatEventUtil;
import cc.mrbird.febs.pay.util.WeixinServiceUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.text.StrFormatter;
-import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
-import cn.hutool.extra.spring.SpringUtil;
import cn.hutool.http.HttpRequest;
import cn.hutool.http.HttpResponse;
-import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil;
-import com.alibaba.fastjson.JSON;
-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;
@@ -46,7 +42,6 @@
import java.io.*;
import java.math.BigDecimal;
-import java.net.*;
import java.nio.charset.Charset;
import java.util.ArrayList;
import java.util.HashMap;
@@ -72,6 +67,8 @@
private MallMemberWithdrawMapper mallMemberWithdrawMapper;
private final IMallMoneyFlowService mallMoneyFlowService;
@Autowired
+ WechatEventUtil wechatEventUtil;
+ @Autowired
RedisUtils redisUtils;
private final SpringContextHolder springContextHolder;
@@ -85,9 +82,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);
@@ -95,13 +96,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;
}
@@ -194,6 +188,24 @@
// }
return new FebsResponse().success();
}
+ @Override
+ public FebsResponse getUpCode(WxUpCodeDto wxUpCodeDto) {
+ if(ObjectUtil.isEmpty(wxUpCodeDto.getInviteId())){
+ return new FebsResponse().fail().message("邀请码不存在");
+ }
+ String inviteId = wxUpCodeDto.getInviteId();
+ MallMember mallMember = mallMemberMapper.selectInfoByInviteId(inviteId);
+ if(ObjectUtil.isEmpty(mallMember)){
+ return new FebsResponse().fail().message("邀请码不存在");
+ }
+ //前两个参数没用
+ String ticket = wechatEventUtil.getTicket(inviteId);
+ if(StrUtil.isEmpty(ticket)){
+ return new FebsResponse().fail().message("临时带参二维码ticket失败");
+ }
+ String qRcode = wechatEventUtil.getQRcode(ticket);
+ return new FebsResponse().success().data(qRcode);
+ }
@Override
public BrandWCPayRequestData startPayment(MallOrderInfo mallOrderInfo) throws Exception {
@@ -225,10 +237,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);
@@ -286,12 +298,15 @@
}
@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;
@@ -328,7 +343,7 @@
String randomNum = MallUtils.getRandomNum(5);
String imgName="/user_" + randomNum + "_acode_1.jpg";
- String codeImgPath = generateAcode(wxGenerateQrCodeDto.getScene(), wxGenerateQrCodeDto.getPage(), imgName, "800px", null);
+ 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);
@@ -399,9 +414,9 @@
* @return
*/
//图片上传路径
- public static final String IMG_UPLOAD_PATH="/mnt/sdc/webresource/groupbuy/wxcode";
+ public static final String IMG_UPLOAD_PATH="/mnt/sdc/webresource/qianayi/wxcode";
public String generateAcode(String scene,String path,String imgName,String width, Integer type){
- String urlPrefix="https://hwfile.csxuncong.com/groupbuy/wxcode";
+ String urlPrefix="https://hwfile.csxuncong.com/qianayi/wxcode";
String imgPath=IMG_UPLOAD_PATH+imgName;
if(!FileUtil.exist(imgPath)){
@@ -411,24 +426,24 @@
if (type == null) {
// 该接口无数量限制，但是 scene 传参最大字符长度为32个字符
url = StrFormatter.format("https://api.weixin.qq.com/wxa/getwxacodeunlimit?access_token={}",redisUtils.get(WechatConfigure.WX_ACCESS_TOKEN_REDIS_KEY).toString());
- obj.put("scene", scene);
- obj.put("path", path);
+ obj.set("scene", scene);
+ obj.set("page", path);
} else {
// 该接口存在数量限制, 总共可生成10w个, 但参数是接在path后面
url = StrFormatter.format("https://api.weixin.qq.com/wxa/getwxacode?access_token={}", redisUtils.get(WechatConfigure.WX_ACCESS_TOKEN_REDIS_KEY).toString());
- obj.put("path", path + "?" + scene );
+ obj.set("page", path + "?" + scene );
}
//最小 280px，最大 1280px
- obj.put("width", width);
- obj.put("auto_color", false);
+ obj.set("width", width);
+ obj.set("auto_color", false);
cn.hutool.json.JSONObject obj2 = JSONUtil.createObj();
- obj2.put("r", 0);
- obj2.put("g", 0);
- obj2.put("b", 0);
- obj.put("line_color", obj2);
+ obj2.set("r", 0);
+ obj2.set("g", 0);
+ obj2.set("b", 0);
+ obj.set("line_color", obj2);
//是否需要透明底色，为 true 时，生成透明底色的小程序码
- obj.put("is_hyaline", false);
+ obj.set("is_hyaline", false);
try {
HttpResponse execute = HttpRequest.post(url).body(obj.toString(), "application/json").execute();
InputStream inputStream = execute.bodyStream();
--
Gitblit v1.9.1