From 6fb0d9786c5cc9549fb485670ccb37bb0815aad2 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 19 Jul 2023 10:44:27 +0800
Subject: [PATCH] 商城商品修改
---
src/main/java/cc/mrbird/febs/pay/service/impl/XcxPayServiceImpl.java | 27 ++++++++++++---------------
1 files changed, 12 insertions(+), 15 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 1d26f55..69527a8 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
@@ -78,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);
@@ -88,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;
}
@@ -218,10 +215,10 @@
orderStateMsgVo.setTemplate_id(info.getTemplateId());//订阅消息模板id
orderStateMsgVo.setPage(info.getPage());
Map<String, WxTemplateData> m = new HashMap<>(4);
- m.put("thing19.DATA", new WxTemplateData(info.getAddressArea()));
- m.put("phone_number18.DATA", new WxTemplateData(info.getLeaderPhone()));
- m.put("thing3.DATA", new WxTemplateData(info.getGoodsName()));
- m.put("thing15.DATA", new WxTemplateData(info.getRemark()));
+ 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);
@@ -395,9 +392,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)){
--
Gitblit v1.9.1