From 67fe0b55639da99782e00646ee54fbad72cded24 Mon Sep 17 00:00:00 2001 From: seesaw Date: Thu, 26 Sep 2024 10:40:53 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=88=86=E8=B4=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/admin/user/MemberUserController.java | 2 ++ .../controller/admin/user/vo/MemberUserRespVO.java | 2 ++ .../member/dal/mysql/user/MemberUserMapper.java | 5 +++++ .../member/service/user/MemberUserService.java | 2 ++ .../member/service/user/MemberUserServiceImpl.java | 6 +++++- .../pay/core/client/impl/weixin/WxPubPayClient.java | 2 +- .../system/controller/app/face/FaceController.java | 12 ++++++++---- 7 files changed, 25 insertions(+), 6 deletions(-) diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/MemberUserController.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/MemberUserController.java index dbacf2c5..97d7ade4 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/MemberUserController.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/MemberUserController.java @@ -123,6 +123,7 @@ public class MemberUserController { List tagNames = tags.stream().map(MemberTagDO::getName).collect(Collectors.toList()); memberUserRespVO.setTagNames(tagNames); } + memberUserRespVO.setFaceUrl(memberUserService.getFaceUrl(memberUserRespVO.getId())); memberUserRespVO.setGroupName(MemberGroupService.getGroupNameByUserId(id)); return success(memberUserRespVO); } @@ -153,6 +154,7 @@ public class MemberUserController { Map groupNames = MemberGroupService.getGroupNameByUserIds(pageResult.getList().stream().map(MemberUserDO::getId).collect(Collectors.toList())); memberUserRespVOPageResult.getList().forEach(respVo->{ respVo.setGroupName(groupNames.get(respVo.getId())); + respVo.setFaceUrl(memberUserService.getFaceUrl(respVo.getId())); }); return success(memberUserRespVOPageResult); } diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/vo/MemberUserRespVO.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/vo/MemberUserRespVO.java index 08b12345..d78709de 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/vo/MemberUserRespVO.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/vo/MemberUserRespVO.java @@ -49,5 +49,7 @@ public class MemberUserRespVO extends MemberUserBaseVO { @Schema(description = "用户经验值", requiredMode = Schema.RequiredMode.REQUIRED, example = "200") private Integer experience; + @Schema(description = "用户人脸", requiredMode = Schema.RequiredMode.REQUIRED, example = "200") + private String faceUrl; } diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/user/MemberUserMapper.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/user/MemberUserMapper.java index e72f3a52..c283c8a2 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/user/MemberUserMapper.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/user/MemberUserMapper.java @@ -13,6 +13,7 @@ import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; import java.util.List; import java.util.stream.Collectors; @@ -110,4 +111,8 @@ public interface MemberUserMapper extends BaseMapperX { .notIn(CollectionUtil.isNotEmpty(listVO.getIds()) ,MemberUserDO::getId, listVO.getIds()) .orderByDesc(MemberUserDO::getId)); } + + @Select("select url from user_face where sys_user_id = #{userId}") + String getFace(Long userId); + } diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserService.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserService.java index b5794283..6e86217b 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserService.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserService.java @@ -244,4 +244,6 @@ public interface MemberUserService { String getCardId(Long userId); BigDecimal getReductionAmount(Long userId,BigDecimal money,LocalDateTime time); + + String getFaceUrl(Long userId); } diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImpl.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImpl.java index b9c2d45c..ae467ecc 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImpl.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImpl.java @@ -769,8 +769,12 @@ public class MemberUserServiceImpl implements MemberUserService { } } + @Override + public String getFaceUrl(Long userId) { + return memberUserMapper.getFace(userId); + } - public BigDecimal countAmount(MemberTagDO memberTagDO,BigDecimal money,String timePeriod ){ + public BigDecimal countAmount(MemberTagDO memberTagDO, BigDecimal money, String timePeriod ){ if(memberTagDO.getType().equals("1")){ if (memberTagDO.getTimeFlag().equals("0")){ return money.multiply(memberTagDO.getProportion()).setScale(2, RoundingMode.HALF_UP); diff --git a/yudao-module-pay/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/weixin/WxPubPayClient.java b/yudao-module-pay/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/weixin/WxPubPayClient.java index e56cfc83..05832a14 100644 --- a/yudao-module-pay/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/weixin/WxPubPayClient.java +++ b/yudao-module-pay/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/weixin/WxPubPayClient.java @@ -60,7 +60,7 @@ public class WxPubPayClient extends AbstractWxPayClient { WxPayUnifiedOrderV3Request request = buildPayUnifiedOrderRequestV3(reqDTO) .setPayer(new WxPayUnifiedOrderV3Request.Payer().setOpenid(getOpenid(reqDTO))); //添加分账 - request.setSettleInfo(new WxPayUnifiedOrderV3Request.SettleInfo().setProfitSharing(true)); +// request.setSettleInfo(new WxPayUnifiedOrderV3Request.SettleInfo().setProfitSharing(true)); // 执行请求 WxPayUnifiedOrderV3Result.JsapiResult response = client.createOrderV3(TradeTypeEnum.JSAPI, request); diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/app/face/FaceController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/app/face/FaceController.java index 7c7e9ef0..9e8a1f8e 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/app/face/FaceController.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/app/face/FaceController.java @@ -24,6 +24,7 @@ import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; +import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Random; @@ -44,11 +45,13 @@ public class FaceController { @PostMapping("/register") - public CommonResult faceAdd(SaveDto saveDto) { + public CommonResult> faceAdd(SaveDto saveDto) { + Map result = new HashMap<>(); + log.info("添加人脸特征值到数据库"); // 生成雪花id long nextId = IdUtil.getSnowflake().nextId(); - CommonResult httpResult = CommonResult.success("成功"); + CommonResult> httpResult = new CommonResult<>(); MultipartFile file = saveDto.getFile(); if (file.isEmpty()) { httpResult.setMsg("文件为空"); @@ -70,8 +73,9 @@ public class FaceController { userById.setUrl(imagePath); faceService.getBaseMapper().updateById(userById); } - - httpResult.setData(String.valueOf(nextId)); + result.put("faceId", String.valueOf(nextId)); + result.put("faceUrl", imagePath); + httpResult.setData(result); return httpResult; }