From 95044dd4dacee5f7ecb081af5d557d14fad83c24 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期二, 22 八月 2023 18:39:47 +0800
Subject: [PATCH] bug
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java | 117 +++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 103 insertions(+), 14 deletions(-)
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 166b0fd..1f31e90 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
@@ -20,6 +20,7 @@
import com.ruoyi.shop.domain.dto.*;
import com.ruoyi.shop.domain.pojo.shop.*;
import com.ruoyi.shop.domain.pojo.task.ShopFile;
+import com.ruoyi.shop.domain.pojo.task.ShopTask;
import com.ruoyi.shop.domain.vo.*;
import com.ruoyi.shop.enums.WxApplyMentStateEnum;
import com.ruoyi.shop.mapper.shop.ShopMapper;
@@ -122,6 +123,12 @@
@Resource
private WechatPayUtils wechatPayUtils;
+
+ @Resource
+ private ShopDetailService shopDetailService;
+
+ @Resource
+ private RemoteUserService remoteUserService;
/**
* 获取商户详情
@@ -792,13 +799,15 @@
shopIds = shopMapper.listShopIdByTotal(mgtBasePlatformDto);
Shop shop = this.getShopByBelongUserId(userId);
shopIds.add(shop.getShopId());
+ userIds.add(userId);
}else {
//普通员工查询商户归属的shopId
Shop shop = this.getShopByBelongUserId(userId);
+
shopIds.add(shop.getShopId());
}
//分别查询
- StaffHomeShopTotalVo staffHomeShopTotalVo = shopMapper.getStaffHomeTotal(shopIds);
+ StaffHomeShopTotalVo staffHomeShopTotalVo = shopMapper.getStaffHomeTotal(userIds);
Integer shopTaskCount = shopTaskService.getShopIngTotal(shopIds);
staffHomeShopTotalVo.setFollowMember(0);
staffHomeShopTotalVo.setNewMember(0);
@@ -831,7 +840,6 @@
}
merHomeShopTotalVo.setShopType(shop.getShopType());
MerHomeShopTotalVo orderVo = remoteOrderService.getMerHomeTotal(merHomeShopTotalVo).getData();
- ShopTotal shopTotal = shopTotalService.getById(shopId);
merHomeShopTotalVo.setShopId(shopId);
merHomeShopTotalVo.setShopType(shop.getShopType());
merHomeShopTotalVo.setTodayShop(orderVo.getTodayShop());
@@ -839,8 +847,8 @@
Integer taskCount = memberTaskService.getMemberIngTotal(shopId);
merHomeShopTotalVo.setTask(taskCount);
merHomeShopTotalVo.setShopTurnover(orderVo.getShopTurnover());
- merHomeShopTotalVo.setCycleSurp(shopTotal.getUseableCyclePerson());
- merHomeShopTotalVo.setExplorationSurp(shopTotal.getUseableExperiencePerson());
+ merHomeShopTotalVo.setCycleSurp(orderVo.getCycleSurp());
+ merHomeShopTotalVo.setExplorationSurp(orderVo.getExplorationSurp());
merHomeShopTotalVo.setPlatformBirthdayFlag(shop.getPlatformBirthdayFlag());
merHomeShopTotalVo.setPlatformCouponFlag(shop.getPlatformCouponFlag());
return merHomeShopTotalVo;
@@ -1001,7 +1009,7 @@
public void mgtShopAuth(MgtShopAuthDto mgtShopAuthDto) throws WxPayException {
ShopAuthentication shopAuthentication = shopAuthenticationService.getById(mgtShopAuthDto.getAuthId());
Shop shop = this.getByShopId(shopAuthentication.getShopId());
- String applyNumber = IdUtils.simpleUUID();
+
if(mgtShopAuthDto.getBlBusinessFoeverFlag()!=null&&mgtShopAuthDto.getBlBusinessFoeverFlag()==1){
mgtShopAuthDto.setBlBusinessDeanline(mgtShopAuthDto.getBlBusinessStartTime()+",长期");
}
@@ -1009,7 +1017,11 @@
mgtShopAuthDto.setLpIcEndDate("长期");
}
BeanUtils.copyProperties(mgtShopAuthDto , shopAuthentication);
- shopAuthentication.setApplyNumber(applyNumber);
+ String applyNumber = shopAuthentication.getApplyNumber();
+ if(StringUtils.isBlank(applyNumber)){
+ applyNumber = IdUtils.simpleUUID();
+ shopAuthentication.setApplyNumber(applyNumber);
+ }
ApplymentsResult applymentsResult;
try {
applymentsResult = wechatPayUtils.ecommerceApply(shopAuthentication,applyNumber,shop);
@@ -1138,15 +1150,19 @@
MgtShopAuthGetVo shopAuthGetVo = new MgtShopAuthGetVo();
ShopAuthentication shopAuthentication = shopAuthenticationService.getById(authId);
BeanUtils.copyProperties(shopAuthentication, shopAuthGetVo);
- if(shopAuthGetVo.getBlBusinessDeanline().equals("长期")){
- shopAuthGetVo.setBlBusinessFoeverFlag(1);
- }else{
- shopAuthGetVo.setBlBusinessFoeverFlag(0);
+ if(shopAuthGetVo.getBlBusinessDeanline()!=null){
+ if(shopAuthGetVo.getBlBusinessDeanline().equals("长期")){
+ shopAuthGetVo.setBlBusinessFoeverFlag(1);
+ }else{
+ shopAuthGetVo.setBlBusinessFoeverFlag(0);
+ }
}
- if(shopAuthGetVo.getLpIcEndDate().equals("长期")){
- shopAuthGetVo.setLpIcForeverFlag(1);
- }else{
- shopAuthGetVo.setLpIcForeverFlag(0);
+ if(shopAuthGetVo.getLpIcEndDate()!=null){
+ if(shopAuthGetVo.getLpIcEndDate().equals("长期")){
+ shopAuthGetVo.setLpIcForeverFlag(1);
+ }else{
+ shopAuthGetVo.setLpIcForeverFlag(0);
+ }
}
return shopAuthGetVo;
}
@@ -1460,4 +1476,77 @@
throw new RuntimeException(e);
}
}
+
+ /**
+ * @description 修改店铺详细资料
+ * @author jqs
+ * @date 2023/8/22 14:51
+ * @param staffShopDetailDto
+ * @return void
+ */
+ @Override
+ public void editShopDetail(StaffShopDetailDto staffShopDetailDto){
+ ShopDetail shopDetail = shopDetailService.getById(staffShopDetailDto.getShopId());
+ if(shopDetail == null){
+ shopDetail = new ShopDetail();
+ shopDetail.setDelFlag(0);
+ }
+ BeanUtils.copyProperties(staffShopDetailDto, shopDetail);
+ List<StaffCustomerDto> staffCustomerDtoList = staffShopDetailDto.getStaffCustomerDtoList();
+ if(staffCustomerDtoList!=null&&!staffCustomerDtoList.isEmpty()){
+ StringJoiner customerNameSJ = new StringJoiner(",");
+ StringJoiner customerMobileSJ = new StringJoiner(",");
+ for(StaffCustomerDto staffCustomerDto : staffCustomerDtoList){
+ customerNameSJ.add(staffCustomerDto.getCustomerName());
+ customerMobileSJ.add(staffCustomerDto.getCustomerMobile());
+ }
+ shopDetail.setCustomerName(customerNameSJ.toString());
+ shopDetail.setCustomerMobile(customerMobileSJ.toString());
+ }
+ shopDetailService.saveOrUpdate(shopDetail);
+ }
+
+ /**
+ * @description 获取店铺详细资料
+ * @author jqs
+ * @date 2023/8/22 16:15
+ * @param shopId
+ * @return StaffShopDetailVo
+ */
+ @Override
+ public StaffShopDetailVo getShopDetail(Long shopId){
+ ShopDetail shopDetail = shopDetailService.getById(shopId);
+ StaffShopDetailVo staffShopDetailVo = new StaffShopDetailVo();
+ BeanUtils.copyProperties(shopDetail, staffShopDetailVo);
+ //归属客户
+ Shop shop = this.getByShopId(shopId);
+ Long belongUserId = shop.getBelongUserId();
+ if(belongUserId!=null){
+ SysUser sysUser = remoteUserService.getSysUser(belongUserId).getData();
+ if(sysUser!=null){
+ staffShopDetailVo.setBelongUser(sysUser.getNickName());
+ }
+ }
+ //最近任务时间
+ ShopTask shopTask = shopTaskService.getLastTask(shopId);
+ if(shopTask!=null){
+ staffShopDetailVo.setNextTaskDate(shopTask.getTaskDate());
+ }
+ //处理联系人
+ String customerName = shopDetail.getCustomerName();
+ String customerMobile = shopDetail.getCustomerMobile();
+ List<StaffCustomerDto> staffCustomerDtoList = new ArrayList<>();
+ String[] customerNameArr = customerName.split(",");
+ String[] customerMobileArr = customerMobile.split(",");
+ staffShopDetailVo.setContactName(customerNameArr[0]);
+ StaffCustomerDto staffCustomerDto;
+ for(int i=0;i<customerNameArr.length;i++){
+ staffCustomerDto = new StaffCustomerDto();
+ staffCustomerDto.setCustomerName(customerNameArr[i]);
+ staffCustomerDto.setCustomerMobile(customerMobileArr[i]);
+ staffCustomerDtoList.add(staffCustomerDto);
+ }
+ staffShopDetailVo.setStaffCustomerDtoList(staffCustomerDtoList);
+ return staffShopDetailVo;
+ }
}
--
Gitblit v1.7.1