From a207cf2aeab226b919f7ed42c72f132eae9a6727 Mon Sep 17 00:00:00 2001 From: Aug <17674666882@163.com> Date: Tue, 8 Jul 2025 16:03:42 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=94=AF=E4=BB=98=E6=88=90=E5=8A=9F?= =?UTF-8?q?=EF=BC=8C=E7=8A=B6=E6=80=81=E6=9C=AA=E5=BE=85=E6=94=AF=E4=BB=98?= =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/service/impl/AppletIndexServiceImpl.java | 213 +++++++++++---------- .../java/org/jeecg/modules/pay/MpWxPayService.java | 4 +- .../src/main/resources/application-dev.yml | 2 +- 3 files changed, 113 insertions(+), 106 deletions(-) diff --git a/module-common/src/main/java/org/jeecg/api/service/impl/AppletIndexServiceImpl.java b/module-common/src/main/java/org/jeecg/api/service/impl/AppletIndexServiceImpl.java index 3b6b5c6..5cb3676 100644 --- a/module-common/src/main/java/org/jeecg/api/service/impl/AppletIndexServiceImpl.java +++ b/module-common/src/main/java/org/jeecg/api/service/impl/AppletIndexServiceImpl.java @@ -1030,125 +1030,132 @@ public class AppletIndexServiceImpl implements AppletIndexService { WxPayOrderNotifyResult notify = mpWxPayService.notify(requestBody); String outTradeNo = notify.getOutTradeNo(); log.info("支付回调订单号码："+outTradeNo); - //查询订单信息 - CommonOrder commonOrder = commonOrderService.getById(outTradeNo); - //如果订单存在则修改订单状态 - if (commonOrder!=null){ - if(commonOrder.getState()==0){ - //根据订单中的商品标识查询商品sku - List commonShopSkuList = commonOrderSkuService - .lambdaQuery() - .eq(CommonOrderSku::getOrderId,outTradeNo) - .list(); - - for (CommonOrderSku commonShopSku : commonShopSkuList){ - //1.根据订单中的商品标识查询商品信息 - CommonShop shopIng = commonShopService.lambdaQuery() - .eq(CommonShop::getId,commonShopSku.getShopId()) - .one(); + try{ - //初始化直接推荐返点金额 - BigDecimal directGivePrice = BigDecimal.ZERO; - //初始化间接推荐返点金额 - BigDecimal indirectGivePrice = BigDecimal.ZERO; + //查询订单信息 + CommonOrder commonOrder = commonOrderService.getById(outTradeNo); + //如果订单存在则修改订单状态 + if (commonOrder!=null){ + if(commonOrder.getState()==0){ + //根据订单中的商品标识查询商品sku + List commonShopSkuList = commonOrderSkuService + .lambdaQuery() + .eq(CommonOrderSku::getOrderId,outTradeNo) + .list(); - //得到直接推荐 - //2.根据订单查询用户信息 - HanHaiMember hanHaiMember = hanHaiMemberService.getById(commonOrder.getUserId()); - //3.查询用户是否存在直接邀请人 - HanHaiMember shareMember = hanHaiMemberService. - lambdaQuery() - .eq(HanHaiMember::getId,hanHaiMember.getShareId()) - .one(); - if(shareMember!=null){ - //得到直接邀请人用户角色 - Integer shareRole = shareMember.getRole(); - //普通角色 - if (shareRole==0){ - directGivePrice = shopIng.getGivePrice(); - }else if (shareRole==1){ //银卡 - directGivePrice = shopIng.getSilverGivePrice(); - }else if (shareRole==2){ //金卡 - directGivePrice = shopIng.getGoldGivePrice(); - }else{ - directGivePrice = shopIng.getDiamondGivePrice(); + for (CommonOrderSku commonShopSku : commonShopSkuList){ + //1.根据订单中的商品标识查询商品信息 + CommonShop shopIng = commonShopService.lambdaQuery() + .eq(CommonShop::getId,commonShopSku.getShopId()) + .one(); + + //初始化直接推荐返点金额 + BigDecimal directGivePrice = BigDecimal.ZERO; + //初始化间接推荐返点金额 + BigDecimal indirectGivePrice = BigDecimal.ZERO; + + + //得到直接推荐 + //2.根据订单查询用户信息 + HanHaiMember hanHaiMember = hanHaiMemberService.getById(commonOrder.getUserId()); + //3.查询用户是否存在直接邀请人 + HanHaiMember shareMember = hanHaiMemberService. + lambdaQuery() + .eq(HanHaiMember::getId,hanHaiMember.getShareId()) + .one(); + if(shareMember!=null){ + //得到直接邀请人用户角色 + Integer shareRole = shareMember.getRole(); + //普通角色 + if (shareRole==0){ + directGivePrice = shopIng.getGivePrice(); + }else if (shareRole==1){ //银卡 + directGivePrice = shopIng.getSilverGivePrice(); + }else if (shareRole==2){ //金卡 + directGivePrice = shopIng.getGoldGivePrice(); + }else{ + directGivePrice = shopIng.getDiamondGivePrice(); + } + //增加流水 + CommonMoneyLog moneyLog = new CommonMoneyLog(); + moneyLog.setId(IdWorker.getIdStr()); + moneyLog.setTitle("获得佣金【"+hanHaiMember.getNickName()+"】购买【"+shopIng.getTitle()+"】"); + moneyLog.setMoney(directGivePrice); + moneyLog.setOldMoney(shareMember.getPrice()); + moneyLog.setType(0); + moneyLog.setState(1);//已到账 + moneyLog.setUserId(shareMember.getId()); + moneyLog.setCreateTime(new Date()); + commonMoneyLogService.save(moneyLog); + + + shareMember.setPrice(shareMember.getPrice().add(directGivePrice)); + hanHaiMemberService.updateById(shareMember); } - //增加流水 - CommonMoneyLog moneyLog = new CommonMoneyLog(); - moneyLog.setId(IdWorker.getIdStr()); - moneyLog.setTitle("获得佣金【"+hanHaiMember.getNickName()+"】购买【"+shopIng.getTitle()+"】"); - moneyLog.setMoney(directGivePrice); - moneyLog.setOldMoney(shareMember.getPrice()); - moneyLog.setType(0); - moneyLog.setState(1);//已到账 - moneyLog.setUserId(shareMember.getId()); - moneyLog.setCreateTime(new Date()); - commonMoneyLogService.save(moneyLog); - shareMember.setPrice(shareMember.getPrice().add(directGivePrice)); - hanHaiMemberService.updateById(shareMember); - } - - - //4.查询用户是否存在间接邀请人 - HanHaiMember shareMember2 = hanHaiMemberService. - lambdaQuery() - .eq(HanHaiMember::getId,shareMember.getVid()) - .one(); - if(shareMember2!=null){ - //得到间接邀请人用户角色 - Integer shareRole2 = shareMember2.getRole(); - if (shareRole2==0){ - indirectGivePrice = shopIng.getGivePriceTwo(); - }else if (shareRole2==1){ //银卡 - indirectGivePrice = shopIng.getSilverGivePriceTwo(); - }else if (shareRole2==2){ //金卡 - indirectGivePrice = shopIng.getGoldGivePriceTwo(); - }else{ - indirectGivePrice = shopIng.getDiamondGivePriceTwo(); + //4.查询用户是否存在间接邀请人 + HanHaiMember shareMember2 = hanHaiMemberService. + lambdaQuery() + .eq(HanHaiMember::getId,hanHaiMember.getVid()) + .one(); + if(shareMember2!=null){ + //得到间接邀请人用户角色 + Integer shareRole2 = shareMember2.getRole(); + if (shareRole2==0){ + indirectGivePrice = shopIng.getGivePriceTwo(); + }else if (shareRole2==1){ //银卡 + indirectGivePrice = shopIng.getSilverGivePriceTwo(); + }else if (shareRole2==2){ //金卡 + indirectGivePrice = shopIng.getGoldGivePriceTwo(); + }else{ + indirectGivePrice = shopIng.getDiamondGivePriceTwo(); + } + //增加流水 + CommonMoneyLog moneyLog = new CommonMoneyLog(); + moneyLog.setId(IdWorker.getIdStr()); + moneyLog.setTitle("获得佣金【"+hanHaiMember.getNickName()+"】购买【"+shopIng.getTitle()+"】"); + moneyLog.setMoney(indirectGivePrice); + moneyLog.setOldMoney(shareMember2.getPrice()); + moneyLog.setType(0); + moneyLog.setState(1); + moneyLog.setUserId(shareMember2.getId()); + moneyLog.setCreateTime(new Date()); + commonMoneyLogService.save(moneyLog); + + shareMember2.setPrice(shareMember2.getPrice().add(indirectGivePrice)); + hanHaiMemberService.updateById(shareMember2); } - //增加流水 - CommonMoneyLog moneyLog = new CommonMoneyLog(); - moneyLog.setId(IdWorker.getIdStr()); - moneyLog.setTitle("获得佣金【"+hanHaiMember.getNickName()+"】购买【"+shopIng.getTitle()+"】"); - moneyLog.setMoney(indirectGivePrice); - moneyLog.setOldMoney(shareMember2.getPrice()); - moneyLog.setType(0); - moneyLog.setState(1); - moneyLog.setUserId(shareMember2.getId()); - moneyLog.setCreateTime(new Date()); - commonMoneyLogService.save(moneyLog); - - shareMember2.setPrice(shareMember2.getPrice().add(indirectGivePrice)); - hanHaiMemberService.updateById(shareMember2); } - } - //根据订单用户标识查询用户信息 - HanHaiMember member = hanHaiMemberService.getById(commonOrder.getUserId()); + //根据订单用户标识查询用户信息 + HanHaiMember member = hanHaiMemberService.getById(commonOrder.getUserId()); - //生成用户支付流水记录 - CommonMoneyLog commonMoneyLog = new CommonMoneyLog(); - commonMoneyLog.setId(IdWorker.getIdStr()); - commonMoneyLog.setUserId(member.getId()); - commonMoneyLog.setTitle("用户微信支付"); - commonMoneyLog.setMoney(commonOrder.getPrice()); - commonMoneyLog.setOldMoney(member.getMoney()); - commonMoneyLog.setType(1); - commonMoneyLog.setState(1); - commonMoneyLog.setCreateTime(new Date()); - commonMoneyLogService.save(commonMoneyLog); + //生成用户支付流水记录 + CommonMoneyLog commonMoneyLog = new CommonMoneyLog(); + commonMoneyLog.setId(IdWorker.getIdStr()); + commonMoneyLog.setUserId(member.getId()); + commonMoneyLog.setTitle("用户微信支付"); + commonMoneyLog.setMoney(commonOrder.getPrice()); + commonMoneyLog.setOldMoney(member.getMoney()); + commonMoneyLog.setType(1); + commonMoneyLog.setState(1); + commonMoneyLog.setCreateTime(new Date()); + commonMoneyLogService.save(commonMoneyLog); - //修改订单状态 - commonOrder.setState(1); - commonOrderService.updateById(commonOrder); + //修改订单状态 + commonOrder.setState(1); + commonOrderService.updateById(commonOrder); + } } + }catch (Exception e){ + e.printStackTrace(); } + return null; } diff --git a/module-pay/src/main/java/org/jeecg/modules/pay/MpWxPayService.java b/module-pay/src/main/java/org/jeecg/modules/pay/MpWxPayService.java index f2f7f7d..00f7bc8 100644 --- a/module-pay/src/main/java/org/jeecg/modules/pay/MpWxPayService.java +++ b/module-pay/src/main/java/org/jeecg/modules/pay/MpWxPayService.java @@ -96,12 +96,12 @@ public class MpWxPayService { request.setDetail(productName); //商品详情 request.setTotalFee(price); //总金额|分计 request.setSpbillCreateIp(clientIp); //终端IP - request.setNotifyUrl(wxPay.notifyOneUrl);//设置回调路径 + request.setNotifyUrl("https://admin.momeirenzhubao.com/jewelry-admin/index_common/payNotify");//设置回调路径 request.setProductId(productId); //商品id request.setOpenid(openId); //JSAPI OPENID if (dev){ request.setTotalFee(price); - request.setNotifyUrl(wxPay.notifyUrlOneDev); + request.setNotifyUrl("https://admin.momeirenzhubao.com/jewelry-admin/index_common/payNotify"); } try { Object order = wxPayService.createOrder(request); diff --git a/module-system/src/main/resources/application-dev.yml b/module-system/src/main/resources/application-dev.yml index 126c026..62fb3d3 100644 --- a/module-system/src/main/resources/application-dev.yml +++ b/module-system/src/main/resources/application-dev.yml @@ -1,5 +1,5 @@ server: - port: 8081 + port: 8001 tomcat: max-swallow-size: -1 error: