From 1a1e608f143bd49a000dbd0192ce9fd6c04feb6f Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期四, 24 七月 2025 09:21:17 +0800
Subject: [PATCH] bug修改
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/shop/Shop.java | 10 ++++++++--
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java | 39 ++++++++++++++++++++++-----------------
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java | 8 ++++----
3 files changed, 34 insertions(+), 23 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/shop/Shop.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/shop/Shop.java
index db4e83d..2d6f81b 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/shop/Shop.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/shop/Shop.java
@@ -318,8 +318,14 @@
/**
* 抖音门店id
*/
- @TableField("poi_id")
- private String poiId;
+ @TableField("dy_poi_id")
+ private String dyPoiId;
+
+ /**
+ * 快手门店id
+ */
+ @TableField("ks_poi_id")
+ private String ks_PoiId;
@Override
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java
index 2ab3962..80c259a 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java
@@ -283,10 +283,10 @@
member.setCreateTime(new Date());
member.setMobile(mobile);
initMemberTotal(memberId);
- log.info("sysUser01-----------------" + sysUser.toString());
+// log.info("sysUser01-----------------" + sysUser.toString());
} else {
sysUser = sysUserService.getSysUser(member.getUserId()).getData();
- log.info("sysUser02-----------------" + sysUser.toString());
+// log.info("sysUser02-----------------" + sysUser.toString());
}
member.setWxUnionid(appUserRegisterDto.getWxUnionid());
member.setMiniOpenid(appUserRegisterDto.getMiniOpenid());
@@ -433,12 +433,12 @@
}
}
//今日到店用户
- if(1 == merMemberPageDto.getIsTodayStore()){
+ if(null != merMemberPageDto.getIsTodayStore() && 1 == merMemberPageDto.getIsTodayStore()){
List<Integer> data = remoteOrderService.countShopServicePerson(merMemberPageDto.getShopId()).getData();
merMemberPageDto.setUserIds(data);
}
//有未跟进的任务用户
- if(1 == merMemberPageDto.getIsTask()){
+ if(null != merMemberPageDto.getIsTask() && 1 == merMemberPageDto.getIsTask()){
List<Integer> data = remoteShopService.getMemberIngTotal(merMemberPageDto.getShopId()).getData();
merMemberPageDto.setUserIds(data);
}
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java
index a03ddfd..981dd7f 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java
@@ -245,13 +245,15 @@
shopRelTagService.deleteByShopId(shop.getShopId());
shopRelUserService.deleteByShopId(shop.getShopId());
//默认登录账号开关 开启后原默认账号开关关闭
- List<Long> openIdList = Arrays.stream(mgtEditShopDto.getRelUserOpenIds().split(","))
- .map(String::trim)
- .filter(StringUtils::isNotBlank)
- .map(Long::valueOf)
- .collect(Collectors.toList());
- if ( !openIdList.isEmpty()) {
- shopRelUserService.setDefaultCloseByUserIdList(openIdList);
+ if(StringUtils.isNotEmpty(mgtEditShopDto.getRelUserOpenIds())){
+ List<Long> openIdList = Arrays.stream(mgtEditShopDto.getRelUserOpenIds().split(","))
+ .map(String::trim)
+ .filter(StringUtils::isNotBlank)
+ .map(Long::valueOf)
+ .collect(Collectors.toList());
+ if ( !openIdList.isEmpty()) {
+ shopRelUserService.setDefaultCloseByUserIdList(openIdList);
+ }
}
//清空归属
@@ -317,7 +319,10 @@
handleShopStaff(shop.getShopId(),belongSysUser);
}*/
//商户关联人员
- String[] openIds = mgtEditShopDto.getRelUserOpenIds().split(",");//开启默认登录账号
+ String[] openIds = null;
+ if(StringUtils.isNotEmpty(mgtEditShopDto.getRelUserOpenIds())){
+ openIds = mgtEditShopDto.getRelUserOpenIds().split(",");//开启默认登录账号
+ }
if(StringUtils.isNotBlank(relUserIds)){
shopStaffService.clearShopStaffRelation(shop.getShopId());
String[] relUserIdArray = relUserIds.split(",");
@@ -334,7 +339,7 @@
shopRelUser.setUserName(sysUser.getNickName());
shopRelUser.setUserMobile(sysUser.getPhonenumber());
shopRelUser.setUserDeptId(sysUser.getDeptId());
- shopRelUser.setIsDefault((openIds.length > 0 && Arrays.asList(openIds).contains(str)) ? 1 : 0);
+ shopRelUser.setIsDefault((null != openIds && openIds.length > 0 && Arrays.asList(openIds).contains(str)) ? 1 : 0);
shopRelUserService.save(shopRelUser);
handleShopStaff(shop.getShopId(),sysUser);
}
@@ -406,10 +411,10 @@
shopProportion.setDelFlag(0);
shopProportion.setShopId(shop.getShopId());
shopProportion.setShopType(shop.getShopType());
+ BigDecimal proportionPercent = new BigDecimal("30");
String proportionPercentStr = redisService.getCacheObject(SecurityConstant.SHOP_COMMON_PROPORTION);
- BigDecimal proportionPercent = new BigDecimal(proportionPercentStr);
- if(proportionPercent==null){
- proportionPercent = new BigDecimal("30");
+ if(StringUtils.isNotEmpty(proportionPercentStr)){
+ proportionPercent = new BigDecimal(proportionPercentStr);
}
shopProportion.setProportionPercent(proportionPercent);
shopProportion.setUpdateTime(new Date());
@@ -964,13 +969,13 @@
MerHomeShopTotalVo orderVo = remoteOrderService.getMerHomeTotal(merHomeShopTotalVo).getData();
merHomeShopTotalVo.setShopId(shopId);
merHomeShopTotalVo.setShopType(shop.getShopType());
- merHomeShopTotalVo.setTodayShop(orderVo.getTodayShop());
- merHomeShopTotalVo.setUnHandleOrder(orderVo.getUnHandleOrder());
+ merHomeShopTotalVo.setTodayShop(null == orderVo ? 0: orderVo.getTodayShop());
+ merHomeShopTotalVo.setUnHandleOrder(null == orderVo ? 0: orderVo.getUnHandleOrder());
List<Integer> taskCount = memberTaskService.getMemberIngTotal(shopId);
merHomeShopTotalVo.setTask(taskCount.size());
- merHomeShopTotalVo.setShopTurnover(orderVo.getShopTurnover());
- merHomeShopTotalVo.setCycleSurp(orderVo.getCycleSurp());
- merHomeShopTotalVo.setExplorationSurp(orderVo.getExplorationSurp());
+ merHomeShopTotalVo.setShopTurnover(null == orderVo ? BigDecimal.ZERO : orderVo.getShopTurnover());
+ merHomeShopTotalVo.setCycleSurp(null == orderVo ? 0: orderVo.getCycleSurp());
+ merHomeShopTotalVo.setExplorationSurp(null == orderVo ? 0: orderVo.getExplorationSurp());
merHomeShopTotalVo.setPlatformBirthdayFlag(shop.getPlatformBirthdayFlag());
merHomeShopTotalVo.setPlatformCouponFlag(shop.getPlatformCouponFlag());
int unHandleReserve = shopAppointableTimeService.count(new LambdaQueryWrapper<TShopAppointableTime>().eq(TShopAppointableTime::getShopId, shopId).eq(TShopAppointableTime::getStatus, 1));
--
Gitblit v1.7.1