diff --git a/nursing-unit-admin/nu-admin-api/nu-admin-local-api/src/main/java/com/nu/modules/orgapplyinfo/api/IOrgApplyInfoApi.java b/nursing-unit-admin/nu-admin-api/nu-admin-local-api/src/main/java/com/nu/modules/orgapplyinfo/api/IOrgApplyInfoApi.java index e445c98..4f13f13 100644 --- a/nursing-unit-admin/nu-admin-api/nu-admin-local-api/src/main/java/com/nu/modules/orgapplyinfo/api/IOrgApplyInfoApi.java +++ b/nursing-unit-admin/nu-admin-api/nu-admin-local-api/src/main/java/com/nu/modules/orgapplyinfo/api/IOrgApplyInfoApi.java @@ -10,5 +10,5 @@ public interface IOrgApplyInfoApi { int updateById(OrgApplyInfoApiEntity orgApplyInfoApiEntity); - List queryAuditInfo(String tel); + List queryAuditInfo(String openId, String id, String status); } diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/NuBizAdvisoryInfo/controller/H5ApiAdvisoryInfoController.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/NuBizAdvisoryInfo/controller/H5ApiAdvisoryInfoController.java index 8a428b4..e3e4b14 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/NuBizAdvisoryInfo/controller/H5ApiAdvisoryInfoController.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/NuBizAdvisoryInfo/controller/H5ApiAdvisoryInfoController.java @@ -17,6 +17,7 @@ import org.jeecg.common.aspect.annotation.AutoLog; import org.jeecg.common.system.base.controller.JeecgController; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.query.QueryRuleEnum; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.*; @@ -55,6 +56,7 @@ public class H5ApiAdvisoryInfoController extends JeecgController add(@RequestBody NuBizAdvisoryInfo nuBizAdvisoryInfo) { nuBizAdvisoryInfoService.save(nuBizAdvisoryInfo); + nuBizAdvisoryInfoService.handlePlatId(nuBizAdvisoryInfo); return Result.OK(nuBizAdvisoryInfo); } @@ -126,22 +128,12 @@ public class H5ApiAdvisoryInfoController extends JeecgController editNuBizAdvisoryInfo(@RequestBody NuBizAdvisoryInfo nuBizAdvisoryInfo) { - if(StringUtils.isEmpty(nuBizAdvisoryInfo.getOpenId())){ - return Result.error("填写openId"); - } - if(StringUtils.isEmpty(nuBizAdvisoryInfo.getServerUrl())){ - return Result.error("填写微信名称"); - } QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("open_id",nuBizAdvisoryInfo.getOpenId()); - NuBizAdvisoryInfo nuBizAdvisoryInfoQuery = nuBizAdvisoryInfoService.getOne(queryWrapper); - if(nuBizAdvisoryInfoQuery == null){ - return Result.error("未找到对应数据"); - } - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.eq("open_id",nuBizAdvisoryInfo.getOpenId()); - updateWrapper.set("server_url",nuBizAdvisoryInfo.getServerUrl()); - nuBizAdvisoryInfoService.update(updateWrapper); + NuBizAdvisoryInfo upData = new NuBizAdvisoryInfo(); + upData.setAvatar(nuBizAdvisoryInfo.getAvatar());//改头像 + upData.setNickName(nuBizAdvisoryInfo.getNickName());//改昵称 + nuBizAdvisoryInfoService.update(upData,queryWrapper); return Result.OK("编辑成功!"); } diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/NuBizAdvisoryInfo/entity/NuBizAdvisoryInfo.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/NuBizAdvisoryInfo/entity/NuBizAdvisoryInfo.java index 5c4ad6c..5d5d156 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/NuBizAdvisoryInfo/entity/NuBizAdvisoryInfo.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/NuBizAdvisoryInfo/entity/NuBizAdvisoryInfo.java @@ -38,6 +38,9 @@ public class NuBizAdvisoryInfo implements Serializable { @TableId(type = IdType.ASSIGN_ID) @ApiModelProperty(value = "id") private String id; + /**平台id*/ + @ApiModelProperty(value = "平台Id") + private Long platId; /**微信id*/ @Excel(name = "微信id", width = 15) @ApiModelProperty(value = "微信id") @@ -50,6 +53,13 @@ public class NuBizAdvisoryInfo implements Serializable { @Excel(name = "咨询人姓名", width = 15) @ApiModelProperty(value = "咨询人姓名") private String name; + /**昵称*/ + @Excel(name = "昵称", width = 15) + @ApiModelProperty(value = "昵称") + private String nickName; + /**头像*/ + @ApiModelProperty(value = "头像") + private String avatar; /**性别*/ @Excel(name = "性别", width = 15, dicCode = "sex") @Dict(dicCode = "sex") @@ -120,7 +130,6 @@ public class NuBizAdvisoryInfo implements Serializable { private String izJs;//是否是家属 0否 1是 private String izJg;//是否是机构 0否 1是 - @TableField(exist = false) private String advisoryTypeName; @TableField(exist = false) diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/NuBizAdvisoryInfo/mapper/NuBizAdvisoryInfoMapper.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/NuBizAdvisoryInfo/mapper/NuBizAdvisoryInfoMapper.java index ea5fed0..fa39746 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/NuBizAdvisoryInfo/mapper/NuBizAdvisoryInfoMapper.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/NuBizAdvisoryInfo/mapper/NuBizAdvisoryInfoMapper.java @@ -17,4 +17,5 @@ public interface NuBizAdvisoryInfoMapper extends BaseMapper { NuBizAdvisoryInfo getUserByTel(@Param("mobile") String mobile); NuBizAdvisoryInfo findByOpenId(@Param("openId")String openId); + } diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/NuBizAdvisoryInfo/mapper/xml/NuBizAdvisoryInfoMapper.xml b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/NuBizAdvisoryInfo/mapper/xml/NuBizAdvisoryInfoMapper.xml index fd4d5e9..f68baf3 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/NuBizAdvisoryInfo/mapper/xml/NuBizAdvisoryInfoMapper.xml +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/NuBizAdvisoryInfo/mapper/xml/NuBizAdvisoryInfoMapper.xml @@ -8,4 +8,5 @@ - \ No newline at end of file + + diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/NuBizAdvisoryInfo/service/INuBizAdvisoryInfoService.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/NuBizAdvisoryInfo/service/INuBizAdvisoryInfoService.java index f7876e8..31661cc 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/NuBizAdvisoryInfo/service/INuBizAdvisoryInfoService.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/NuBizAdvisoryInfo/service/INuBizAdvisoryInfoService.java @@ -16,4 +16,6 @@ public interface INuBizAdvisoryInfoService extends IService { NuBizAdvisoryInfo getUserByTel(String mobile); NuBizAdvisoryInfo findByOpenId(String openId); + + void handlePlatId(NuBizAdvisoryInfo nuBizAdvisoryInfo); } diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/NuBizAdvisoryInfo/service/impl/NuBizAdvisoryInfoServiceImpl.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/NuBizAdvisoryInfo/service/impl/NuBizAdvisoryInfoServiceImpl.java index 5cb4501..ec40523 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/NuBizAdvisoryInfo/service/impl/NuBizAdvisoryInfoServiceImpl.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/NuBizAdvisoryInfo/service/impl/NuBizAdvisoryInfoServiceImpl.java @@ -17,13 +17,15 @@ import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import javax.servlet.http.HttpServletRequest; +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; import java.util.LinkedHashMap; import java.util.List; /** * @Description: 咨询信息 * @Author: 张明远 - * @Date: 2025-04-07 + * @Date: 2025-04-07 * @Version: V1.0 */ @Service @@ -35,23 +37,40 @@ public class NuBizAdvisoryInfoServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("open_id",openId); - queryWrapper.eq(StringUtils.isNotBlank(wechatName),"wechat_name",wechatName); + queryWrapper.eq("open_id", openId); + queryWrapper.eq(StringUtils.isNotBlank(wechatName), "wechat_name", wechatName); NuBizAdvisoryInfo nuBizAdvisoryInfo = baseMapper.selectOne(queryWrapper); //查询是否有微信注册信息，没有则创建 - if(nuBizAdvisoryInfo==null) { + if (nuBizAdvisoryInfo == null) { nuBizAdvisoryInfo = new NuBizAdvisoryInfo(); nuBizAdvisoryInfo.setOpenId(openId); nuBizAdvisoryInfo.setWechatName(wechatName); baseMapper.insert(nuBizAdvisoryInfo); + + QueryWrapper qw = new QueryWrapper<>(); + qw.orderByDesc("plat_id"); + qw.last("limit 1"); + NuBizAdvisoryInfo info = baseMapper.selectOne(qw); + if (info.getPlatId() == null) { + System.out.println(LocalDate.now().format(DateTimeFormatter.ofPattern("yyMM")) + "000001"); + System.out.println(Long.parseLong(LocalDate.now().format(DateTimeFormatter.ofPattern("yyMM")) + "000001")); + nuBizAdvisoryInfo.setPlatId(Long.parseLong(LocalDate.now().format(DateTimeFormatter.ofPattern("yyMM")) + "000001")); + System.out.println(nuBizAdvisoryInfo.getPlatId()); + } else { + String maxPlatId = info.getPlatId() + ""; + long num = Long.parseLong(maxPlatId.substring(4)); + nuBizAdvisoryInfo.setPlatId(Long.parseLong(LocalDate.now().format(DateTimeFormatter.ofPattern("yyMM")) + String.format("%06d", num + 1))); + } + baseMapper.updateById(nuBizAdvisoryInfo); } - if(StringUtils.isNotBlank(nuBizAdvisoryInfo.getTel())){ - String token =userInfo(nuBizAdvisoryInfo); + if (StringUtils.isNotBlank(nuBizAdvisoryInfo.getTel())) { + String token = userInfo(nuBizAdvisoryInfo); nuBizAdvisoryInfo.setToken(token); } return nuBizAdvisoryInfo; } + /** * 用户信息 * @@ -76,6 +95,25 @@ public class NuBizAdvisoryInfoServiceImpl extends ServiceImpl qw = new QueryWrapper<>(); + qw.orderByDesc("plat_id"); + qw.last("limit 1"); + NuBizAdvisoryInfo info = baseMapper.selectOne(qw); + if (info.getPlatId() == null) { + System.out.println(LocalDate.now().format(DateTimeFormatter.ofPattern("yyMM")) + "000001"); + System.out.println(Long.parseLong(LocalDate.now().format(DateTimeFormatter.ofPattern("yyMM")) + "000001")); + nuBizAdvisoryInfo.setPlatId(Long.parseLong(LocalDate.now().format(DateTimeFormatter.ofPattern("yyMM")) + "000001")); + System.out.println(nuBizAdvisoryInfo.getPlatId()); + } else { + String maxPlatId = info.getPlatId() + ""; + long num = Long.parseLong(maxPlatId.substring(4)); + nuBizAdvisoryInfo.setPlatId(Long.parseLong(LocalDate.now().format(DateTimeFormatter.ofPattern("yyMM")) + String.format("%06d", num + 1))); + } + baseMapper.updateById(nuBizAdvisoryInfo); } } diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/service/impl/OrgApplyInfoServiceImpl.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/service/impl/OrgApplyInfoServiceImpl.java index 06319f9..5684f47 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/service/impl/OrgApplyInfoServiceImpl.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/service/impl/OrgApplyInfoServiceImpl.java @@ -9,6 +9,7 @@ import com.nu.modules.orgapplyinfo.entity.OrgApplyInfoApiEntity; import com.nu.modules.orgapplyinfo.mapper.OrgApplyInfoMapper; import com.nu.modules.orgapplyinfo.service.IOrgApplyInfoService; import com.nu.utils.DictUtils; +import org.apache.commons.lang.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -30,7 +31,7 @@ public class OrgApplyInfoServiceImpl extends ServiceImpl queryAuditInfo(String tel) { + public List queryAuditInfo(String openId,String id, String status) { QueryWrapper qw = new QueryWrapper<>(); - qw.eq("tel", tel); + qw.eq("open_id", openId); + if (StringUtils.isNotBlank(id)) { + qw.eq("id", id); + } + if (StringUtils.isNotBlank(status)) { + qw.eq("status", status); + } qw.orderByDesc("create_time"); List list = baseMapper.selectList(qw); - for(OrgApplyInfo par:list){ - par.setOrgProvince_dictText(dictUtils.translateDictValue("id","name","sys_category",par.getOrgProvince())); - par.setOrgCity_dictText(dictUtils.translateDictValue("id","name","sys_category",par.getOrgCity())); - par.setOrgDistrict_dictText(dictUtils.translateDictValue("id","name","sys_category",par.getOrgDistrict())); + for (OrgApplyInfo par : list) { + par.setOrgProvince_dictText(dictUtils.translateDictValue("id", "name", "sys_category", par.getOrgProvince())); + par.setOrgCity_dictText(dictUtils.translateDictValue("id", "name", "sys_category", par.getOrgCity())); + par.setOrgDistrict_dictText(dictUtils.translateDictValue("id", "name", "sys_category", par.getOrgDistrict())); } String jsonStr = JSON.toJSONString(list); diff --git a/nursing-unit-api/src/main/java/com/nu/modules/wechat/orgapplyinfo/api/OrgApplyInfoApi.java b/nursing-unit-api/src/main/java/com/nu/modules/wechat/orgapplyinfo/api/OrgApplyInfoApi.java index 9399a9e..8ef6cdb 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/wechat/orgapplyinfo/api/OrgApplyInfoApi.java +++ b/nursing-unit-api/src/main/java/com/nu/modules/wechat/orgapplyinfo/api/OrgApplyInfoApi.java @@ -24,21 +24,22 @@ public class OrgApplyInfoApi { /** * 新增/编辑机构加盟申请信息 + * * @param orgApplyInfoApiEntity * @return */ @AutoLog(value = "新增/编辑机构加盟申请信息") @PostMapping("/save") public Result save(@RequestBody OrgApplyInfoApiEntity orgApplyInfoApiEntity) { - System.out.println("-----------新增/编辑机构加盟申请信息--------tel------------"+orgApplyInfoApiEntity.getTel()); - if(StringUtils.isNotBlank(orgApplyInfoApiEntity.getTel())){ + System.out.println("-----------新增/编辑机构加盟申请信息--------tel------------" + orgApplyInfoApiEntity.getTel()); + if (StringUtils.isNotBlank(orgApplyInfoApiEntity.getTel())) { EmployeesAdvisoryInfoEntity employeesAdvisoryInfoEntity = new EmployeesAdvisoryInfoEntity(); employeesAdvisoryInfoEntity.setTel(orgApplyInfoApiEntity.getTel()); employeesAdvisoryInfoEntity.setAdvisoryType("3"); employeesAdvisoryInfoEntity.setIzJg("1"); - System.out.println("-----------新增/编辑机构加盟申请信息--------employeesAdvisoryInfoEntity1------------"+employeesAdvisoryInfoEntity.getTel()); - System.out.println("-----------新增/编辑机构加盟申请信息--------employeesAdvisoryInfoEntity2------------"+employeesAdvisoryInfoEntity.getAdvisoryType()); - System.out.println("-----------新增/编辑机构加盟申请信息--------employeesAdvisoryInfoEntity3------------"+employeesAdvisoryInfoEntity.getIzJg()); + System.out.println("-----------新增/编辑机构加盟申请信息--------employeesAdvisoryInfoEntity1------------" + employeesAdvisoryInfoEntity.getTel()); + System.out.println("-----------新增/编辑机构加盟申请信息--------employeesAdvisoryInfoEntity2------------" + employeesAdvisoryInfoEntity.getAdvisoryType()); + System.out.println("-----------新增/编辑机构加盟申请信息--------employeesAdvisoryInfoEntity3------------" + employeesAdvisoryInfoEntity.getIzJg()); employessAdvisioryInfoApi.updateByTel(employeesAdvisoryInfoEntity); } if (StringUtils.isNotBlank(orgApplyInfoApiEntity.getId())) { @@ -50,16 +51,18 @@ public class OrgApplyInfoApi { } /** - * 根据手机号获取加盟申请信息 + * 根据微信号获取加盟申请信息 * - * @param tel + * @param id nu_org_apply_info表id + * @param openId 微信openid + * @param status 审核状态 * @return */ @GetMapping("/queryAuditInfo") - public Result> queryAuditInfo(@RequestParam("tel") String tel){ - if(StringUtils.isBlank(tel)){ - return Result.error("手机号码错误"); + public Result> queryAuditInfo(@RequestParam("openId") String openId, @RequestParam(value = "id", required = false) String id, @RequestParam(value = "status", required = false) String status) { + if (StringUtils.isBlank(openId)) { + return Result.error("未填写openId"); } - return Result.ok(orgApplyInfoApi.queryAuditInfo(tel)); + return Result.ok(orgApplyInfoApi.queryAuditInfo(openId, id,status)); } }