From b85789cd60aff1c1dbcbe66541a0f31c6f0169dd Mon Sep 17 00:00:00 2001 From: huliyong <2783385703@qq.com> Date: Mon, 30 Jun 2025 12:58:33 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 3 +- .../CommonAddOrderList/CommonAddOrderList.vue | 2 +- .../modules/CommonAddOrderForm.vue | 2 +- .../api/service/impl/AppletIndexServiceImpl.java | 64 +++---- .../api/service/impl/AppletInfoServiceImpl.java | 55 ++++-- .../api/service/impl/AppletOrderServiceImpl.java | 194 +++++++-------------- .../controller/CommonAddOrderController.java | 7 + 7 files changed, 138 insertions(+), 189 deletions(-) diff --git a/.gitignore b/.gitignore index 5bd05d6..699b7b4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ target -.idea \ No newline at end of file +.idea +dist diff --git a/admin-pc/src/views/modules/CommonAddOrderList/CommonAddOrderList.vue b/admin-pc/src/views/modules/CommonAddOrderList/CommonAddOrderList.vue index 4d0deb3..e40777f 100644 --- a/admin-pc/src/views/modules/CommonAddOrderList/CommonAddOrderList.vue +++ b/admin-pc/src/views/modules/CommonAddOrderList/CommonAddOrderList.vue @@ -198,7 +198,7 @@ export default { dataIndex: 'shopId_dictText' }, { - title: '是否支付', + title: '是否下单', align: "center", dataIndex: 'isPay', customRender: (text) => (text ? filterMultiDictText(this.dictOptions['isPay'], text) : ''), diff --git a/admin-pc/src/views/modules/CommonAddOrderList/modules/CommonAddOrderForm.vue b/admin-pc/src/views/modules/CommonAddOrderList/modules/CommonAddOrderForm.vue index e294238..8b0e57d 100644 --- a/admin-pc/src/views/modules/CommonAddOrderList/modules/CommonAddOrderForm.vue +++ b/admin-pc/src/views/modules/CommonAddOrderList/modules/CommonAddOrderForm.vue @@ -31,7 +31,7 @@ - + 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 5d6e9e0..51518f7 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 @@ -38,10 +38,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import javax.transaction.Transactional; import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; -import java.util.List; +import java.util.*; @Slf4j @Service @@ -145,25 +142,19 @@ public class AppletIndexServiceImpl implements AppletIndexService { .eq(CommonAddOrder::getIsPay, "N") .orderByDesc(CommonAddOrder::getCreateTime) .list(); - //如果有数据返回数据，循环赋值 - List listNew = new ArrayList<>(); - if (list.size()>0){ - for (CommonAddOrder commonAddOrder : list) { - //获取商品标识 - String[] shopIdSplit = commonAddOrder.getShopId().split(","); - //创建一个集合 - List list1 = new ArrayList<>(); - for (String shopId : shopIdSplit) { - //获取商品信息 - CommonShop commonShop = commonShopService.getById(shopId); - //加入集合 - list1.add(commonShop); - } - commonAddOrder.setCommonShop(list1); - listNew.add(commonAddOrder); - } - } - return Result.OK("快捷订单查询成功",listNew); + +// //如果有数据返回数据，循环赋值 +// for (CommonAddOrder commonAddOrder : list) { +// if(StringUtils.isNotBlank(commonAddOrder.getShopId())){ +// String[] shopIdSplit = commonAddOrder.getShopId().split(","); +// List list1 = commonShopService.lambdaQuery() +// .in(CommonShop::getId, Arrays.asList(shopIdSplit)) +// .list(); +// commonAddOrder.setCommonShop(list1); +// } +// } + + return Result.OK("快捷订单查询成功",list); } @@ -450,23 +441,20 @@ public class AppletIndexServiceImpl implements AppletIndexService { public Result getAddOrderInfo(String token,String orderId){ HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); CommonAddOrder commonAddOrder = commonAddOrderService.getById(orderId); - //写入商品信息 - //如果有数据返回数据，循环赋值 - //获取商品标识 - String[] shopIdSplit = commonAddOrder.getShopId().split(","); - //创建一个集合 - List list1 = new ArrayList<>(); - for (String shopId : shopIdSplit) { - //获取商品信息 - CommonShop commonShop = commonShopService.getById(shopId); - //加入集合 - list1.add(commonShop); + + if (commonAddOrder == null){ + return Result.error("快捷订单不存在"); } - commonAddOrder.setCommonShop(list1); - if (commonAddOrder.getUserId().equals(hanHaiMember.getId())){ - return Result.OK("快捷订单信息",commonAddOrder); + + if(StringUtils.isNotBlank(commonAddOrder.getShopId())){ + String[] shopIdSplit = commonAddOrder.getShopId().split(","); + List list1 = commonShopService.lambdaQuery() + .in(CommonShop::getId, Arrays.asList(shopIdSplit)) + .list(); + commonAddOrder.setCommonShop(list1); } - return Result.error("订单信息不存在"); + + return Result.OK("快捷订单信息",commonAddOrder); } diff --git a/module-common/src/main/java/org/jeecg/api/service/impl/AppletInfoServiceImpl.java b/module-common/src/main/java/org/jeecg/api/service/impl/AppletInfoServiceImpl.java index 68663a2..2c86e17 100644 --- a/module-common/src/main/java/org/jeecg/api/service/impl/AppletInfoServiceImpl.java +++ b/module-common/src/main/java/org/jeecg/api/service/impl/AppletInfoServiceImpl.java @@ -195,20 +195,12 @@ public class AppletInfoServiceImpl implements AppletInfoService { public Result getTeamList(String token,Integer state, PageBean pageBean){ HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); Page pageList = hanHaiMemberService.lambdaQuery() - .eq(HanHaiMember::getShareId,hanHaiMember.getId()) + .eq(state == 0, HanHaiMember::getShareId,hanHaiMember.getId()) + .eq(state != 0, HanHaiMember::getVid,hanHaiMember.getId()) .page(page); - if(state == 0){ - pageList = hanHaiMemberService.lambdaQuery() - .eq(HanHaiMember::getShareId,hanHaiMember.getId()) - .page(page); - }else{ - pageList = hanHaiMemberService.lambdaQuery() - .eq(HanHaiMember::getVid,hanHaiMember.getId()) - .page(page); - } - //创建一个新的集合 @@ -222,21 +214,35 @@ public class AppletInfoServiceImpl implements AppletInfoService { fansPageBean1.setNickName(item.getNickName()); //查询该用户的订单数量,count中的state>0 - int count = commonOrderService.lambdaQuery() - .in(CommonOrder::getStatus,1,2,3) - .eq(CommonOrder::getUserId,item.getId()) - .count().intValue(); - fansPageBean1.setOrderNum(count); + List list = commonOrderService.lambdaQuery() + .in(CommonOrder::getStatus, 1, 2, 3) + .eq(CommonOrder::getUserId, item.getId()) + .select(CommonOrder::getOneMoney, CommonOrder::getTwoMoney) + .list(); + + fansPageBean1.setOrderNum(list.size()); //查询该用户的佣金之和 BigDecimal commission = new BigDecimal(0); + for (CommonOrder order : list) { + //订单直推佣金 + BigDecimal oneMoney = order.getOneMoney() == null ? BigDecimal.ZERO : order.getOneMoney(); + //订单间推佣金 + BigDecimal twoMoney = order.getTwoMoney() == null ? BigDecimal.ZERO : order.getTwoMoney(); + if (state == 0){ + commission = commission.add(oneMoney); + }else { + commission = commission.add(twoMoney); + } + } + fansPageBean1.setCommission(commission); fansPageBean1.setCreateTime(item.getCreateTime()); fansPageBean.add(fansPageBean1); }); - pageListFans.setRecords(fansPageBean); + pageListFans.setRecords(fansPageBean); return Result.OK(pageListFans); @@ -248,11 +254,24 @@ public class AppletInfoServiceImpl implements AppletInfoService { @Override public Result getTeamHeader(String token){ HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + +// BigDecimal lj_price = BigDecimal.ZERO; +// +// for (CommonMoneyLog log : commonMoneyLogService.lambdaQuery() +// .eq(CommonMoneyLog::getUserId, hanHaiMember.getId()) +// .eq(CommonMoneyLog::getType, 0) +// .select(CommonMoneyLog::getMoney) +// .list()) { +// +// lj_price = lj_price.add(log.getMoney()); +// +// } + Map map = new HashMap(); map.put("money",hanHaiMember.getMoney()); map.put("role",0); map.put("lj_money",100);// - map.put("lj_price",0);//总佣金 +// map.put("lj_price", lj_price);//累计总积分 return Result.OK("团队头部信息查询成功",map); } diff --git a/module-common/src/main/java/org/jeecg/api/service/impl/AppletOrderServiceImpl.java b/module-common/src/main/java/org/jeecg/api/service/impl/AppletOrderServiceImpl.java index b7bfab2..29a5e1c 100644 --- a/module-common/src/main/java/org/jeecg/api/service/impl/AppletOrderServiceImpl.java +++ b/module-common/src/main/java/org/jeecg/api/service/impl/AppletOrderServiceImpl.java @@ -184,7 +184,7 @@ public class AppletOrderServiceImpl implements AppletOrderService { //商城-支付回调 @Override - public Result payNotify(String requestBody){ + public String payNotify(String requestBody){ WxPayOrderNotifyResult notify = mpWxPayService.notify(requestBody); String outTradeNo = notify.getOutTradeNo(); log.info("支付回调订单号码："+outTradeNo); @@ -209,79 +209,78 @@ public class AppletOrderServiceImpl implements AppletOrderService { commonMoneyLog.setState(1); commonMoneyLogService.save(commonMoneyLog); - //订单直推佣金 - BigDecimal oneMoney = commonOrder.getOneMoney(); - //订单间推佣金 - BigDecimal twoMoney = commonOrder.getTwoMoney(); - log.info("订单直推佣金："+oneMoney); - log.info("订单间推佣金："+twoMoney); - //返佣 - log.info("下单用户："+member.getNickName()+"电话号码："+member.getPhone()); - log.info("订单号：" + commonOrder.getId()); - //上级标识 - String oneId = member.getShareId(); - log.info("上级标识："+oneId); - //如果上级标识不为空 - if(StringUtils.isNotBlank(oneId)){ - HanHaiMember hanHaiMember2 = hanHaiMemberService.getById(oneId); - - if(hanHaiMember2 !=null) { - //上级返佣 - hanHaiMember2.setMoney(hanHaiMember2.getMoney().add(oneMoney)); - hanHaiMemberService.updateById(hanHaiMember2); - //添加佣金记录 - CommonMoneyLog moneyLog1 = new CommonMoneyLog(); - moneyLog1.setId(UUID.randomUUID().toString().replace("-", "")+"1"); - moneyLog1.setCreateTime(new Date()); - moneyLog1.setTitle("微信支付直推佣金"); - moneyLog1.setMoney(oneMoney); - moneyLog1.setUserId(hanHaiMember2.getId()); - moneyLog1.setOldMoney(hanHaiMember2.getMoney()); - moneyLog1.setType(0); - moneyLog1.setState(1); - commonMoneyLogService.save(moneyLog1); + //进行分销 + orderDistribution(commonOrder, member, "微信支付"); + } + return "" + + " " + + " " + + " "; + } - } - } - //上上级标识 - String twoId = member.getVid(); - log.info("上上级标识："+twoId); - if(StringUtils.isNotBlank(twoId)){ - HanHaiMember hanHaiMember3 = hanHaiMemberService.getById(twoId); - if(hanHaiMember3 !=null) { - //上级返佣 - hanHaiMember3.setMoney(hanHaiMember3.getMoney().add(twoMoney)); - hanHaiMemberService.updateById(hanHaiMember3); - //添加佣金记录 - CommonMoneyLog moneyLog2 = new CommonMoneyLog(); - moneyLog2.setId(UUID.randomUUID().toString().replace("-", "")+"2"); - moneyLog2.setCreateTime(new Date()); - moneyLog2.setTitle("微信支付间推佣金"); - moneyLog2.setMoney(twoMoney); - moneyLog2.setUserId(hanHaiMember3.getId()); - moneyLog2.setOldMoney(hanHaiMember3.getMoney()); - moneyLog2.setType(0); - moneyLog2.setState(1); - commonMoneyLogService.save(moneyLog2); - } + public void orderDistribution(CommonOrder order, HanHaiMember member, String title){ + //订单直推佣金 + BigDecimal oneMoney = order.getOneMoney() == null ? BigDecimal.ZERO : order.getOneMoney(); + //订单间推佣金 + BigDecimal twoMoney = order.getTwoMoney() == null ? BigDecimal.ZERO : order.getTwoMoney(); + log.info("订单直推佣金："+oneMoney); + log.info("订单间推佣金："+twoMoney); + //返佣 + log.info("下单用户："+member.getNickName()+"电话号码："+member.getPhone()); + log.info("订单号：" + order.getId()); + //上级标识 + String oneId = member.getShareId(); + log.info("上级标识："+oneId); + //如果上级标识不为空 + if(StringUtils.isNotBlank(oneId)){ + HanHaiMember hanHaiMember2 = hanHaiMemberService.getById(oneId); + + if(hanHaiMember2 !=null) { + //上级返佣 + hanHaiMember2.setMoney(hanHaiMember2.getMoney().add(oneMoney)); + hanHaiMemberService.updateById(hanHaiMember2); + //添加佣金记录 + CommonMoneyLog moneyLog1 = new CommonMoneyLog(); + moneyLog1.setId(UUID.randomUUID().toString().replace("-", "")+"1"); + moneyLog1.setCreateTime(new Date()); + moneyLog1.setTitle(title + "直推佣金"); + moneyLog1.setMoney(oneMoney); + moneyLog1.setUserId(hanHaiMember2.getId()); + moneyLog1.setOldMoney(hanHaiMember2.getMoney()); + moneyLog1.setType(0); + moneyLog1.setState(1); + commonMoneyLogService.save(moneyLog1); } - - - - - - + } + //上上级标识 + String twoId = member.getVid(); + log.info("上上级标识："+twoId); + if(StringUtils.isNotBlank(twoId)){ + HanHaiMember hanHaiMember3 = hanHaiMemberService.getById(twoId); + if(hanHaiMember3 !=null) { + //上级返佣 + hanHaiMember3.setMoney(hanHaiMember3.getMoney().add(twoMoney)); + hanHaiMemberService.updateById(hanHaiMember3); + //添加佣金记录 + CommonMoneyLog moneyLog2 = new CommonMoneyLog(); + moneyLog2.setId(UUID.randomUUID().toString().replace("-", "")+"2"); + moneyLog2.setCreateTime(new Date()); + moneyLog2.setTitle(title + "间推佣金"); + moneyLog2.setMoney(twoMoney); + moneyLog2.setUserId(hanHaiMember3.getId()); + moneyLog2.setOldMoney(hanHaiMember3.getMoney()); + moneyLog2.setType(0); + moneyLog2.setState(1); + commonMoneyLogService.save(moneyLog2); + } } - return null; } - - //商城-加入购物车之后一次下多个订单 //商城-立即购买多少商品 @Transactional @@ -299,13 +298,6 @@ public class AppletOrderServiceImpl implements AppletOrderService { } - - - - - - - //用户地址不能为空 if(StringUtils.isBlank(addressId)){ return Result.error("请选择收货地址"); @@ -431,66 +423,8 @@ public class AppletOrderServiceImpl implements AppletOrderService { commonMoneyLog.setState(1); commonMoneyLogService.save(commonMoneyLog); + orderDistribution(cityOrder, member, "余额支付"); - //订单直推佣金 - BigDecimal oneMoney = cityOrder.getOneMoney(); - //订单间推佣金 - BigDecimal twoMoney = cityOrder.getTwoMoney(); - log.info("订单直推佣金："+oneMoney); - log.info("订单间推佣金："+twoMoney); - //返佣 - HanHaiMember hanHaiMember1 = hanHaiMemberService.getById(cityOrder.getUserId()); - log.info("下单用户："+hanHaiMember1.getNickName()+"电话号码："+hanHaiMember1.getPhone()); - log.info("订单号：" + cityOrder.getId()); - //上级标识 - String oneId = hanHaiMember1.getShareId(); - log.info("上级标识："+oneId); - //如果上级标识不为空 - if(StringUtils.isNotBlank(oneId)){ - HanHaiMember hanHaiMember2 = hanHaiMemberService.getById(oneId); - - if(hanHaiMember2 !=null) { - //上级返佣 - hanHaiMember2.setMoney(hanHaiMember2.getMoney().add(oneMoney)); - hanHaiMemberService.updateById(hanHaiMember2); - //添加佣金记录 - CommonMoneyLog moneyLog1 = new CommonMoneyLog(); - moneyLog1.setId(UUID.randomUUID().toString().replace("-", "")+"1"); - moneyLog1.setCreateTime(new Date()); - moneyLog1.setTitle("余额支付直推佣金"); - moneyLog1.setMoney(oneMoney); - moneyLog1.setUserId(hanHaiMember2.getId()); - moneyLog1.setOldMoney(hanHaiMember2.getMoney()); - moneyLog1.setType(0); - moneyLog1.setState(1); - commonMoneyLogService.save(moneyLog1); - - } - - } - //上上级标识 - String twoId = hanHaiMember1.getVid(); - log.info("上上级标识："+twoId); - if(StringUtils.isNotBlank(twoId)){ - HanHaiMember hanHaiMember3 = hanHaiMemberService.getById(twoId); - if(hanHaiMember3 !=null) { - //上级返佣 - hanHaiMember3.setMoney(hanHaiMember3.getMoney().add(twoMoney)); - hanHaiMemberService.updateById(hanHaiMember3); - //添加佣金记录 - CommonMoneyLog moneyLog2 = new CommonMoneyLog(); - moneyLog2.setId(UUID.randomUUID().toString().replace("-", "")+"2"); - moneyLog2.setCreateTime(new Date()); - moneyLog2.setTitle("余额支付间推佣金"); - moneyLog2.setMoney(twoMoney); - moneyLog2.setUserId(hanHaiMember3.getId()); - moneyLog2.setOldMoney(hanHaiMember3.getMoney()); - moneyLog2.setType(0); - moneyLog2.setState(1); - commonMoneyLogService.save(moneyLog2); - } - - } return Result.OK("余额支付成功"); }else{ diff --git a/module-common/src/main/java/org/jeecg/modules/commonAddOrder/controller/CommonAddOrderController.java b/module-common/src/main/java/org/jeecg/modules/commonAddOrder/controller/CommonAddOrderController.java index 8031d55..3b59fed 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonAddOrder/controller/CommonAddOrderController.java +++ b/module-common/src/main/java/org/jeecg/modules/commonAddOrder/controller/CommonAddOrderController.java @@ -9,6 +9,8 @@ import java.io.UnsupportedEncodingException; import java.net.URLDecoder; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + +import org.apache.commons.lang3.StringUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.util.oConvertUtils; @@ -96,6 +98,11 @@ public class CommonAddOrderController extends JeecgController edit(@RequestBody CommonAddOrder commonAddOrder) { + + if ("1".equals(commonAddOrder.getStatus()) && StringUtils.isBlank(commonAddOrder.getShopId())){ + return Result.error("请选择至少一件商品"); + } + commonAddOrderService.updateById(commonAddOrder); return Result.OK("编辑成功!"); }