java/jiashida.git

			@@ -1,14 +1,17 @@
			package com.ruoyi.web.controller.api;

			import cn.hutool.core.date.DateUtil;
			import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
			import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
			import com.ruoyi.common.core.domain.R;
			import com.ruoyi.common.utils.DateUtils;
			import com.ruoyi.framework.web.service.TokenService;
			import com.ruoyi.system.contstant.RedisConstant;
			import com.ruoyi.system.dto.UpdatePhoneDto;
			import com.ruoyi.system.dto.UpdateUserDto;
			import com.ruoyi.system.enums.UserTypeEnum;
			import com.ruoyi.system.model.TAppUser;
			import com.ruoyi.system.model.TCommissionTransactionFlow;
			import com.ruoyi.system.service.TAppUserService;
			import com.ruoyi.system.service.TCommissionTransactionFlowService;
			import com.ruoyi.system.utils.wx.WxQrCodeUtil;
			@@ -22,6 +25,9 @@
			import org.springframework.data.redis.core.RedisTemplate;
			import org.springframework.web.bind.annotation.*;

			import java.math.BigDecimal;
			import java.util.Date;
			import java.util.List;
			import java.util.Objects;

			/**
			@@ -62,8 +68,13 @@
			} else {
			appUser.setPromotionQrCode(cache.toString());
			}
			//查询预估积分
			Date now = new Date();
			List<TCommissionTransactionFlow> list = commissionTransactionFlowService.lambdaQuery().eq(TCommissionTransactionFlow::getAppUserId, userId)
			.between(TCommissionTransactionFlow::getCreateTime, DateUtil.beginOfMonth(now), DateUtil.endOfMonth(now)).list();
			Integer total = list.stream().mapToInt(TCommissionTransactionFlow::getCommissionAmount).sum();
			appUser.setEstimatedMonthlyIntegral(total);
			}
			//todo 查询预估积分
			return R.ok(appUser);
			}

			@@ -202,6 +202,7 @@
			url:
			prefix: https://xzgt.test.591taxi.cn:${server.port}${server.servlet.context-path}
			wx:
			url: https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid={0}&secret={1}
			conf:
			appId: wx87744e4e4094a829
			secretId: c322159083d844e63dff458b5e54c4c9

			@@ -192,6 +192,7 @@
			accessPath: /file/
			allowExt: .jpg\|.png\|.gif\|.jpeg\|.doc\|.docx\|.apk\|.MP4\|.mp4\|.pdf\|.PDF\|.xls\|.xlsx\|.rar\|.zip\|.rar\|.m4a
			wx:
			url: https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid={0}&secret={1}
			conf:
			appId: wx87744e4e4094a829
			secretId: c322159083d844e63dff458b5e54c4c9

			@@ -58,7 +58,7 @@

			@ApiModelProperty(value = "佣金收入金额")
			@TableField("commission_amount")
			private BigDecimal commissionAmount;
			private Integer commissionAmount;

			@ApiModelProperty(value = "添加时间")
			@TableField("create_time")

	ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/UserIndexController.java	13 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-applet/src/main/resources/application-prod.yml	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-applet/src/main/resources/application-test.yml	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-system/src/main/java/com/ruoyi/system/model/TCommissionTransactionFlow.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史