From 7f9e3f9c3b0bd7f4e04616dca83d2da8b3a646e4 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 17 Jul 2023 14:57:05 +0800
Subject: [PATCH] 扫码和关注的事件

---
 src/main/java/cc/mrbird/febs/pay/service/impl/XcxPayServiceImpl.java |   19 ++++++++-----------
 1 files changed, 8 insertions(+), 11 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 7f848cc..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()+",'type':"+apiRechargeWalletDto.getType()+"}";
+        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;
     }
 
@@ -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