zt/canteen
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

去掉分账

Browse Source
This commit is contained in:
seesaw
2024-09-26 10:40:53 +08:00
parent 101251c777
commit 67fe0b5563
7 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/MemberUserController.java
View File

@ -123,6 +123,7 @@ public class MemberUserController {
List<String> 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<Long, String> 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);
}

2
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/vo/MemberUserRespVO.java
View File

@ -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;
}

5
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/user/MemberUserMapper.java
View File

@ -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<MemberUserDO> {
.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);
}

2
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserService.java
View File

@ -244,4 +244,6 @@ public interface MemberUserService {
String getCardId(Long userId);
BigDecimal getReductionAmount(Long userId,BigDecimal money,LocalDateTime time);
String getFaceUrl(Long userId);
}

6
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImpl.java
View File

@ -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);

2
yudao-module-pay/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/weixin/WxPubPayClient.java
View File

@ -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);

12
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/app/face/FaceController.java
View File

@ -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<String> faceAdd(SaveDto saveDto) {
public CommonResult<Map<String,String>> faceAdd(SaveDto saveDto) {
Map<String,String> result = new HashMap<>();
log.info("添加人脸特征值到数据库");
// 生成雪花id
long nextId = IdUtil.getSnowflake().nextId();
CommonResult<String> httpResult = CommonResult.success("成功");
CommonResult<Map<String,String>> 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;
}