From b8cbfe745bd44a198f321623d3e41647c909a479 Mon Sep 17 00:00:00 2001 From: lzx_win <2602107437@qq.com> Date: Sun, 8 Jun 2025 08:16:17 +0800 Subject: [PATCH] =?UTF-8?q?=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 | 24 +++++++++++++--------- .../api/service/impl/AppletInfoServiceImpl.java | 4 +++- .../api/service/impl/AppletOrderServiceImpl.java | 6 +++--- .../modules/commonShop/entity/CommonShop.java | 1 + .../src/main/resources/application-dev.yml | 2 +- 5 files changed, 22 insertions(+), 15 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 8d0200a..dc94ff2 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 @@ -114,7 +114,7 @@ public class AppletIndexServiceImpl implements AppletIndexService { page = commonShopService.lambdaQuery() .like(StringUtils.isNotBlank(pageBean.getTitle()),CommonShop::getName,pageBean.getTitle()) .eq(StringUtils.isNotBlank(shopIconId),CommonShop::getShopCion,shopIconId) - .eq(StringUtils.isNotBlank(shopClassId),CommonShop::getShopClass,shopClassId) + .like(StringUtils.isNotBlank(shopClassId),CommonShop::getShopClass,shopClassId) .eq(StringUtils.isNotBlank(cityId),CommonShop::getCityId,cityId) .eq(CommonShop::getIsOpen,"Y") .page(page); @@ -353,17 +353,21 @@ public class AppletIndexServiceImpl implements AppletIndexService { List commonAddOrders = new ArrayList<>(); records.forEach(item->{ - //获取商品标识 - String[] shopIdSplit = item.getShopId().split(","); - //创建一个集合 - List list1 = new ArrayList<>(); - for (String shopId : shopIdSplit) { - //获取商品信息 - CommonShop commonShop = commonShopService.getById(shopId); - //加入集合 - list1.add(commonShop); + if(StringUtils.isNotBlank(item.getShopId())){ + //获取商品标识 + String[] shopIdSplit = item.getShopId().split(","); + //创建一个集合 + List list1 = new ArrayList<>(); + for (String shopId : shopIdSplit) { + //获取商品信息 + CommonShop commonShop = commonShopService.getById(shopId); + //加入集合 + list1.add(commonShop); + } + } commonAddOrders.add(item); + }); pageList.setRecords(commonAddOrders); 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 6cbff00..681d2dd 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 @@ -124,6 +124,7 @@ public class AppletInfoServiceImpl implements AppletInfoService { Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); Page page1 = commonAddressService.lambdaQuery() .eq(CommonAddress::getUserId, hanHaiMember.getId()) + .orderByDesc(CommonAddress::getDefaultFlag) .orderByDesc(CommonAddress::getCreateTime) .page(page); return Result.OK("地址信息查询成功",page1); @@ -264,7 +265,8 @@ public class AppletInfoServiceImpl implements AppletInfoService { commonMoneyLog.setCreateTime(new Date()); commonMoneyLog.setTitle("提现"); commonMoneyLog.setUserId(hanHaiMember.getId()); - commonMoneyLog.setMoney(hanHaiMember.getMoney()); + commonMoneyLog.setMoney(money); + commonMoneyLog.setOldMoney(hanHaiMember.getMoney()); commonMoneyLog.setType(1); commonMoneyLog.setState(0); commonMoneyLogService.save(commonMoneyLog); 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 96b5cdd..9fe8445 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 @@ -158,8 +158,8 @@ public class AppletOrderServiceImpl implements AppletOrderService { public Result confirmOrder(String token,String orderId){ HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); CommonOrder commonOrder = commonOrderService.getById(orderId); - if (commonOrder.getStatus().equals("1")){ - commonOrder.setStatus("2"); + if (commonOrder.getStatus().equals("2")){ + commonOrder.setStatus("3"); commonOrderService.updateById(commonOrder); return Result.OK("确认成功"); } @@ -173,7 +173,7 @@ public class AppletOrderServiceImpl implements AppletOrderService { HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); CommonOrder commonOrder = commonOrderService.getById(orderId); if (commonOrder.getStatus().equals("0")){ - commonOrder.setStatus("3"); + commonOrder.setStatus("4"); commonOrderService.updateById(commonOrder); HanHaiMember hanHaiMember1 = hanHaiMemberService.getById(hanHaiMember.getId()); hanHaiMember1.setMoney(hanHaiMember1.getMoney().add(commonOrder.getPrice())); diff --git a/module-common/src/main/java/org/jeecg/modules/commonShop/entity/CommonShop.java b/module-common/src/main/java/org/jeecg/modules/commonShop/entity/CommonShop.java index 4388f17..fb524b4 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonShop/entity/CommonShop.java +++ b/module-common/src/main/java/org/jeecg/modules/commonShop/entity/CommonShop.java @@ -66,6 +66,7 @@ public class CommonShop implements Serializable { @Excel(name = "商品标题", width = 15) @ApiModelProperty(value = "商品标题") private java.lang.String name; + private java.lang.String title; /**商品图片*/ @Excel(name = "商品图片", width = 15) @ApiModelProperty(value = "商品图片") diff --git a/module-system/src/main/resources/application-dev.yml b/module-system/src/main/resources/application-dev.yml index d49ea09..8afb559 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: 8002 + port: 8001 tomcat: max-swallow-size: -1 error: