Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of gitee.com:darlk/ShengTangManage into develop

Browse Source
This commit is contained in:
huangdeliang
2021-05-25 10:20:33 +08:00
parent ee4f3c29d5 fe1691970d
commit 4137d96cee
33 changed files with 1338 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
stdiet-custom/src/main/java/com/stdiet/custom/domain/SysImportFanRecord.java
View File

@ -1,9 +1,13 @@
package com.stdiet.custom.domain;
import java.util.Date;
import java.util.List;
import java.util.Map;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.stdiet.common.annotation.Excel;
import com.stdiet.common.core.domain.BaseEntity;
import lombok.Data;
/**
* 导粉管理对象 sys_import_fan_record
@ -11,6 +15,7 @@ import com.stdiet.common.core.domain.BaseEntity;
* @author xzj
* @date 2021-05-17
*/
@Data
public class SysImportFanRecord extends BaseEntity
{
private static final long serialVersionUID = 1L;
@ -33,4 +38,31 @@ public class SysImportFanRecord extends BaseEntity
/** 删除标识，0未删除 1已删除 */
private Long delFlag;
//微信ID
private Long wxAccountId;
//进粉数量
private Long fanNum;
private String importFanChannelName;
private String liveRoomName;
private String liveNutritionistName;
private List<Map<String,Object>> wxAccountList;
private String importFanChannels;
private String importFanLives;
private String wxAccountIds;
private String fanNums;
//总进粉数量
private Integer totalFanNum;
}

7
stdiet-custom/src/main/java/com/stdiet/custom/domain/SysImportFanWxAccount.java
View File

@ -1,9 +1,12 @@
package com.stdiet.custom.domain;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import com.stdiet.common.annotation.Excel;
import com.stdiet.common.core.domain.BaseEntity;
import java.util.Date;
/**
* 导粉记录中对应微信记录对象 sys_import_fan_wx_account
*
@ -32,4 +35,8 @@ public class SysImportFanWxAccount extends BaseEntity
/** 删除标识 0未删除 1已删除 */
private Long delFlag;
//导粉日期
@JsonFormat(pattern = "yyyy-MM-dd")
private Date importFanDate;
}

3
stdiet-custom/src/main/java/com/stdiet/custom/domain/SysWxSaleAccount.java
View File

@ -44,4 +44,7 @@ public class SysWxSaleAccount extends BaseEntity
private Integer status;
private Integer useCount;
//销售昵称
private String saleName;
}

10
stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysImportFanRecordMapper.java
View File

@ -58,4 +58,14 @@ public interface SysImportFanRecordMapper
* @return 结果
*/
public int deleteSysImportFanRecordByIds(Long[] ids);
/**
* 根据日期渠道、直播间获取进粉记录
* @param sysImportFanRecord
* @return
*/
public SysImportFanRecord getFanRecordByChannelLive(SysImportFanRecord sysImportFanRecord);
//查询总导粉数量
int selectTotalSysImportFanNum(SysImportFanRecord sysImportFanRecord);
}

23
stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysImportFanWxAccountMapper.java
View File

@ -1,6 +1,8 @@
package com.stdiet.custom.mapper;
import java.util.List;
import java.util.Map;
import com.stdiet.custom.domain.SysImportFanWxAccount;
/**
@ -58,4 +60,25 @@ public interface SysImportFanWxAccountMapper
* @return 结果
*/
public int deleteSysImportFanWxAccountByIds(Long[] ids);
/**
* 根据导粉记录ID、微信ID查询对应微信记录
* @param sysImportFanWxAccount
* @return
*/
public SysImportFanWxAccount getWxAccountByFanRecordId(SysImportFanWxAccount sysImportFanWxAccount);
/**
* 根据微信号查询
* @param sysImportFanWxAccount
* @return
*/
List<Map<String,Object>> getTotalImportFanNum(SysImportFanWxAccount sysImportFanWxAccount);
/**
* 根据记录ID删除对应所有微信
* @param ids
* @return
*/
int deleteSysImportFanWxAccountByFanRecordIds(Long[] ids);
}

6
stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysWxSaleAccountMapper.java
View File

@ -71,4 +71,10 @@ public interface SysWxSaleAccountMapper
SysWxSaleAccount selectWxAdId();
int insertWxAdLog(SysWxAdLog sysWxAdLog);
/**
* 获取可接粉的微信号以及分配的销售昵称
* @return
*/
List<SysWxSaleAccount> getWxAccountAndSale();
}

8
stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysWxUserInfoMapper.java
View File

@ -2,6 +2,7 @@ package com.stdiet.custom.mapper;
import java.util.List;
import com.stdiet.custom.domain.SysWxUserInfo;
import org.apache.ibatis.annotations.Param;
/**
* 微信用户Mapper接口
@ -62,4 +63,11 @@ public interface SysWxUserInfoMapper
* @return 结果
*/
public int deleteSysWxUserInfoByIds(String[] openids);
/**
* 根据手机号查询微信用户
* @param phone
* @return
*/
public SysWxUserInfo getSysWxUserInfoByPhone(@Param("phone")String phone);
}

3
stdiet-custom/src/main/java/com/stdiet/custom/service/ISysImportFanRecordService.java
View File

@ -58,4 +58,7 @@ public interface ISysImportFanRecordService
* @return 结果
*/
public int deleteSysImportFanRecordById(Long id);
//查询总导粉数量
int selectTotalSysImportFanNum(SysImportFanRecord sysImportFanRecord);
}

23
stdiet-custom/src/main/java/com/stdiet/custom/service/ISysImportFanWxAccountService.java
View File

@ -1,7 +1,10 @@
package com.stdiet.custom.service;
import java.util.List;
import java.util.Map;
import com.stdiet.custom.domain.SysImportFanWxAccount;
import com.stdiet.custom.domain.SysWxSaleAccount;
/**
* 导粉记录中对应微信记录Service接口
@ -58,4 +61,24 @@ public interface ISysImportFanWxAccountService
* @return 结果
*/
public int deleteSysImportFanWxAccountById(Long id);
/**
* 根据导粉记录ID、微信ID查询对应微信记录
* @param sysImportFanWxAccount
* @return
*/
public SysImportFanWxAccount getWxAccountByFanRecordId(SysImportFanWxAccount sysImportFanWxAccount);
/**
* 根据日期统计微信号导粉数量
* @return
*/
List<Map<String,Object>> getTotalImportFanNum(SysImportFanWxAccount sysImportFanWxAccount);
/**
* 根据记录ID删除对应所有微信
* @param ids
* @return
*/
int deleteSysImportFanWxAccountByFanRecordIds(Long[] ids);
}

6
stdiet-custom/src/main/java/com/stdiet/custom/service/ISysWxSaleAccountService.java
View File

@ -72,4 +72,10 @@ public interface ISysWxSaleAccountService
String getWxAdId(SysWxAdLog sysWxAdLog);
Integer logWxAd(SysWxAdLog sysWxAdLog);
/**
* 获取可接粉的微信号以及分配的销售昵称
* @return
*/
List<SysWxSaleAccount> getWxAccountAndSale();
}

7
stdiet-custom/src/main/java/com/stdiet/custom/service/ISysWxUserInfoService.java
View File

@ -63,5 +63,12 @@ public interface ISysWxUserInfoService
*/
public int deleteSysWxUserInfoById(String openid);
/**
* 根据手机号查询微信用户
* @param phone
* @return
*/
public SysWxUserInfo getSysWxUserInfoByPhone(String phone);
}

2
stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysCommissionDayServiceImpl.java
View File

@ -33,7 +33,7 @@ public class SysCommissionDayServiceImpl implements ISysCommissionDayService {
private SysOrderMapper sysOrderMapper;
@Autowired
private SysOrderPauseMapper sysOrderPauseMapper;
private SysOrderPauseMapper sysOrderPauseMapper ;
@Autowired
private ISysOrderNutritionistReplaceRecordService sysOrderNutritionistReplaceRecordService;

5
stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysCustomerHealthyServiceImpl.java
View File

@ -14,6 +14,7 @@ import com.stdiet.custom.domain.SysCustomer;
import com.stdiet.custom.domain.SysCustomerPhysicalSigns;
import com.stdiet.custom.dto.request.HealthyDetailRequest;
import com.stdiet.custom.dto.response.NutritionalCalories;
import com.stdiet.custom.mapper.SysCustomerMapper;
import com.stdiet.custom.service.ISysCustomerService;
import com.stdiet.custom.utils.NutritionalUtils;
import com.stdiet.custom.utils.PdfUtils;
@ -36,7 +37,7 @@ public class SysCustomerHealthyServiceImpl implements ISysCustomerHealthyService
private SysCustomerHealthyMapper sysCustomerHealthyMapper;
@Autowired
private ISysCustomerService sysCustomerService;
private SysCustomerMapper sysCustomerMapper;
public static final String reportDownFileNameFormat = "%s超重%s斤%s";
@ -78,7 +79,7 @@ public class SysCustomerHealthyServiceImpl implements ISysCustomerHealthyService
return AjaxResult.error("客户不存在");
}
//判断客户是否存在
SysCustomer sysCustomer = sysCustomerService.selectSysCustomerById(Long.parseLong(customerId));
SysCustomer sysCustomer = sysCustomerMapper.selectSysCustomerById(Long.parseLong(customerId));
if(sysCustomer == null){
return AjaxResult.error("客户不存在");
}

32
stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysCustomerServiceImpl.java
View File

@ -6,10 +6,14 @@ import com.stdiet.common.utils.sign.AesUtils;
import com.stdiet.custom.domain.SysCustomer;
import com.stdiet.custom.domain.SysCustomerHealthy;
import com.stdiet.custom.domain.SysCustomerPhysicalSigns;
import com.stdiet.custom.domain.SysWxUserInfo;
import com.stdiet.custom.mapper.SysCustomerMapper;
import com.stdiet.custom.mapper.SysCustomerPhysicalSignsMapper;
import com.stdiet.custom.mapper.SysWxUserInfoMapper;
import com.stdiet.custom.service.ISysCustomerService;
import com.stdiet.custom.service.ISysWxUserInfoService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -38,6 +42,9 @@ public class SysCustomerServiceImpl implements ISysCustomerService {
@Autowired
private SysCustomerPhysicalSignsServiceImpl sysCustomerPhysicalSignsService;
@Autowired
private ISysWxUserInfoService sysWxUserInfoService;
/**
* 查询客户信息
*
@ -69,7 +76,11 @@ public class SysCustomerServiceImpl implements ISysCustomerService {
@Override
public int insertSysCustomer(SysCustomer sysCustomer) {
sysCustomer.setCreateTime(DateUtils.getNowDate());
return sysCustomerMapper.insertSysCustomer(sysCustomer);
int row = sysCustomerMapper.insertSysCustomer(sysCustomer);
if(row > 0){
updateWxInfoMessage(sysCustomer);
}
return row;
}
/**
@ -81,7 +92,11 @@ public class SysCustomerServiceImpl implements ISysCustomerService {
@Override
public int updateSysCustomer(SysCustomer sysCustomer) {
sysCustomer.setUpdateTime(DateUtils.getNowDate());
return sysCustomerMapper.updateSysCustomer(sysCustomer);
int row = sysCustomerMapper.updateSysCustomer(sysCustomer);
if(row > 0){
updateWxInfoMessage(sysCustomer);
}
return row;
}
/**
@ -177,4 +192,17 @@ public class SysCustomerServiceImpl implements ISysCustomerService {
public SysCustomer getCustomerByOpenId(String openid){
return sysCustomerMapper.getCustomerByOpenId(openid);
}
@Async
public void updateWxInfoMessage(SysCustomer newCustomer){
if(newCustomer == null || newCustomer.getId() == null || StringUtils.isEmpty(newCustomer.getPhone())){
return;
}
//根据手机号查询微信用户记录
SysWxUserInfo wxUserInfo = sysWxUserInfoService.getSysWxUserInfoByPhone(newCustomer.getPhone());
if(wxUserInfo != null && (wxUserInfo.getCusId() == null || wxUserInfo.getCusId().longValue() != newCustomer.getId())){
wxUserInfo.setCusId(newCustomer.getId());
sysWxUserInfoService.updateSysWxUserInfo(wxUserInfo);
}
}
}

48
stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysImportFanRecordServiceImpl.java
View File

@ -1,7 +1,10 @@
package com.stdiet.custom.service.impl;
import java.util.Date;
import java.util.List;
import com.stdiet.common.utils.DateUtils;
import com.stdiet.custom.domain.SysImportFanWxAccount;
import com.stdiet.custom.service.ISysImportFanWxAccountService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.stdiet.custom.mapper.SysImportFanRecordMapper;
@ -20,6 +23,9 @@ public class SysImportFanRecordServiceImpl implements ISysImportFanRecordService
@Autowired
private SysImportFanRecordMapper sysImportFanRecordMapper;
@Autowired
private ISysImportFanWxAccountService sysImportFanWxAccountService;
/**
* 查询导粉管理
*
@ -54,7 +60,29 @@ public class SysImportFanRecordServiceImpl implements ISysImportFanRecordService
public int insertSysImportFanRecord(SysImportFanRecord sysImportFanRecord)
{
sysImportFanRecord.setCreateTime(DateUtils.getNowDate());
return sysImportFanRecordMapper.insertSysImportFanRecord(sysImportFanRecord);
//根据账号渠道、直播间判断是否已存在该渠道的导粉记录
SysImportFanRecord record = sysImportFanRecordMapper.getFanRecordByChannelLive(sysImportFanRecord);
int row = 0;
if(record == null){
row = sysImportFanRecordMapper.insertSysImportFanRecord(sysImportFanRecord);
}
if(record != null || row > 0){
//添加微信号对应记录
SysImportFanWxAccount sysImportFanWxAccount = new SysImportFanWxAccount();
sysImportFanWxAccount.setImportFanRecordId(record != null ? record.getId() : sysImportFanRecord.getId());
sysImportFanWxAccount.setImportWxAccountId(sysImportFanRecord.getWxAccountId());
sysImportFanWxAccount.setImportFanNum(sysImportFanRecord.getFanNum());
sysImportFanWxAccount.setCreateTime(new Date());
//根据微信号、导粉记录查询是否存在
SysImportFanWxAccount oldFanWxAccount = sysImportFanWxAccountService.getWxAccountByFanRecordId(sysImportFanWxAccount);
if(oldFanWxAccount == null){
row = sysImportFanWxAccountService.insertSysImportFanWxAccount(sysImportFanWxAccount);
}else{
oldFanWxAccount.setImportFanNum((oldFanWxAccount.getImportFanNum() == null ? 0 : oldFanWxAccount.getImportFanNum()) + sysImportFanWxAccount.getImportFanNum());
row = sysImportFanWxAccountService.updateSysImportFanWxAccount(oldFanWxAccount);
}
}
return row;
}
/**
@ -79,7 +107,11 @@ public class SysImportFanRecordServiceImpl implements ISysImportFanRecordService
@Override
public int deleteSysImportFanRecordByIds(Long[] ids)
{
return sysImportFanRecordMapper.deleteSysImportFanRecordByIds(ids);
int row = sysImportFanRecordMapper.deleteSysImportFanRecordByIds(ids);
if(row > 0){
sysImportFanWxAccountService.deleteSysImportFanWxAccountByFanRecordIds(ids);
}
return row;
}
/**
@ -91,6 +123,16 @@ public class SysImportFanRecordServiceImpl implements ISysImportFanRecordService
@Override
public int deleteSysImportFanRecordById(Long id)
{
return sysImportFanRecordMapper.deleteSysImportFanRecordById(id);
int row = sysImportFanRecordMapper.deleteSysImportFanRecordById(id);
if(row > 0){
Long[] ids = {id};
sysImportFanWxAccountService.deleteSysImportFanWxAccountByFanRecordIds(ids);
}
return row;
}
//查询总导粉数量
public int selectTotalSysImportFanNum(SysImportFanRecord sysImportFanRecord){
return sysImportFanRecordMapper.selectTotalSysImportFanNum(sysImportFanRecord);
}
}

30
stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysImportFanWxAccountServiceImpl.java
View File

@ -1,7 +1,10 @@
package com.stdiet.custom.service.impl;
import java.util.List;
import java.util.Map;
import com.stdiet.common.utils.DateUtils;
import com.stdiet.custom.domain.SysWxSaleAccount;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.stdiet.custom.mapper.SysImportFanWxAccountMapper;
@ -93,4 +96,31 @@ public class SysImportFanWxAccountServiceImpl implements ISysImportFanWxAccountS
{
return sysImportFanWxAccountMapper.deleteSysImportFanWxAccountById(id);
}
/**
* 根据导粉记录ID、微信ID查询对应微信记录
* @param sysImportFanWxAccount
* @return
*/
public SysImportFanWxAccount getWxAccountByFanRecordId(SysImportFanWxAccount sysImportFanWxAccount){
return sysImportFanWxAccountMapper.getWxAccountByFanRecordId(sysImportFanWxAccount);
}
/**
* 根据日期统计微信号导粉数量
* @return
*/
public List<Map<String,Object>> getTotalImportFanNum(SysImportFanWxAccount sysImportFanWxAccount){
return sysImportFanWxAccountMapper.getTotalImportFanNum(sysImportFanWxAccount);
}
/**
* 根据记录ID删除对应所有微信
* @param ids
* @return
*/
public int deleteSysImportFanWxAccountByFanRecordIds(Long[] ids){
return sysImportFanWxAccountMapper.deleteSysImportFanWxAccountByFanRecordIds(ids);
}
}

5
stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysRecipesServiceImpl.java
View File

@ -64,7 +64,10 @@ public class SysRecipesServiceImpl implements ISysRecipesService {
@Override
public List<SysRecipes> selectSysRecipesByRecipesId(Long id) {
return sysRecipesMapper.selectSysRecipesByRecipesId(id);
long t = System.currentTimeMillis();
List<SysRecipes> list = sysRecipesMapper.selectSysRecipesByRecipesId(id);
System.out.println(System.currentTimeMillis() - t);
return list;
}
@Override

11
stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysWxSaleAccountServiceImpl.java
View File

@ -9,7 +9,9 @@ import com.stdiet.custom.service.ISysWxSaleAccountService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Date;
import java.util.List;
import java.util.Map;
/**
* 微信账号Service业务层处理
@ -128,4 +130,13 @@ public class SysWxSaleAccountServiceImpl implements ISysWxSaleAccountService {
public Integer logWxAd(SysWxAdLog sysWxAdLog) {
return sysWxSaleAccountMapper.insertWxAdLog(sysWxAdLog);
}
/**
* 获取可接粉的微信号以及分配的销售昵称
* @param sysWxSaleAccount
* @return
*/
public List<SysWxSaleAccount> getWxAccountAndSale(){
return sysWxSaleAccountMapper.getWxAccountAndSale();
}
}

9
stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysWxUserInfoServiceImpl.java
View File

@ -97,4 +97,13 @@ public class SysWxUserInfoServiceImpl implements ISysWxUserInfoService {
public int deleteSysWxUserInfoById(String openid) {
return sysWxUserInfoMapper.deleteSysWxUserInfoById(openid);
}
/**
* 根据手机号查询微信用户
* @param phone
* @return
*/
public SysWxUserInfo getSysWxUserInfoByPhone(String phone){
return sysWxUserInfoMapper.getSysWxUserInfoByPhone(phone);
}
}